From: wessels <>
Date: Thu, 5 Mar 1998 05:07:54 +0000 (+0000)
Subject: support for multi-addressed neighbors
X-Git-Tag: SQUID_3_0_PRE1~3933
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e6d12aa2a5d955ee25359d8bcc68d9094a9dff;p=thirdparty%2Fsquid.git

support for multi-addressed neighbors
---

diff --git a/src/acl.cc b/src/acl.cc
index b3c5e06104..36bf7540dd 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.144 1998/02/26 18:00:35 wessels Exp $
+ * $Id: acl.cc,v 1.145 1998/03/04 22:07:54 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -304,15 +304,16 @@ aclParseMethodList(void *curlist)
     }
 }
 
-/* Decode a ascii representation (asc) of a IP adress, and place
+/*
+ * Decode a ascii representation (asc) of a IP adress, and place
  * adress and netmask information in addr and mask.
+ * This function should NOT be called if 'asc' is a hostname!
  */
 static int
 decode_addr(const char *asc, struct in_addr *addr, struct in_addr *mask)
 {
     u_num32 a;
     int a1 = 0, a2 = 0, a3 = 0, a4 = 0;
-    struct hostent *hp = NULL;
 
     switch (sscanf(asc, "%d.%d.%d.%d", &a1, &a2, &a3, &a4)) {
     case 4:			/* a dotted quad */
@@ -327,15 +328,8 @@ decode_addr(const char *asc, struct in_addr *addr, struct in_addr *mask)
 	    break;
 	}
     default:
-	/* Note, must use plain gethostbyname() here because at startup
-	 * ipcache hasn't been initialized */
-	if ((hp = gethostbyname(asc)) != NULL) {
-	    *addr = inaddrFromHostent(hp);
-	} else {
-	    /* XXX: Here we could use getnetbyname */
-	    debug(28, 0) ("decode_addr: Invalid IP address or hostname '%s'\n", asc);
-	    return 0;		/* This is not valid address */
-	}
+	debug(28, 0) ("decode_addr: Invalid IP address '%s'\n", asc);
+	return 0;		/* This is not valid address */
 	break;
     }
 
@@ -370,6 +364,10 @@ aclParseIpData(const char *t)
     LOCAL_ARRAY(char, addr2, 256);
     LOCAL_ARRAY(char, mask, 256);
     acl_ip_data *q = xcalloc(1, sizeof(acl_ip_data));
+    acl_ip_data *r;
+    acl_ip_data **Q;
+    struct hostent *hp;
+    char **x;
     debug(28, 5) ("aclParseIpData: %s\n", t);
     if (!strcasecmp(t, "all")) {
 	q->addr1.s_addr = 0;
@@ -389,8 +387,26 @@ aclParseIpData(const char *t)
     } else if (sscanf(t, "%[^/]/%s", addr1, mask) == 2) {
 	addr2[0] = '\0';
     } else if (sscanf(t, "%s", addr1) == 1) {
-	addr2[0] = '\0';
-	mask[0] = '\0';
+	/*
+	 * Note, must use plain gethostbyname() here because at startup
+	 * ipcache hasn't been initialized
+	 */
+	if ((hp = gethostbyname(addr1)) == NULL) {
+	    debug(28, 0) ("aclParseIpData: Bad host/IP: '%s'\n", t);
+	    safe_free(q);
+	    return NULL;
+	}
+	Q = &q;
+	for (x = hp->h_addr_list; x != NULL && *x != NULL; x++) {
+	    if ((r = *Q) == NULL)
+		*Q = r = xcalloc(1, sizeof(struct _acl_ip_data));
+	    xmemcpy(&r->addr1.s_addr, *x, sizeof(r->addr1.s_addr));
+	    r->addr2.s_addr = 0;
+	    r->mask.s_addr = 0;
+	    Q = &r->next;
+	    debug(28, 3) ("%s --> %s\n", addr1, inet_ntoa(r->addr1));
+	}
+	return q;
     } else {
 	debug(28, 0) ("aclParseIpData: Bad host/IP: '%s'\n", t);
 	safe_free(q);
@@ -438,9 +454,11 @@ aclParseIpList(void *curlist)
     splayNode **Top = curlist;
     acl_ip_data *q = NULL;
     while ((t = strtokFile())) {
-	if ((q = aclParseIpData(t)) == NULL)
-	    continue;
-	*Top = splay_insert(q, *Top, aclIpNetworkCompare);
+	q = aclParseIpData(t);
+	while (q != NULL) {
+	    *Top = splay_insert(q, *Top, aclIpNetworkCompare);
+	    q = q->next;
+	}
     }
 }
 
@@ -455,9 +473,11 @@ aclParseIpList(void **curtree)
     *curtree = Tree;
     tree_init(Tree);
     while ((t = strtokFile())) {
-	if ((q = aclParseIpData(t)) == NULL)
-	    continue;
-	tree_add(Tree, bintreeNetworkCompare, q, NULL);
+	q = aclParseIpData(t);
+	while (q != NULL) {
+	    tree_add(Tree, bintreeNetworkCompare, q, NULL);
+	    q = q->next;
+	}
     }
 }
 
@@ -470,10 +490,12 @@ aclParseIpList(void *curlist)
     acl_ip_data *q = NULL;
     for (Tail = curlist; *Tail; Tail = &((*Tail)->next));
     while ((t = strtokFile())) {
-	if ((q = aclParseIpData(t)) == NULL)
-	    continue;
+	q = aclParseIpData(t);
 	*(Tail) = q;
-	Tail = &q->next;
+	while (q != NULL) {
+	    Tail = &q->next;
+	    q = q->next;
+	}
     }
 }
 
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 148a78faf1..697b5c672c 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.176 1998/02/19 23:28:40 wessels Exp $
+ * $Id: neighbors.cc,v 1.177 1998/03/04 22:07:55 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -978,6 +978,7 @@ dump_peers(StoreEntry * sentry, peer * peers)
     peer *e = NULL;
     struct _domain_ping *d = NULL;
     icp_opcode op;
+    int i;
     if (peers == NULL)
 	storeAppendPrintf(sentry, "There are no neighbors installed.\n");
     for (e = peers; e; e = e->next) {
@@ -987,6 +988,10 @@ dump_peers(StoreEntry * sentry, peer * peers)
 	    e->host,
 	    e->http_port,
 	    e->icp_port);
+	for (i = 0; i < e->n_addresses; i++) {
+	    storeAppendPrintf(sentry, "Address[%d] : %s\n", i,
+		inet_ntoa(e->addresses[i]));
+	}
 	storeAppendPrintf(sentry, "Status     : %s\n",
 	    neighborUp(e) ? "Up" : "Down");
 	storeAppendPrintf(sentry, "AVG RTT    : %d msec\n", e->stats.rtt);