Adding upstream version 4.2.5.upstream/4.2.5upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 45 insertions, 45 deletions

diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
index 5df5e1d..c918119 100644
--- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
+++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
@@ -207,27 +207,27 @@ SchedulingRequestResourceConfig
 SDT-MAC-PHY-CG-Config-r17
 SidelinkParametersNR-r16
 SidelinkUEInformationNR-r16
-SIB1
-SIB2
-SIB3
-SIB4
-SIB5
-SIB6
-SIB7
-SIB8
-SIB9
-SIB10-r16
-SIB11-r16
-SIB12-r16
-SIB13-r16
-SIB14-r16
-SIB15-r17
-SIB16-r17
-SIB17-r17
-SIB18-r17
-SIB19-r17
-SIB20-r17
-SIB21-r17
+SIB1                               @sib1
+SIB2                               @sib2
+SIB3                               @sib3
+SIB4                               @sib4
+SIB5                               @sib5
+SIB6                               @sib6
+SIB7                               @sib7
+SIB8                               @sib8
+SIB9                               @sib9
+SIB10-r16                          @sib10
+SIB11-r16                          @sib11
+SIB12-r16                          @sib12
+SIB13-r16                          @sib13
+SIB14-r16                          @sib14
+SIB15-r17                          @sib15
+SIB16-r17                          @sib16
+SIB17-r17                          @sib17
+SIB18-r17                          @sib18
+SIB19-r17                          @sib21
+SIB20-r17                          @sib22
+SIB21-r17                          @sib23
 SL-ConfigDedicatedEUTRA-Info-r16
 SL-ConfigDedicatedNR-r16
 SL-MeasResultListRelay-r17
@@ -724,73 +724,73 @@ RAT-Type TYPE_PREFIX
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MIB");
 
 #.FN_HDR SystemInformation
-  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "System Information [");
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "System Information [ ");
 
 #.FN_FTR SystemInformation
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " ]");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "]");
 
 #.FN_HDR SIB2
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB2");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB2 ");
 
 #.FN_HDR SIB3
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB3");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB3 ");
 
 #.FN_HDR SIB4
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB4");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB4 ");
 
 #.FN_HDR SIB5
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB5");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB5 ");
 
 #.FN_HDR SIB6
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB6");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB6 ");
 
 #.FN_HDR SIB7
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB7");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB7 ");
 
 #.FN_HDR SIB8
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB8");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB8 ");
 
 #.FN_HDR SIB9
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB9");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB9 ");
 
 #.FN_HDR SIB10-r16
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB10");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB10 ");
 
 #.FN_HDR SIB11-r16
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB11");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB11");
 
 #.FN_HDR SIB12-r16
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB12");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB12 ");
 
 #.FN_HDR SIB13-r16
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB13");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB13 ");
 
 #.FN_HDR SIB14-r16
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB14");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB14 ");
 
 #.FN_HDR SIB15-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB15");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB15 ");
 
 #.FN_HDR SIB16-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB16");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB16 ");
 
 #.FN_HDR SIB17-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB17");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB17 ");
 
 #.FN_HDR SIB18-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB18");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB18 ");
 
 #.FN_HDR SIB19-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB19");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB19 ");
 
 #.FN_HDR SIB20-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB20");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB20 ");
 
 #.FN_HDR SIB21-r17
-  col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB21");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB21 ");
 
 #.FN_HDR SIB1
-  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SIB1");
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SIB1 ");
 
 #.FN_HDR RRCReject
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC Reject");
diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
index cbfb67c..88f72f7 100644
--- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
+++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
@@ -1061,7 +1061,7 @@ proto_register_nr_rrc(void) {
   register_dissector("nr-rrc.measgapconfig_msg", dissect_nr_rrc_measgapconfig_msg, proto_nr_rrc);
   register_dissector("nr-rrc.handoverpreparationinformation_msg", dissect_nr_rrc_handoverpreparationinformation_msg, proto_nr_rrc);
   register_dissector("nr-rrc.handovercommand_msg", dissect_nr_rrc_handovercommand_msg, proto_nr_rrc);
-
+ /*#include "packet-nr-rrc-dis-reg.c" */
 #include "packet-nr-rrc-dis-reg.c"
 
   nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(),