summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-02-09 00:11:44 +0000
committerGuy Harris <guy@alum.mit.edu>2001-02-09 00:11:44 +0000
commitf116900cac1eb80d6a24aaae6f8b1e64507f33b8 (patch)
tree1c461645c5a89341a8ce1a98495f73183819baee
parent6742f8bec9a0c47051f02b7fcca61ce3f6a5fa35 (diff)
downloadwireshark-f116900cac1eb80d6a24aaae6f8b1e64507f33b8.tar.gz
Change to include Service ID field in dissection of Service Info
component of WCCP 2 messages even if the service type is WCCP2_SERVICE_DYNAMIC, from Simharajan Srishylam. svn path=/trunk/; revision=3005
-rw-r--r--AUTHORS6
-rw-r--r--doc/ethereal.pod.template1
-rw-r--r--packet-wccp.c10
3 files changed, 15 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 907fe2f11e..8fde8359fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -503,6 +503,12 @@ David Hampton <dhampton@mac.com> {
"Decode As" dialog
}
+Simharajan Srishylam <Simharajan.Srishylam@netapp.com> {
+ Include Service ID field in dissection of Service Info component
+ of WCCP 2 messages even if the service type is
+ WCCP2_SERVICE_DYNAMIC
+}
+
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 1379580b51..e07bf96cb2 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1063,6 +1063,7 @@ B<http://www.ethereal.com>.
Kent Engström <kent@unit.liu.se>
Ronnie Sahlberg <rsahlber@bigpond.net.au>
Alexandre P. Ferreira <alexandref@spliceip.com.br>
+ Simharajan Srishylam <Simharajan.Srishylam@netapp.com>
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.
diff --git a/packet-wccp.c b/packet-wccp.c
index 98fca3ba76..e3f1de7a17 100644
--- a/packet-wccp.c
+++ b/packet-wccp.c
@@ -2,7 +2,7 @@
* Routines for Web Cache Coordination Protocol dissection
* Jerry Talkington <jerryt@netapp.com>
*
- * $Id: packet-wccp.c,v 1.17 2001/01/22 08:03:46 guy Exp $
+ * $Id: packet-wccp.c,v 1.18 2001/02/09 00:11:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -591,12 +591,18 @@ dissect_wccp2_service_info(tvbuff_t *tvb, int offset, int length,
"Service Type: Well-known service");
proto_tree_add_text(info_tree, tvb, offset+1, 1,
"Service ID: %s",
- val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals, "Unknown (0x%02X)"));
+ val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals,
+ "Unknown (0x%02X)"));
+
break;
case WCCP2_SERVICE_DYNAMIC:
proto_tree_add_text(info_tree, tvb, offset, 1,
"Service Type: Dynamic service");
+ proto_tree_add_text(info_tree, tvb, offset+1, 1,
+ "Service ID: %s",
+ val_to_str(tvb_get_guint8(tvb, offset+1), service_id_vals,
+ "Unknown (0x%02X)"));
proto_tree_add_text(info_tree, tvb, offset+2, 1,
"Priority: %u", tvb_get_guint8(tvb, offset+2));
/*