aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-07-13 23:50:31 +0200
committerAnders Broman <a.broman58@gmail.com>2016-07-14 07:12:02 +0000
commitefc6e509ef55c4eb8de132a44e91660576d1dbb3 (patch)
tree0a3a647407630acd63d7a44c7d626d34c8b07370 /epan
parent0d73ae3161e55fec631336e9efc4a0602bb095a6 (diff)
LTE RRC: add dissection of schedulingInfoSIB1-r13 field
Change-Id: I226ae82a2d75a9b658a0e9122b4ef1925b003279 Reviewed-on: https://code.wireshark.org/review/16417 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/asn1/lte-rrc/lte-rrc.cnf3
-rw-r--r--epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c17
-rw-r--r--epan/dissectors/packet-lte-rrc.c27
3 files changed, 42 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 42030f8f3b..35e045338c 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -2342,6 +2342,9 @@ SL-DiscSysInfoReport-r13/cellSelectionInfo-r13/q-RxLevMinOffset-r13 STRINGS=VALS
#.FN_HDR RRCConnectionResumeComplete-NB
col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResumeComplete-NB");
+#.TYPE_ATTR
+MasterInformationBlock-NB/schedulingInfoSIB1-r13 TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_schedulingInfoSIB1_NB_r13_vals_ext
+
#.FN_BODY RRCConnectionReject-NB-r13-IEs/extendedWaitTime-r13
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "s");
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index 0af1cd94fe..26d4669f53 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -2341,6 +2341,23 @@ lte_rrc_thresholdWLAN_RSSI_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", -128+v, v);
}
+static const value_string lte_rrc_schedulingInfoSIB1_NB_r13_vals[] = {
+ { 0, "4 NPDSCH repetitions - TBS 208 bits"},
+ { 1, "8 NPDSCH repetitions - TBS 208 bits"},
+ { 2, "16 NPDSCH repetitions - TBS 208 bits"},
+ { 3, "4 NPDSCH repetitions - TBS 328 bits"},
+ { 4, "8 NPDSCH repetitions - TBS 328 bits"},
+ { 5, "16 NPDSCH repetitions - TBS 328 bits"},
+ { 6, "4 NPDSCH repetitions - TBS 440 bits"},
+ { 7, "8 NPDSCH repetitions - TBS 440 bits"},
+ { 8, "16 NPDSCH repetitions - TBS 440 bits"},
+ { 9, "4 NPDSCH repetitions - TBS 680 bits"},
+ { 10, "8 NPDSCH repetitions - TBS 680 bits"},
+ { 11, "16 NPDSCH repetitions - TBS 680 bits"},
+ { 0, NULL}
+};
+static value_string_ext lte_rrc_schedulingInfoSIB1_NB_r13_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_schedulingInfoSIB1_NB_r13_vals);
+
static void
lte_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index f67e9a60a6..5b4a074e10 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -9009,6 +9009,23 @@ lte_rrc_thresholdWLAN_RSSI_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", -128+v, v);
}
+static const value_string lte_rrc_schedulingInfoSIB1_NB_r13_vals[] = {
+ { 0, "4 NPDSCH repetitions - TBS 208 bits"},
+ { 1, "8 NPDSCH repetitions - TBS 208 bits"},
+ { 2, "16 NPDSCH repetitions - TBS 208 bits"},
+ { 3, "4 NPDSCH repetitions - TBS 328 bits"},
+ { 4, "8 NPDSCH repetitions - TBS 328 bits"},
+ { 5, "16 NPDSCH repetitions - TBS 328 bits"},
+ { 6, "4 NPDSCH repetitions - TBS 440 bits"},
+ { 7, "8 NPDSCH repetitions - TBS 440 bits"},
+ { 8, "16 NPDSCH repetitions - TBS 440 bits"},
+ { 9, "4 NPDSCH repetitions - TBS 680 bits"},
+ { 10, "8 NPDSCH repetitions - TBS 680 bits"},
+ { 11, "16 NPDSCH repetitions - TBS 680 bits"},
+ { 0, NULL}
+};
+static value_string_ext lte_rrc_schedulingInfoSIB1_NB_r13_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_schedulingInfoSIB1_NB_r13_vals);
+
static void
lte_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
@@ -68411,7 +68428,7 @@ static int dissect_UE_Capability_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinf
/*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 2875 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2892 "./asn1/lte-rrc/packet-lte-rrc-template.c"
static int
dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
@@ -84892,7 +84909,7 @@ void proto_register_lte_rrc(void) {
"BIT_STRING_SIZE_2", HFILL }},
{ &hf_lte_rrc_schedulingInfoSIB1_r13,
{ "schedulingInfoSIB1-r13", "lte-rrc.schedulingInfoSIB1_r13",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_schedulingInfoSIB1_NB_r13_vals_ext, 0,
"INTEGER_0_15", HFILL }},
{ &hf_lte_rrc_systemInfoValueTag_r13,
{ "systemInfoValueTag-r13", "lte-rrc.systemInfoValueTag_r13",
@@ -86308,7 +86325,7 @@ void proto_register_lte_rrc(void) {
"T_n311_r13_01", HFILL }},
/*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 3195 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 3212 "./asn1/lte-rrc/packet-lte-rrc-template.c"
{ &hf_lte_rrc_eutra_cap_feat_group_ind_1,
{ "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
@@ -89140,7 +89157,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_UE_TimersAndConstants_NB_r13,
/*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 3922 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 3939 "./asn1/lte-rrc/packet-lte-rrc-template.c"
&ett_lte_rrc_featureGroupIndicators,
&ett_lte_rrc_featureGroupIndRel9Add,
@@ -89240,7 +89257,7 @@ void proto_register_lte_rrc(void) {
/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 3996 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 4013 "./asn1/lte-rrc/packet-lte-rrc-template.c"
register_init_routine(&lte_rrc_init_protocol);
register_cleanup_routine(&lte_rrc_cleanup_protocol);