Try to make the buildbot happy.
svn path=/trunk/; revision=44425
This commit is contained in:
Anders Broman
parent
5aad9e0d93
commit
3cf2df1ef5
|
|
@ -1287,7 +1287,7 @@ BindingID_port = 0;
|
|||
|
||||
#.FN_BODY E-DCH-MACdFlow-Specific-InfoItem
|
||||
umts_fp_conversation_info_t *p_conv_data = NULL;
|
||||
address dst_addr,null_addr;
|
||||
address null_addr;
|
||||
conversation_t *p_conv;
|
||||
guint32 no_ddi_entries, i;
|
||||
|
||||
|
|
@ -1296,9 +1296,6 @@ guint32 no_ddi_entries, i;
|
|||
{
|
||||
return offset;
|
||||
}
|
||||
dst_addr.type=AT_IPv4;
|
||||
dst_addr.len=4;
|
||||
dst_addr.data=(guint8 *)&transportLayerAddress_ipv4;
|
||||
|
||||
/* Check if we have conversation info */
|
||||
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
|
||||
|
|
@ -1423,7 +1420,7 @@ BindingID_port = 0;
|
|||
|
||||
#.FN_BODY E-DCH-MACdFlow-Specific-InfoItem-to-Modify
|
||||
guint32 no_ddi_entries, i;
|
||||
address dst_addr, null_addr;
|
||||
address null_addr;
|
||||
nbap_edch_port_info_t * old_info;
|
||||
umts_fp_conversation_info_t *p_conv_data = NULL;
|
||||
conversation_t *p_conv;
|
||||
|
|
@ -1461,11 +1458,6 @@ num_items = 1;
|
|||
transportLayerAddress_ipv4 = old_info->crnc_address;
|
||||
|
||||
/*Do the configurations*/
|
||||
dst_addr.type=AT_IPv4;
|
||||
dst_addr.len=4;
|
||||
dst_addr.data=(guint8 *)&transportLayerAddress_ipv4;
|
||||
|
||||
|
||||
/* Check if we have conversation info */
|
||||
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
|
||||
p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
|
||||
|
|
|
|||
|
|
@ -10032,7 +10032,7 @@ dissect_nbap_AddorDeleteIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
|
|||
|
||||
static int
|
||||
dissect_nbap_CFN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 2032 "../../asn1/nbap/nbap.cnf"
|
||||
#line 2024 "../../asn1/nbap/nbap.cnf"
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
0U, 255U, &cfn, FALSE);
|
||||
|
||||
|
|
@ -10285,7 +10285,7 @@ dissect_nbap_AvailabilityStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 2002 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1994 "../../asn1/nbap/nbap.cnf"
|
||||
umts_fp_conversation_info_t *umts_fp_conversation_info = NULL;
|
||||
address null_addr;
|
||||
conversation_t *conversation = NULL;
|
||||
|
|
@ -11500,7 +11500,7 @@ dissect_nbap_Common_E_DCH_Resource_Combination_InfoList(tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_nbap_Common_MACFlow_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1869 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1861 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
0U, maxNrOfCommonMACFlows_1, &common_macdflow_id, FALSE);
|
||||
|
|
@ -11634,7 +11634,7 @@ dissect_nbap_E_DCH_MACdFlow_Multiplexing_List(tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_nbap_LogicalChannelID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1547 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1539 "../../asn1/nbap/nbap.cnf"
|
||||
/* Set logical channel id for this entry*/
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
1U, 15U, &logical_channel_id, FALSE);
|
||||
|
|
@ -11653,7 +11653,7 @@ dissect_nbap_LogicalChannelID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
|
|||
|
||||
static int
|
||||
dissect_nbap_MAC_PDU_SizeExtended(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1631 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1623 "../../asn1/nbap/nbap.cnf"
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
1U, 1504U, NULL, TRUE);
|
||||
|
||||
|
|
@ -12076,7 +12076,7 @@ static const per_sequence_t CommonMACFlow_Specific_InfoItem_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_CommonMACFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1876 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1868 "../../asn1/nbap/nbap.cnf"
|
||||
address dst_addr;
|
||||
transportLayerAddress_ipv4 = 0;
|
||||
BindingID_port = 0;
|
||||
|
|
@ -12123,7 +12123,7 @@ dissect_nbap_CommonMACFlow_Specific_InfoList(tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_nbap_MACdPDU_Size(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1538 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1530 "../../asn1/nbap/nbap.cnf"
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
1U, 5000U, &MACdPDU_Size, TRUE);
|
||||
|
||||
|
|
@ -13343,7 +13343,7 @@ dissect_nbap_CriticalityDiagnostics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
|
|||
|
||||
static int
|
||||
dissect_nbap_CRNC_CommunicationContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1981 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1973 "../../asn1/nbap/nbap.cnf"
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
0U, 1048575U, &com_context_id, FALSE);
|
||||
|
||||
|
|
@ -18026,7 +18026,7 @@ dissect_nbap_E_DCH_HARQ_Combining_Capability(tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_DDI_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1528 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1520 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
0U, 62U, &e_dch_ddi_value, FALSE);
|
||||
|
|
@ -18160,7 +18160,7 @@ static const per_sequence_t E_DCH_LogicalChannelInformationItem_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_LogicalChannelInformationItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1525 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1517 "../../asn1/nbap/nbap.cnf"
|
||||
num_items++;
|
||||
|
||||
|
||||
|
|
@ -18177,7 +18177,7 @@ static const per_sequence_t E_DCH_LogicalChannelInformation_sequence_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_LogicalChannelInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1518 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1510 "../../asn1/nbap/nbap.cnf"
|
||||
num_items = 0;
|
||||
|
||||
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -18212,7 +18212,7 @@ static int
|
|||
dissect_nbap_E_DCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1289 "../../asn1/nbap/nbap.cnf"
|
||||
umts_fp_conversation_info_t *p_conv_data = NULL;
|
||||
address dst_addr,null_addr;
|
||||
address null_addr;
|
||||
conversation_t *p_conv;
|
||||
guint32 no_ddi_entries, i;
|
||||
|
||||
|
|
@ -18223,9 +18223,6 @@ guint32 no_ddi_entries, i;
|
|||
{
|
||||
return offset;
|
||||
}
|
||||
dst_addr.type=AT_IPv4;
|
||||
dst_addr.len=4;
|
||||
dst_addr.data=(guint8 *)&transportLayerAddress_ipv4;
|
||||
|
||||
/* Check if we have conversation info */
|
||||
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
|
||||
|
|
@ -18396,7 +18393,7 @@ static const per_sequence_t E_DCH_LogicalChannelToModifyItem_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_LogicalChannelToModifyItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1513 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1505 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
ett_nbap_E_DCH_LogicalChannelToModifyItem, E_DCH_LogicalChannelToModifyItem_sequence);
|
||||
|
|
@ -18471,9 +18468,9 @@ static const per_sequence_t E_DCH_MACdFlow_Specific_InfoItem_to_Modify_sequence[
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1425 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1422 "../../asn1/nbap/nbap.cnf"
|
||||
guint32 no_ddi_entries, i;
|
||||
address dst_addr, null_addr;
|
||||
address null_addr;
|
||||
nbap_edch_port_info_t * old_info;
|
||||
umts_fp_conversation_info_t *p_conv_data = NULL;
|
||||
conversation_t *p_conv;
|
||||
|
|
@ -18513,11 +18510,6 @@ num_items = 1;
|
|||
transportLayerAddress_ipv4 = old_info->crnc_address;
|
||||
|
||||
/*Do the configurations*/
|
||||
dst_addr.type=AT_IPv4;
|
||||
dst_addr.len=4;
|
||||
dst_addr.data=(guint8 *)&transportLayerAddress_ipv4;
|
||||
|
||||
|
||||
/* Check if we have conversation info */
|
||||
SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
|
||||
p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
|
||||
|
|
@ -18609,7 +18601,7 @@ static const per_sequence_t E_DCH_FDD_Information_to_Modify_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_E_DCH_FDD_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1345 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1342 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
address dst_addr, null_addr;
|
||||
conversation_t *conversation,*old_conversation;
|
||||
|
|
@ -23293,7 +23285,7 @@ static const per_sequence_t HSDSCH_Common_System_InformationFDD_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_Common_System_InformationFDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1898 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1890 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
* 5.1.6 High Speed Downlink Shared Channels
|
||||
* The Data Transfer procedure is used to transfer a HS-DSCH DATA FRAME (TYPE 1, TYPE 2 [FDD and 1.28Mcps
|
||||
|
|
@ -23447,7 +23439,7 @@ static const per_sequence_t HSDSCH_MACdFlow_Specific_InfoItem_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1608 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1600 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
|
||||
address dst_addr;
|
||||
|
|
@ -23551,7 +23543,7 @@ static const value_string nbap_RLC_Mode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_RLC_Mode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1555 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1547 "../../asn1/nbap/nbap.cnf"
|
||||
guint32 rlc_mode;
|
||||
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -23622,7 +23614,7 @@ static const per_sequence_t HSDSCH_MACdFlows_Information_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_MACdFlows_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1579 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1571 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
int protocol_ie_id;
|
||||
guint32 i;
|
||||
|
|
@ -23664,7 +23656,7 @@ dissect_nbap_HSDSCH_MACdFlows_Information(tvbuff_t *tvb _U_, int offset _U_, asn
|
|||
|
||||
static int
|
||||
dissect_nbap_T_hSDSCH_Physical_Layer_Category(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1572 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1564 "../../asn1/nbap/nbap.cnf"
|
||||
guint32 hsdsch_physical_layer_category;
|
||||
|
||||
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -23732,7 +23724,7 @@ static const per_sequence_t HSDSCH_FDD_Information_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1661 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1653 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
* Collect the information about the HSDSCH MACdFlows set up conversation(s) and set the conversation data.
|
||||
*/
|
||||
|
|
@ -23868,7 +23860,7 @@ static const per_sequence_t HSDSCH_MACdFlow_Specific_InfoItem_to_Modify_sequence
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1749 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1741 "../../asn1/nbap/nbap.cnf"
|
||||
|
||||
|
||||
address dst_addr;
|
||||
|
|
@ -24060,7 +24052,7 @@ static const per_sequence_t HSDSCH_Information_to_Modify_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1772 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1764 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
* This is pretty much the same like if we setup a previous flow
|
||||
*/
|
||||
|
|
@ -24174,7 +24166,7 @@ static const value_string nbap_HSDSCH_MACdPDUSizeFormat_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_MACdPDUSizeFormat(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1638 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1630 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
* Removed 10 Aug. 2012, Im not sure if this was right, it wrongfully
|
||||
* set some packets as type 2 for HSDHCH modified items.
|
||||
|
|
@ -24697,7 +24689,7 @@ static const per_sequence_t HSDSCH_Paging_System_InformationFDD_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_nbap_HSDSCH_Paging_System_InformationFDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1973 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1965 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
g_warning("HS-DSCH Type 3 NOT Implemented!");
|
||||
*/
|
||||
|
|
@ -27998,7 +27990,7 @@ dissect_nbap_NI_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
|
|||
|
||||
static int
|
||||
dissect_nbap_NodeB_CommunicationContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 1985 "../../asn1/nbap/nbap.cnf"
|
||||
#line 1977 "../../asn1/nbap/nbap.cnf"
|
||||
/*Set up and map that maps Node-B ids to CRNC ids, since often you only have one of them present in nbap*/
|
||||
nbap_com_context_id *cur_val;
|
||||
|
||||
|
|
@ -40973,7 +40965,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO,"RadioLinkReconfigurationCommit ");
|
|||
actx->pinfo->link_dir=P2P_DIR_DL;
|
||||
|
||||
|
||||
#line 2024 "../../asn1/nbap/nbap.cnf"
|
||||
#line 2016 "../../asn1/nbap/nbap.cnf"
|
||||
/*
|
||||
* Here we need to signal the CFN value, down to FP so
|
||||
* that lowert layers know when a reconfiguration becomes active
|
||||
|
|
|
|||
Loading…
Reference in New Issue