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

From Alexis La Goutte: 

I do not know if I have to reopen this ticket or create a new ticket.
But with last SVN, when i dissector Aruba GRE, i get 
In GRE line, it is find to unknown protocol (0x8200 - unknown)
We need to create a new patch to not show "unknown".

svn path=/trunk/; revision=26962
This commit is contained in:
Jaap Keuter 2008-12-10 23:28:51 +00:00
parent e137f6cb76
commit 39de8a0cb8
3 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,31 @@ const value_string gre_typevals[] = {
{ ETHERTYPE_IPv6, "IPv6" },
{ ETHERTYPE_MPLS, "MPLS label switched packet" },
{ ETHERTYPE_CDMA2000_A10_UBS,"CDMA2000 A10 Unstructured byte stream" },
{ ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
{ ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
{ GRE_ARUBA_8200, "ARUBA WLAN" },
{ GRE_ARUBA_8210, "ARUBA WLAN" },
{ GRE_ARUBA_8220, "ARUBA WLAN" },
{ GRE_ARUBA_8230, "ARUBA WLAN" },
{ GRE_ARUBA_8240, "ARUBA WLAN" },
{ GRE_ARUBA_8250, "ARUBA WLAN" },
{ GRE_ARUBA_8260, "ARUBA WLAN" },
{ GRE_ARUBA_8270, "ARUBA WLAN" },
{ GRE_ARUBA_8280, "ARUBA WLAN" },
{ GRE_ARUBA_8290, "ARUBA WLAN" },
{ GRE_ARUBA_82A0, "ARUBA WLAN" },
{ GRE_ARUBA_82B0, "ARUBA WLAN" },
{ GRE_ARUBA_82C0, "ARUBA WLAN" },
{ GRE_ARUBA_82D0, "ARUBA WLAN" },
{ GRE_ARUBA_82E0, "ARUBA WLAN" },
{ GRE_ARUBA_82F0, "ARUBA WLAN" },
{ GRE_ARUBA_8300, "ARUBA WLAN" },
{ GRE_ARUBA_8310, "ARUBA WLAN" },
{ GRE_ARUBA_8320, "ARUBA WLAN" },
{ GRE_ARUBA_8330, "ARUBA WLAN" },
{ GRE_ARUBA_8340, "ARUBA WLAN" },
{ GRE_ARUBA_8350, "ARUBA WLAN" },
{ GRE_ARUBA_8360, "ARUBA WLAN" },
{ GRE_ARUBA_8370, "ARUBA WLAN" },
{ 0, NULL }
};

28
epan/dissectors/packet-ieee80211.c
View File

@ -73,6 +73,7 @@
#include "packet-llc.h"
#include "packet-ieee80211.h"
#include <epan/etypes.h>
#include <epan/greproto.h>
#include <epan/oui.h>
#include <epan/crc32.h>
#include <epan/tap.h>
@ -535,33 +536,6 @@ int add_mimo_compressed_beamforming_feedback_report (proto_tree *tree, tvbuff_t
#define WAVE_IPV6ADDR 0x0020
#define WAVE_PEERMAC 0x0040
/* ************************************************************************* */
/* Aruba GRE Encapulsation ID */
/* ************************************************************************* */
#define GRE_ARUBA_8200 0x8200
#define GRE_ARUBA_8210 0x8210
#define GRE_ARUBA_8220 0x8220
#define GRE_ARUBA_8230 0x8230
#define GRE_ARUBA_8240 0x8240
#define GRE_ARUBA_8250 0x8250
#define GRE_ARUBA_8260 0x8260
#define GRE_ARUBA_8270 0x8270
#define GRE_ARUBA_8280 0x8280
#define GRE_ARUBA_8290 0x8290
#define GRE_ARUBA_82A0 0x82A0
#define GRE_ARUBA_82B0 0x82B0
#define GRE_ARUBA_82C0 0x82C0
#define GRE_ARUBA_82D0 0x82D0
#define GRE_ARUBA_82E0 0x82E0
#define GRE_ARUBA_82F0 0x82F0
#define GRE_ARUBA_8300 0x8300
#define GRE_ARUBA_8310 0x8310
#define GRE_ARUBA_8320 0x8320
#define GRE_ARUBA_8330 0x8330
#define GRE_ARUBA_8340 0x8340
#define GRE_ARUBA_8350 0x8350
#define GRE_ARUBA_8360 0x8360
#define GRE_ARUBA_8370 0x8370
/* ************************************************************************* */

28
epan/greproto.h
View File

@ -34,3 +34,31 @@
#define GRE_NHRP 0x2001
#define GRE_WCCP 0x883E
#define GRE_ERSPAN 0x88BE
/* ************************************************************************* */
/* Aruba GRE Encapulsation ID */
/* ************************************************************************* */
#define GRE_ARUBA_8200 0x8200
#define GRE_ARUBA_8210 0x8210
#define GRE_ARUBA_8220 0x8220
#define GRE_ARUBA_8230 0x8230
#define GRE_ARUBA_8240 0x8240
#define GRE_ARUBA_8250 0x8250
#define GRE_ARUBA_8260 0x8260
#define GRE_ARUBA_8270 0x8270
#define GRE_ARUBA_8280 0x8280
#define GRE_ARUBA_8290 0x8290
#define GRE_ARUBA_82A0 0x82A0
#define GRE_ARUBA_82B0 0x82B0
#define GRE_ARUBA_82C0 0x82C0
#define GRE_ARUBA_82D0 0x82D0
#define GRE_ARUBA_82E0 0x82E0
#define GRE_ARUBA_82F0 0x82F0
#define GRE_ARUBA_8300 0x8300
#define GRE_ARUBA_8310 0x8310
#define GRE_ARUBA_8320 0x8320
#define GRE_ARUBA_8330 0x8330
#define GRE_ARUBA_8340 0x8340
#define GRE_ARUBA_8350 0x8350
#define GRE_ARUBA_8360 0x8360
#define GRE_ARUBA_8370 0x8370