From d218c174f8de5b9ef64db524ec7b2a308e4372e5 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Mon, 5 Nov 2018 09:13:03 +0000 Subject: [PATCH] fix-traffic_via Gbp-Pq: Name 0012-fix-traffic_via.patch --- .../{[u c s f p eS;tNc p s ] => [u c s f p eS;tNc p s ]} | 2 +- .../{[uIcRs f p eN;t cCH p s ] => [uIcRs f p eN;t cCHp s ]} | 2 +- .../{[uIcRs f p eN;t cCN p s ] => [uIcRs f p eN;t cCNp s ]} | 2 +- .../{[uScMsSf pSeN;t cCM p sS] => [uScMsSf pSeN;t cCMp sS]} | 2 +- .../{[uScRs f p eN;t cCH p s ] => [uScRs f p eN;t cCHp s ]} | 2 +- .../tests/{long rubbish via code 2 => long rubbish via code2} | 4 ++-- src/traffic_via/tests/rubbish | 2 +- src/traffic_via/traffic_via.cc | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename src/traffic_via/tests/{[u c s f p eS;tNc p s ] => [u c s f p eS;tNc p s ]} (94%) rename src/traffic_via/tests/{[uIcRs f p eN;t cCH p s ] => [uIcRs f p eN;t cCHp s ]} (93%) rename src/traffic_via/tests/{[uIcRs f p eN;t cCN p s ] => [uIcRs f p eN;t cCNp s ]} (94%) rename src/traffic_via/tests/{[uScMsSf pSeN;t cCM p sS] => [uScMsSf pSeN;t cCMp sS]} (94%) rename src/traffic_via/tests/{[uScRs f p eN;t cCH p s ] => [uScRs f p eN;t cCHp s ]} (94%) rename src/traffic_via/tests/{long rubbish via code 2 => long rubbish via code2} (83%) diff --git a/src/traffic_via/tests/[u c s f p eS;tNc p s ] b/src/traffic_via/tests/[u c s f p eS;tNc p s ] similarity index 94% rename from src/traffic_via/tests/[u c s f p eS;tNc p s ] rename to src/traffic_via/tests/[u c s f p eS;tNc p s ] index f574eb27..95cf7a7d 100644 --- a/src/traffic_via/tests/[u c s f p eS;tNc p s ] +++ b/src/traffic_via/tests/[u c s f p eS;tNc p s ] @@ -1,4 +1,4 @@ -Via header is [u c s f p eS;tNc p s ], Length is 25 +Via header is [u c s f p eS;tNc p s ], Length is 24 Via Header Details: Request headers received from client :unknown Result of Traffic Server cache lookup for URL :no cache lookup diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCH p s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ] similarity index 93% rename from src/traffic_via/tests/[uIcRs f p eN;t cCH p s ] rename to src/traffic_via/tests/[uIcRs f p eN;t cCHp s ] index e7b47996..a5f3238c 100644 --- a/src/traffic_via/tests/[uIcRs f p eN;t cCH p s ] +++ b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ] @@ -1,4 +1,4 @@ -Via header is [uIcRs f p eN;t cCH p s ], Length is 25 +Via header is [uIcRs f p eN;t cCHp s ], Length is 24 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") diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCN p s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ] similarity index 94% rename from src/traffic_via/tests/[uIcRs f p eN;t cCN p s ] rename to src/traffic_via/tests/[uIcRs f p eN;t cCNp s ] index d3d3860b..6af0055e 100644 --- a/src/traffic_via/tests/[uIcRs f p eN;t cCN p s ] +++ b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ] @@ -1,4 +1,4 @@ -Via header is [uIcRs f p eN;t cCN p s ], Length is 25 +Via header is [uIcRs f p eN;t cCNp s ], Length is 24 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") diff --git a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS] b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS] similarity index 94% rename from src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS] rename to src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS] index e4bee740..1e494c63 100644 --- a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS] +++ b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS] @@ -1,4 +1,4 @@ -Via header is [uScMsSf pSeN;t cCM p sS], Length is 25 +Via header is [uScMsSf pSeN;t cCMp sS], Length is 24 Via Header Details: Request headers received from client :simple request (not conditional) Result of Traffic Server cache lookup for URL :miss (a cache "MISS") diff --git a/src/traffic_via/tests/[uScRs f p eN;t cCH p s ] b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ] similarity index 94% rename from src/traffic_via/tests/[uScRs f p eN;t cCH p s ] rename to src/traffic_via/tests/[uScRs f p eN;t cCHp s ] index e587c1a2..d7d394c6 100644 --- a/src/traffic_via/tests/[uScRs f p eN;t cCH p s ] +++ b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ] @@ -1,4 +1,4 @@ -Via header is [uScRs f p eN;t cCH p s ], Length is 25 +Via header is [uScRs f p eN;t cCHp s ], Length is 24 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") diff --git a/src/traffic_via/tests/long rubbish via code 2 b/src/traffic_via/tests/long rubbish via code2 similarity index 83% rename from src/traffic_via/tests/long rubbish via code 2 rename to src/traffic_via/tests/long rubbish via code2 index b8f47efa..d3abd3d9 100644 --- a/src/traffic_via/tests/long rubbish via code 2 +++ b/src/traffic_via/tests/long rubbish via code2 @@ -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 2, Length is 23 +Via header is long rubbish via code2, Length is 22 Via Header Details: -Error codes (if any) :unknown +Error codes (if any) :Invalid sequence diff --git a/src/traffic_via/tests/rubbish b/src/traffic_via/tests/rubbish index 51066c11..348f372e 100644 --- a/src/traffic_via/tests/rubbish +++ b/src/traffic_via/tests/rubbish @@ -1,4 +1,4 @@ Via header is rubbish, Length is 7 -Invalid VIA header. VIA header length should be 6 or 23 characters +Invalid VIA header. VIA header length should be 6 or 22 characters Valid via header format is [ucsfpe:tcps] diff --git a/src/traffic_via/traffic_via.cc b/src/traffic_via/traffic_via.cc index db55da36..b755f2c6 100644 --- a/src/traffic_via/traffic_via.cc +++ b/src/traffic_via/traffic_via.cc @@ -238,13 +238,13 @@ decodeViaHeader(const char *str) ++viaHdrLength; } - if (viaHdrLength == 23 || viaHdrLength == 6) { + if (viaHdrLength == 22 || 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 23 characters\n"); + printf("\nInvalid VIA header. VIA header length should be 6 or 22 characters\n"); printf("Valid via header format is " "[ucsfpe:tc<" "cache type>ps]\n"); -- 2.30.2