X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmultilink.c;h=3aee0bcf6876686e73599835c483a1d585824cba;hp=07bd6d0c62b2ca769299978c6ce5cdf17bc3bbe6;hb=HEAD;hpb=2ae35d6c067d198c5e0bb4ac2d480271f3de3540

diff --git a/pppd/multilink.c b/pppd/multilink.c
index 07bd6d0..b44d2bb 100644
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -17,7 +17,7 @@
  * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
+ *     <paulus@ozlabs.org>".
  *
  * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -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>
@@ -36,10 +41,11 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
-#include "pppd.h"
+#include "pppd-private.h"
 #include "fsm.h"
 #include "lcp.h"
 #include "tdb.h"
+#include "multilink.h"
 
 bool endpoint_specified;	/* user gave explicit endpoint discriminator */
 char *bundle_id;		/* identifier for our bundle */
@@ -73,6 +79,18 @@ static int owns_unit(TDB_DATA pid, int unit);
 
 #define process_exists(n)	(kill((n), 0) == 0 || errno != ESRCH)
 
+multilink_join_hook_fn *multilink_join_hook = NULL;
+
+bool mp_master()
+{
+    return multilink_master;
+}
+
+bool mp_on()
+{
+    return doing_multilink;
+}
+
 void
 mp_check_options(void)
 {
@@ -134,12 +152,12 @@ mp_join_bundle(void)
 		if (demand) {
 			/* already have a bundle */
 			cfg_bundle(0, 0, 0, 0);
-			netif_set_mtu(0, mtu);
+			ppp_set_mtu(0, mtu);
 			return 0;
 		}
 		make_new_bundle(0, 0, 0, 0);
 		set_ifunit(1);
-		netif_set_mtu(0, mtu);
+		ppp_set_mtu(0, mtu);
 		return 0;
 	}
 
@@ -184,8 +202,8 @@ mp_join_bundle(void)
 	mtu = MIN(ho->mrru, ao->mru);
 	if (demand) {
 		cfg_bundle(go->mrru, ho->mrru, go->neg_ssnhf, ho->neg_ssnhf);
-		netif_set_mtu(0, mtu);
-		script_setenv("BUNDLE", bundle_id + 7, 1);
+		ppp_set_mtu(0, mtu);
+		ppp_script_setenv("BUNDLE", bundle_id + 7, 1);
 		return 0;
 	}
 
@@ -219,7 +237,7 @@ mp_join_bundle(void)
 		/* attach to existing unit */
 		if (bundle_attach(unit)) {
 			set_ifunit(0);
-			script_setenv("BUNDLE", bundle_id + 7, 0);
+			ppp_script_setenv("BUNDLE", bundle_id + 7, 0);
 			make_bundle_links(1);
 			unlock_db();
 			info("Link attached to %s", ifname);
@@ -231,8 +249,8 @@ mp_join_bundle(void)
 	/* we have to make a new bundle */
 	make_new_bundle(go->mrru, ho->mrru, go->neg_ssnhf, ho->neg_ssnhf);
 	set_ifunit(1);
-	netif_set_mtu(0, mtu);
-	script_setenv("BUNDLE", bundle_id + 7, 1);
+	ppp_set_mtu(0, mtu);
+	ppp_script_setenv("BUNDLE", bundle_id + 7, 1);
 	make_bundle_links(0);
 	unlock_db();
 	info("New bundle %s created", ifname);
@@ -268,7 +286,7 @@ void mp_bundle_terminated(void)
 	print_link_stats();
 	if (!demand) {
 		remove_pidfiles();
-		script_unsetenv("IFNAME");
+		ppp_script_unsetenv("IFNAME");
 	}
 
 	lock_db();
@@ -430,13 +448,11 @@ owns_unit(TDB_DATA key, int unit)
 static int
 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;
@@ -446,7 +462,7 @@ get_default_epdisc(struct epdisc *ep)
 	hp = gethostbyname(hostname);
 	if (hp != NULL) {
 		addr = *(u_int32_t *)hp->h_addr;
-		if (!bad_ip_adrs(addr)) {
+		if (!ppp_bad_ip_addr(addr)) {
 			addr = ntohl(addr);
 			if (!LOCAL_IP_ADDR(addr)) {
 				ep->class = EPD_IP;