* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: ipcp.c,v 1.65 2004/01/13 03:59:06 paulus Exp $"
+#define RCSID "$Id: ipcp.c,v 1.70 2005/08/25 23:59:34 paulus Exp $"
/*
* TODO:
static int ipcp_cilen __P((fsm *)); /* Return length of our CI */
static void ipcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */
static int ipcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
-static int ipcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */
+static int ipcp_nakci __P((fsm *, u_char *, int, int));/* Peer nak'd our CI */
static int ipcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
static int ipcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
static void ipcp_up __P((fsm *)); /* We're UP */
};
static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
-static void ipcp_script __P((char *)); /* Run an up/down script */
+static void ipcp_script __P((char *, int)); /* Run an up/down script */
static void ipcp_script_done __P((void *));
/*
wo->accept_remote = 0;
}
}
+ BZERO(&ipcp_hisoptions[f->unit], sizeof(ipcp_options));
}
* First see if we want to change our options to the old
* forms because we have received old forms from the peer.
*/
- if ((wo->neg_addr || wo->old_addrs) && !go->neg_addr && !go->old_addrs) {
- /* use the old style of address negotiation */
- go->old_addrs = 1;
- }
+ if (go->neg_addr && go->old_addrs && !ho->neg_addr && ho->old_addrs)
+ go->neg_addr = 0;
if (wo->neg_vj && !go->neg_vj && !go->old_vj) {
/* try an older style of VJ negotiation */
/* use the old style only if the peer did */
* 1 - Nak was good.
*/
static int
-ipcp_nakci(f, p, len)
+ipcp_nakci(f, p, len, treat_as_reject)
fsm *f;
u_char *p;
int len;
+ int treat_as_reject;
{
ipcp_options *go = &ipcp_gotoptions[f->unit];
u_char cimaxslotindex, cicflag;
* from our idea, only if the accept_{local,remote} flag is set.
*/
NAKCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs,
- if (go->accept_local && ciaddr1) { /* Do we know our address? */
- try.ouraddr = ciaddr1;
- }
- if (go->accept_remote && ciaddr2) { /* Does he know his? */
- try.hisaddr = ciaddr2;
+ if (treat_as_reject) {
+ try.old_addrs = 0;
+ } else {
+ if (go->accept_local && ciaddr1) {
+ /* take his idea of our address */
+ try.ouraddr = ciaddr1;
+ }
+ if (go->accept_remote && ciaddr2) {
+ /* take his idea of his address */
+ try.hisaddr = ciaddr2;
+ }
}
);
* the peer wants.
*/
NAKCIVJ(CI_COMPRESSTYPE, neg_vj,
- if (cilen == CILEN_VJ) {
+ if (treat_as_reject) {
+ try.neg_vj = 0;
+ } else if (cilen == CILEN_VJ) {
GETCHAR(cimaxslotindex, p);
GETCHAR(cicflag, p);
if (cishort == IPCP_VJ_COMP) {
);
NAKCIADDR(CI_ADDR, neg_addr,
- if (go->accept_local && ciaddr1) { /* Do we know our address? */
+ if (treat_as_reject) {
+ try.neg_addr = 0;
+ try.old_addrs = 0;
+ } else if (go->accept_local && ciaddr1) {
+ /* take his idea of our address */
try.ouraddr = ciaddr1;
}
);
NAKCIDNS(CI_MS_DNS1, req_dns1,
- try.dnsaddr[0] = cidnsaddr;
- );
+ if (treat_as_reject) {
+ try.req_dns1 = 0;
+ } else {
+ try.dnsaddr[0] = cidnsaddr;
+ }
+ );
NAKCIDNS(CI_MS_DNS2, req_dns2,
- try.dnsaddr[1] = cidnsaddr;
- );
+ if (treat_as_reject) {
+ try.req_dns2 = 0;
+ } else {
+ try.dnsaddr[1] = cidnsaddr;
+ }
+ );
/*
* There may be remaining CIs, if the peer is requesting negotiation
}
if (!sifaddr(u, wo->ouraddr, wo->hisaddr, GetMask(wo->ouraddr)))
return 0;
+ ipcp_script(_PATH_IPPREUP, 1);
if (!sifup(u))
return 0;
if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
if (!ho->neg_addr && !ho->old_addrs)
ho->hisaddr = wo->hisaddr;
+ if (!(go->neg_addr || go->old_addrs) && (wo->neg_addr || wo->old_addrs)
+ && wo->ouraddr != 0) {
+ error("Peer refused to agree to our IP address");
+ ipcp_close(f->unit, "Refused our IP address");
+ return;
+ }
if (go->ouraddr == 0) {
error("Could not determine local IP address");
ipcp_close(f->unit, "Could not determine local IP address");
}
#endif
+ /* run the pre-up script, if any, and wait for it to finish */
+ ipcp_script(_PATH_IPPREUP, 1);
+
/* bring the interface up for IP */
if (!sifup(f->unit)) {
if (debug)
notice("secondary DNS address %I", go->dnsaddr[1]);
}
+ reset_link_stats(f->unit);
+
np_up(f->unit, PPP_IP);
ipcp_is_up = 1;
*/
if (ipcp_script_state == s_down && ipcp_script_pid == 0) {
ipcp_script_state = s_up;
- ipcp_script(_PATH_IPUP);
+ ipcp_script(_PATH_IPUP, 0);
}
}
IPCPDEBUG(("ipcp: down"));
/* XXX a bit IPv4-centric here, we only need to get the stats
* before the interface is marked down. */
+ /* XXX more correct: we must get the stats before running the notifiers,
+ * at least for the radius plugin */
update_link_stats(f->unit);
notify(ip_down_notifier, 0);
if (ip_down_hook)
}
sifvjcomp(f->unit, 0, 0, 0);
+ print_link_stats(); /* _after_ running the notifiers and ip_down_hook(),
+ * because print_link_stats() sets link_stats_valid
+ * to 0 (zero) */
+
/*
* If we are doing dial-on-demand, set the interface
* to queue up outgoing packets (for now).
/* Execute the ip-down script */
if (ipcp_script_state == s_up && ipcp_script_pid == 0) {
ipcp_script_state = s_down;
- ipcp_script(_PATH_IPDOWN);
+ ipcp_script(_PATH_IPDOWN, 0);
}
}
case s_up:
if (ipcp_fsm[0].state != OPENED) {
ipcp_script_state = s_down;
- ipcp_script(_PATH_IPDOWN);
+ ipcp_script(_PATH_IPDOWN, 0);
}
break;
case s_down:
if (ipcp_fsm[0].state == OPENED) {
ipcp_script_state = s_up;
- ipcp_script(_PATH_IPUP);
+ ipcp_script(_PATH_IPUP, 0);
}
break;
}
* interface-name tty-name speed local-IP remote-IP.
*/
static void
-ipcp_script(script)
+ipcp_script(script, wait)
char *script;
+ int wait;
{
char strspeed[32], strlocal[32], strremote[32];
char *argv[8];
argv[5] = strremote;
argv[6] = ipparam;
argv[7] = NULL;
- ipcp_script_pid = run_program(script, argv, 0, ipcp_script_done, NULL);
+ if (wait)
+ run_program(script, argv, 0, NULL, NULL, 1);
+ else
+ ipcp_script_pid = run_program(script, argv, 0, ipcp_script_done,
+ NULL, 0);
}
/*