From: hno <>
Date: Sat, 4 Nov 2006 22:44:58 +0000 (+0000)
Subject: Add client source port logformat tag >p
X-Git-Tag: SQUID_3_0_PRE5~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44eb213b04b1911e1074d20ee937a3d0ab066e60;p=thirdparty%2Fsquid.git

Add client source port logformat tag >p

by Gary Lau
---

diff --git a/src/access_log.cc b/src/access_log.cc
index e1de5cfe8d..c4b7b64eb3 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: access_log.cc,v 1.118 2006/10/02 02:21:50 adrian Exp $
+ * $Id: access_log.cc,v 1.119 2006/11/04 15:44:58 hno Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -322,7 +322,7 @@ typedef enum {
 
     LFT_CLIENT_IP_ADDRESS,
     LFT_CLIENT_FQDN,
-    /*LFT_CLIENT_PORT, */
+    LFT_CLIENT_PORT,
 
     /*LFT_SERVER_IP_ADDRESS, */
     LFT_SERVER_IP_OR_PEER_NAME,
@@ -439,7 +439,7 @@ struct logformat_token_table_entry logformat_token_table[] =
 
         {">a", LFT_CLIENT_IP_ADDRESS},
 
-        /*{ ">p", LFT_CLIENT_PORT}, */
+        { ">p", LFT_CLIENT_PORT},
         {">A", LFT_CLIENT_FQDN},
 
         /*{ "<a", LFT_SERVER_IP_ADDRESS }, */
@@ -549,7 +549,12 @@ accessLogCustom(AccessLogEntry * al, customlog * log)
 
             break;
 
-            /* case LFT_CLIENT_PORT: */
+        case LFT_CLIENT_PORT:
+	    if (al->request) {
+		outint = al->request->client_port;
+		doint = 1;
+	    }
+	    break;
 
             /* case LFT_SERVER_IP_ADDRESS: */
 
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2f9ad0d713..bf77705c45 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.426 2006/11/01 19:22:10 serassio Exp $
+# $Id: cf.data.pre,v 1.427 2006/11/04 15:44:58 hno Exp $
 #
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
@@ -1206,6 +1206,7 @@ DOC_START
 
 		>a	Client source IP address
 		>A	Client FQDN
+		>p	Client source port
 		<A	Server IP address or peer name
 		la	Local IP address (http_port)
 		lp	Local port number (http_port)