osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Peter Van Eynde 

via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8635
"enhanced WCCP decoder"

GRE part of the patch.

Me:
Reorder values
Manually apply the rejected parts of the patch (incompatible whitespace)
Fix whitespace inconsistencies of the patch.

svn path=/trunk/; revision=49240
This commit is contained in:
Jörg Mayer 2013-05-11 10:46:36 +00:00
parent 1164990ffb
commit 21f1d0e46b
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -3731,7 +3731,8 @@ Ivan Klyuchnikov <kluchnikovi[AT]gmail.com>
Max Baker <max[AT]warped.org>
Diederik de Groot <dkgroot[AT]talon.nl>
Hauke Mehrtens <hauke[AT]hauke-m.de>
"0xBismarck" <0xbismarck[AT]gmail.com>
0xBismarck <0xbismarck[AT]gmail.com>
Peter Van Eynde <pevaneyn@cisco.com>
Dan Lasley <dlasley[AT]promus.com> gave permission for his
dumpit() hex-dump routine to be used.

19
epan/dissectors/packet-gre.c
View File

@ -84,6 +84,7 @@ static int hf_gre_3ggp2_seg = -1;
static int hf_gre_wccp_redirect_header = -1;
static int hf_gre_wccp_dynamic_service = -1;
static int hf_gre_wccp_alternative_bucket_used = -1;
static int hf_gre_wccp_redirect_header_valid = -1;
static int hf_gre_wccp_service_id = -1;
static int hf_gre_wccp_alternative_bucket = -1;
static int hf_gre_wccp_primary_bucket = -1;
@ -117,6 +118,7 @@ const value_string gre_version[] = {
{ 0, NULL}
};
const value_string gre_typevals[] = {
{ GRE_KEEPALIVE, "Possible GRE keepalive packet" },
{ ETHERTYPE_PPP, "PPP" },
{ ETHERTYPE_IP, "IP" },
{ SAP_OSINL5, "OSI"},
@ -207,6 +209,12 @@ static const true_false_string gre_wccp_alternative_bucket_used_val = {
"Primary bucket used",
};
static const true_false_string gre_wccp_redirect_header_valid_val = {
"Header is present, but ignore contents",
"Header contents are valid",
};
static int
dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree)
{
@ -293,6 +301,8 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree)
proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket_used, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rh_tree, hf_gre_wccp_redirect_header_valid, tvb, offset, 1, FALSE);
proto_tree_add_item(rh_tree, hf_gre_wccp_service_id, tvb, offset +1, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket, tvb, offset +2, 1, ENC_BIG_ENDIAN);
@ -673,12 +683,17 @@ proto_register_gre(void)
},
{ &hf_gre_wccp_dynamic_service,
{ "Dynamic Service", "gre.wccp.dynamic_service",
FT_BOOLEAN, 8, TFS(&gre_wccp_dynamic_service_val), 0x80,
FT_BOOLEAN, 8, TFS(&gre_wccp_dynamic_service_val), 0x01,
NULL, HFILL }
},
{ &hf_gre_wccp_alternative_bucket_used,
{ "Alternative bucket used", "gre.wccp.alternative_bucket_used",
FT_BOOLEAN, 8, TFS(&gre_wccp_alternative_bucket_used_val), 0x40,
FT_BOOLEAN, 8, TFS(&gre_wccp_alternative_bucket_used_val), 0x02,
NULL, HFILL }
},
{ &hf_gre_wccp_redirect_header_valid,
{ "WCCP Redirect header is valid", "gre.wccp.redirect_header_valid",
FT_BOOLEAN, 8, TFS(&gre_wccp_redirect_header_valid_val), 0x04,
NULL, HFILL }
},
{ &hf_gre_wccp_service_id,

1
epan/greproto.h
View File

@ -31,6 +31,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define GRE_KEEPALIVE 0x0000
#define GRE_NHRP 0x2001
#define GRE_WCCP 0x883E
#define GRE_ERSPAN_88BE 0x88BE