Skip to content

remove icp code #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmamidi merged 1 commit into from
May 9, 2017
Merged

remove icp code #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/traffic_manager/AddConfigFilesHere.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ initializeRegistry()
configFiles->addFile("socks.config", false);
configFiles->addFile("records.config", false);
configFiles->addFile("cache.config", false);
configFiles->addFile("icp.config", false);
configFiles->addFile("ip_allow.config", false);
configFiles->addFile("parent.config", false);
configFiles->addFile("remap.config", false);
Expand Down
3 changes: 1 addition & 2 deletions ...ffic_via/tests/[u c s f p eS;tNc i p s ] → ...affic_via/tests/[u c s f p eS;tNc p s ]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is [u c s f p eS;tNc i p s ], Length is 26
Via header is [u c s f p eS;tNc p s ], Length is 25
Via Header Details:
Request headers received from client :unknown
Result of Traffic Server cache lookup for URL :no cache lookup
Expand All @@ -9,6 +9,5 @@ Error codes (if any) :server related error
Tunnel info :tunneling due to no forward
Cache Type :unknown
Cache Lookup Result :cache miss or no cache lookup
ICP status :no icp
Parent proxy connection status :no parent proxy or unknown
Origin server connection status :no server connection needed
3 changes: 1 addition & 2 deletions ...ffic_via/tests/[uIcRs f p eN;t cCHi p s ] → ...affic_via/tests/[uIcRs f p eN;t cCH p s ]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is [uIcRs f p eN;t cCHi p s ], Length is 26
Via header is [uIcRs f p eN;t cCH p s ], Length is 25
Via Header Details:
Request headers received from client :IMS
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
Expand All @@ -9,6 +9,5 @@ Error codes (if any) :no error
Tunnel info :no tunneling
Cache Type :cache
Cache Lookup Result :cache hit
ICP status :no icp
Parent proxy connection status :no parent proxy or unknown
Origin server connection status :no server connection needed
3 changes: 1 addition & 2 deletions ...ffic_via/tests/[uIcRs f p eN;t cCNi p s ] → ...affic_via/tests/[uIcRs f p eN;t cCN p s ]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is [uIcRs f p eN;t cCNi p s ], Length is 26
Via header is [uIcRs f p eN;t cCN p s ], Length is 25
Via Header Details:
Request headers received from client :IMS
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
Expand All @@ -9,6 +9,5 @@ Error codes (if any) :no error
Tunnel info :no tunneling
Cache Type :cache
Cache Lookup Result :conditional hit (client sent conditional, doc fresh in cache, returned 304)
ICP status :no icp
Parent proxy connection status :no parent proxy or unknown
Origin server connection status :no server connection needed
3 changes: 1 addition & 2 deletions ...ffic_via/tests/[uScMsSf pSeN;t cCMi p sS] → ...affic_via/tests/[uScMsSf pSeN;t cCM p sS]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is [uScMsSf pSeN;t cCMi p sS], Length is 26
Via header is [uScMsSf pSeN;t cCM p sS], Length is 25
Via Header Details:
Request headers received from client :simple request (not conditional)
Result of Traffic Server cache lookup for URL :miss (a cache "MISS")
Expand All @@ -9,6 +9,5 @@ Error codes (if any) :no error
Tunnel info :no tunneling
Cache Type :cache
Cache Lookup Result :cache miss (url not in cache)
ICP status :no icp
Parent proxy connection status :no parent proxy or unknown
Origin server connection status :connection opened successfully
3 changes: 1 addition & 2 deletions ...ffic_via/tests/[uScRs f p eN;t cCHi p s ] → ...affic_via/tests/[uScRs f p eN;t cCH p s ]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is [uScRs f p eN;t cCHi p s ], Length is 26
Via header is [uScRs f p eN;t cCH p s ], Length is 25
Via Header Details:
Request headers received from client :simple request (not conditional)
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
Expand All @@ -9,6 +9,5 @@ Error codes (if any) :no error
Tunnel info :no tunneling
Cache Type :cache
Cache Lookup Result :cache hit
ICP status :no icp
Parent proxy connection status :no parent proxy or unknown
Origin server connection status :no server connection needed
2 changes: 1 addition & 1 deletion ...raffic_via/tests/long rubbish via code 24 → ...traffic_via/tests/long rubbish via code 2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ traffic_via: Invalid VIA header character: i
traffic_via: Invalid VIA header character: a
traffic_via: Invalid VIA header character: o
traffic_via: Invalid VIA header character: d
Via header is long rubbish via code 24, Length is 24
Via header is long rubbish via code 2, Length is 23
Via Header Details:
Error codes (if any) :unknown
4 changes: 2 additions & 2 deletions cmd/traffic_via/tests/rubbish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Via header is rubbish, Length is 7

Invalid VIA header. VIA header length should be 6 or 24 characters
Valid via header format is [u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>]e<error-codes>:t<tunneling-info>c<cache type><cache-lookup-result>i<icp-conn-info>p<parent-proxy-conn-info>s<server-conn-info>]
Invalid VIA header. VIA header length should be 6 or 23 characters
Valid via header format is [u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>e<error-codes>:t<tunneling-info>c<cache type><cache-lookup-result>p<parent-proxy-conn-info>s<server-conn-info>]
16 changes: 5 additions & 11 deletions cmd/traffic_via/traffic_via.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ detailViaLookup(char flag)
// Cache type
viaTable = new VIA("Cache Type");
viaTable->viaData[(unsigned char)'C'] = "cache";
viaTable->viaData[(unsigned char)'I'] = "icp";
viaTable->viaData[(unsigned char)'L'] = "cluster, (not used)";
viaTable->viaData[(unsigned char)'P'] = "parent";
viaTable->viaData[(unsigned char)'S'] = "server";
viaTable->viaData[(unsigned char)' '] = "unknown";
Expand All @@ -90,12 +90,6 @@ detailViaLookup(char flag)
viaTable->next->viaData[(unsigned char)'S'] = "cache hit, but expired";
viaTable->next->viaData[(unsigned char)'K'] = "cookie miss";
break;
case 'i':
viaTable = new VIA("ICP status");
viaTable->viaData[(unsigned char)' '] = "no icp";
viaTable->viaData[(unsigned char)'S'] = "connection opened successfully";
viaTable->viaData[(unsigned char)'F'] = "connection open failed";
break;
case 'p':
viaTable = new VIA("Parent proxy connection status");
viaTable->viaData[(unsigned char)' '] = "no parent proxy or unknown";
Expand Down Expand Up @@ -243,16 +237,16 @@ decodeViaHeader(const char *str)
++viaHdrLength;
}

if (viaHdrLength == 24 || viaHdrLength == 6) {
if (viaHdrLength == 23 || viaHdrLength == 6) {
// Decode via header
printViaHeader(Via);
return TS_ERR_OKAY;
}
// Invalid header size, come out.
printf("\nInvalid VIA header. VIA header length should be 6 or 24 characters\n");
printf("\nInvalid VIA header. VIA header length should be 6 or 23 characters\n");
printf("Valid via header format is "
"[u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>]e<error-codes>:t<tunneling-info>c<"
"cache type><cache-lookup-result>i<icp-conn-info>p<parent-proxy-conn-info>s<server-conn-info>]");
"[u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>e<error-codes>:t<tunneling-info>c<"
"cache type><cache-lookup-result>p<parent-proxy-conn-info>s<server-conn-info>]\n");
return TS_ERR_FAIL;
}

Expand Down
5 changes: 0 additions & 5 deletions doc/.tx/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/hosting.config.en.po
source_file = _build/locale/pot/admin-guide/files/hosting.config.en.pot
source_lang = en

[apache-traffic-server-6x.admin-guide--files--icp_config_en]
file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/icp.config.en.po
source_file = _build/locale/pot/admin-guide/files/icp.config.en.pot
source_lang = en

[apache-traffic-server-6x.admin-guide--files--index_en]
file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/index.en.po
source_file = _build/locale/pot/admin-guide/files/index.en.pot
Expand Down
2 changes: 1 addition & 1 deletion doc/appendices/faq.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Via: HTTP/1.0 storm (Traffic-Server/4.0.0 [cMs f ])
The short status code shows the cache-lookup, server-info and cache-fill information as listed in the full status code description below. The long status code list provided in older, commercial versions of Traffic Server can be restored by setting the verbose_via_str config variable.
The character strings in the via-code show [<request results>:<proxy op>] where <request results> represents status information about the results of the client request and <proxy op> represent some information about the proxy operations performed during request processing. The full via-code status format is

[u<client-info> c<cache-lookup> s<server-info> f<cache-fill> p<proxy-info> e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> i<icp-conn-info> p<parent-proxy> s<server-conn-info>]
[u<client-info> c<cache-lookup> s<server-info> f<cache-fill> p<proxy-info> e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> p<parent-proxy> s<server-conn-info>]


u client-info
Expand Down
8 changes: 4 additions & 4 deletions doc/locale/ja/LC_MESSAGES/appendices/faq.en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,12 +383,12 @@ msgstr ""
#: ../../../appendices/faq.en.rst:146
msgid ""
"[u<client-info> c<cache-lookup> s<server-info> f<cache-fill> p<proxy-info> "
"e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> i<icp-"
"conn-info> p<parent-proxy> s<server-conn-info>]"
"e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> "
"p<parent-proxy> s<server-conn-info>]"
msgstr ""
"[u<client-info> c<cache-lookup> s<server-info> f<cache-fill> p<proxy-info> "
"e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> i<icp-"
"conn-info> p<parent-proxy> s<server-conn-info>]"
"e<error-codes> : t<tunnel-info>c<cache-type><cache-lookup-result> "
"p<parent-proxy> s<server-conn-info>]"

#: ../../../appendices/faq.en.rst:150
msgid "u client-info"
Expand Down
2 changes: 1 addition & 1 deletion iocore/cache/I_CacheDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define CACHE_ALT_REMOVED -2

#define CACHE_DB_MAJOR_VERSION 24
#define CACHE_DB_MINOR_VERSION 0
#define CACHE_DB_MINOR_VERSION 1

#define CACHE_DIR_MAJOR_VERSION 18
#define CACHE_DIR_MINOR_VERSION 0
Expand Down
1 change: 0 additions & 1 deletion iocore/eventsystem/I_Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
#define HTTP_NET_CONNECTION_EVENT_EVENTS_START 1400
#define HTTP_NET_VCONNECTION_EVENT_EVENTS_START 1500
#define GC_EVENT_EVENTS_START 1600
#define ICP_EVENT_EVENTS_START 1800
#define TRANSFORM_EVENTS_START 2000
#define STAT_PAGES_EVENTS_START 2100
#define HTTP_SESSION_EVENTS_START 2200
Expand Down
8 changes: 4 additions & 4 deletions lib/cppapi/HttpMethod.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "atscppapi/HttpMethod.h"

const std::string atscppapi::HTTP_METHOD_STRINGS[] = {std::string("UNKNOWN"), std::string("GET"), std::string("POST"),
std::string("HEAD"), std::string("CONNECT"), std::string("DELETE"),
std::string("ICP_QUERY"), std::string("OPTIONS"), std::string("PURGE"),
std::string("PUT"), std::string("TRACE"), std::string("PUSH")};
const std::string atscppapi::HTTP_METHOD_STRINGS[] = {std::string("UNKNOWN"), std::string("GET"), std::string("POST"),
std::string("HEAD"), std::string("CONNECT"), std::string("DELETE"),
std::string("OPTIONS"), std::string("PURGE"), std::string("PUT"),
std::string("TRACE"), std::string("PUSH")};
1 change: 0 additions & 1 deletion lib/cppapi/include/atscppapi/HttpMethod.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ enum HttpMethod {
HTTP_METHOD_HEAD,
HTTP_METHOD_CONNECT,
HTTP_METHOD_DELETE,
HTTP_METHOD_ICP_QUERY,
HTTP_METHOD_OPTIONS,
HTTP_METHOD_PURGE,
HTTP_METHOD_PUT,
Expand Down
10 changes: 0 additions & 10 deletions lib/perl/lib/Apache/TS/AdminClient.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,16 +533,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.http.transaction_no_activity_timeout_out
proxy.config.http_ui_enabled
proxy.config.http.uncacheable_requests_bypass_parent
proxy.config.icp.default_reply_port
proxy.config.icp.enabled
proxy.config.icp.icp_configuration
proxy.config.icp.icp_interface
proxy.config.icp.icp_port
proxy.config.icp.lookup_local
proxy.config.icp.multicast_enabled
proxy.config.icp.query_timeout
proxy.config.icp.reply_to_unknown_peer
proxy.config.icp.stale_icp_enabled
proxy.config.io.max_buffer_size
proxy.config.lm.pserver_timeout_msecs
proxy.config.lm.pserver_timeout_secs
Expand Down
33 changes: 0 additions & 33 deletions mgmt/api/APITestCliRemote.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,32 +474,6 @@ print_hosting_ele(TSHostingEle *ele)
print_int_list(ele->volumes);
}

void
print_icp_ele(TSIcpEle *ele)
{
if (!ele) {
printf("can't print ele\n");
return;
}

int peer_type;

switch (ele->peer_type) {
case TS_ICP_PARENT:
peer_type = 1;
break;
case TS_ICP_SIBLING:
peer_type = 2;
break;

default:
peer_type = 10;
}

printf("%s:%s:%d:%d:%d:%d:%s:%d:\n", ele->peer_hostname, ele->peer_host_ip_addr, peer_type, ele->peer_proxy_port,
ele->peer_icp_port, (ele->is_multicast ? 1 : 0), ele->mc_ip_addr, (ele->mc_ttl == TS_MC_TTL_SINGLE_SUBNET ? 1 : 2));
}

void
print_ip_allow_ele(TSIpAllowEle *ele)
{
Expand Down Expand Up @@ -789,9 +763,6 @@ print_ele_list(TSFileNameT file, TSCfgContext ctx)
case TS_FNAME_HOSTING:
print_hosting_ele((TSHostingEle *)ele);
break;
case TS_FNAME_ICP_PEER:
print_icp_ele((TSIcpEle *)ele);
break;
case TS_FNAME_IP_ALLOW:
print_ip_allow_ele((TSIpAllowEle *)ele);
break;
Expand Down Expand Up @@ -1449,8 +1420,6 @@ test_cfg_context_get(char *args)
file = TS_FNAME_CONGESTION;
} else if (strcmp(name, "hosting.config") == 0) {
file = TS_FNAME_HOSTING;
} else if (strcmp(name, "icp.config") == 0) {
file = TS_FNAME_ICP_PEER;
} else if (strcmp(name, "ip_allow.config") == 0) {
file = TS_FNAME_IP_ALLOW;
} else if (strcmp(name, "parent.config") == 0) {
Expand Down Expand Up @@ -1515,8 +1484,6 @@ test_cfg_context_move(char *args)
file = TS_FNAME_CONGESTION;
} else if (strcmp(name, "hosting.config") == 0) {
file = TS_FNAME_HOSTING;
} else if (strcmp(name, "icp.config") == 0) {
file = TS_FNAME_ICP_PEER;
} else if (strcmp(name, "ip_allow.config") == 0) {
file = TS_FNAME_IP_ALLOW;
} else if (strcmp(name, "parent.config") == 0) {
Expand Down
Loading