diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-05 20:05:12 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-05 20:05:12 +0000 |
| commit | 03929b6237f116dadb4dee05f1e1c3ace997231e (patch) | |
| tree | fcf385816f0ef74bab00dcbae64ae3c37608f1de /asn1 | |
| parent | a5c2c6fb0d370560e9183990808ee37c8b9ef6bb (diff) | |
| download | wireshark-03929b6237f116dadb4dee05f1e1c3ace997231e.tar.gz wireshark-03929b6237f116dadb4dee05f1e1c3ace997231e.tar.bz2 wireshark-03929b6237f116dadb4dee05f1e1c3ace997231e.zip | |
From Pascal Quantin:
[RRC] Update SIB PDU decoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4371
I also removed dummy code.
svn path=/trunk/; revision=31451
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/rrc/packet-rrc-template.c | 24 | ||||
| -rw-r--r-- | asn1/rrc/rrc.cnf | 10 |
2 files changed, 4 insertions, 30 deletions
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index 7eac1b1f18..375ba6aacd 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -2,7 +2,7 @@ * Routines for Universal Mobile Telecommunications System (UMTS); * Radio Resource Control (RRC) protocol specification * (3GPP TS 25.331 version 6.7.0 Release 6) packet dissection - * Copyright 2006, Anders Broman <anders.broman@ericsson.com> + * Copyright 2006-2010, Anders Broman <anders.broman@ericsson.com> * * $Id$ * @@ -85,28 +85,6 @@ static proto_tree *top_tree; #include "packet-rrc.h" -/* -TODO: Remove the dummy function when these functions are taken into use - - These functions are not referenced from the ASN1 specifications - as this generates a lot of unsued code warings from GCC this dummy function - is introduced to reduce the number of warnings until the proper use is discovered - */ - -static void -dissect_rrc_dummy_remove_unused_code_warnings(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_){ - - /* Dummy code to keep GCC happy */ - switch(hf_index){ - case 0: - dissect_rrc_UL_PhysChCapabilityFDD_r6( tvb, offset, actx , tree, hf_index); - dissect_rrc_UE_Positioning_GANSS_Data( tvb, offset, actx , tree, hf_index); - break; - default: - break; - } -} - static void dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 805d127d21..755d71b540 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -57,6 +57,7 @@ SysInfoType15-1 @si.sib15-1 SysInfoType15-1bis @si.sib15-1bis SysInfoType15-2 @si.sib15-2 SysInfoType15-2bis @si.sib15-2bis +SysInfoType15-2ter @si.sib15-2ter SysInfoType15-3 @si.sib15-3 SysInfoType15-3bis @si.sib15-3bis SysInfoType15-4 @si.sib15-4 @@ -67,6 +68,8 @@ SysInfoType15-8 @si.sib15-8 SysInfoType16 @si.sib16 SysInfoType17 @si.sib17 SysInfoType18 @si.sib18 +SysInfoType19 @si.sib19 +SysInfoType20 @si.sib20 SysInfoTypeSB1 @si.sb1 SysInfoTypeSB2 @si.sb2 HandoverToUTRANCommand @irat.ho_to_utran_cmd @@ -487,12 +490,5 @@ tvbuff_t *parameter_tvb=NULL; dissect_rrc_InterRATHandoverInfo_PDU(parameter_tvb, actx->pinfo, tree); } -#.FN_BODY ue-CapabilityContainer/present VAL_PTR = ¶meter_tvb -tvbuff_t *parameter_tvb=NULL; - -%(DEFAULT_BODY)s - if (parameter_tvb){ - dissect_UE_RadioAccessCapabilityInfo_PDU(parameter_tvb, actx->pinfo, tree); - } #.END |