osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NR RRC: Make more PDUs set col and proto.

This commit is contained in:
Anders Broman 2021-10-05 20:41:08 +02:00 committed by Wireshark GitLab Utility
parent 0aae44e145
commit d2dff29c83
2 changed files with 96 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
View File

@ -570,6 +570,49 @@ dissect_nr_rrc_ue_mrdc_capability_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_,
return dissect_nr_rrc_UE_MRDC_Capability_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ue_nr_capability_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "UE-NR-Capability");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_UE_NR_Capability_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ul_dcch_message_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "UL-DCCH-Message");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_UL_DCCH_Message_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_rrcreconfiguration_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "RRCReconfiguration");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_RRCReconfiguration_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ue_capabilityrat_containerlist_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
@ -824,9 +867,11 @@ proto_register_nr_rrc(void) {
/* Register the dissectors defined in nr-rrc.cnf */
register_dissector("nr-rrc.cg_configinfo", dissect_nr_rrc_cg_configinfo_msg, proto_nr_rrc);
register_dissector("nr-rrc.radiobearerconfig", dissect_nr_rrc_radiobearerconfig_msg, proto_nr_rrc);
register_dissector("nr-rrc.rrc_reconf_msg", dissect_nr_rrc_rrcreconfiguration_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_capabilityrat_containerlist", dissect_nr_rrc_ue_capabilityrat_containerlist_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_mrdc_cap_msg", dissect_nr_rrc_ue_mrdc_capability_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_nr_cap_msg", dissect_nr_rrc_ue_nr_capability_msg, proto_nr_rrc);
register_dissector("nr-rrc.ul.dcch_msg_msg", dissect_nr_rrc_ul_dcch_message_msg, proto_nr_rrc);
#include "packet-nr-rrc-dis-reg.c"

55
epan/dissectors/packet-nr-rrc.c
View File

@ -9478,6 +9478,49 @@ dissect_nr_rrc_ue_mrdc_capability_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_,
return dissect_nr_rrc_UE_MRDC_Capability_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ue_nr_capability_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "UE-NR-Capability");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_UE_NR_Capability_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ul_dcch_message_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "UL-DCCH-Message");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_UL_DCCH_Message_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_rrcreconfiguration_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
proto_item* ti;
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "RRCReconfiguration");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
return dissect_nr_rrc_RRCReconfiguration_PDU(tvb, pinfo, sub_tree, NULL);
}
static int
dissect_nr_rrc_ue_capabilityrat_containerlist_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
@ -91582,7 +91625,7 @@ static int dissect_UE_NR_Capability_v15c0_PDU(tvbuff_t *tvb _U_, packet_info *pi
/*--- End of included file: packet-nr-rrc-fn.c ---*/
#line 587 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 630 "./asn1/nr-rrc/packet-nr-rrc-template.c"
int
dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
@ -116215,7 +116258,7 @@ proto_register_nr_rrc(void) {
"T_sl_Rx_256QAM_r16_01", HFILL }},
/*--- End of included file: packet-nr-rrc-hfarr.c ---*/
#line 619 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 662 "./asn1/nr-rrc/packet-nr-rrc-template.c"
{ &hf_nr_rrc_serialNumber_gs,
{ "Geographical Scope", "nr-rrc.serialNumber.gs",
@ -118801,7 +118844,7 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_T_csi_ReportSidelink_r16,
/*--- End of included file: packet-nr-rrc-ettarr.c ---*/
#line 757 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 800 "./asn1/nr-rrc/packet-nr-rrc-template.c"
&ett_nr_rrc_DedicatedNAS_Message,
&ett_nr_rrc_targetRAT_MessageContainer,
&ett_nr_rrc_nas_Container,
@ -118872,9 +118915,11 @@ proto_register_nr_rrc(void) {
/* Register the dissectors defined in nr-rrc.cnf */
register_dissector("nr-rrc.cg_configinfo", dissect_nr_rrc_cg_configinfo_msg, proto_nr_rrc);
register_dissector("nr-rrc.radiobearerconfig", dissect_nr_rrc_radiobearerconfig_msg, proto_nr_rrc);
register_dissector("nr-rrc.rrc_reconf_msg", dissect_nr_rrc_rrcreconfiguration_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_capabilityrat_containerlist", dissect_nr_rrc_ue_capabilityrat_containerlist_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_mrdc_cap_msg", dissect_nr_rrc_ue_mrdc_capability_msg, proto_nr_rrc);
register_dissector("nr-rrc.ue_nr_cap_msg", dissect_nr_rrc_ue_nr_capability_msg, proto_nr_rrc);
register_dissector("nr-rrc.ul.dcch_msg_msg", dissect_nr_rrc_ul_dcch_message_msg, proto_nr_rrc);
/*--- Included file: packet-nr-rrc-dis-reg.c ---*/
@ -118897,7 +118942,7 @@ proto_register_nr_rrc(void) {
/*--- End of included file: packet-nr-rrc-dis-reg.c ---*/
#line 832 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 877 "./asn1/nr-rrc/packet-nr-rrc-template.c"
nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(),
g_direct_hash, g_direct_equal);