You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2009/11/18 01:32:21 UTC
svn commit: r881632 - in
/incubator/trafficserver/traffic/trunk/proxy/logging: Log.cc LogAccess.cc
LogAccess.h LogAccessHttp.cc LogAccessHttp.h LogAccessICP.cc LogAccessICP.h
LogAccessTest.cc LogAccessTest.h
Author: zwoop
Date: Wed Nov 18 00:32:20 2009
New Revision: 881632
URL: http://svn.apache.org/viewvc?rev=881632&view=rev
Log:
TS-40 Reinstate "caun" log field.
Author: George Paul
Reviewed by leif
This fixes the squid log, I've tested binary logging as well as ascii.
Modified:
incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.h
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.h
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.h
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc Wed Nov 18 00:32:20 2009
@@ -392,6 +392,14 @@
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "chih", field);
+ // Jira TS-40: Re-add Squid field 'caun'
+ field = NEW (new LogField ("client_auth_user_name", "caun",
+ LogField::STRING,
+ &LogAccess::marshal_client_auth_user_name,
+ &LogAccess::unmarshal_str));
+ global_field_list.add (field, false);
+ ink_hash_table_insert (field_symbol_hash, "caun", field);
+
field = NEW(new LogField("client_req_timestamp_sec", "cqts",
LogField::sINT,
&LogAccess::marshal_client_req_timestamp_sec, &LogAccess::unmarshal_int_to_str));
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Wed Nov 18 00:32:20 2009
@@ -92,11 +92,11 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-/*int
+int
LogAccess::marshal_client_auth_user_name(char *buf)
{
DEFAULT_STR_FIELD;
-}a*/
+}
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h Wed Nov 18 00:32:20 2009
@@ -169,7 +169,7 @@
// client -> proxy fields
//
inkcoreapi virtual int marshal_client_host_ip(char *); // INT
- //inkcoreapi virtual int marshal_client_auth_user_name(char *); // STR
+ inkcoreapi virtual int marshal_client_auth_user_name(char *); // STR
int marshal_client_req_timestamp_sec(char *); // INT
inkcoreapi virtual int marshal_client_req_text(char *); // STR
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc Wed Nov 18 00:32:20 2009
@@ -156,21 +156,24 @@
user authenticated to the proxy (RFC931)
-------------------------------------------------------------------------*/
-/*int
+int
LogAccessHttp::marshal_client_auth_user_name(char *buf)
{
char *str = NULL;
int len = MIN_ALIGN;
- if (m_http_sm->t_state.auth_params.user_name) {
+ // Jira TS-40:
+ // NOTE: Authentication related code and modules were removed/disabled.
+ // Uncomment code path below when re-added/enabled.
+ /*if (m_http_sm->t_state.auth_params.user_name) {
str = m_http_sm->t_state.auth_params.user_name;
len = LogAccess::strlen(str);
- }
+ } */
if (buf) {
marshal_str(buf, str, len);
}
return len;
-}*/
+}
/*-------------------------------------------------------------------------
Private utility function to remove ftp password, if there is any
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.h?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.h Wed Nov 18 00:32:20 2009
@@ -57,7 +57,7 @@
// client -> proxy fields
//
virtual int marshal_client_host_ip(char *); // INT
- //virtual int marshal_client_auth_user_name(char *); // STR
+ virtual int marshal_client_auth_user_name(char *); // STR
virtual int marshal_client_req_text(char *); // STR
virtual int marshal_client_req_http_method(char *); // INT
virtual int marshal_client_req_url(char *); // STR
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc Wed Nov 18 00:32:20 2009
@@ -82,7 +82,7 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-/*int
+int
LogAccessICP::marshal_client_auth_user_name(char *buf)
{
char *str = (char *) m_icp_log->GetIdent();
@@ -91,7 +91,7 @@
marshal_str(buf, str, len);
}
return len;
-}*/
+}
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.h?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.h Wed Nov 18 00:32:20 2009
@@ -52,7 +52,7 @@
// client -> proxy fields
//
virtual int marshal_client_host_ip(char *); // INT
- //virtual int marshal_client_auth_user_name(char *); // STR
+ virtual int marshal_client_auth_user_name(char *); // STR
virtual int marshal_client_req_text(char *); // STR
virtual int marshal_client_req_http_method(char *); // INT
virtual int marshal_client_req_url(char *); // STR
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.cc?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.cc Wed Nov 18 00:32:20 2009
@@ -77,7 +77,7 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-/*int
+int
LogAccessTest::marshal_client_auth_user_name(char *buf)
{
static char *str = "major tom";
@@ -86,7 +86,7 @@
marshal_str(buf, str, len);
}
return len;
-}a*/
+}
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.h?rev=881632&r1=881631&r2=881632&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessTest.h Wed Nov 18 00:32:20 2009
@@ -49,7 +49,7 @@
// client -> proxy fields
//
virtual int marshal_client_host_ip(char *); // INT
- //virtual int marshal_client_auth_user_name(char *); // STR
+ virtual int marshal_client_auth_user_name(char *); // STR
// marshal_client_req_timestamp_sec is non-virtual!
virtual int marshal_client_req_text(char *); // STR
virtual int marshal_client_req_http_method(char *); // INT