X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=6aeb3abae5dcb2ce06530225c0912fe62ce4f788;hb=bcffc4820fca2aba7b91657909bc0cb76f69227e;hp=0d1c128b89754d3daf3fb2ac67d8bd88f2011f50;hpb=bfa20ccde2a70b1252dbb614132f1a4cbee815d4;p=ppp.git diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 0d1c128..6aeb3ab 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.35 1998/11/07 06:59:26 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.39 1999/03/16 03:12:03 paulus Exp $"; #endif /* @@ -27,7 +27,6 @@ static char rcsid[] = "$Id: ipcp.c,v 1.35 1998/11/07 06:59:26 paulus Exp $"; #include #include -#include #include #include #include @@ -52,6 +51,7 @@ bool disable_defaultip = 0; /* Don't use hostname for default IP adrs */ 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 */ /* * Callbacks for fsm code. (CI = Configuration Information) @@ -147,6 +147,8 @@ static option_t ipcp_option_list[] = { { "-proxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, "disable proxyarp option", OPT_A2COPY, &ipcp_wantoptions[0].proxy_arp }, + { "usepeerdns", o_bool, &usepeerdns, + "Ask peer for DNS address(es)", 1 }, { NULL } }; @@ -165,6 +167,7 @@ static int ipcp_printpkt __P((u_char *, int, static void ip_check_options __P((void)); static int ip_demand_conf __P((int)); static int ip_active_pkt __P((u_char *, int)); +static void create_resolv __P((u_int32_t, u_int32_t)); struct protent ipcp_protent = { PPP_IPCP, @@ -221,13 +224,7 @@ u_int32_t ipaddr; { static char b[64]; - ipaddr = ntohl(ipaddr); - - sprintf(b, "%d.%d.%d.%d", - (u_char)(ipaddr >> 24), - (u_char)(ipaddr >> 16), - (u_char)(ipaddr >> 8), - (u_char)(ipaddr)); + slprintf(b, sizeof(b), "%I", ipaddr); return b; } @@ -343,6 +340,7 @@ ipcp_init(unit) wo->maxslotindex = MAX_STATES - 1; /* really max index */ wo->cflag = 1; + /* max slots and slot-id compression are currently hardwired in */ /* ppp_if.c to 16 and 1, this needs to be changed (among other */ /* things) gmc */ @@ -434,6 +432,7 @@ ipcp_protrej(unit) /* * ipcp_resetci - Reset our CI. + * Called by fsm_sconfreq, Send Configure Request. */ static void ipcp_resetci(f) @@ -446,6 +445,8 @@ ipcp_resetci(f) wo->accept_local = 1; if (wo->hisaddr == 0) 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; } @@ -453,6 +454,7 @@ ipcp_resetci(f) /* * ipcp_cilen - Return length of our CI. + * Called by fsm_sconfreq, Send Configure Request. */ static int ipcp_cilen(f) @@ -464,6 +466,7 @@ ipcp_cilen(f) #define LENCIVJ(neg, old) (neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0) #define LENCIADDR(neg, old) (neg ? (old? CILEN_ADDRS : CILEN_ADDR) : 0) +#define LENCIDNS(neg) (neg ? (CILEN_ADDR) : 0) /* * First see if we want to change our options to the old @@ -490,12 +493,15 @@ ipcp_cilen(f) } return (LENCIADDR(go->neg_addr, go->old_addrs) + - LENCIVJ(go->neg_vj, go->old_vj)); + LENCIVJ(go->neg_vj, go->old_vj) + + LENCIDNS(go->req_dns1) + + LENCIDNS(go->req_dns2)) ; } /* * ipcp_addci - Add our desired CIs to a packet. + * Called by fsm_sconfreq, Send Configure Request. */ static void ipcp_addci(f, ucp, lenp) @@ -540,18 +546,37 @@ ipcp_addci(f, ucp, lenp) neg = 0; \ } +#define ADDCIDNS(opt, neg) \ + if (neg) { \ + int addrlen = CILEN_ADDR; \ + if (len >= addrlen) { \ + u_int32_t l; \ + PUTCHAR(opt, ucp); \ + PUTCHAR(addrlen, ucp); \ + l = ntohl(0); \ + PUTLONG(l, ucp); \ + len -= addrlen; \ + } else \ + neg = 0; \ + } + ADDCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), go->neg_addr, go->old_addrs, go->ouraddr, go->hisaddr); 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_DNS2, go->req_dns2); + *lenp -= len; } /* * ipcp_ackci - Ack our CIs. + * Called by fsm_rconfack, Receive Configure ACK. * * Returns: * 0 - Ack was bad. @@ -634,7 +659,7 @@ ipcp_ackci(f, p, len) return (1); bad: - IPCPDEBUG((LOG_INFO, "ipcp_ackci: received bad Ack!")); + IPCPDEBUG(("ipcp_ackci: received bad Ack!")); return (0); } @@ -642,6 +667,7 @@ bad: * ipcp_nakci - Peer has sent a NAK for some of our CIs. * This should not modify any state if the Nak is bad * or if IPCP is in the OPENED state. + * Calback from fsm_rconfnakrej - Receive Configure-Nak or Configure-Reject. * * Returns: * 0 - Nak was bad. @@ -657,7 +683,7 @@ ipcp_nakci(f, p, len) u_char cimaxslotindex, cicflag; u_char citype, cilen, *next; u_short cishort; - u_int32_t ciaddr1, ciaddr2, l; + u_int32_t ciaddr1, ciaddr2, l, cidnsaddr; ipcp_options no; /* options we've seen Naks for */ ipcp_options try; /* options to request next time */ @@ -700,6 +726,22 @@ 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) && \ + len >= cilen && \ + p[0] == opt) { \ + len -= cilen; \ + INCPTR(2, p); \ + GETLONG(l, p); \ + cidnsaddr = htonl(l); \ + no.neg = 1; \ + code \ + } + /* * Accept the peer's idea of {our,his} address, if different * from our idea, only if the accept_{local,remote} flag is set. @@ -707,13 +749,9 @@ ipcp_nakci(f, p, len) NAKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr, go->old_addrs, if (go->accept_local && ciaddr1) { /* Do we know our address? */ try.ouraddr = ciaddr1; - IPCPDEBUG((LOG_INFO, "local IP address %s", - ip_ntoa(ciaddr1))); } if (go->accept_remote && ciaddr2) { /* Does he know his? */ try.hisaddr = ciaddr2; - IPCPDEBUG((LOG_INFO, "remote IP address %s", - ip_ntoa(ciaddr2))); } ); @@ -746,6 +784,16 @@ 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; + ); + /* * There may be remaining CIs, if the peer is requesting negotiation * on an option that we didn't include in our request packet. @@ -811,13 +859,14 @@ ipcp_nakci(f, p, len) return 1; bad: - IPCPDEBUG((LOG_INFO, "ipcp_nakci: received bad Nak!")); + IPCPDEBUG(("ipcp_nakci: received bad Nak!")); return 0; } /* * ipcp_rejci - Reject some of our CIs. + * Callback from fsm_rconfnakrej. */ static int ipcp_rejci(f, p, len) @@ -882,12 +931,33 @@ ipcp_rejci(f, p, len) try.neg = 0; \ } +#define REJCIDNS(opt, neg, dnsaddr) \ + if (go->neg && \ + ((cilen = p[1]) == CI_MS_DNS1) && \ + len >= cilen && \ + p[0] == opt) { \ + u_int32_t l; \ + len -= cilen; \ + INCPTR(2, p); \ + GETLONG(l, p); \ + cilong = htonl(l); \ + /* Check rejected value. */ \ + if (cilong != dnsaddr) \ + goto bad; \ + try.neg = 0; \ + } + + REJCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr, go->old_addrs, go->ouraddr, go->hisaddr); REJCIVJ(CI_COMPRESSTYPE, neg_vj, go->vj_protocol, go->old_vj, go->maxslotindex, go->cflag); + REJCIDNS(CI_MS_DNS1, req_dns1, go->dnsaddr[0]); + + REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]); + /* * If there are any remaining CIs, then this packet is bad. */ @@ -901,13 +971,14 @@ ipcp_rejci(f, p, len) return 1; bad: - IPCPDEBUG((LOG_INFO, "ipcp_rejci: received bad Reject!")); + IPCPDEBUG(("ipcp_rejci: received bad Reject!")); return 0; } /* * ipcp_reqci - Check the peer's requested CIs and send appropriate response. + * Callback from fsm_rconfreq, Receive Configure Request * * Returns: CONFACK, CONFNAK or CONFREJ and input packet modified * appropriately. If reject_if_disagree is non-zero, doesn't return @@ -953,7 +1024,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) if (l < 2 || /* Not enough data for CI header or */ p[1] < 2 || /* CI length too small or */ p[1] > l) { /* CI length too big? */ - IPCPDEBUG((LOG_INFO, "ipcp_reqci: bad CI length!")); + IPCPDEBUG(("ipcp_reqci: bad CI length!")); orc = CONFREJ; /* Reject bad CI */ cilen = l; /* Reject till end of packet */ l = 0; /* Don't loop again */ @@ -966,7 +1037,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) switch (citype) { /* Check CI type */ case CI_ADDRS: - IPCPDEBUG((LOG_INFO, "ipcp: received ADDRS ")); if (!ao->neg_addr || cilen != CILEN_ADDRS) { /* Check CI length */ orc = CONFREJ; /* Reject CI */ @@ -981,7 +1051,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) */ GETLONG(tl, p); /* Parse source address (his) */ ciaddr1 = htonl(tl); - IPCPDEBUG((LOG_INFO, "(%s:", ip_ntoa(ciaddr1))); if (ciaddr1 != wo->hisaddr && (ciaddr1 == 0 || !wo->accept_remote)) { orc = CONFNAK; @@ -1005,7 +1074,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) */ GETLONG(tl, p); /* Parse desination address (ours) */ ciaddr2 = htonl(tl); - IPCPDEBUG((LOG_INFO, "%s)", ip_ntoa(ciaddr2))); if (ciaddr2 != wo->ouraddr) { if (ciaddr2 == 0 || !wo->accept_local) { orc = CONFNAK; @@ -1026,8 +1094,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) break; case CI_ADDR: - IPCPDEBUG((LOG_INFO, "ipcp: received ADDR ")); - if (!ao->neg_addr || cilen != CILEN_ADDR) { /* Check CI length */ orc = CONFREJ; /* Reject CI */ @@ -1042,7 +1108,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) */ GETLONG(tl, p); /* Parse source address (his) */ ciaddr1 = htonl(tl); - IPCPDEBUG((LOG_INFO, "(%s)", ip_ntoa(ciaddr1))); if (ciaddr1 != wo->hisaddr && (ciaddr1 == 0 || !wo->accept_remote)) { orc = CONFNAK; @@ -1068,7 +1133,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) case CI_MS_DNS2: /* Microsoft primary or secondary DNS request */ d = citype == CI_MS_DNS2; - IPCPDEBUG((LOG_INFO, "ipcp: received DNS%d Request ", d+1)); /* If we do not have a DNS address then we cannot send it */ if (ao->dnsaddr[d] == 0 || @@ -1089,7 +1153,6 @@ ipcp_reqci(f, inp, len, reject_if_disagree) case CI_MS_WINS2: /* Microsoft primary or secondary WINS request */ d = citype == CI_MS_WINS2; - IPCPDEBUG((LOG_INFO, "ipcp: received WINS%d Request ", d+1)); /* If we do not have a DNS address then we cannot send it */ if (ao->winsaddr[d] == 0 || @@ -1107,14 +1170,12 @@ ipcp_reqci(f, inp, len, reject_if_disagree) break; case CI_COMPRESSTYPE: - IPCPDEBUG((LOG_INFO, "ipcp: received COMPRESSTYPE ")); if (!ao->neg_vj || (cilen != CILEN_VJ && cilen != CILEN_COMPRESS)) { orc = CONFREJ; break; } GETSHORT(cishort, p); - IPCPDEBUG((LOG_INFO, "(%d)", cishort)); if (!(cishort == IPCP_VJ_COMP || (cishort == IPCP_VJ_COMP_OLD && cilen == CILEN_COMPRESS))) { @@ -1154,10 +1215,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) orc = CONFREJ; break; } - endswitch: - IPCPDEBUG((LOG_INFO, " (%s)\n", CODENAME(orc))); - if (orc == CONFACK && /* Good CI */ rc != CONFACK) /* but prior CI wasnt? */ continue; /* Don't send this one */ @@ -1210,7 +1268,7 @@ endswitch: } *len = ucp - inp; /* Compute output length */ - IPCPDEBUG((LOG_INFO, "ipcp: returning Configure-%s", CODENAME(rc))); + IPCPDEBUG(("ipcp: returning Configure-%s", CODENAME(rc))); return (rc); /* Return final code */ } @@ -1280,8 +1338,8 @@ ip_demand_conf(u) if (sifproxyarp(u, wo->hisaddr)) proxy_arp_set[u] = 1; - syslog(LOG_NOTICE, "local IP address %s", ip_ntoa(wo->ouraddr)); - syslog(LOG_NOTICE, "remote IP address %s", ip_ntoa(wo->hisaddr)); + notice("local IP address %I", wo->ouraddr); + notice("remote IP address %I", wo->hisaddr); return 1; } @@ -1301,8 +1359,7 @@ ipcp_up(f) ipcp_options *go = &ipcp_gotoptions[f->unit]; ipcp_options *wo = &ipcp_wantoptions[f->unit]; - np_up(f->unit, PPP_IP); - IPCPDEBUG((LOG_INFO, "ipcp: up")); + IPCPDEBUG(("ipcp: up")); /* * We must have a non-zero IP address for both ends of the link. @@ -1311,24 +1368,32 @@ ipcp_up(f) ho->hisaddr = wo->hisaddr; if (ho->hisaddr == 0) { - syslog(LOG_ERR, "Could not determine remote IP address"); + error("Could not determine remote IP address"); ipcp_close(f->unit, "Could not determine remote IP address"); return; } if (go->ouraddr == 0) { - syslog(LOG_ERR, "Could not determine local IP address"); + 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 (usepeerdns && (go->dnsaddr[0] || go->dnsaddr[1])) { + script_setenv("USEPEERDNS", "1"); + if (go->dnsaddr[0]) + script_setenv("DNS1", ip_ntoa(go->dnsaddr[0])); + if (go->dnsaddr[1]) + script_setenv("DNS2", ip_ntoa(go->dnsaddr[1])); + create_resolv(go->dnsaddr[0], go->dnsaddr[1]); + } + /* * Check that the peer is allowed to use the IP address it wants. */ if (!auth_ip_addr(f->unit, ho->hisaddr)) { - syslog(LOG_ERR, "Peer is not authorized to use remote address %s", - ip_ntoa(ho->hisaddr)); + error("Peer is not authorized to use remote address %I", ho->hisaddr); ipcp_close(f->unit, "Unauthorized remote IP address"); return; } @@ -1344,15 +1409,13 @@ ipcp_up(f) if (demand) { if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { if (go->ouraddr != wo->ouraddr) { - syslog(LOG_WARNING, "Local IP address changed to %s", - ip_ntoa(go->ouraddr)); + warn("Local IP address changed to %I", go->ouraddr); script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr)); wo->ouraddr = go->ouraddr; } else script_unsetenv("OLDIPLOCAL"); if (ho->hisaddr != wo->hisaddr) { - syslog(LOG_WARNING, "Remote IP address changed to %s", - ip_ntoa(ho->hisaddr)); + warn("Remote IP address changed to %I", ho->hisaddr); script_setenv("OLDIPREMOTE", ip_ntoa(wo->hisaddr)); wo->hisaddr = ho->hisaddr; } else @@ -1362,7 +1425,8 @@ ipcp_up(f) /* Set the interface to the new addresses */ mask = GetMask(go->ouraddr); if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { - IPCPDEBUG((LOG_WARNING, "sifaddr failed")); + if (debug) + warn("Interface configuration failed"); ipcp_close(f->unit, "Interface configuration failed"); return; } @@ -1389,7 +1453,8 @@ ipcp_up(f) #if !(defined(SVR4) && (defined(SNI) || defined(__USLC__))) if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { - IPCPDEBUG((LOG_WARNING, "sifaddr failed")); + if (debug) + warn("Interface configuration failed"); ipcp_close(f->unit, "Interface configuration failed"); return; } @@ -1397,14 +1462,16 @@ ipcp_up(f) /* bring the interface up for IP */ if (!sifup(f->unit)) { - IPCPDEBUG((LOG_WARNING, "sifup failed")); + if (debug) + warn("Interface failed to come up"); ipcp_close(f->unit, "Interface configuration failed"); return; } #if (defined(SVR4) && (defined(SNI) || defined(__USLC__))) if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask)) { - IPCPDEBUG((LOG_WARNING, "sifaddr failed")); + if (debug) + warn("Interface configuration failed"); ipcp_close(f->unit, "Interface configuration failed"); return; } @@ -1421,10 +1488,16 @@ ipcp_up(f) if (sifproxyarp(f->unit, ho->hisaddr)) proxy_arp_set[f->unit] = 1; - syslog(LOG_NOTICE, "local IP address %s", ip_ntoa(go->ouraddr)); - syslog(LOG_NOTICE, "remote IP address %s", ip_ntoa(ho->hisaddr)); + notice("local IP address %I", go->ouraddr); + notice("remote IP address %I", ho->hisaddr); + if (go->dnsaddr[0]) + notice("primary DNS address %I", go->dnsaddr[0]); + if (go->dnsaddr[1]) + notice("secondary DNS address %I", go->dnsaddr[1]); } + np_up(f->unit, PPP_IP); + /* * Execute the ip-up script, like this: * /etc/ppp/ip-up interface tty speed local-IP remote-IP @@ -1446,7 +1519,7 @@ static void ipcp_down(f) fsm *f; { - IPCPDEBUG((LOG_INFO, "ipcp: down")); + IPCPDEBUG(("ipcp: down")); np_down(f->unit, PPP_IP); sifvjcomp(f->unit, 0, 0, 0); @@ -1509,7 +1582,8 @@ ipcp_finished(f) * has finished. */ static void -ipcp_script_done(void *arg) +ipcp_script_done(arg) + void *arg; { ipcp_script_pid = 0; switch (ipcp_script_state) { @@ -1540,9 +1614,9 @@ ipcp_script(script) char strspeed[32], strlocal[32], strremote[32]; char *argv[8]; - sprintf(strspeed, "%d", baud_rate); - strcpy(strlocal, ip_ntoa(ipcp_gotoptions[0].ouraddr)); - strcpy(strremote, ip_ntoa(ipcp_hisoptions[0].hisaddr)); + slprintf(strspeed, sizeof(strspeed), "%d", baud_rate); + slprintf(strlocal, sizeof(strlocal), "%I", ipcp_gotoptions[0].ouraddr); + slprintf(strremote, sizeof(strremote), "%I", ipcp_hisoptions[0].hisaddr); argv[0] = script; argv[1] = ifname; @@ -1555,6 +1629,33 @@ ipcp_script(script) ipcp_script_pid = run_program(script, argv, 0, ipcp_script_done, NULL); } +/* + * create_resolv - create the replacement resolv.conf file + */ +static void +create_resolv(peerdns1, peerdns2) + u_int32_t peerdns1, peerdns2; +{ + FILE *f; + + f = fopen(_PATH_RESOLV, "w"); + if (f == NULL) { + error("Failed to create %s: %m", _PATH_RESOLV); + return; + } + + if (peerdns1) + fprintf(f, "nameserver %s\n", ip_ntoa(peerdns1)); + + if (peerdns2) + fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2)); + + if (ferror(f)) + error("Write failed to %s: %m", _PATH_RESOLV); + + fclose(f); +} + /* * ipcp_printpkt - print the contents of an IPCP packet. */