diff options
| -rw-r--r-- | epan/dissectors/packet-mip.c | 3 | ||||
| -rw-r--r-- | epan/sminmpec.h | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 57594d54f4..2940816331 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -124,7 +124,6 @@ static gint ett_mip_pmipv4_ext = -1; /* Port used for Mobile IP */ #define UDP_PORT_MIP 434 -#define CVSE_VERIZON_ID 12951 /* http://www.iana.org/assignments/mobileip-numbers */ typedef enum { @@ -626,7 +625,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) cvse_vendor_id = tvb_get_ntohl(tvb, cvse_local_offset); cvse_local_offset+=4; /*Vendor CVSE Type*/ - if( cvse_vendor_id == CVSE_VERIZON_ID ){ + if( cvse_vendor_id == VENDOR_VERIZON ){ /*Verizon CVSE type*/ proto_tree_add_item(ext_tree, hf_mip_cvse_verizon_cvse_type, tvb, cvse_local_offset, 2, FALSE); } diff --git a/epan/sminmpec.h b/epan/sminmpec.h index 6ba20936fb..6bf69aeb43 100644 --- a/epan/sminmpec.h +++ b/epan/sminmpec.h @@ -36,13 +36,13 @@ #define VENDOR_IETF 0 /* reserved - used by the IETF in L2TP? */ #define VENDOR_ACC 5 #define VENDOR_CISCO 9 -#define VENDOR_HEWLETT_PACKARD 11 -#define VENDOR_SUN_MICROSYSTEMS 42 +#define VENDOR_HEWLETT_PACKARD 11 +#define VENDOR_SUN_MICROSYSTEMS 42 #define VENDOR_MERIT 61 #define VENDOR_MOTOROLA 161 #define VENDOR_SHIVA 166 #define VENDOR_ERICSSON 193 -#define VENDOR_CISCO_VPN5000 255 +#define VENDOR_CISCO_VPN5000 255 #define VENDOR_LIVINGSTON 307 #define VENDOR_MICROSOFT 311 #define VENDOR_3COM 429 @@ -54,7 +54,7 @@ #define VENDOR_JUNIPER 2636 #define VENDOR_APTIS 2637 #define VENDOR_DT_AG 2937 -#define VENDOR_CISCO_VPN3000 3076 +#define VENDOR_CISCO_VPN3000 3076 #define VENDOR_COSINE 3085 #define VENDOR_SHASTA 3199 #define VENDOR_NETSCREEN 3224 @@ -73,10 +73,11 @@ #define VENDOR_COLUBRIS 8744 #define VENDOR_COLUMBIA_UNIVERSITY 11862 #define VENDOR_THE3GPP 10415 -#define VENDOR_GEMTEK_SYSTEMS 10529 -#define VENDOR_WIFI_ALLIANCE 14122 -#define VENDOR_T_SYSTEMS_NOVA 16787 -#define VENDOR_CACE 32622 +#define VENDOR_GEMTEK_SYSTEMS 10529 +#define VENDOR_VERIZON 12951 +#define VENDOR_WIFI_ALLIANCE 14122 +#define VENDOR_T_SYSTEMS_NOVA 16787 +#define VENDOR_CACE 32622 WS_VAR_IMPORT const value_string sminmpec_values[]; |