diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-10-20 13:36:56 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-10-20 21:03:51 +0000 |
| commit | 8652762738f1bc4a4b5bac221463bb77718b6531 (patch) | |
| tree | 59509a96fc8377553d3e82e23780ad9fa342980e /epan/dissectors | |
| parent | e0401ad15b6b2c0da2ec6cbf96a1dd63b2c278e8 (diff) | |
Separate signed and unsigned decimal UAT fields.
Most of them are unsigned; do the appropriate fetching, checking, and
writing-to-UAT-file for them. Have separate macros and routines for the
one signed one, which is the drbid in the LTE MAC dissector.
Use the Wireshark string-to-number routines; they do the appropriate
bounds checking, and make sure unsigned numbers don't start with a -.
Change-Id: I4f137aa31d631c5b5622b2c320574b8ab3333f31
Reviewed-on: https://code.wireshark.org/review/30288
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-mac-lte.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-mac-nr.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-pdcp-lte.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 88334ef4ea..d4d1ffa8f1 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1515,7 +1515,7 @@ static lcid_drb_mapping_t *lcid_drb_mappings = NULL; static guint num_lcid_drb_mappings = 0; UAT_VS_DEF(lcid_drb_mappings, lcid, lcid_drb_mapping_t, guint16, 3, "LCID 3") -UAT_DEC_CB_DEF(lcid_drb_mappings, drbid, lcid_drb_mapping_t) +UAT_SIGNED_DEC_CB_DEF(lcid_drb_mappings, drbid, lcid_drb_mapping_t) UAT_VS_DEF(lcid_drb_mappings, channel_type, lcid_drb_mapping_t, rlc_channel_type_t, rlcAM, "AM") /* UAT object */ diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index ee653ae9e6..ae9e9eb26a 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -404,8 +404,8 @@ static const value_string rlc_bearer_type_vals[] = { /* Mapping type */ typedef struct lcid_drb_mapping_t { - guint8 lcid; - guint8 drbid; + guint32 lcid; + guint32 drbid; rlc_bearer_type_t bearer_type; } lcid_drb_mapping_t; diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 82db99e32e..5eb493133a 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -157,7 +157,7 @@ static expert_field ei_pdcp_lte_missing_udp_framing_tag = EI_INIT; */ /* UAT entry structure. */ typedef struct { - guint16 ueid; + guint32 ueid; gchar *rrcCipherKeyString; gchar *upCipherKeyString; gchar *rrcIntegrityKeyString; |