From bee9bbb1e96af1697d4045e03928f86159538337 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 28 Apr 1995 06:24:53 +0000 Subject: [PATCH] some more fixes so we don't nak with addr 0.0.0.0 after they've reqd that. --- pppd/ipcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pppd/ipcp.c b/pppd/ipcp.c index abeae25..b3096c6 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.16 1995/04/26 06:46:50 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.17 1995/04/28 06:24:53 paulus Exp $"; #endif /* @@ -575,13 +575,13 @@ ipcp_nakci(f, p, len) case CI_ADDR: if (go->neg_addr || no.neg_addr || cilen != CILEN_ADDR) goto bad; - try.neg_addr = 1; try.old_addrs = 0; GETLONG(l, p); ciaddr1 = htonl(l); if (ciaddr1 && go->accept_local) try.ouraddr = ciaddr1; - no.neg_addr = 1; + if (try.ouraddr != 0) + no.neg_addr = 1; break; default: goto bad; @@ -783,6 +783,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) * If neither we nor he knows his address, reject the option. */ orc = CONFREJ; + wo->req_addr = 0; /* don't NAK with 0.0.0.0 later */ break; } @@ -843,6 +844,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) * Don't ACK an address of 0.0.0.0 - reject it instead. */ orc = CONFREJ; + wo->req_addr = 0; /* don't NAK with 0.0.0.0 later */ break; } -- 2.39.2