X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=8c09d705be3f5b29f0d4d8926500a23293b56428;hb=26703b215b0b68d7005e6b5e41d744101471a743;hp=41eabd2192ed0363394a5bc6e611ec80d43dff2f;hpb=ab7cff041f1b8054ae5691df236fe18c1d23bfe6;p=ppp.git diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 41eabd2..8c09d70 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.43 1999/03/19 04:23:39 paulus Exp $"; -#endif +#define RCSID "$Id: ipcp.c,v 1.55 2000/06/30 04:54:20 paulus Exp $" /* * TODO: @@ -39,6 +37,8 @@ static char rcsid[] = "$Id: ipcp.c,v 1.43 1999/03/19 04:23:39 paulus Exp $"; #include "ipcp.h" #include "pathnames.h" +static const char rcsid[] = RCSID; + /* global vars */ ipcp_options ipcp_wantoptions[NUM_PPP]; /* Options that we want to request */ ipcp_options ipcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */ @@ -47,12 +47,21 @@ ipcp_options ipcp_hisoptions[NUM_PPP]; /* Options that we ack'd */ bool disable_defaultip = 0; /* Don't use hostname for default IP adrs */ +/* Hook for a plugin to know when IP protocol has come up */ +void (*ip_up_hook) __P((void)) = NULL; + +/* Hook for a plugin to know when IP protocol has come down */ +void (*ip_down_hook) __P((void)) = NULL; + +/* Hook for a plugin to choose the remote IP address */ +void (*ip_choose_hook) __P((u_int32_t *)) = NULL; + /* local vars */ -static int cis_received[NUM_PPP]; /* # Conf-Reqs received */ static int default_route_set[NUM_PPP]; /* Have set up a default route */ static int proxy_arp_set[NUM_PPP]; /* Have created proxy arp entry */ static bool usepeerdns; /* Ask peer for DNS addrs */ static int ipcp_is_up; /* have called np_up() */ +static bool ask_for_local; /* request our address from peer */ /* * Callbacks for fsm code. (CI = Configuration Information) @@ -110,7 +119,7 @@ static option_t ipcp_option_list[] = { { "-vjccomp", o_bool, &ipcp_wantoptions[0].cflag, "Disable VJ connection-ID compression", OPT_A2COPY, &ipcp_allowoptions[0].cflag }, - { "vj-max-slots", 1, setvjslots, + { "vj-max-slots", 1, (void *)setvjslots, "Set maximum VJ header slots" }, { "ipcp-accept-local", o_bool, &ipcp_wantoptions[0].accept_local, "Accept peer's address for us", 1 }, @@ -120,9 +129,9 @@ static option_t ipcp_option_list[] = { "Set ip script parameter" }, { "noipdefault", o_bool, &disable_defaultip, "Don't use name for default IP adrs", 1 }, - { "ms-dns", 1, setdnsaddr, + { "ms-dns", 1, (void *)setdnsaddr, "DNS address for the peer's use" }, - { "ms-wins", 1, setwinsaddr, + { "ms-wins", 1, (void *)setwinsaddr, "Nameserver for SMB over TCP/IP for peer" }, { "ipcp-restart", o_int, &ipcp_fsm[0].timeouttime, "Set timeout for IPCP" }, @@ -190,7 +199,7 @@ struct protent ipcp_protent = { ip_active_pkt }; -static void ipcp_clear_addrs __P((int)); +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_done __P((void *)); @@ -265,7 +274,7 @@ setdnsaddr(argv) struct hostent *hp; dns = inet_addr(*argv); - if (dns == -1) { + if (dns == (u_int32_t) -1) { if ((hp = gethostbyname(*argv)) == NULL) { option_error("invalid address parameter '%s' for ms-dns option", *argv); @@ -297,7 +306,7 @@ setwinsaddr(argv) struct hostent *hp; wins = inet_addr(*argv); - if (wins == -1) { + if (wins == (u_int32_t) -1) { if ((hp = gethostbyname(*argv)) == NULL) { option_error("invalid address parameter '%s' for ms-wins option", *argv); @@ -441,6 +450,7 @@ ipcp_resetci(f) fsm *f; { ipcp_options *wo = &ipcp_wantoptions[f->unit]; + ipcp_options *go = &ipcp_gotoptions[f->unit]; wo->req_addr = wo->neg_addr && ipcp_allowoptions[f->unit].neg_addr; if (wo->ouraddr == 0) @@ -449,8 +459,11 @@ ipcp_resetci(f) wo->accept_remote = 1; wo->req_dns1 = usepeerdns; /* Request DNS addresses from the peer */ wo->req_dns2 = usepeerdns; - ipcp_gotoptions[f->unit] = *wo; - cis_received[f->unit] = 0; + *go = *wo; + if (!ask_for_local) + go->ouraddr = 0; + if (ip_choose_hook) + ip_choose_hook(&wo->hisaddr); } @@ -481,16 +494,11 @@ ipcp_cilen(f) } if (wo->neg_vj && !go->neg_vj && !go->old_vj) { /* try an older style of VJ negotiation */ - if (cis_received[f->unit] == 0) { - /* keep trying the new style until we see some CI from the peer */ + /* use the old style only if the peer did */ + if (ho->neg_vj && ho->old_vj) { go->neg_vj = 1; - } else { - /* use the old style only if the peer did */ - if (ho->neg_vj && ho->old_vj) { - go->neg_vj = 1; - go->old_vj = 1; - go->vj_protocol = ho->vj_protocol; - } + go->old_vj = 1; + go->vj_protocol = ho->vj_protocol; } } @@ -548,16 +556,15 @@ ipcp_addci(f, ucp, lenp) neg = 0; \ } -#define ADDCIDNS(opt, neg) \ +#define ADDCIDNS(opt, neg, addr) \ if (neg) { \ - int addrlen = CILEN_ADDR; \ - if (len >= addrlen) { \ + if (len >= CILEN_ADDR) { \ u_int32_t l; \ PUTCHAR(opt, ucp); \ - PUTCHAR(addrlen, ucp); \ - l = ntohl(0); \ + PUTCHAR(CILEN_ADDR, ucp); \ + l = ntohl(addr); \ PUTLONG(l, ucp); \ - len -= addrlen; \ + len -= CILEN_ADDR; \ } else \ neg = 0; \ } @@ -568,9 +575,9 @@ ipcp_addci(f, ucp, lenp) ADDCIVJ(CI_COMPRESSTYPE, go->neg_vj, go->vj_protocol, go->old_vj, go->maxslotindex, go->cflag); - ADDCIDNS(CI_MS_DNS1, go->req_dns1); + ADDCIDNS(CI_MS_DNS1, go->req_dns1, go->dnsaddr[0]); - ADDCIDNS(CI_MS_DNS2, go->req_dns2); + ADDCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]); *lenp -= len; } @@ -647,12 +654,31 @@ ipcp_ackci(f, p, len) } \ } +#define ACKCIDNS(opt, neg, addr) \ + if (neg) { \ + u_int32_t l; \ + if ((len -= CILEN_ADDR) < 0) \ + goto bad; \ + GETCHAR(citype, p); \ + GETCHAR(cilen, p); \ + if (cilen != CILEN_ADDR || citype != opt) \ + goto bad; \ + GETLONG(l, p); \ + cilong = htonl(l); \ + if (addr != cilong) \ + goto bad; \ + } + ACKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), go->neg_addr, go->old_addrs, go->ouraddr, go->hisaddr); ACKCIVJ(CI_COMPRESSTYPE, go->neg_vj, go->vj_protocol, go->old_vj, go->maxslotindex, go->cflag); + ACKCIDNS(CI_MS_DNS1, go->req_dns1, go->dnsaddr[0]); + + ACKCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]); + /* * If there are any remaining CIs, then this packet is bad. */ @@ -728,9 +754,6 @@ ipcp_nakci(f, p, len) code \ } -/* - * Peer returns DNS address in a NAK packet - */ #define NAKCIDNS(opt, neg, code) \ if (go->neg && \ ((cilen = p[1]) == CILEN_ADDR) && \ @@ -788,12 +811,10 @@ ipcp_nakci(f, p, len) NAKCIDNS(CI_MS_DNS1, req_dns1, try.dnsaddr[0] = cidnsaddr; - try.req_dns1 = 0; ); NAKCIDNS(CI_MS_DNS2, req_dns2, try.dnsaddr[1] = cidnsaddr; - try.req_dns2 = 0; ); /* @@ -932,7 +953,7 @@ ipcp_rejci(f, p, len) #define REJCIDNS(opt, neg, dnsaddr) \ if (go->neg && \ - ((cilen = p[1]) == CI_MS_DNS1) && \ + ((cilen = p[1]) == CILEN_ADDR) && \ len >= cilen && \ p[0] == opt) { \ u_int32_t l; \ @@ -1006,8 +1027,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) u_char maxslotindex, cflag; int d; - cis_received[f->unit] = 1; - /* * Reset all his options. */ @@ -1300,17 +1319,7 @@ ip_check_options() wo->ouraddr = local; } } - - if (demand && wo->hisaddr == 0) { - option_error("remote IP address required for demand-dialling\n"); - exit(1); - } -#if 0 - if (demand && wo->accept_remote) { - option_error("ipcp-accept-remote is incompatible with demand\n"); - exit(1); - } -#endif + ask_for_local = wo->ouraddr != 0 || !disable_defaultip; } @@ -1324,6 +1333,17 @@ ip_demand_conf(u) { ipcp_options *wo = &ipcp_wantoptions[u]; + if (wo->hisaddr == 0) { + /* make up an arbitrary address for the peer */ + wo->hisaddr = htonl(0x0a707070 + ifunit); + wo->accept_remote = 1; + } + if (wo->ouraddr == 0) { + /* make up an arbitrary address for us */ + wo->ouraddr = htonl(0x0a404040 + ifunit); + wo->accept_local = 1; + ask_for_local = 0; /* don't tell the peer this address */ + } if (!sifaddr(u, wo->ouraddr, wo->hisaddr, GetMask(wo->ouraddr))) return 0; if (!sifup(u)) @@ -1366,25 +1386,25 @@ ipcp_up(f) if (!ho->neg_addr) ho->hisaddr = wo->hisaddr; - if (ho->hisaddr == 0) { - error("Could not determine remote IP address"); - ipcp_close(f->unit, "Could not determine remote IP address"); - return; - } if (go->ouraddr == 0) { error("Could not determine local IP address"); ipcp_close(f->unit, "Could not determine local IP address"); return; } - script_setenv("IPLOCAL", ip_ntoa(go->ouraddr)); - script_setenv("IPREMOTE", ip_ntoa(ho->hisaddr)); + if (ho->hisaddr == 0) { + ho->hisaddr = htonl(0x0a404040 + ifunit); + warn("Could not determine remote IP address: defaulting to %I", + ho->hisaddr); + } + script_setenv("IPLOCAL", ip_ntoa(go->ouraddr), 0); + script_setenv("IPREMOTE", ip_ntoa(ho->hisaddr), 1); if (usepeerdns && (go->dnsaddr[0] || go->dnsaddr[1])) { - script_setenv("USEPEERDNS", "1"); + script_setenv("USEPEERDNS", "1", 0); if (go->dnsaddr[0]) - script_setenv("DNS1", ip_ntoa(go->dnsaddr[0])); + script_setenv("DNS1", ip_ntoa(go->dnsaddr[0]), 0); if (go->dnsaddr[1]) - script_setenv("DNS2", ip_ntoa(go->dnsaddr[1])); + script_setenv("DNS2", ip_ntoa(go->dnsaddr[1]), 0); create_resolv(go->dnsaddr[0], go->dnsaddr[1]); } @@ -1407,19 +1427,19 @@ ipcp_up(f) */ if (demand) { if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { + ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr); if (go->ouraddr != wo->ouraddr) { warn("Local IP address changed to %I", go->ouraddr); - script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr)); + script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0); wo->ouraddr = go->ouraddr; } else script_unsetenv("OLDIPLOCAL"); if (ho->hisaddr != wo->hisaddr) { warn("Remote IP address changed to %I", ho->hisaddr); - script_setenv("OLDIPREMOTE", ip_ntoa(wo->hisaddr)); + script_setenv("OLDIPREMOTE", ip_ntoa(wo->hisaddr), 0); wo->hisaddr = ho->hisaddr; } else script_unsetenv("OLDIPREMOTE"); - ipcp_clear_addrs(f->unit); /* Set the interface to the new addresses */ mask = GetMask(go->ouraddr); @@ -1487,6 +1507,8 @@ ipcp_up(f) if (sifproxyarp(f->unit, ho->hisaddr)) proxy_arp_set[f->unit] = 1; + ipcp_wantoptions[0].ouraddr = go->ouraddr; + notice("local IP address %I", go->ouraddr); notice("remote IP address %I", ho->hisaddr); if (go->dnsaddr[0]) @@ -1498,6 +1520,9 @@ ipcp_up(f) np_up(f->unit, PPP_IP); ipcp_is_up = 1; + if (ip_up_hook) + ip_up_hook(); + /* * Execute the ip-up script, like this: * /etc/ppp/ip-up interface tty speed local-IP remote-IP @@ -1520,8 +1545,11 @@ ipcp_down(f) fsm *f; { IPCPDEBUG(("ipcp: down")); - if (get_ppp_stats(f->unit, &link_stats)) - link_stats_valid = 1; + /* XXX a bit IPv4-centric here, we only need to get the stats + * before the interface is marked down. */ + update_link_stats(f->unit); + if (ip_down_hook) + ip_down_hook(); if (ipcp_is_up) { ipcp_is_up = 0; np_down(f->unit, PPP_IP); @@ -1535,8 +1563,10 @@ ipcp_down(f) if (demand) { sifnpmode(f->unit, PPP_IP, NPMODE_QUEUE); } else { + sifnpmode(f->unit, PPP_IP, NPMODE_DROP); sifdown(f->unit); - ipcp_clear_addrs(f->unit); + ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, + ipcp_hisoptions[f->unit].hisaddr); } /* Execute the ip-down script */ @@ -1552,13 +1582,11 @@ ipcp_down(f) * proxy arp entries, etc. */ static void -ipcp_clear_addrs(unit) +ipcp_clear_addrs(unit, ouraddr, hisaddr) int unit; + u_int32_t ouraddr; /* local address */ + u_int32_t hisaddr; /* remote address */ { - u_int32_t ouraddr, hisaddr; - - ouraddr = ipcp_gotoptions[unit].ouraddr; - hisaddr = ipcp_hisoptions[unit].hisaddr; if (proxy_arp_set[unit]) { cifproxyarp(unit, hisaddr); proxy_arp_set[unit] = 0; @@ -1750,7 +1778,8 @@ ipcp_printpkt(p, plen, printer, arg) case CI_MS_DNS2: p += 2; GETLONG(cilong, p); - printer(arg, "ms-dns %I", htonl(cilong)); + printer(arg, "ms-dns%d %I", code - CI_MS_DNS1 + 1, + htonl(cilong)); break; case CI_MS_WINS1: case CI_MS_WINS2: @@ -1771,7 +1800,7 @@ ipcp_printpkt(p, plen, printer, arg) case TERMREQ: if (len > 0 && *p >= ' ' && *p < 0x7f) { printer(arg, " "); - print_string(p, len, printer, arg); + print_string((char *)p, len, printer, arg); p += len; len = 0; }