|| ((addr) & 0xfff00000) == 0xac100000 /* 172.16.x.x */ \
|| ((addr) & 0xffff0000) == 0xc0a80000) /* 192.168.x.x */
-#define process_exists(n) (kill(0, (n)) == 0 || errno != ESRCH)
+#define process_exists(n) (kill((n), 0) == 0 || errno != ESRCH)
void
mp_check_options()
if (!wo->neg_endpoint && !noendpoint) {
/* get a default endpoint value */
wo->neg_endpoint = get_default_epdisc(&wo->endpoint);
- if (wo->neg_endpoint)
- dbglog("using default endpoint %s",
- epdisc_to_str(&wo->endpoint));
}
}
{
lcp_options *go = &lcp_gotoptions[0];
lcp_options *ho = &lcp_hisoptions[0];
+ lcp_options *ao = &lcp_allowoptions[0];
int unit, pppd_pid;
- int l;
+ int l, mtu;
char *p;
TDB_DATA key, pid, rec;
/* not doing multilink */
if (go->neg_mrru)
notice("oops, multilink negotiated only for receive");
- multilink = 0;
+ mtu = ho->neg_mru? ho->mru: PPP_MRU;
+ if (mtu > ao->mru)
+ mtu = ao->mru;
+ if (demand) {
+ /* already have a bundle */
+ cfg_bundle(0, 0, 0, 0);
+ netif_set_mtu(0, mtu);
+ return 0;
+ }
make_new_bundle(0, 0, 0, 0);
set_ifunit(1);
+ netif_set_mtu(0, mtu);
return 0;
}
epdisc_to_str(&ho->endpoint));
if (bundle_name)
p += slprintf(p, bundle_id+l-p, "/%v", bundle_name);
- dbglog("bundle_id = %s", bundle_id+7);
+
+ /*
+ * For demand mode, we only need to configure the bundle
+ * and attach the link.
+ */
+ 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);
+ return 0;
+ }
/*
* Check if the bundle ID is already in the database.
*/
unit = -1;
- pppd_pid = -1;
+ tdb_writelock(pppdb);
key.dptr = bundle_id;
key.dsize = p - bundle_id;
- tdb_writelock(pppdb);
pid = tdb_fetch(pppdb, key);
if (pid.dptr != NULL) {
- /* bundle ID exists, see if the pppd record still exists */
+ /* bundle ID exists, see if the pppd record exists */
rec = tdb_fetch(pppdb, pid);
if (rec.dptr != NULL) {
/* it is, parse the interface number */
parse_num(rec.dptr, "IFNAME=ppp", &unit);
/* check the pid value */
- parse_num(rec.dptr, "PPPD_PID=", &pppd_pid);
- if (!process_exists(pppd_pid) || !owns_unit(pid, unit))
+ if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid)
+ || !process_exists(pppd_pid)
+ || !owns_unit(pid, unit))
unit = -1;
free(rec.dptr);
}
}
if (unit >= 0) {
- /* attach to existing unit, if the pid still exists */
+ /* attach to existing unit */
if (bundle_attach(unit)) {
- dbglog("attached link to interface %d", ifunit);
set_ifunit(0);
script_setenv("BUNDLE", bundle_id + 7, 0);
tdb_writeunlock(pppdb);
+ info("Link attached to %s", ifname);
return 1;
}
/* attach failed because bundle doesn't exist */
/* 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);
tdb_writeunlock(pppdb);
+ info("New bundle %s created", ifname);
return 0;
}
if (i == 0 || str[i] != 0)
return 0;
set_ip_epdisc(ep, addr);
- dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
return 1;
}
if (i == EPD_MAC && get_if_hwaddr(ep->value, str) >= 0) {
ep->length = 6;
- dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
return 1;
}
if (*str != 0 || (ep->class == EPD_MAC && l != 6))
return 0;
ep->length = l;
- dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
return 1;
}