diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/asn1/ilp | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/ilp')
| -rw-r--r-- | epan/dissectors/asn1/ilp/ilp.cnf | 8 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ilp/packet-ilp-template.c | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/epan/dissectors/asn1/ilp/ilp.cnf b/epan/dissectors/asn1/ilp/ilp.cnf index 093b51ac..b4f789e7 100644 --- a/epan/dissectors/asn1/ilp/ilp.cnf +++ b/epan/dissectors/asn1/ilp/ilp.cnf @@ -29,7 +29,7 @@ CellGlobalIdEUTRA/cellIdentity eutra_cellIdentity #.FIELD_ATTR SETId/min ABBREV=minsi LocationDataLCI/latitude ABBREV=locationdatalci.latitude -LocationDataLCI/latitude ABBREV=locationdatalci.longitude +LocationDataLCI/longitude ABBREV=locationdatalci.longitude LocationDataLCI/altitude ABBREV=locationdatalci.altitude CellGlobalIdEUTRA/cellIdentity ABBREV=cellglobalideutra.cellIdentity @@ -53,7 +53,7 @@ CellGlobalIdEUTRA/cellIdentity ABBREV=cellglobalideutra.cellIdentity #.FN_BODY IlpMessage VAL_PTR = &IlpMessage -guint32 IlpMessage; +uint32_t IlpMessage; %(DEFAULT_BODY)s @@ -96,7 +96,7 @@ guint32 IlpMessage; proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_ilp_setid); - proto_tree_add_item(subtree, hf_ilp_mobile_directory_number, mdn_tvb, 0, 8, ENC_BCD_DIGITS_0_9); + proto_tree_add_item(subtree, hf_ilp_mobile_directory_number, mdn_tvb, 0, 8, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN); } #.FN_BODY SETId/imsi VAL_PTR=&imsi_tvb @@ -106,7 +106,7 @@ guint32 IlpMessage; proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_ilp_setid); - dissect_e212_imsi(imsi_tvb, actx->pinfo, subtree, 0, 8, FALSE); + dissect_e212_imsi(imsi_tvb, actx->pinfo, subtree, 0, 8, false); } #.TYPE_ATTR diff --git a/epan/dissectors/asn1/ilp/packet-ilp-template.c b/epan/dissectors/asn1/ilp/packet-ilp-template.c index 48cd9386..4c6e7535 100644 --- a/epan/dissectors/asn1/ilp/packet-ilp-template.c +++ b/epan/dissectors/asn1/ilp/packet-ilp-template.c @@ -18,6 +18,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-per.h" #include "packet-tcp.h" @@ -42,19 +43,19 @@ static dissector_handle_t ilp_tcp_handle; #define ILP_TCP_PORT 7276 /* Initialize the protocol and registered fields */ -static int proto_ilp = -1; +static int proto_ilp; #define ILP_HEADER_SIZE 2 -static gboolean ilp_desegment = TRUE; +static bool ilp_desegment = true; #include "packet-ilp-hf.c" -static int hf_ilp_mobile_directory_number = -1; +static int hf_ilp_mobile_directory_number; /* Initialize the subtree pointers */ -static gint ett_ilp = -1; -static gint ett_ilp_setid = -1; +static int ett_ilp; +static int ett_ilp_setid; #include "packet-ilp-ett.c" /* Include constants */ @@ -64,7 +65,7 @@ static gint ett_ilp_setid = -1; #include "packet-ilp-fn.c" -static guint +static unsigned get_ilp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) { /* PDU length = Message length */ @@ -95,7 +96,7 @@ void proto_register_ilp(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_ilp, &ett_ilp_setid, #include "packet-ilp-ettarr.c" |