diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-drb.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-drb.c')
| -rw-r--r-- | epan/dissectors/packet-drb.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-drb.c b/epan/dissectors/packet-drb.c index f21311f5..82e5aaa9 100644 --- a/epan/dissectors/packet-drb.c +++ b/epan/dissectors/packet-drb.c @@ -17,24 +17,24 @@ static dissector_handle_t drb_handle; -static int proto_drb = -1; +static int proto_drb; -static int hf_drb_len = -1; +static int hf_drb_len; -static gint ett_drb = -1; -static gint ett_ref = -1; +static int ett_drb; +static int ett_ref; void proto_register_drb(void); void proto_reg_handoff_drb(void); -static void dissect_drb_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const gchar* label) +static void dissect_drb_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, unsigned* offset, const char* label) { - guint32 len; + uint32_t len; proto_tree* obj_tree; - gchar* type; - gchar* value; + char* type; + char* value; - len = tvb_get_guint32(tvb, *offset, ENC_BIG_ENDIAN); + len = tvb_get_uint32(tvb, *offset, ENC_BIG_ENDIAN); obj_tree = proto_tree_add_subtree(tree, tvb, *offset, 4 + len, ett_ref, NULL, label); proto_tree_add_item(obj_tree, hf_drb_len, tvb, *offset, 4, ENC_NA); *offset += 4; @@ -45,19 +45,19 @@ static void dissect_drb_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr proto_item_append_text(obj_tree, "Value: %s", value); } -static void dissect_drb_response(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset) +static void dissect_drb_response(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, unsigned* offset) { col_append_str(pinfo->cinfo, COL_INFO, " (response)"); dissect_drb_object(tvb, pinfo, tree, offset, "Success"); dissect_drb_object(tvb, pinfo, tree, offset, "Response"); } -static void dissect_drb_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset) +static void dissect_drb_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, unsigned* offset) { - gint32 nargs; - gint32 i; - gint len; - gchar* loop_label; + int32_t nargs; + int32_t i; + int len; + char* loop_label; col_append_str(pinfo->cinfo, COL_INFO, " (request)"); dissect_drb_object(tvb, pinfo, tree, offset, "Ref"); @@ -73,10 +73,10 @@ static void dissect_drb_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* t static int dissect_drb(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_tree* ti; proto_tree* drb_tree; - guint8 type; + uint8_t type; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRb"); col_clear(pinfo->cinfo, COL_INFO); @@ -85,7 +85,7 @@ static int dissect_drb(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void ti = proto_tree_add_item(tree, proto_drb, tvb, 0, -1, ENC_NA); drb_tree = proto_item_add_subtree(ti, ett_drb); - type = tvb_get_guint8(tvb, 6); + type = tvb_get_uint8(tvb, 6); if (type == 'T' || type == 'F') { dissect_drb_response(tvb, pinfo, drb_tree, &offset); } else { @@ -104,7 +104,7 @@ void proto_register_drb(void) }; /* Setup protocol subtree array */ - static gint* ett[] = { + static int* ett[] = { &ett_drb, &ett_ref }; |