summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mip.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--epan/dissectors/packet-mip.c240
1 files changed, 120 insertions, 120 deletions
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 5209fa78..90faca89 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -26,107 +26,107 @@ void proto_reg_handoff_mip(void);
static dissector_table_t mip_nvse_ext_dissector_table;
/* Initialize the protocol and registered fields */
-static int proto_mip = -1;
-static int hf_mip_type = -1;
-static int hf_mip_flags = -1;
-static int hf_mip_s = -1;
-static int hf_mip_b = -1;
-static int hf_mip_d = -1;
-static int hf_mip_m = -1;
-static int hf_mip_g = -1;
-static int hf_mip_v = -1;
-static int hf_mip_t = -1;
-static int hf_mip_x = -1;
-static int hf_mip_code = -1;
-static int hf_mip_life = -1;
-static int hf_mip_homeaddr = -1;
-static int hf_mip_haaddr = -1;
-static int hf_mip_coa = -1;
-static int hf_mip_ident = -1;
-static int hf_mip_ext_type = -1;
-static int hf_mip_gaext_stype = -1;
-static int hf_mip_ext_len = -1;
-static int hf_mip_ext = -1;
-static int hf_mip_aext_spi = -1;
-static int hf_mip_aext_auth = -1;
-static int hf_mip_next_nai = -1;
-static int hf_mip_rext_flags = -1;
-static int hf_mip_rext_i = -1;
-static int hf_mip_rext_reserved = -1;
-static int hf_mip_rext_tstamp = -1;
-static int hf_mip_rev_reserved = -1;
-static int hf_mip_flags2 = -1;
-static int hf_mip_rev_a = -1;
-static int hf_mip_rev_i = -1;
-static int hf_mip_rev_reserved2 = -1;
-static int hf_mip_ack_reserved = -1;
-static int hf_mip_ack_i = -1;
-static int hf_mip_ack_reserved2 = -1;
-static int hf_mip_hda = -1;
-static int hf_mip_fda = -1;
-static int hf_mip_revid = -1;
-static int hf_mip_dhaext_stype = -1;
-static int hf_mip_dhaext_addr = -1;
-static int hf_mip_mstrext_stype = -1;
-static int hf_mip_mstrext_text = -1;
-static int hf_mip_nattt_nexthdr = -1;
-static int hf_mip_nattt_reserved = -1;
-static int hf_mip_utrqext_stype = -1;
-static int hf_mip_utrqext_reserved1 = -1;
-static int hf_mip_utrqext_flags = -1;
-static int hf_mip_utrqext_f = -1;
-static int hf_mip_utrqext_r = -1;
-static int hf_mip_utrqext_reserved2 = -1;
-static int hf_mip_utrqext_encap_type = -1;
-static int hf_mip_utrqext_reserved3 = -1;
-static int hf_mip_utrpext_stype = -1;
-static int hf_mip_utrpext_code = -1;
-static int hf_mip_utrpext_flags = -1;
-static int hf_mip_utrpext_f = -1;
-static int hf_mip_utrpext_reserved = -1;
-static int hf_mip_utrpext_keepalive = -1;
-static int hf_mip_pmipv4nonskipext_stype = -1;
-static int hf_mip_pmipv4nonskipext_pernodeauthmethod = -1;
-static int hf_mip_pmipv4skipext_stype = -1;
-static int hf_mip_pmipv4skipext_interfaceid = -1;
-static int hf_mip_pmipv4skipext_deviceid_type = -1;
-static int hf_mip_pmipv4skipext_deviceid_id = -1;
-static int hf_mip_pmipv4skipext_subscriberid_type = -1;
-static int hf_mip_pmipv4skipext_subscriberid_id = -1;
-static int hf_mip_pmipv4skipext_accesstechnology_type = -1;
-static int hf_mip_cvse_reserved = -1;
-static int hf_mip_cvse_vendor_org_id = -1;
-static int hf_mip_cvse_verizon_cvse_type = -1;
-static int hf_mip_cvse_3gpp2_cvse_type = -1;
-static int hf_mip_cvse_3gpp2_grekey = -1;
-static int hf_mip_cvse_vendor_cvse_type = -1;
-static int hf_mip_cvse_vendor_cvse_value = -1;
-static int hf_mip_nvse_reserved = -1;
-static int hf_mip_nvse_vendor_org_id = -1;
-static int hf_mip_nvse_vendor_nvse_type = -1;
-static int hf_mip_nvse_vendor_nvse_value = -1;
-static int hf_mip_nvse_3gpp2_type = -1;
-static int hf_mip_nvse_3gpp2_type17_entity = -1;
-static int hf_mip_nvse_3gpp2_type16_value = -1;
-static int hf_mip_nvse_3gpp2_type17_subtype1 = -1;
-static int hf_mip_nvse_3gpp2_type17_subtype2 = -1;
-static int hf_mip_nvse_3gpp2_type17_length = -1;
-static int hf_mip_nvse_3gpp2_type17_prim_dns = -1;
-static int hf_mip_nvse_3gpp2_type17_sec_dns = -1;
-static int hf_mip_mne_sub_type = -1;
-static int hf_mip_mne_code = -1;
-static int hf_mip_mne_prefix_length = -1;
-static int hf_mip_mne_prefix = -1;
-static int hf_mip_mne_reserved = -1;
+static int proto_mip;
+static int hf_mip_type;
+static int hf_mip_flags;
+static int hf_mip_s;
+static int hf_mip_b;
+static int hf_mip_d;
+static int hf_mip_m;
+static int hf_mip_g;
+static int hf_mip_v;
+static int hf_mip_t;
+static int hf_mip_x;
+static int hf_mip_code;
+static int hf_mip_life;
+static int hf_mip_homeaddr;
+static int hf_mip_haaddr;
+static int hf_mip_coa;
+static int hf_mip_ident;
+static int hf_mip_ext_type;
+static int hf_mip_gaext_stype;
+static int hf_mip_ext_len;
+static int hf_mip_ext;
+static int hf_mip_aext_spi;
+static int hf_mip_aext_auth;
+static int hf_mip_next_nai;
+static int hf_mip_rext_flags;
+static int hf_mip_rext_i;
+static int hf_mip_rext_reserved;
+static int hf_mip_rext_tstamp;
+static int hf_mip_rev_reserved;
+static int hf_mip_flags2;
+static int hf_mip_rev_a;
+static int hf_mip_rev_i;
+static int hf_mip_rev_reserved2;
+static int hf_mip_ack_reserved;
+static int hf_mip_ack_i;
+static int hf_mip_ack_reserved2;
+static int hf_mip_hda;
+static int hf_mip_fda;
+static int hf_mip_revid;
+static int hf_mip_dhaext_stype;
+static int hf_mip_dhaext_addr;
+static int hf_mip_mstrext_stype;
+static int hf_mip_mstrext_text;
+static int hf_mip_nattt_nexthdr;
+static int hf_mip_nattt_reserved;
+static int hf_mip_utrqext_stype;
+static int hf_mip_utrqext_reserved1;
+static int hf_mip_utrqext_flags;
+static int hf_mip_utrqext_f;
+static int hf_mip_utrqext_r;
+static int hf_mip_utrqext_reserved2;
+static int hf_mip_utrqext_encap_type;
+static int hf_mip_utrqext_reserved3;
+static int hf_mip_utrpext_stype;
+static int hf_mip_utrpext_code;
+static int hf_mip_utrpext_flags;
+static int hf_mip_utrpext_f;
+static int hf_mip_utrpext_reserved;
+static int hf_mip_utrpext_keepalive;
+static int hf_mip_pmipv4nonskipext_stype;
+static int hf_mip_pmipv4nonskipext_pernodeauthmethod;
+static int hf_mip_pmipv4skipext_stype;
+static int hf_mip_pmipv4skipext_interfaceid;
+static int hf_mip_pmipv4skipext_deviceid_type;
+static int hf_mip_pmipv4skipext_deviceid_id;
+static int hf_mip_pmipv4skipext_subscriberid_type;
+static int hf_mip_pmipv4skipext_subscriberid_id;
+static int hf_mip_pmipv4skipext_accesstechnology_type;
+static int hf_mip_cvse_reserved;
+static int hf_mip_cvse_vendor_org_id;
+static int hf_mip_cvse_verizon_cvse_type;
+static int hf_mip_cvse_3gpp2_cvse_type;
+static int hf_mip_cvse_3gpp2_grekey;
+static int hf_mip_cvse_vendor_cvse_type;
+static int hf_mip_cvse_vendor_cvse_value;
+static int hf_mip_nvse_reserved;
+static int hf_mip_nvse_vendor_org_id;
+static int hf_mip_nvse_vendor_nvse_type;
+static int hf_mip_nvse_vendor_nvse_value;
+static int hf_mip_nvse_3gpp2_type;
+static int hf_mip_nvse_3gpp2_type17_entity;
+static int hf_mip_nvse_3gpp2_type16_value;
+static int hf_mip_nvse_3gpp2_type17_subtype1;
+static int hf_mip_nvse_3gpp2_type17_subtype2;
+static int hf_mip_nvse_3gpp2_type17_length;
+static int hf_mip_nvse_3gpp2_type17_prim_dns;
+static int hf_mip_nvse_3gpp2_type17_sec_dns;
+static int hf_mip_mne_sub_type;
+static int hf_mip_mne_code;
+static int hf_mip_mne_prefix_length;
+static int hf_mip_mne_prefix;
+static int hf_mip_mne_reserved;
/* Initialize the subtree pointers */
-static gint ett_mip = -1;
-static gint ett_mip_flags = -1;
-static gint ett_mip_ext = -1;
-static gint ett_mip_exts = -1;
-static gint ett_mip_pmipv4_ext = -1;
+static int ett_mip;
+static int ett_mip_flags;
+static int ett_mip_ext;
+static int ett_mip_exts;
+static int ett_mip_pmipv4_ext;
-static expert_field ei_mip_data_not_dissected = EI_INIT;
+static expert_field ei_mip_data_not_dissected;
static dissector_handle_t mip_handle;
@@ -479,7 +479,7 @@ static int
dissect_mip_priv_ext_3gpp2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
{
int offset = 0;
- guint16 type;
+ uint16_t type;
int length = tvb_reported_length(tvb);
type = tvb_get_ntohs(tvb,offset);
@@ -527,13 +527,13 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
proto_tree *exts_tree=NULL;
proto_tree *ext_tree;
proto_tree *pmipv4_tree;
- gint ext_len;
- guint8 ext_type;
- guint8 ext_subtype=0;
- guint8 pmipv4skipext_subscriberid_type;
- gint hdrLen;
- guint32 cvse_vendor_id;
- guint16 cvse_3gpp2_type;
+ int ext_len;
+ uint8_t ext_type;
+ uint8_t ext_subtype=0;
+ uint8_t pmipv4skipext_subscriberid_type;
+ int hdrLen;
+ uint32_t cvse_vendor_id;
+ uint16_t cvse_3gpp2_type;
int cvse_local_offset= 0;
int nvse_local_offset= 0;
int mne_local_offset= 0;
@@ -545,13 +545,13 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
while (tvb_reported_length_remaining(tvb, offset) > 0) {
/* Get our extension info */
- ext_type = tvb_get_guint8(tvb, offset);
+ ext_type = tvb_get_uint8(tvb, offset);
if (ext_type == GEN_AUTH_EXT || ext_type == PMIPv4_NON_SKIP_EXT) {
/*
* Very nasty . . breaks normal extensions, since the length is
* in the wrong place :(
*/
- ext_subtype = tvb_get_guint8(tvb, offset + 1);
+ ext_subtype = tvb_get_uint8(tvb, offset + 1);
ext_len = tvb_get_ntohs(tvb, offset + 2);
hdrLen = 4;
}
@@ -564,7 +564,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
hdrLen = 4;
}
else {
- ext_len = tvb_get_guint8(tvb, offset + 1);
+ ext_len = tvb_get_uint8(tvb, offset + 1);
hdrLen = 2;
}
@@ -699,7 +699,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
break;
case PMIPv4_SKIP_EXT: /* draft-leung-mip4-proxy-mode */
/* sub-type */
- ext_subtype = tvb_get_guint8(tvb, offset);
+ ext_subtype = tvb_get_uint8(tvb, offset);
pmipv4_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, ext_len,
ett_mip_pmipv4_ext, NULL, "PMIPv4 Sub-Type: %s",
val_to_str(ext_subtype, mip_pmipv4skipext_stypes, "Unknown Sub-Type %u"));
@@ -711,7 +711,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_deviceid_type, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_deviceid_id, tvb, offset + 2, ext_len - 2, ENC_NA);
} else if (ext_subtype == PMIPv4_SKIPEXT_STYPE_SUBSCRIBER_ID) {
- pmipv4skipext_subscriberid_type = tvb_get_guint8(tvb, offset + 1);
+ pmipv4skipext_subscriberid_type = tvb_get_uint8(tvb, offset + 1);
proto_tree_add_uint(pmipv4_tree, hf_mip_pmipv4skipext_subscriberid_type, tvb, offset + 1, 1, pmipv4skipext_subscriberid_type);
if (pmipv4skipext_subscriberid_type == 1) {
proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_subscriberid_id, tvb, offset + 2, ext_len - 2, ENC_NA);
@@ -764,7 +764,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
case OLD_NVSE_EXT: /* RFC 3115 */
case NVSE_EXT: /* RFC 3115 */
{
- guint32 nvse_vendor_org_id;
+ uint32_t nvse_vendor_org_id;
tvbuff_t *next_tvb;
proto_tree_add_item(ext_tree, hf_mip_nvse_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -791,9 +791,9 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info
case MNE_EXT: /* RFC 5177 */
{
- guint8 sub_type;
+ uint8_t sub_type;
- sub_type = tvb_get_guint8(tvb, offset);
+ sub_type = tvb_get_uint8(tvb, offset);
proto_tree_add_item(ext_tree, hf_mip_mne_sub_type, tvb, offset, 1, ENC_BIG_ENDIAN);
mne_local_offset = offset+1;
switch (sub_type) {
@@ -837,8 +837,8 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
/* Set up structures we will need to add the protocol subtree and manage it */
proto_item *ti;
proto_tree *mip_tree=NULL;
- guint8 type;
- gint offset=0;
+ uint8_t type;
+ int offset=0;
tvbuff_t *next_tvb;
/* Make entries in Protocol column and Info column on summary display */
@@ -846,7 +846,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MobileIP");
col_clear(pinfo->cinfo, COL_INFO);
- type = tvb_get_guint8(tvb, offset);
+ type = tvb_get_uint8(tvb, offset);
switch (type) {
case MIP_REGISTRATION_REQUEST:
col_add_fstr(pinfo->cinfo, COL_INFO,
@@ -908,7 +908,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
"Reg Reply: HoA=%s HA=%s, Code=%u",
tvb_ip_to_str(pinfo->pool, tvb, 4),
tvb_ip_to_str(pinfo->pool, tvb, 8),
- tvb_get_guint8(tvb,1));
+ tvb_get_uint8(tvb,1));
if (tree) {
/* Add Subtree */
@@ -944,7 +944,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
break;
case MIP_NATT_TUNNEL_DATA:
col_add_fstr(pinfo->cinfo, COL_INFO, "Tunnel Data: Next Header=%u",
- tvb_get_guint8(tvb,1));
+ tvb_get_uint8(tvb,1));
if (tree) {
/* Add Subtree */
@@ -1530,7 +1530,7 @@ void proto_register_mip(void)
};
/* Setup protocol subtree array */
- static gint *ett[] = {
+ static int *ett[] = {
&ett_mip,
&ett_mip_flags,
&ett_mip_ext,