aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ipars.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-ipars.c')
-rw-r--r--epan/dissectors/packet-ipars.c106
1 files changed, 52 insertions, 54 deletions
diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index 881c8e9fa5..dc73f3ddc8 100644
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -19,9 +19,8 @@
#include <wsutil/str_util.h>
void proto_register_ipars(void);
-static int proto_ipars = -1;
-static guint8 ipars_eomtype = G_MAXUINT8;
-static gint ett_ipars = -1;
+static int proto_ipars;
+static gint ett_ipars;
#define S1 (0x00)
#define S2 (0x20)
@@ -34,13 +33,14 @@ static gint ett_ipars = -1;
#define MAX_EOM_MSG_SIZE (16) /* max size of an EOMx indicator string */
static int
-dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* data _U_)
+dissect_ipars(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
int bytes;
guint8 ia = 0, ta = 0, cmd = 0, la = 0;
tvbuff_t *next_tvb;
int offset = 0;
gchar *eom_msg;
+ guint8 ipars_eomtype;
eom_msg = (gchar *)wmem_alloc(pinfo->pool, MAX_EOM_MSG_SIZE);
eom_msg[0] = 0;
@@ -86,60 +86,58 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* da
}
}
- if (tree) {
- bytes = tvb_captured_length_remaining(tvb, 0);
- if (bytes > 0) {
- proto_tree *ipars_tree;
- proto_item *ti;
+ bytes = tvb_captured_length_remaining(tvb, 0);
+ if (bytes > 0) {
+ proto_tree *ipars_tree;
+ proto_item *ti;
- ia = tvb_get_guint8(tvb, 0) & 0x3f;
-
- ti = proto_tree_add_protocol_format(tree, proto_ipars, tvb, 0, -1, "Ipars");
- ipars_tree = proto_item_add_subtree(ti, ett_ipars);
+ ia = tvb_get_guint8(tvb, 0) & 0x3f;
- if (ia == 0x03) {
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "GoAhead Next IA");
- col_set_str(pinfo->cinfo, COL_INFO, "GoAhead");
- return tvb_captured_length(tvb);
- } else if (ia != S1) {
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb,
- 0,
- bytes, "Unknown format - Data (%d byte%s)", bytes,
- plurality(bytes, "", "s"));
- return tvb_captured_length(tvb);
- }
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "S1");
- ia = tvb_get_guint8(tvb, 1) & 0x3f;
- if (ia != S2) {
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb,
- 0,
- bytes, "Unknown format - Data (%d byte%s)", bytes,
- plurality(bytes, "", "s"));
- return tvb_captured_length(tvb);
- }
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 1, 1, "S2");
- ia = tvb_get_guint8(tvb, 2) & 0x3f;
- if (ia == GA) {
- ia = tvb_get_guint8(tvb, 3) & 0x3f;
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 2, 2, "GoAhead IA: %2.2X", ia);
- ipars_eomtype = tvb_get_guint8(tvb, 4) & 0x3f;
- switch (ipars_eomtype) {
- case EOMc: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMc"); break;
- case EOMi: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMi"); break;
- case EOMu: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMu"); break;
- case EOMpb: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMpb"); break;
- default: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "Unknown EOM type (0x%2.2X)", ia); break;
- }
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 4, 1, "%s", eom_msg);
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 5, 1, "Good BCC");
- } else {
- next_tvb = tvb_new_subset_remaining(tvb, 3);
- proto_tree_add_protocol_format(ipars_tree, proto_ipars, next_tvb,
- 0,
- bytes, "Data (%d byte%s)", bytes,
- plurality(bytes, "", "s"));
+ ti = proto_tree_add_protocol_format(tree, proto_ipars, tvb, 0, -1, "Ipars");
+ ipars_tree = proto_item_add_subtree(ti, ett_ipars);
+
+ if (ia == 0x03) {
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "GoAhead Next IA");
+ col_set_str(pinfo->cinfo, COL_INFO, "GoAhead");
+ return tvb_captured_length(tvb);
+ } else if (ia != S1) {
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb,
+ 0,
+ bytes, "Unknown format - Data (%d byte%s)", bytes,
+ plurality(bytes, "", "s"));
+ return tvb_captured_length(tvb);
+ }
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "S1");
+ ia = tvb_get_guint8(tvb, 1) & 0x3f;
+ if (ia != S2) {
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb,
+ 0,
+ bytes, "Unknown format - Data (%d byte%s)", bytes,
+ plurality(bytes, "", "s"));
return tvb_captured_length(tvb);
+ }
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 1, 1, "S2");
+ ia = tvb_get_guint8(tvb, 2) & 0x3f;
+ if (ia == GA) {
+ ia = tvb_get_guint8(tvb, 3) & 0x3f;
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 2, 2, "GoAhead IA: %2.2X", ia);
+ ipars_eomtype = tvb_get_guint8(tvb, 4) & 0x3f;
+ switch (ipars_eomtype) {
+ case EOMc: snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMc"); break;
+ case EOMi: snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMi"); break;
+ case EOMu: snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMu"); break;
+ case EOMpb: snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMpb"); break;
+ default: snprintf(eom_msg, MAX_EOM_MSG_SIZE, "Unknown EOM type (0x%2.2X)", ia); break;
}
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 4, 1, "%s", eom_msg);
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 5, 1, "Good BCC");
+ } else {
+ next_tvb = tvb_new_subset_remaining(tvb, 3);
+ proto_tree_add_protocol_format(ipars_tree, proto_ipars, next_tvb,
+ 0,
+ bytes, "Data (%d byte%s)", bytes,
+ plurality(bytes, "", "s"));
+ return tvb_captured_length(tvb);
}
}
return tvb_captured_length(tvb);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 11:57:14 +0000