summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1998-02-28 21:01:09 +0000
committerphk <phk@FreeBSD.org>1998-02-28 21:01:09 +0000
commitc5228af8cf2dc9f9d3c5ebb1a617edc4e6d4542c (patch)
tree7649424705868d5a7efdc29e9bb22199ada96caf /sys/net
parentfaf593c225fcb43f99de0b93dcf7fef0bcf0bfbf (diff)
downloadFreeBSD-src-c5228af8cf2dc9f9d3c5ebb1a617edc4e6d4542c.zip
FreeBSD-src-c5228af8cf2dc9f9d3c5ebb1a617edc4e6d4542c.tar.gz
Make it possible to indicate that we don't care about the remote
sides IP address, as long as it isn't 0.0.0.0
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_spppsubr.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index b457947..87d3eb8 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
*
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
*
- * $Id: if_spppsubr.c,v 1.31 1998/01/08 23:41:31 eivind Exp $
+ * $Id: if_spppsubr.c,v 1.32 1998/02/09 06:09:57 eivind Exp $
*/
#include "opt_inet.h"
@@ -2502,15 +2502,18 @@ sppp_ipcp_RCR(struct sppp *sp, struct lcp_header *h, int len)
case IPCP_OPT_ADDRESS:
desiredaddr = p[2] << 24 | p[3] << 16 |
p[4] << 8 | p[5];
- if (desiredaddr == hisaddr) {
+ if (desiredaddr == hisaddr ||
+ (hisaddr == 1 && desiredaddr != 0) {
/*
* Peer's address is same as our value,
+ * or we have set it to 0.0.0.1 to
+ * indicate that we do not really care,
* this is agreeable. Gonna conf-ack
* it.
*/
if (debug)
addlog("%s [ack] ",
- sppp_dotted_quad(hisaddr));
+ sppp_dotted_quad(desiredaddr));
/* record that we've seen it already */
sp->ipcp.flags |= IPCP_HISADDR_SEEN;
continue;
OpenPOWER on IntegriCloud