more Round Robin stuff

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 401ab3dae2357fd1d4f154abad9f65d5b011ca3e..49c810c7308f3278324e22d1f19f489971fce02a 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.107 1997/01/31 21:03:10 wessels Exp $
+ * $Id: neighbors.cc,v 1.108 1997/01/31 22:06:30 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -279,9 +279,13 @@ getRoundRobinParent(request_t * request)
     edge *e;
     edge *f = NULL;
     for (e = friends.edges_head; e; e = e->next) {
+       if (!BIT_TEST(e->options, NEIGHBOR_ROUNDROBIN))
+           continue;
+       if (neighborType(e, request) != EDGE_PARENT)
+           continue;
        if (!neighborUp(e))
            continue;
-       if (!BIT_TEST(e->options, NEIGHBOR_ROUNDROBIN))
+       if (!edgeWouldBePinged(e, request))
            continue;
        if (f && f->rr_count < e->rr_count)
            continue;

diff --git a/src/ssl.cc b/src/ssl.cc
index a948d1e46e12f553a04fe71193da8c3e92742453..369d1b16dc23d250264a0d07983a033a6c2ed8b0 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.33 1997/01/31 21:34:53 wessels Exp $
+ * $Id: ssl.cc,v 1.34 1997/01/31 22:06:31 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -502,6 +502,8 @@ sslSelectNeighbor(int fd, const ipcache_addrs * ia, void *data)
        hierarchyNote(request, HIER_DEFAULT_PARENT, 0, e->host);
     } else if ((e = getSingleParent(request))) {
        hierarchyNote(request, HIER_SINGLE_PARENT, 0, e->host);
+    } else if ((e = getRoundRobinParent(request))) {
+       hierarchyNote(request, HIER_ROUNDROBIN_PARENT, 0, e->host);
     } else if ((e = getFirstUpParent(request))) {
        hierarchyNote(request, HIER_FIRSTUP_PARENT, 0, e->host);
     }

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 9a8377ee5b83edba9542d61b4d4f0f73356d0257..03e768a82655f37a5c7a645f8de8c41a301587ff 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.33 1997/01/31 21:34:53 wessels Exp $
+ * $Id: tunnel.cc,v 1.34 1997/01/31 22:06:31 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -502,6 +502,8 @@ sslSelectNeighbor(int fd, const ipcache_addrs * ia, void *data)
        hierarchyNote(request, HIER_DEFAULT_PARENT, 0, e->host);
     } else if ((e = getSingleParent(request))) {
        hierarchyNote(request, HIER_SINGLE_PARENT, 0, e->host);
+    } else if ((e = getRoundRobinParent(request))) {
+       hierarchyNote(request, HIER_ROUNDROBIN_PARENT, 0, e->host);
     } else if ((e = getFirstUpParent(request))) {
        hierarchyNote(request, HIER_FIRSTUP_PARENT, 0, e->host);
     }