X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmultilink.c;h=6f17cf87eeb10df66e68430cab87b476c1bf6c25;hb=607d8eadccfd62c1fa84a36bd1440bd48b4e55ca;hp=7444162e66eef0dc3d43c52f78569ef013ce59cd;hpb=637346ba24c289c5a0485651c05baa3f7c22a6b8;p=ppp.git

diff --git a/pppd/multilink.c b/pppd/multilink.c
index 7444162..6f17cf8 100644
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -27,6 +27,11 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -50,13 +55,13 @@ bool multilink_master;		/* we own the multilink bundle */
 extern TDB_CONTEXT *pppdb;
 extern char db_key[];
 
-static void make_bundle_links __P((int append));
-static void remove_bundle_link __P((void));
-static void iterate_bundle_links __P((void (*func) __P((char *))));
+static void make_bundle_links(int append);
+static void remove_bundle_link(void);
+static void iterate_bundle_links(void (*func)(char *));
 
-static int get_default_epdisc __P((struct epdisc *));
-static int parse_num __P((char *str, const char *key, int *valp));
-static int owns_unit __P((TDB_DATA pid, int unit));
+static int get_default_epdisc(struct epdisc *);
+static int parse_num(char *str, const char *key, int *valp);
+static int owns_unit(TDB_DATA pid, int unit);
 
 #define set_ip_epdisc(ep, addr) do {	\
 	ep->length = 4;			\
@@ -74,7 +79,7 @@ static int owns_unit __P((TDB_DATA pid, int unit));
 #define process_exists(n)	(kill((n), 0) == 0 || errno != ESRCH)
 
 void
-mp_check_options()
+mp_check_options(void)
 {
 	lcp_options *wo = &lcp_wantoptions[0];
 	lcp_options *ao = &lcp_allowoptions[0];
@@ -102,7 +107,7 @@ mp_check_options()
  * if we are doing multilink.
  */
 int
-mp_join_bundle()
+mp_join_bundle(void)
 {
 	lcp_options *go = &lcp_gotoptions[0];
 	lcp_options *ho = &lcp_hisoptions[0];
@@ -193,7 +198,7 @@ mp_join_bundle()
 	 * Check if the bundle ID is already in the database.
 	 */
 	unit = -1;
-	tdb_writelock(pppdb);
+	lock_db();
 	key.dptr = bundle_id;
 	key.dsize = p - bundle_id;
 	pid = tdb_fetch(pppdb, key);
@@ -204,7 +209,7 @@ mp_join_bundle()
 			/* make sure the string is null-terminated */
 			rec.dptr[rec.dsize-1] = 0;
 			/* parse the interface number */
-			parse_num(rec.dptr, "IFNAME=ppp", &unit);
+			parse_num(rec.dptr, "UNIT=", &unit);
 			/* check the pid value */
 			if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid)
 			    || !process_exists(pppd_pid)
@@ -221,7 +226,7 @@ mp_join_bundle()
 			set_ifunit(0);
 			script_setenv("BUNDLE", bundle_id + 7, 0);
 			make_bundle_links(1);
-			tdb_writeunlock(pppdb);
+			unlock_db();
 			info("Link attached to %s", ifname);
 			return 1;
 		}
@@ -234,17 +239,17 @@ mp_join_bundle()
 	netif_set_mtu(0, mtu);
 	script_setenv("BUNDLE", bundle_id + 7, 1);
 	make_bundle_links(0);
-	tdb_writeunlock(pppdb);
+	unlock_db();
 	info("New bundle %s created", ifname);
 	multilink_master = 1;
 	return 0;
 }
 
-void mp_exit_bundle()
+void mp_exit_bundle(void)
 {
-	tdb_writelock(pppdb);
+	lock_db();
 	remove_bundle_link();
-	tdb_writeunlock(pppdb);
+	unlock_db();
 }
 
 static void sendhup(char *str)
@@ -258,7 +263,7 @@ static void sendhup(char *str)
 	}
 }
 
-void mp_bundle_terminated()
+void mp_bundle_terminated(void)
 {
 	TDB_DATA key;
 
@@ -271,15 +276,18 @@ void mp_bundle_terminated()
 		script_unsetenv("IFNAME");
 	}
 
-	tdb_writelock(pppdb);
+	lock_db();
 	destroy_bundle();
 	iterate_bundle_links(sendhup);
 	key.dptr = blinks_id;
 	key.dsize = strlen(blinks_id);
 	tdb_delete(pppdb, key);
-	tdb_writeunlock(pppdb);
-	
-new_phase(PHASE_DEAD);
+	unlock_db();
+
+	new_phase(PHASE_DEAD);
+
+	doing_multilink = 0;
+	multilink_master = 0;
 }
 
 static void make_bundle_links(int append)
@@ -322,7 +330,7 @@ static void make_bundle_links(int append)
 		free(p);
 }
 
-static void remove_bundle_link()
+static void remove_bundle_link(void)
 {
 	TDB_DATA key, rec;
 	char entry[32];
@@ -385,10 +393,7 @@ static void iterate_bundle_links(void (*func)(char *))
 }
 
 static int
-parse_num(str, key, valp)
-     char *str;
-     const char *key;
-     int *valp;
+parse_num(char *str, const char *key, int *valp)
 {
 	char *p, *endp;
 	int i;
@@ -409,15 +414,13 @@ parse_num(str, key, valp)
  * Check whether the pppd identified by `key' still owns ppp unit `unit'.
  */
 static int
-owns_unit(key, unit)
-     TDB_DATA key;
-     int unit;
+owns_unit(TDB_DATA key, int unit)
 {
 	char ifkey[32];
 	TDB_DATA kd, vd;
 	int ret = 0;
 
-	slprintf(ifkey, sizeof(ifkey), "IFNAME=ppp%d", unit);
+	slprintf(ifkey, sizeof(ifkey), "UNIT=%d", unit);
 	kd.dptr = ifkey;
 	kd.dsize = strlen(ifkey);
 	vd = tdb_fetch(pppdb, kd);
@@ -430,16 +433,13 @@ owns_unit(key, unit)
 }
 
 static int
-get_default_epdisc(ep)
-     struct epdisc *ep;
+get_default_epdisc(struct epdisc *ep)
 {
-	char *p;
 	struct hostent *hp;
 	u_int32_t addr;
 
 	/* First try for an ethernet MAC address */
-	p = get_first_ethernet();
-	if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) {
+	if (get_first_ether_hwaddr(ep->value) >= 0) {
 		ep->class = EPD_MAC;
 		ep->length = 6;
 		return 1;
@@ -471,8 +471,7 @@ static char *endp_class_names[] = {
 };
 
 char *
-epdisc_to_str(ep)
-     struct epdisc *ep;
+epdisc_to_str(struct epdisc *ep)
 {
 	static char str[MAX_ENDP_LEN*3+8];
 	u_char *p = ep->value;
@@ -522,9 +521,7 @@ static int hexc_val(int c)
 }
 
 int
-str_to_epdisc(ep, str)
-     struct epdisc *ep;
-     char *str;
+str_to_epdisc(struct epdisc *ep, char *str)
 {
 	int i, l;
 	char *p, *endp;
@@ -586,4 +583,3 @@ str_to_epdisc(ep, str)
 	ep->length = l;
 	return 1;
 }
-