summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rip.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rip.c')
-rw-r--r--epan/dissectors/packet-rip.c100
1 files changed, 50 insertions, 50 deletions
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index fa37c8d3..355b432a 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -66,41 +66,41 @@ static const value_string rip_auth_type[] = {
#define RIP_ENTRY_LENGTH 20
#define MD5_AUTH_DATA_LEN 16
-static gboolean pref_display_routing_domain = FALSE;
+static bool pref_display_routing_domain;
static dissector_handle_t rip_handle;
-static int proto_rip = -1;
-
-static int hf_rip_auth = -1;
-static int hf_rip_auth_data_len = -1;
-static int hf_rip_auth_passwd = -1;
-static int hf_rip_auth_seq_num = -1;
-static int hf_rip_authentication_data = -1;
-static int hf_rip_command = -1;
-static int hf_rip_digest_offset = -1;
-static int hf_rip_family = -1;
-static int hf_rip_ip = -1;
-static int hf_rip_key_id = -1;
-static int hf_rip_metric = -1;
-static int hf_rip_netmask = -1;
-static int hf_rip_next_hop = -1;
-static int hf_rip_route_tag = -1;
-static int hf_rip_routing_domain = -1;
-static int hf_rip_version = -1;
-static int hf_rip_zero_padding = -1;
-
-static gint ett_rip = -1;
-static gint ett_rip_vec = -1;
-static gint ett_auth_vec = -1;
-
-static expert_field ei_rip_unknown_address_family = EI_INIT;
-
-static void dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+static int proto_rip;
+
+static int hf_rip_auth;
+static int hf_rip_auth_data_len;
+static int hf_rip_auth_passwd;
+static int hf_rip_auth_seq_num;
+static int hf_rip_authentication_data;
+static int hf_rip_command;
+static int hf_rip_digest_offset;
+static int hf_rip_family;
+static int hf_rip_ip;
+static int hf_rip_key_id;
+static int hf_rip_metric;
+static int hf_rip_netmask;
+static int hf_rip_next_hop;
+static int hf_rip_route_tag;
+static int hf_rip_routing_domain;
+static int hf_rip_version;
+static int hf_rip_zero_padding;
+
+static int ett_rip;
+static int ett_rip_vec;
+static int ett_auth_vec;
+
+static expert_field ei_rip_unknown_address_family;
+
+static void dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, uint8_t version,
proto_tree *tree);
-static void dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+static void dissect_ip_rip_vektor(tvbuff_t *tvb, packet_info *pinfo, int offset, uint8_t version,
proto_tree *tree);
-static gint dissect_rip_authentication(tvbuff_t *tvb, int offset,
+static int dissect_rip_authentication(tvbuff_t *tvb, int offset,
proto_tree *tree);
static int
@@ -109,17 +109,17 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
int offset = 0;
proto_tree *rip_tree = NULL;
proto_item *ti;
- guint8 command;
- guint8 version;
- guint16 family;
- gint trailer_len = 0;
- gboolean is_md5_auth = FALSE;
+ uint8_t command;
+ uint8_t version;
+ uint16_t family;
+ int trailer_len = 0;
+ bool is_md5_auth = false;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIP");
col_clear(pinfo->cinfo, COL_INFO);
- command = tvb_get_guint8(tvb, 0);
- version = tvb_get_guint8(tvb, 1);
+ command = tvb_get_uint8(tvb, 0);
+ version = tvb_get_uint8(tvb, 1);
col_set_str(pinfo->cinfo, COL_PROTOCOL,
val_to_str_const(version, version_vals, "RIP"));
@@ -131,7 +131,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
proto_tree_add_uint(rip_tree, hf_rip_command, tvb, 0, 1, command);
proto_tree_add_uint(rip_tree, hf_rip_version, tvb, 1, 1, version);
- if (version == RIPv2 && pref_display_routing_domain == TRUE)
+ if (version == RIPv2 && pref_display_routing_domain == true)
proto_tree_add_item(rip_tree, hf_rip_routing_domain, tvb, 2, 2,
ENC_BIG_ENDIAN);
@@ -150,12 +150,12 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
dissect_unspec_rip_vektor(tvb, offset, version, rip_tree);
break;
case AFVAL_IP: /* IP */
- dissect_ip_rip_vektor(tvb, offset, version, rip_tree);
+ dissect_ip_rip_vektor(tvb, pinfo, offset, version, rip_tree);
break;
case 0xFFFF:
if( offset == RIP_HEADER_LENGTH ) {
trailer_len=dissect_rip_authentication(tvb, offset, rip_tree);
- is_md5_auth = TRUE;
+ is_md5_auth = true;
break;
}
if(is_md5_auth && tvb_reported_length_remaining(tvb, offset) == 20)
@@ -173,11 +173,11 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
}
static void
-dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, uint8_t version,
proto_tree *tree)
{
proto_tree *rip_vektor_tree;
- guint32 metric;
+ uint32_t metric;
metric = tvb_get_ntohl(tvb, offset+16);
rip_vektor_tree = proto_tree_add_subtree_format(tree, tvb, offset,
@@ -198,16 +198,16 @@ dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
}
static void
-dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+dissect_ip_rip_vektor(tvbuff_t *tvb, packet_info *pinfo, int offset, uint8_t version,
proto_tree *tree)
{
proto_tree *rip_vektor_tree;
- guint32 metric;
+ uint32_t metric;
metric = tvb_get_ntohl(tvb, offset+16);
rip_vektor_tree = proto_tree_add_subtree_format(tree, tvb, offset,
RIP_ENTRY_LENGTH, ett_rip_vec, NULL, "IP Address: %s, Metric: %u",
- tvb_ip_to_str(wmem_packet_scope(), tvb, offset+4), metric);
+ tvb_ip_to_str(pinfo->pool, tvb, offset+4), metric);
proto_tree_add_item(rip_vektor_tree, hf_rip_family, tvb, offset, 2, ENC_BIG_ENDIAN);
if (version == RIPv2) {
@@ -227,12 +227,12 @@ dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
offset+16, 4, metric);
}
-static gint
+static int
dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_tree *rip_authentication_tree;
- guint16 authtype;
- guint32 digest_off, auth_data_len;
+ uint16_t authtype;
+ uint32_t digest_off, auth_data_len;
auth_data_len = 0;
authtype = tvb_get_ntohs(tvb, offset + 2);
@@ -254,7 +254,7 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree)
digest_off = tvb_get_ntohs( tvb, offset+4 );
proto_tree_add_item( rip_authentication_tree, hf_rip_digest_offset, tvb, offset+4, 2, ENC_BIG_ENDIAN);
proto_tree_add_item( rip_authentication_tree, hf_rip_key_id, tvb, offset+6, 1, ENC_NA);
- auth_data_len = tvb_get_guint8( tvb, offset+7 );
+ auth_data_len = tvb_get_uint8( tvb, offset+7 );
proto_tree_add_item( rip_authentication_tree, hf_rip_auth_data_len, tvb, offset+7, 1, ENC_NA);
proto_tree_add_item( rip_authentication_tree, hf_rip_auth_seq_num, tvb, offset+8, 4, ENC_BIG_ENDIAN);
proto_tree_add_item( rip_authentication_tree, hf_rip_zero_padding, tvb, offset+12, 8, ENC_ASCII);
@@ -358,7 +358,7 @@ proto_register_rip(void)
},
};
- static gint *ett[] = {
+ static int *ett[] = {
&ett_rip,
&ett_rip_vec,
&ett_auth_vec,
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 14:12:07 +0000