diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-10-18 03:36:04 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-10-18 03:36:04 +0000 |
| commit | c50b9888074968e797aa28f81192f4835ca1c091 (patch) | |
| tree | 9d20c2311276a708d5a3a07e29f3730fc6bae618 /epan/dissectors/packet-nstrace.c | |
| parent | 42c52d86127263dcb84791f7213726964a3ef025 (diff) | |
From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280
From me: fix indentation(tabs->spaces) and trailing whitespace.
svn path=/trunk/; revision=52665
Diffstat (limited to 'epan/dissectors/packet-nstrace.c')
| -rw-r--r-- | epan/dissectors/packet-nstrace.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index d7a5c7c710..b6115847b3 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -67,10 +67,13 @@ static gint ett_ns_activity_flags = -1; static const value_string ns_dir_vals[] = { { NSPR_PDPKTRACEFULLTX_V10, "TX" }, { NSPR_PDPKTRACEFULLTX_V20, "TX" }, + { NSPR_PDPKTRACEFULLTX_V30, "TX" }, { NSPR_PDPKTRACEFULLTXB_V10, "TXB" }, { NSPR_PDPKTRACEFULLTXB_V20, "TXB" }, + { NSPR_PDPKTRACEFULLTXB_V30, "TXB" }, { NSPR_PDPKTRACEFULLRX_V10, "RX" }, { NSPR_PDPKTRACEFULLRX_V20, "RX" }, + { NSPR_PDPKTRACEFULLRX_V30, "RX" }, { NSPR_PDPKTRACEPARTTX_V10, "TX" }, { NSPR_PDPKTRACEPARTTX_V20, "TX" }, { NSPR_PDPKTRACEPARTTXB_V10, "TXB" }, @@ -101,6 +104,7 @@ static const value_string ns_dir_vals[] = { { NSPR_PDPKTRACEFULLNEWRX_V24, "NEW_RX" }, { NSPR_PDPKTRACEFULLNEWRX_V25, "NEW_RX" }, { NSPR_PDPKTRACEFULLNEWRX_V26, "NEW_RX" }, + { NSPR_PDPKTRACEFULLNEWRX_V30, "NEW_RX" }, { NSPR_PDPKTRACEPARTTX_V22, "TX" }, { NSPR_PDPKTRACEPARTTX_V23, "TX" }, { NSPR_PDPKTRACEPARTTX_V24, "TX" }, @@ -156,7 +160,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wmem_strbuf_append(flags_strbuf, "None"); - if (pnstr->rec_type == NSPR_HEADER_VERSION205) + if (pnstr->rec_type == NSPR_HEADER_VERSION205 || pnstr->rec_type == NSPR_HEADER_VERSION300 || pnstr->rec_type == NSPR_HEADER_VERSION206) { src_vmname_len = tvb_get_guint8(tvb,pnstr->src_vmname_len_offset); dst_vmname_len = tvb_get_guint8(tvb,pnstr->dst_vmname_len_offset); @@ -172,6 +176,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pnstr->rec_type) { + case NSPR_HEADER_VERSION300: case NSPR_HEADER_VERSION206: flagoffset = pnstr->ns_activity_offset; flagval32 = tvb_get_letohl(tvb, flagoffset); @@ -428,4 +433,5 @@ void proto_reg_handoff_ns(void) nstrace_handle = create_dissector_handle(dissect_nstrace, proto_nstrace); dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_1_0, nstrace_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_2_0, nstrace_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_3_0, nstrace_handle); } |