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-jmirror.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-jmirror.c')
| -rw-r--r-- | epan/dissectors/packet-jmirror.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c index 9f4acca7..dff8c5c0 100644 --- a/epan/dissectors/packet-jmirror.c +++ b/epan/dissectors/packet-jmirror.c @@ -30,10 +30,10 @@ static dissector_handle_t jmirror_handle; */ /* Jmirror protocol variables */ -static int proto_jmirror = -1; -static int hf_jmirror_mid = -1; -static int hf_jmirror_sid = -1; -static gint ett_jmirror = -1; +static int proto_jmirror; +static int hf_jmirror_mid; +static int hf_jmirror_sid; +static int ett_jmirror; /* Handles which point to the packet dissectors */ static dissector_handle_t ipv4_handle; @@ -62,10 +62,10 @@ get_heuristic_handle(tvbuff_t *tvb) return NULL; /* Not enough bytes for heuristic test */ /* Filter for IPv4 and IPv6 packets */ - byte0 = tvb_get_guint8(tvb, offset + 0); - byte1 = tvb_get_guint8(tvb, offset + 1); - byte2 = tvb_get_guint8(tvb, offset + 2); - byte3 = tvb_get_guint8(tvb, offset + 3); + byte0 = tvb_get_uint8(tvb, offset + 0); + byte1 = tvb_get_uint8(tvb, offset + 1); + byte2 = tvb_get_uint8(tvb, offset + 2); + byte3 = tvb_get_uint8(tvb, offset + 3); /* Look for IPv4 with standard header length */ if ( byte0 == 0x45 && ipv4_handle ) @@ -156,7 +156,7 @@ proto_register_jmirror(void) "Unique identifier of the user session", HFILL } } }; - static gint *jmirror_ett[] = { + static int *jmirror_ett[] = { &ett_jmirror }; |