Correctly deal with multiple caches

diff --git a/src/protos.h b/src/protos.h
index e03a9400a9369e1d2dfcb79794fbd014fcd0fec6..c4f57ea24d52e8b0b605e02a433c542233f8c392 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.342 1999/07/13 14:51:17 wessels Exp $
+ * $Id: protos.h,v 1.343 1999/07/21 22:08:12 glenn Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -525,8 +525,8 @@ extern variable_list *snmp_meshCtblFn(variable_list *, snint *);
 
 #if USE_WCCP
 extern PF wccpHandleUdp;
-extern PF wccpHandleGre;
 extern EVH wccpHereIam;
+extern EVH wccpAssignBuckets;
 extern void wccpInit(void);
 extern void wccpConnectionOpen(void);
 extern void wccpConnectionShutdown(void);

diff --git a/src/wccp.cc b/src/wccp.cc
index a031e2d2238ddb9e2c1aea3a7822887c3a9f91e6..a50ff5819f24202abbd6c403a3e3e2a6fafd1926 100644 (file)
--- a/src/wccp.cc
+++ b/src/wccp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wccp.cc,v 1.5 1999/07/13 14:51:30 wessels Exp $
+ * $Id: wccp.cc,v 1.6 1999/07/21 22:08:14 glenn Exp $
  *
  * DEBUG: section 80     WCCP Support
  * AUTHOR: Glenn Chisholm
@@ -84,13 +84,11 @@ struct wccp_assign_bucket_t {
 static int theInWccpConnection = -1;
 static int theOutWccpConnection = -1;
 static struct wccp_here_i_am_t wccp_here_i_am;
-static struct sockaddr_in router;
-static int router_len;
-static int last_change;
-static int last_assign;
-static int change;
+static struct wccp_i_see_you_t wccp_i_see_you;
+static int change, local_ip;
+
+static int wccpLowestIP();
 
-static void wccpAssignBuckets(struct wccp_i_see_you_t *wccp_i_see_you);
 /*
  * The functions used during startup:
  * wccpInit
@@ -104,26 +102,21 @@ wccpInit(void)
 {
     debug(80, 5) ("wccpInit: Called\n");
 
-    router_len = sizeof(router);
-    memset(&router, '\0', router_len);
-    router.sin_family = AF_INET;
-    router.sin_port = htons(2048);
-    router.sin_addr = Config.Wccp.router;
-
     memset(&wccp_here_i_am, '\0', sizeof(wccp_here_i_am));
     wccp_here_i_am.type = htonl(WCCP_HERE_I_AM);
     wccp_here_i_am.version = htonl(WCCP_VERSION);
     wccp_here_i_am.revision = htonl(WCCP_REVISION);
 
-    change = 0;
-    last_change = 0;
-    last_assign = 0;
+    change = 1;
+
 }
 
 void
 wccpConnectionOpen(void)
 {
     u_short port = WCCP_PORT;
+    struct sockaddr_in router, local;
+    int        local_len, router_len;
 
     debug(80, 5) ("wccpConnectionOpen: Called\n");
     if (Config.Wccp.router.s_addr != inet_addr("0.0.0.0")) {
@@ -138,7 +131,7 @@ wccpConnectionOpen(void)
        if (theInWccpConnection < 0)
            fatal("Cannot open WCCP Port");
        commSetSelect(theInWccpConnection, COMM_SELECT_READ, wccpHandleUdp, NULL, 0);
-       debug(1, 1) ("Accepting WCCP UDP messages on port %d, FD %d.\n",
+       debug(1, 1) ("Accepting WCCP messages on port %d, FD %d.\n",
            (int) port, theInWccpConnection);
        if (Config.Wccp.outgoing.s_addr != no_addr.s_addr) {
            enter_suid();
@@ -165,6 +158,20 @@ wccpConnectionOpen(void)
     } else {
        debug(1, 1) ("WCCP Disabled.\n");
     }
+ 
+    router_len = sizeof(router);
+    memset(&router, '\0', router_len);
+    router.sin_family = AF_INET;
+    router.sin_port = htons(2048);
+    router.sin_addr = Config.Wccp.router;  
+    if(connect(theOutWccpConnection, (struct sockaddr *)&router, router_len))
+       fatal("Unable to connect WCCP out socket"); 
+
+    local_len = sizeof(local); 
+    memset(&local, '\0', local_len);
+    if(getsockname(theOutWccpConnection, (struct sockaddr *)&local, &local_len))
+       fatal("Unable to getsockname on WCCP out socket");
+    local_ip = local.sin_addr.s_addr;
 }
 
 void
@@ -200,7 +207,6 @@ wccpConnectionClose(void)
 void
 wccpHandleUdp(int sock, void *not_used)
 {
-    struct wccp_i_see_you_t wccp_i_see_you;
     struct sockaddr_in from;
     socklen_t from_len;
     int len;
@@ -210,6 +216,7 @@ wccpHandleUdp(int sock, void *not_used)
     commSetSelect(sock, COMM_SELECT_READ, wccpHandleUdp, NULL, 0);
     from_len = sizeof(struct sockaddr_in);
     memset(&from, '\0', from_len);
+    memset(&wccp_i_see_you, '\0', sizeof(wccp_i_see_you));
 
     Counter.syscalls.sock.recvfroms++;
 
@@ -219,37 +226,35 @@ wccpHandleUdp(int sock, void *not_used)
        0,
        (struct sockaddr *) &from,
        &from_len);
+    if (len < 0)
+       return;
+    if (Config.Wccp.router.s_addr != from.sin_addr.s_addr) 
+       return;
+    if (ntohl(wccp_i_see_you.version) != WCCP_VERSION)
+       return;
+    if (ntohl(wccp_i_see_you.type) != WCCP_I_SEE_YOU)
+       return;
+    if(!change){
+       change = wccp_i_see_you.change;
+       return;
+    }
+    if (change != wccp_i_see_you.change) {
+       change = wccp_i_see_you.change;
+       if(wccpLowestIP(wccp_i_see_you))
+           if (!eventFind(wccpAssignBuckets, NULL))
+               eventAdd("wccpAssignBuckets", wccpAssignBuckets, NULL, 30.0, 1);
+    }
+}
 
-    if (len > 0) {
-       debug(80, 5) ("wccpHandleUdp: FD %d: received %d bytes from %s.\n",
-           sock,
-           len,
-           inet_ntoa(from.sin_addr));
-       if (Config.Wccp.router.s_addr != ntohl(from.sin_addr.s_addr)) {
-           if ((ntohl(wccp_i_see_you.version) == WCCP_VERSION) && (ntohl(wccp_i_see_you.type) == WCCP_I_SEE_YOU)) {
-               debug(80, 5) ("wccpHandleUdp: Valid WCCP packet recieved.\n");
-               wccp_here_i_am.id = wccp_i_see_you.id;
-               if (change != wccp_i_see_you.change) {
-                   change = wccp_i_see_you.change;
-                   if (last_assign)
-                       last_assign = 0;
-                   else
-                       last_change = 4;
-               }
-               if (last_change) {
-                   last_change--;
-                   if (!last_change) {
-                       wccpAssignBuckets(&wccp_i_see_you);
-                       last_assign = 1;
-                   }
-               }
-           } else {
-               debug(80, 5) ("wccpHandleUdp: Invalid WCCP packet recieved.\n");
-           }
-       } else {
-           debug(80, 5) ("wccpHandleUdp: WCCP packet recieved from invalid address.\n");
-       }
+int
+wccpLowestIP()
+{
+    int loop;
+    for (loop = 0; loop < ntohl(wccp_i_see_you.number); loop++) {
+       if (wccp_i_see_you.wccp_cache_entry[loop].ip_addr < local_ip)
+           return (0);
     }
+    return (1);
 }
 
 void
@@ -257,18 +262,17 @@ wccpHereIam(void *voidnotused)
 {
     debug(80, 6) ("wccpHereIam: Called\n");
 
-    sendto(theOutWccpConnection,
+    wccp_here_i_am.id = wccp_i_see_you.id;
+    send(theOutWccpConnection,
        &wccp_here_i_am,
        sizeof(wccp_here_i_am),
-       0,
-       (struct sockaddr *) &router,
-       router_len);
+       0);
 
     eventAdd("wccpHereIam", wccpHereIam, NULL, 10.0, 1);
 }
 
 void
-wccpAssignBuckets(struct wccp_i_see_you_t *wccp_i_see_you)
+wccpAssignBuckets(void *voidnotused)
 {
     struct wccp_assign_bucket_t wccp_assign_bucket;
     int number_buckets, loop_buckets, loop, bucket, number_caches;
@@ -277,27 +281,26 @@ wccpAssignBuckets(struct wccp_i_see_you_t *wccp_i_see_you)
     memset(&wccp_assign_bucket, '\0', sizeof(wccp_assign_bucket));
     memset(&wccp_assign_bucket.bucket, 0, sizeof(wccp_assign_bucket.bucket));
 
-    number_caches = ntohl(wccp_i_see_you->number);
+    number_caches = ntohl(wccp_i_see_you.number);
     if (number_caches > WCCP_ACTIVE_CACHES)
        number_caches = WCCP_ACTIVE_CACHES;
 
     number_buckets = WCCP_BUCKETS / number_caches;
     bucket = 0;
     for (loop = 0; loop < number_caches; loop++) {
-       wccp_assign_bucket.ip_addr[loop] = wccp_i_see_you->wccp_cache_entry[loop].ip_addr;
+       wccp_assign_bucket.ip_addr[loop] = wccp_i_see_you.wccp_cache_entry[loop].ip_addr;
        for (loop_buckets = 0; loop_buckets < number_buckets; loop_buckets++) {
            wccp_assign_bucket.bucket[bucket++] = loop;
        }
     }
     wccp_assign_bucket.type = ntohl(WCCP_ASSIGN_BUCKET);
-    wccp_assign_bucket.id = wccp_i_see_you->id;
+    wccp_assign_bucket.id = wccp_i_see_you.id;
     wccp_assign_bucket.number = ntohl(number_caches);
-    sendto(theOutWccpConnection,
+    send(theOutWccpConnection,
        &wccp_assign_bucket,
        sizeof(wccp_assign_bucket),
-       0,
-       (struct sockaddr *) &router,
-       router_len);
+       0);
+    change = 0;
 }
 
 #endif /* USE_WCCP */