added request_t->my_addr

diff --git a/src/client_side.cc b/src/client_side.cc
index 87d17ce89b328fcee2886a98de3b029317d75543..cb2b96ac4712c9c7df757a3bac1e29781c949416 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.438 1999/01/29 21:28:10 wessels Exp $
+ * $Id: client_side.cc,v 1.439 1999/01/29 23:01:04 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -255,6 +255,7 @@ clientRedirectDone(void *data, char *result)
        new_request->http_ver = old_request->http_ver;
        httpHeaderAppend(&new_request->header, &old_request->header);
        new_request->client_addr = old_request->client_addr;
+       new_request->my_addr = old_request->my_addr;
        new_request->flags.redirected = 1;
        if (old_request->body) {
            new_request->body = xmalloc(old_request->body_sz);
@@ -2264,6 +2265,7 @@ clientReadRequest(int fd, void *data)
            safe_free(http->log_uri);
            http->log_uri = xstrdup(urlCanonicalClean(request));
            request->client_addr = conn->peer.sin_addr;
+           request->my_addr = conn->me.sin_addr;
            request->http_ver = http->http_ver;
            if (!urlCheckRequest(request)) {
                err = errorCon(ERR_UNSUP_REQ, HTTP_NOT_IMPLEMENTED);

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 1f1be44f6e8d8854df94e55975800b1299595786..b96cb310b6152ed446ba0459405f8959cba6a892 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.269 1999/01/29 22:17:09 wessels Exp $
+ * $Id: neighbors.cc,v 1.270 1999/01/29 23:01:06 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -147,7 +147,7 @@ peerAllowedToUse(const peer * p, request_t * request)
     if (p->access == NULL)
        return do_ping;
     checklist.src_addr = request->client_addr;
-    checklist.my_addr = no_addr;       /* XXX wrong */
+    checklist.my_addr = request->my_addr;
     checklist.request = request;
     return aclCheckFast(p->access, &checklist);
 }

diff --git a/src/peer_select.cc b/src/peer_select.cc
index b1af9d371789699a66e32708553f138f98eb5bc9..e5f62f548138ccc8971046fb846fe2fdb61ff29c 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.97 1999/01/29 21:28:18 wessels Exp $
+ * $Id: peer_select.cc,v 1.98 1999/01/29 23:01:07 wessels Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -237,7 +237,7 @@ peerSelectFoo(ps_state * ps)
                Config.accessList.AlwaysDirect,
                request,
                request->client_addr,
-               no_addr,        /* XXX wrong */
+               request->my_addr,
                NULL,           /* user agent */
                NULL);          /* ident */
            aclNBCheck(ps->acl_checklist,
@@ -251,7 +251,7 @@ peerSelectFoo(ps_state * ps)
                Config.accessList.NeverDirect,
                request,
                request->client_addr,
-               no_addr,        /* XXX wrong */
+               request->my_addr,
                NULL,           /* user agent */
                NULL);          /* ident */
            aclNBCheck(ps->acl_checklist,

diff --git a/src/structs.h b/src/structs.h
index da9f5407a1fa2d8f94efcf2f565285f86965950e..82306569b681a103349fa8ce4bea422964add3b8 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.274 1999/01/29 21:28:21 wessels Exp $
+ * $Id: structs.h,v 1.275 1999/01/29 23:01:07 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1301,6 +1301,7 @@ struct _request_t {
     int imslen;
     int max_forwards;
     struct in_addr client_addr;
+    struct in_addr my_addr;
     HttpHeader header;
     char *body;
     size_t body_sz;