See <https://ci.trafficserver.apache.org/job/clang-format/51/changes>
Changes: [zizhang] TS-3780: Logs_xml: add logging field for incoming (interface) ip. [zizhang] TS-3780: Logs_xml: add logging field for incoming (interface) ip. TESTS [zizhang] TS-3780: Logs_xml: add logging field for incoming (interface) ip. DOCUMENTATION ------------------------------------------ [...truncated 4285 lines...] + echo src/proxy/http2/Http2SessionAccept.h src/proxy/http2/Http2SessionAccept.h + clang-format -i src/proxy/http2/Http2SessionAccept.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HuffmanCodec.h src/proxy/http2/HuffmanCodec.h + clang-format -i src/proxy/http2/HuffmanCodec.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/Http2ConnectionState.cc src/proxy/http2/Http2ConnectionState.cc + clang-format -i src/proxy/http2/Http2ConnectionState.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HTTP2.cc src/proxy/http2/HTTP2.cc + clang-format -i src/proxy/http2/HTTP2.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/Http2ClientSession.h src/proxy/http2/Http2ClientSession.h + clang-format -i src/proxy/http2/Http2ClientSession.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HPACK.h src/proxy/http2/HPACK.h + clang-format -i src/proxy/http2/HPACK.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HTTP2.h src/proxy/http2/HTTP2.h + clang-format -i src/proxy/http2/HTTP2.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HuffmanCodec.cc src/proxy/http2/HuffmanCodec.cc + clang-format -i src/proxy/http2/HuffmanCodec.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/Http2SessionAccept.cc src/proxy/http2/Http2SessionAccept.cc + clang-format -i src/proxy/http2/Http2SessionAccept.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/http2/HPACK.cc src/proxy/http2/HPACK.cc + clang-format -i src/proxy/http2/HPACK.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/Main.cc src/proxy/Main.cc + clang-format -i src/proxy/Main.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/UDPAPIClientTest.cc src/proxy/UDPAPIClientTest.cc + clang-format -i src/proxy/UDPAPIClientTest.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/Plugin.cc src/proxy/Plugin.cc + clang-format -i src/proxy/Plugin.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/TestClock.cc src/proxy/TestClock.cc + clang-format -i src/proxy/TestClock.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/UDPAPIClientTest.h src/proxy/UDPAPIClientTest.h + clang-format -i src/proxy/UDPAPIClientTest.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/ICPProcessor.h src/proxy/ICPProcessor.h + clang-format -i src/proxy/ICPProcessor.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/InkAPITest.cc src/proxy/InkAPITest.cc + clang-format -i src/proxy/InkAPITest.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/EventName.cc src/proxy/EventName.cc + clang-format -i src/proxy/EventName.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/CompletionUtil.h src/proxy/CompletionUtil.h + clang-format -i src/proxy/CompletionUtil.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/ReverseProxy.h src/proxy/ReverseProxy.h + clang-format -i src/proxy/ReverseProxy.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/Prefetch.cc src/proxy/Prefetch.cc + clang-format -i src/proxy/Prefetch.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/TestPreProc.h src/proxy/TestPreProc.h + clang-format -i src/proxy/TestPreProc.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/InkPool_r.h src/proxy/InkPool_r.h + clang-format -i src/proxy/InkPool_r.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/DynamicStats.h src/proxy/DynamicStats.h + clang-format -i src/proxy/DynamicStats.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/StatSystem.cc src/proxy/StatSystem.cc + clang-format -i src/proxy/StatSystem.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/StatPages.h src/proxy/StatPages.h + clang-format -i src/proxy/StatPages.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/CacheControl.cc src/proxy/CacheControl.cc + clang-format -i src/proxy/CacheControl.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/ICP.cc src/proxy/ICP.cc + clang-format -i src/proxy/ICP.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/ControlBase.h src/proxy/ControlBase.h + clang-format -i src/proxy/ControlBase.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/URL.cc src/proxy/hdrs/URL.cc + clang-format -i src/proxy/hdrs/URL.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/MIME.h src/proxy/hdrs/MIME.h + clang-format -i src/proxy/hdrs/MIME.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrTest.h src/proxy/hdrs/HdrTest.h + clang-format -i src/proxy/hdrs/HdrTest.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrTest.cc src/proxy/hdrs/HdrTest.cc + clang-format -i src/proxy/hdrs/HdrTest.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HTTP.cc src/proxy/hdrs/HTTP.cc + clang-format -i src/proxy/hdrs/HTTP.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HttpCompat.cc src/proxy/hdrs/HttpCompat.cc + clang-format -i src/proxy/hdrs/HttpCompat.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrUtils.h src/proxy/hdrs/HdrUtils.h + clang-format -i src/proxy/hdrs/HdrUtils.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrUtils.cc src/proxy/hdrs/HdrUtils.cc + clang-format -i src/proxy/hdrs/HdrUtils.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrToken.cc src/proxy/hdrs/HdrToken.cc + clang-format -i src/proxy/hdrs/HdrToken.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrTSOnly.cc src/proxy/hdrs/HdrTSOnly.cc + clang-format -i src/proxy/hdrs/HdrTSOnly.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrHeap.cc src/proxy/hdrs/HdrHeap.cc + clang-format -i src/proxy/hdrs/HdrHeap.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/test_urlhash.cc src/proxy/hdrs/test_urlhash.cc + clang-format -i src/proxy/hdrs/test_urlhash.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HTTP.h src/proxy/hdrs/HTTP.h + clang-format -i src/proxy/hdrs/HTTP.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/load_http_hdr.cc src/proxy/hdrs/load_http_hdr.cc + clang-format -i src/proxy/hdrs/load_http_hdr.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/URL.h src/proxy/hdrs/URL.h + clang-format -i src/proxy/hdrs/URL.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/MIME.cc src/proxy/hdrs/MIME.cc + clang-format -i src/proxy/hdrs/MIME.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrHeap.h src/proxy/hdrs/HdrHeap.h + clang-format -i src/proxy/hdrs/HdrHeap.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HdrToken.h src/proxy/hdrs/HdrToken.h + clang-format -i src/proxy/hdrs/HdrToken.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/test_header.cc src/proxy/hdrs/test_header.cc + clang-format -i src/proxy/hdrs/test_header.cc + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/hdrs/HttpCompat.h src/proxy/hdrs/HttpCompat.h + clang-format -i src/proxy/hdrs/HttpCompat.h + for f in '`find src -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`' + echo src/proxy/sac.cc src/proxy/sac.cc + clang-format -i src/proxy/sac.cc + cd src + git diff --exit-code diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc index 6f20b46..166f3b8 100644 --- a/proxy/logging/Log.cc +++ b/proxy/logging/Log.cc @@ -344,15 +344,16 @@ Log::init_fields() new LogField("client_host_ip_hex", "chih", LogField::IP, &LogAccess::marshal_client_host_ip, &LogAccess::unmarshal_ip_to_hex); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "chih", field); - - // interface ip - field = new LogField("host_interface_ip", "hii", LogField::IP, &LogAccess::marshal_host_interface_ip, &LogAccess::unmarshal_ip_to_str); + // interface ip + + field = + new LogField("host_interface_ip", "hii", LogField::IP, &LogAccess::marshal_host_interface_ip, &LogAccess::unmarshal_ip_to_str); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "hii", field); - field = - new LogField("host_interface_ip_hex", "hiih", LogField::IP, &LogAccess::marshal_host_interface_ip, &LogAccess::unmarshal_ip_to_hex); + field = new LogField("host_interface_ip_hex", "hiih", LogField::IP, &LogAccess::marshal_host_interface_ip, + &LogAccess::unmarshal_ip_to_hex); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "hiih", field); // interface ip end diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h index 61f6679..f9c6e76 100644 --- a/proxy/logging/LogAccess.h +++ b/proxy/logging/LogAccess.h @@ -170,11 +170,11 @@ public: // // client -> proxy fields // - inkcoreapi virtual int marshal_client_host_ip(char *); // STR - inkcoreapi virtual int marshal_host_interface_ip(char *); // STR - inkcoreapi virtual int marshal_client_host_port(char *); // INT - inkcoreapi virtual int marshal_client_auth_user_name(char *); // STR - int marshal_client_req_timestamp_sec(char *); // INT + inkcoreapi virtual int marshal_client_host_ip(char *); // STR + inkcoreapi virtual int marshal_host_interface_ip(char *); // STR + inkcoreapi virtual int marshal_client_host_port(char *); // INT + 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 inkcoreapi virtual int marshal_client_req_http_method(char *); // STR Build step 'Execute shell' marked build as failure