This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 3075965 Updated traffic_via to have consistency between output and
error messages. Also, updated the test to be able to run from the command line
and give some output.
3075965 is described below
commit 307596508b76fbfb7bb928b111bd2c86523161a0
Author: Bryan Call <[email protected]>
AuthorDate: Thu Mar 14 14:51:41 2019 -0700
Updated traffic_via to have consistency between output and error
messages. Also, updated the test to be able to run from the command
line and give some output.
---
src/traffic_via/test_traffic_via | 7 ++++++-
src/traffic_via/tests/[u c s f p eS;tNc p s ] | 2 +-
src/traffic_via/tests/[uIcRs f p eN;t cCHp s ] | 2 +-
src/traffic_via/tests/[uIcRs f p eN;t cCNp s ] | 2 +-
src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS] | 2 +-
src/traffic_via/tests/[uScRs f p eN;t cCHp s ] | 2 +-
src/traffic_via/tests/long rubbish via code2 | 2 +-
src/traffic_via/tests/rubbish | 2 +-
src/traffic_via/tests/short | 2 +-
src/traffic_via/traffic_via.cc | 3 ++-
10 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/traffic_via/test_traffic_via b/src/traffic_via/test_traffic_via
index fb9fb03..9b3995f 100755
--- a/src/traffic_via/test_traffic_via
+++ b/src/traffic_via/test_traffic_via
@@ -20,11 +20,16 @@ set -e # exit on error
TMPDIR=${TMPDIR:-/tmp}
tmpfile=$(mktemp "$TMPDIR/via.XXXXXX")
-srcdir=$(cd $srcdir && pwd)
+if [ ! -z "$srcdir"]; then
+ srcdir=$(cd $srcdir && pwd)
+else
+ srcdir=$(pwd)
+fi
find $srcdir/tests -type f |
while read f ; do
name=$(basename "$f")
+ echo "testing $name"
./traffic_via "$name" > "$tmpfile" 2>&1 || true
diff -u "$tmpfile" "$srcdir/tests/$name"
done
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 ]
index 95cf7a7..e662dc0 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 24
+Via header is [u c s f p eS;tNc p s ], Length is 22
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 cCHp s ]
b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]
index a5f3238..0755883 100644
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCHp 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 cCHp s ], Length is 24
+Via header is [uIcRs f p eN;t cCHp s ], Length is 22
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 cCNp s ]
b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]
index 6af0055..6ecfc64 100644
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCNp 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 cCNp s ], Length is 24
+Via header is [uIcRs f p eN;t cCNp s ], Length is 22
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 cCMp sS]
b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
index 1e494c6..6ee096a 100644
--- a/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
+++ b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
@@ -1,4 +1,4 @@
-Via header is [uScMsSf pSeN;t cCMp sS], Length is 24
+Via header is [uScMsSf pSeN;t cCMp sS], Length is 22
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 cCHp s ]
b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ]
index d7d394c..ea96fdb 100644
--- a/src/traffic_via/tests/[uScRs f p eN;t cCHp 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 cCHp s ], Length is 24
+Via header is [uScRs f p eN;t cCHp s ], Length is 22
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 code2
b/src/traffic_via/tests/long rubbish via code2
index d3abd3d..3736682 100644
--- a/src/traffic_via/tests/long rubbish via code2
+++ 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 code2, Length is 22
+Via header is [long rubbish via code2], Length is 22
Via Header Details:
Error codes (if any) :Invalid sequence
diff --git a/src/traffic_via/tests/rubbish b/src/traffic_via/tests/rubbish
index 348f372..599670d 100644
--- a/src/traffic_via/tests/rubbish
+++ b/src/traffic_via/tests/rubbish
@@ -1,4 +1,4 @@
-Via header is rubbish, Length is 7
+Via header is [rubbish], Length is 7
Invalid VIA header. VIA header length should be 6 or 22 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>]
diff --git a/src/traffic_via/tests/short b/src/traffic_via/tests/short
index c0f098c..76d85bf 100644
--- a/src/traffic_via/tests/short
+++ b/src/traffic_via/tests/short
@@ -2,5 +2,5 @@ traffic_via: Invalid VIA header character: h
traffic_via: Invalid VIA header character: o
traffic_via: Invalid VIA header character: r
traffic_via: Invalid VIA header character: t
-Via header is short, Length is 5
+Via header is [short], Length is 5
Via Header Details:
diff --git a/src/traffic_via/traffic_via.cc b/src/traffic_via/traffic_via.cc
index b755f2c..cab5098 100644
--- a/src/traffic_via/traffic_via.cc
+++ b/src/traffic_via/traffic_via.cc
@@ -224,7 +224,6 @@ decodeViaHeader(const char *str)
memcpy(Via, str, viaHdrLength);
Via[viaHdrLength] = '\0'; // null terminate
- printf("Via header is %s, Length is %zu\n", Via, viaHdrLength);
// Via header inside square brackets
if (Via[0] == '[' && Via[viaHdrLength - 1] == ']') {
@@ -233,6 +232,8 @@ decodeViaHeader(const char *str)
Via[viaHdrLength] = '\0'; // null terminate the string after trimming
}
+ printf("Via header is [%s], Length is %zu\n", Via, viaHdrLength);
+
if (viaHdrLength == 5) {
Via = strcat(Via, " "); // Add one space character before decoding via
header
++viaHdrLength;
