------------------------------------------------------------
revno: 10305
revision-id: squid3@treenet.co.nz-20110607021337-6t3jv37ft2ly8q8c
parent: squid3@treenet.co.nz-20110531042555-0ltfgposjhgaak4a
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3236
author: Amos Jeffries <squid3@treenet.co.nz>, Christos Tsantilas <chtsanti@users.sourceforge.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: SQUID_3_1
timestamp: Mon 2011-06-06 20:13:37 -0600
message:
  Bug 3236: Port of %oa, %<lp and %<la log format options
  
  Christos Tsantilas:
   Add logging of the local TCP port used by transactions with http servers
  
    The new log format code is "%<lp"
    
    In the case there are several server-side connections logs the port of 
    the last connection.
    
    This is a Measurement Factory project.
  
  
  Amos Jeffries:
   Port 2.7: logformat tag for logging the outgoing IP address (tcp_outgoing_address)
    
    This adds the log format to log the local IP address used on outgoing
    connections to peers and servers. Squid-2.7 called this %oa.
    
    However it is a perfectly matching part of the existing set of %la and
    %lp (local inbound) and %<lp (local outbound port).
    
    As such, the %oa is accepted as input for backward compatibility, but the
    Squid-3 version is: %<la
    
    This is based only very loosely on the Squid-2 %oa work by Andrew Atangulov
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20110607021337-6t3jv37ft2ly8q8c
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 3ac5f095fa0865b40e578d33af06c3b34f5de67b
# timestamp: 2011-06-07 02:51:08 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_1
# base_revision_id: squid3@treenet.co.nz-20110531042555-\
#   0ltfgposjhgaak4a
# 
# Begin patch
=== modified file 'src/HierarchyLogEntry.h'
--- src/HierarchyLogEntry.h	2009-09-03 12:15:55 +0000
+++ src/HierarchyLogEntry.h	2011-06-07 02:13:37 +0000
@@ -34,6 +34,7 @@
 #ifndef SQUID_HTTPHIERARCHYLOGENTRY_H
 #define SQUID_HTTPHIERARCHYLOGENTRY_H
 
+#include "ip/IpAddress.h"
 #include "rfc2181.h"
 #include "PingData.h"
 
@@ -62,6 +63,7 @@
     int64_t peer_response_time; ///< last peer response delay
     timeval first_conn_start; ///< first connection use among all peers
     int64_t total_response_time; ///< cumulative for all peers
+    IpAddress peer_local_addr; ///< local IP:port of the last server-side connection
 };
 
 extern void hierarchyNote(HierarchyLogEntry *, hier_code, const char *);

=== modified file 'src/access_log.cc'
--- src/access_log.cc	2010-10-23 13:29:15 +0000
+++ src/access_log.cc	2011-06-07 02:13:37 +0000
@@ -337,6 +337,9 @@
     LFT_LOCAL_IP,
     LFT_LOCAL_PORT,
     /*LFT_LOCAL_NAME, */
+    LFT_PEER_LOCAL_IP,
+    LFT_PEER_LOCAL_IP_OLD_27,
+    LFT_PEER_LOCAL_PORT,
 
     LFT_TIME_SECONDS_SINCE_EPOCH,
     LFT_TIME_SUBSECOND,
@@ -493,7 +496,11 @@
 
     {"la", LFT_LOCAL_IP},
     {"lp", LFT_LOCAL_PORT},
-    /*{ "lA", LFT_LOCAL_NAME }, */
+    /*{ "lA", LFT_LOCAL_NAME }, */+
+    {"<la", LFT_PEER_LOCAL_IP},
+    {"oa", LFT_PEER_LOCAL_IP_OLD_27},
+    {"<lp", LFT_PEER_LOCAL_PORT},
+    /* {"ot", LFT_PEER_OUTGOING_TOS}, */
 
     {"ts", LFT_TIME_SECONDS_SINCE_EPOCH},
     {"tu", LFT_TIME_SUBSECOND},
@@ -668,6 +675,22 @@
 
             break;
 
+            // the fmt->type can not be LFT_PEER_LOCAL_IP_OLD_27
+            // but compiler complains if ommited
+        case LFT_PEER_LOCAL_IP_OLD_27:
+        case LFT_PEER_LOCAL_IP:
+            if (!al->hier.peer_local_addr.IsAnyAddr()) {
+                out = al->hier.peer_local_addr.NtoA(tmp,sizeof(tmp));
+            }
+            break;
+
+        case LFT_PEER_LOCAL_PORT:
+            if ((outint = al->hier.peer_local_addr.GetPort())) {
+                doint = 1;
+            }
+
+            break;
+
         case LFT_TIME_SECONDS_SINCE_EPOCH:
             // some platforms store time in 32-bit, some 64-bit...
             outoff = static_cast<int64_t>(current_time.tv_sec);
@@ -1498,6 +1521,12 @@
         debugs(46, 0, "WARNING: the \"Hs\" formating code is deprecated use the \">Hs\" instead");
         lt->type = LFT_HTTP_SENT_STATUS_CODE;
         break;
+
+    case LFT_PEER_LOCAL_IP_OLD_27:
+        debugs(46, 0, "WARNING: The \"oa\" formatting code is deprecated. Use the \"<la\" instead.");
+        lt->type = LFT_PEER_LOCAL_IP;
+        break;
+
     default:
         break;
     }
@@ -2049,7 +2078,8 @@
         n_ichoices(0),
         peer_reply_status(HTTP_STATUS_NONE),
         peer_response_time(-1),
-        total_response_time(-1)
+        total_response_time(-1),
+        peer_local_addr()
 {
     memset(host, '\0', SQUIDHOSTNAMELEN);
     memset(cd_host, '\0', SQUIDHOSTNAMELEN);

=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2011-05-29 14:20:41 +0000
+++ src/cf.data.pre	2011-06-07 02:13:37 +0000
@@ -2535,6 +2535,8 @@
 		<A	Server IP address or peer name
 		la	Local IP address (http_port)
 		lp	Local port number (http_port)
+		<la	Local IP address of the last server or peer connection
+		<lp     Local port number of the last server or peer connection
 		ts	Seconds since epoch
 		tu	subsecond time (milliseconds)
 		tl	Local time. Optional strftime format argument

=== modified file 'src/forward.cc'
--- src/forward.cc	2011-05-07 06:21:18 +0000
+++ src/forward.cc	2011-06-07 02:13:37 +0000
@@ -891,6 +891,9 @@
 
         comm_add_close_handler(fd, fwdServerClosedWrapper, this);
 
+        if (comm_local_port(fd))
+            request->hier.peer_local_addr = fd_table[fd].local_addr;
+
         dispatch();
 
         return;
@@ -950,6 +953,9 @@
     if (!fs->_peer)
         origin_tries++;
 
+    if (comm_local_port(fd))
+        request->hier.peer_local_addr = fd_table[fd].local_addr;
+
     /*
      * stats.conn_open is used to account for the number of
      * connections that we have open to the peer, so we can limit

=== modified file 'src/tunnel.cc'
--- src/tunnel.cc	2011-04-11 12:00:03 +0000
+++ src/tunnel.cc	2011-06-07 02:13:37 +0000
@@ -676,6 +676,10 @@
         return;
     }
 
+    // record local IP:port for %<la and %<lp logging
+    if (comm_local_port(sock))
+        request->hier.peer_local_addr = fd_table[sock].local_addr;
+
     tunnelState = new TunnelStateData;
 #if DELAY_POOLS