diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-02-26 14:29:17 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-02-26 19:38:21 +0000 |
| commit | 1dff4e309d036e23c316f2cf9a6d05d5a4449ff2 (patch) | |
| tree | a7ff0816c598def87e246a2ebbd2d80fa47365fc | |
| parent | b4850149dd877375c1d8da3a2d20bddca1d91780 (diff) | |
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
167 files changed, 824 insertions, 824 deletions
diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index 983a747f5b..9920feb5c2 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -86,7 +86,7 @@ void proto_register_acp133(void) { /*--- proto_reg_handoff_acp133 --- */ void proto_reg_handoff_acp133(void) { -#include "packet-acp133-dis-tab.c" +#include "packet-acp133-dis-tab.c" /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index a3f2dec839..e23a811768 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -19,7 +19,7 @@ AE-invocation-identifier #.TYPE_RENAME AARQ-apdu/_untag/protocol-version T_AARQ_protocol_version AARE-apdu/_untag/protocol-version T_AARE_protocol_version -AARQ-apdu/_untag/aSO-context-name T_AARQ_aSO_context_name +AARQ-apdu/_untag/aSO-context-name T_AARQ_aSO_context_name AARE-apdu/_untag/aSO-context-name T_AARE_aSO_context_name ACRQ-apdu/_untag/aSO-context-name T_ACRQ_aSO_context_name ACRP-apdu/_untag/aSO-context-name T_ACRP_aSO_context_name @@ -40,7 +40,7 @@ AARE-apdu/_untag/aSO-context-name aARE_aSO_context_name ACRQ-apdu/_untag/aSO-context-name aCRQ_aSO_context_name PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned -#.FN_PARS Authentication-value-other/other-mechanism-name +#.FN_PARS Authentication-value-other/other-mechanism-name FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Authentication-value-other/other-mechanism-value @@ -110,7 +110,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned #.FN_BODY Release-request-reason int reason = -1; - + %(DEFAULT_BODY)s if(reason != -1) @@ -126,7 +126,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned #.FN_BODY Release-response-reason int reason = -1; - + %(DEFAULT_BODY)s if(reason != -1) @@ -144,7 +144,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned if(source != -1) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(source, acse_ABRT_source_vals, "source(%%d)")); - + #.FIELD_ATTR Association-data/_item NAME = "Association-data" diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf index a27469eee0..5a33c987be 100644 --- a/asn1/ansi_tcap/ansi_tcap.cnf +++ b/asn1/ansi_tcap/ansi_tcap.cnf @@ -21,11 +21,11 @@ OperationCode/private VAL_PTR = &ansi_tcap_private.d.OperationCode_private int start_offset = offset; guint8 family; guint8 specifier; - + %(DEFAULT_BODY)s /* mask off the H bit */ ansi_tcap_private.d.OperationCode_national = (ansi_tcap_private.d.OperationCode_national&0x7fff); - + subtree = proto_item_add_subtree(actx->created_item, ett_ansi_tcap_op_code_nat); /* Bit H is used to distinguish between Operations that require a reply and those that do not. A value of 1 * indicates that a reply is required; a value of 0 indicates that a reply is not required. @@ -77,14 +77,14 @@ OperationCode/private VAL_PTR = &ansi_tcap_private.d.OperationCode_private default: break; } - + #--- INVOKE --- #.FN_BODY Invoke/parameter if(find_tcap_subdissector(tvb, actx, tree)) offset = tvb_length(tvb); - + #.FN_HDR Invoke ansi_tcap_private.d.pdu = 1; @@ -157,10 +157,10 @@ guint8 len; if(next_tvb) { len = tvb_length_remaining(next_tvb, 0); if(len !=0){ - /* 0 octets for the Unidirectional, + /* 0 octets for the Unidirectional, * 4 octets for Query, Response & Abort * 8 octets for Conversation in the order Originating then Responding TID - * + * * In order to match this it seems like we should only use the last 4 octets * in the 8 octets case. */ diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.h b/asn1/ansi_tcap/packet-ansi_tcap-template.h index c4d990a6a1..d9a6f03914 100644 --- a/asn1/ansi_tcap/packet-ansi_tcap-template.h +++ b/asn1/ansi_tcap/packet-ansi_tcap-template.h @@ -36,16 +36,16 @@ struct ansi_tcap_private_t { gchar *TransactionID_str; struct { /* "dynamic" data */ gint pdu; - /* - 1 : invoke, - 2 : returnResult, + /* + 1 : invoke, + 2 : returnResult, 3 : returnError, 4 : reject */ - gint OperationCode; - /* - 0 : national, - 1 : private + gint OperationCode; + /* + 0 : national, + 1 : private */ gint32 OperationCode_national; gint32 OperationCode_private; diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c index b3b3235672..cefb110bc8 100644 --- a/asn1/atn-cm/packet-atn-cm-template.c +++ b/asn1/atn-cm/packet-atn-cm-template.c @@ -82,7 +82,7 @@ dissect_atn_cm( int type = no_msg; proto_item *ti = NULL; proto_tree *sub_tree = NULL; - + ti = proto_tree_add_text( tree, tvb, @@ -93,10 +93,10 @@ dissect_atn_cm( sub_tree = proto_item_add_subtree( ti, ett_atn_cm); - + /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */ - + /* determine whether it is uplink or downlink */ type = check_heur_msg_type(pinfo); @@ -136,7 +136,7 @@ dissect_atn_cm_heur( /* heuristically decode message */ switch(type){ case um: - TRY { + TRY { dissect_CMGroundMessage_PDU( tvb, pinfo, @@ -162,13 +162,13 @@ dissect_atn_cm_heur( default: break; } - + if (is_atn_cm == TRUE) { /* note: */ /* all subsequent PDU's belonging to this conversation are considered CM */ /* if the first CM PDU has been decoded succesfully */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ @@ -219,7 +219,7 @@ void proto_register_atn_cm (void) #include "packet-atn-cm-ettarr.c" &ett_atn_cm }; - + /* register CM application */ proto_atn_cm = proto_register_protocol( ATN_CM_PROTO , diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index 39b9d37da0..a48c42950f 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -124,7 +124,7 @@ dissect_atn_cpdlc( /* "protected mode" for this largely depends on */ /* upgraded avionics packages */ - /*note:*/ + /*note:*/ /* The use of CPDLC is *optional* as the pilot */ /* may always use a voice radio channel to talk to the controller.*/ @@ -136,7 +136,7 @@ dissect_atn_cpdlc( /* we need the ae qualifier stored within the conversation */ /* to decode "plain old cpdlc" or */ /* "protected mode cpdlc correctly " */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ atn_cv = find_atn_conversation( @@ -161,7 +161,7 @@ dissect_atn_cpdlc( if(!atn_cv){ /* atn conversation not found */ return 0; } - + ti = proto_tree_add_text( tree, tvb, @@ -172,7 +172,7 @@ dissect_atn_cpdlc( atn_cpdlc_tree = proto_item_add_subtree( ti, ett_atn_cpdlc); - + switch(atn_cv->ae_qualifier){ case pmcpdlc: if( check_heur_msg_type(pinfo) == um ) { @@ -205,7 +205,7 @@ dissect_atn_cpdlc( default: break; } - return tvb_reported_length_remaining(tvb, 0); + return tvb_reported_length_remaining(tvb, 0); } static gboolean @@ -221,7 +221,7 @@ dissect_atn_cpdlc_heur( int type = no_msg; type = check_heur_msg_type(pinfo); - + switch(type){ case um: TRY { @@ -254,7 +254,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE; } ENDTRY; TRY{ - dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); is_atn_cpdlc = TRUE; is_pm = FALSE; break;} @@ -266,14 +266,14 @@ dissect_atn_cpdlc_heur( default: break; } - + if(is_atn_cpdlc){ /* note: */ /* all subsequent PDU's belonging to this conversation */ /* are considered CPDLC */ /* if the first CPDLC PDU has been decoded succesfully */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ atn_cv = find_atn_conversation(&pinfo->dst, @@ -299,11 +299,11 @@ dissect_atn_cpdlc_heur( else { atn_cv->ae_qualifier = cpdlc; } dissect_atn_cpdlc(tvb, pinfo, tree, NULL); - } + } }else { /* there should *always* be an atn conversation */ - is_atn_cpdlc = FALSE; + is_atn_cpdlc = FALSE; } - + return is_atn_cpdlc; } @@ -316,8 +316,8 @@ void proto_register_atn_cpdlc (void) }; static gint *ett[] = { - #include "packet-atn-cpdlc-ettarr.c" - &ett_atn_cpdlc + #include "packet-atn-cpdlc-ettarr.c" + &ett_atn_cpdlc }; /* register CPDLC */ diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 0c4aa51aef..da0287d5d3 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -61,7 +61,7 @@ why not using existing ses, pres and acse dissectors ? and ommitted otherwise. Instead of adapting existing dissectors it seemed simpler and cleaner to implement everything the new atn-ulcs dissector. - + why using conversations ? PER encoded user data is ambigous; the same encoding may apply to a CM or CPDLC PDU. The workaround is to decode on a transport connection basis. @@ -90,7 +90,7 @@ which ATN standard is supported ? note: The ATN upper layers are derived from OSI standards (ICAO DOC 9705) while ATN/IPS (ICAO DOC 9896) which is entirely based on IPV6. - + */ /* @@ -107,8 +107,8 @@ which ATN standard is supported ? This means that after some time these references get reused for new conversations. This almost certain happens for traces longer than one day rendering this dissector unsuitable for captures exceeding - this one day. - + this one day. + */ #include "config.h" @@ -171,12 +171,12 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary( asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); - + static void dissect_ACSE_apdu_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); - + guint32 dissect_per_object_descriptor_t( tvbuff_t *tvb, guint32 offset, @@ -369,7 +369,7 @@ static guint32 atn_per_external_type( &actx->external, '\0', sizeof(actx->external)); - + actx->external.hf_index = -1; actx->external.encoding = -1; @@ -385,7 +385,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( const guint8* addr = NULL; guint32 ars =0; guint32 adr_prefix =0; - + /* check NSAP address type*/ if( (pinfo->src.type != AT_OSI) || (pinfo->dst.type != AT_OSI)) { @@ -400,7 +400,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( /* first try source address */ /* if the src address originates */ /* from an aircraft it's downlink */ - + /* convert addr into 32-bit integer */ addr = (const guint8 *)pinfo->src.data; adr_prefix = @@ -433,7 +433,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( (addr[1]<<16) | (addr[2]<<8) | addr[3] ); - + /* according to ICAO doc9507 Ed2 SV5 */ /* clause 5.4.3.8.1.5 and 5.4.3.8.1.3 */ /* mobile addresses contain "c1" of "41" */ @@ -578,7 +578,7 @@ dissect_atn_ulcs( proto_tree *atn_ulcs_tree = NULL; guint8 value_pres = 0; guint8 value_ses = 0; - guint16 value_ses_pres = 0; + guint16 value_ses_pres = 0; root_tree = tree; @@ -593,26 +593,26 @@ dissect_atn_ulcs( 0, 0 , FALSE); - + atn_ulcs_tree = proto_item_add_subtree( ti, ett_atn_ulcs); - + dissect_Fully_encoded_data_PDU( tvb, pinfo, atn_ulcs_tree); - + return offset + tvb_reported_length_remaining(tvb, offset ) ; } - + /* decode as SPDU, PPDU and ACSE PDU */ if ( (int)(intptr_t) data == TRUE ) { /* get session and presentation PDU's */ value_ses_pres = tvb_get_ntohs(tvb, offset); - + /* SPDU: dissect session layer */ ti = proto_tree_add_text( tree, @@ -671,7 +671,7 @@ dissect_atn_ulcs( break; } offset++; - + /* PPDU: dissect presentation layer */ ti = proto_tree_add_text( tree, @@ -679,7 +679,7 @@ dissect_atn_ulcs( offset, 0, ATN_PRES_PROTO ); - + atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_pres); value_pres = tvb_get_guint8(tvb, offset); @@ -696,7 +696,7 @@ dissect_atn_ulcs( "%s (0x%02x)", val_to_str( value_ses_pres & ATN_SES_PRES_MASK , atn_pres_vals, "?"), value_pres); - + /* PPDU errorcode in case of SRF/CPR */ switch(value_ses & SES_PDU_TYPE_MASK){ case SES_ATN_SRF: @@ -722,7 +722,7 @@ dissect_atn_ulcs( offset, 0, ATN_ACSE_PROTO ); - + atn_ulcs_tree = proto_item_add_subtree( ti, ett_atn_acse); @@ -743,12 +743,12 @@ static gboolean dissect_atn_ulcs_heur( packet_info *pinfo, proto_tree *tree, void *data _U_) -{ +{ /* do we have enough data*/ /* at least session + presentation data or pdv-list */ if (tvb_reported_length_remaining(tvb, 0) < 2){ return FALSE; } - + /* check for session/presentation/ACSE PDU's */ /* SPDU and PPDU are one octet each */ switch( tvb_get_ntohs(tvb, 0) & 0xf8ff ){ diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.h b/asn1/atn-ulcs/packet-atn-ulcs-template.h index 2ef0bff8ee..1522dea9f7 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.h +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.h @@ -53,7 +53,7 @@ enum msg_type { }; enum ae_qualifier { - ads = 0, + ads = 0, cma =1, /* contact management (CM) */ cpdlc = 2, /* "plain old" CPDLC */ ati = 3 , diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index 8d77d6ea35..af28be358d 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -79,7 +79,7 @@ #define C1222_CMD_WAIT 0x70 #define C1222_CMD_TIMING_SETUP 0x71 -void proto_register_c1222(void); +void proto_register_c1222(void); static dissector_handle_t c1222_handle=NULL; static dissector_handle_t c1222_udp_handle=NULL; @@ -1384,7 +1384,7 @@ void proto_register_c1222(void) { "Reassemble all C12.22 messages spanning multiple TCP segments", "Whether the C12.22 dissector should reassemble all messages spanning multiple TCP segments", &c1222_desegment); - prefs_register_string_preference(c1222_module, "baseoid", "Base OID to use for relative OIDs", + prefs_register_string_preference(c1222_module, "baseoid", "Base OID to use for relative OIDs", "Base object identifier for use in resolving relative object identifiers", &c1222_baseoid_str); #ifdef HAVE_LIBGCRYPT diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index dc4304922f..4c8a5d66b8 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -535,7 +535,7 @@ proto_tree *subtree; #.END #---------------------------------------------------------------------------------------- -#.FN_BODY LocationInformationGPRS/cellGlobalIdOrServiceAreaIdOrLAI +#.FN_BODY LocationInformationGPRS/cellGlobalIdOrServiceAreaIdOrLAI proto_tree *subtree; int start_offset; @@ -548,7 +548,7 @@ proto_tree *subtree; dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_cellGlobalIdOrServiceAreaIdFixedLength); }else{ dissect_gsm_map_LAIFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_locationAreaId); - } + } #.END #---------------------------------------------------------------------------------------- @@ -567,7 +567,7 @@ proto_tree *subtree; #.FN_BODY FCIBillingChargingCharacteristics VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) @@ -576,8 +576,8 @@ proto_tree *subtree; dissect_camel_CAMEL_FCIBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCIBillingChargingCharacteristics); #.FN_BODY FCIGPRSBillingChargingCharacteristics VAL_PTR = ¶meter_tvb - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) @@ -587,17 +587,17 @@ proto_tree *subtree; #.FN_BODY FCISMSBillingChargingCharacteristics VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) - return offset; + return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_FCISMSBillingChargingCharacteristics); dissect_camel_CAMEL_FCISMSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCISMSBillingChargingCharacteristics); #.FN_BODY SCIBillingChargingCharacteristics VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) @@ -607,17 +607,17 @@ proto_tree *subtree; #.FN_BODY SCIGPRSBillingChargingCharacteristics VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) - return offset; + return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_SCIGPRSBillingChargingCharacteristics); dissect_camel_CAMEL_SCIGPRSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics); #.FN_BODY CallResult VAL_PTR = ¶meter_tvb - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; %(DEFAULT_BODY)s if (!parameter_tvb) @@ -641,15 +641,15 @@ proto_tree *subtree; * identification' and 'number digit' fields defined in 3GPP TS 24.008 [9]; * it does not carry the 'called party BCD number IEI' or 'length of called * party BCD number contents'. - * In the context of the DestinationSubscriberNumber field in ConnectSMSArg or - * InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric - * character string. In this case, type-of-number '101'B is used, in accordance - * with 3GPP TS 23.040 [6]. The address is coded in accordance with the - * GSM 7-bit default alphabet definition and the SMS packing rules + * In the context of the DestinationSubscriberNumber field in ConnectSMSArg or + * InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric + * character string. In this case, type-of-number '101'B is used, in accordance + * with 3GPP TS 23.040 [6]. The address is coded in accordance with the + * GSM 7-bit default alphabet definition and the SMS packing rules * as specified in 3GPP TS 23.038 [15] in this case. */ - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; %(DEFAULT_BODY)s diff --git a/asn1/camel/packet-camel-template.h b/asn1/camel/packet-camel-template.h index e2d3e99f38..d8a4eef3a7 100644 --- a/asn1/camel/packet-camel-template.h +++ b/asn1/camel/packet-camel-template.h @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * References: ETSI 300 374 */ -/* - * Indentation logic: this file is indented with 2 spaces indentation. +/* + * Indentation logic: this file is indented with 2 spaces indentation. * there are no tabs. */ @@ -48,7 +48,7 @@ WS_DLL_PUBLIC const value_string camel_opr_code_strings[]; */ #define NB_CAMELSRT_CATEGORY 9+1 /**< Number of type of message */ /* for example TC_BEGIN with InitalDP, and TC_CONT with RequestReportBCSMEvent - is a category, we want to measure the delay between the two messages */ + is a category, we want to measure the delay between the two messages */ #define CAMELSRT_SESSION 1 @@ -67,7 +67,7 @@ WS_DLL_PUBLIC const value_string camelSRTtype_naming[]; /** If we have a request message and its response, (eg: ApplyCharging, ApplyChargingReport) - the frames numbers are stored in this structure */ + the frames numbers are stored in this structure */ struct camelsrt_category_t { guint32 req_num; /**< frame number request seen */ @@ -88,7 +88,7 @@ struct camelsrt_call_t { }; -/** The Key for the hash table is the TCAP origine transaction identifier +/** The Key for the hash table is the TCAP origine transaction identifier of the TC_BEGIN containing the InitialDP */ struct camelsrt_call_info_key_t { @@ -96,8 +96,8 @@ struct camelsrt_call_info_key_t { }; /** Info for a couple of messages (or category) - The request must be available, not duplicated, - and once the corresponding response received, + The request must be available, not duplicated, + and once the corresponding response received, we can deduce the Delta Time between Request/response */ struct camelsrt_msginfo_t { @@ -110,7 +110,7 @@ struct camelsrt_msginfo_t { /** List of infos to store for the analyse */ -struct camelsrt_info_t { +struct camelsrt_info_t { guint32 tcap_session_id; void * tcap_context; guint8 opcode; /**< operation code of message received */ diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index e65b72bd4b..d26d8d3b31 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -23,8 +23,8 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", - val_to_str (value, cdt_AlgorithmID_ShortForm_vals, + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", + val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); #.FN_PARS ContentType-ShortForm @@ -34,11 +34,11 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" %(DEFAULT_BODY)s proto_item_append_text (cdt_item, ", %%s", - val_to_str (content_type, cdt_ContentType_ShortForm_vals, + val_to_str (content_type, cdt_ContentType_ShortForm_vals, "unknown")); - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", - val_to_str (content_type, cdt_ContentType_ShortForm_vals, + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", + val_to_str (content_type, cdt_ContentType_ShortForm_vals, "unknown")); #.FN_PARS CompressedContentInfo/contentType/contentType-OID @@ -71,17 +71,17 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" if (compr_tvb == NULL) { proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_compress_content, tvb, save_offset, -1); - col_append_str (actx->pinfo->cinfo, COL_INFO, + col_append_str (actx->pinfo->cinfo, COL_INFO, "[Error: Unable to get compressed content]"); return offset; } - + next_tvb = tvb_child_uncompress (tvb, compr_tvb, 0, tvb_length (compr_tvb)); if (next_tvb == NULL) { proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_uncompress_content, tvb, save_offset, -1); - col_append_str (actx->pinfo->cinfo, COL_INFO, + col_append_str (actx->pinfo->cinfo, COL_INFO, "[Error: Unable to uncompress content]"); return offset; } @@ -102,5 +102,5 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" call_dissector (data_handle, next_tvb, actx->pinfo, top_tree); break; } - + #.END diff --git a/asn1/cdt/packet-cdt-template.h b/asn1/cdt/packet-cdt-template.h index a038a461f7..b561775289 100644 --- a/asn1/cdt/packet-cdt-template.h +++ b/asn1/cdt/packet-cdt-template.h @@ -2,7 +2,7 @@ * * Routines for Compressed Data Type packet dissection. * - * Copyright 2005, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS + * Copyright 2005, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 2e6145cf73..801dd296bb 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -80,7 +80,7 @@ static const value_string cmip_Opcode_vals[] = { /* CMIP ERRORS */ static const value_string cmip_error_code_vals[] = { #.TABLE_BODY ERROR - { %(&errorCode)s, "%(_ident)s" }, + { %(&errorCode)s, "%(_ident)s" }, #.TABLE_FTR { 0, NULL } }; @@ -106,7 +106,7 @@ CorrelatedNotifications B "2.9.3.2.7.12" "correlatedNotifications(12)" EventTime B "2.9.3.2.7.13" "eventTime(13)" EventTypeId B "2.9.3.2.7.14" "eventType(14)" MonitoredAttributes B "2.9.3.2.7.15" "monitoredAttributes(15)" -NotificationIdentifier B "2.9.3.2.7.16" "notificationIdentifier(16)" +NotificationIdentifier B "2.9.3.2.7.16" "notificationIdentifier(16)" PerceivedSeverity B "2.9.3.2.7.17" "perceivedSeverity(17)" ProbableCause B "2.9.3.2.7.18" "probableCause(18)" ProposedRepairActions B "2.9.3.2.7.19" "proposedRepairActions(19)" @@ -130,15 +130,15 @@ ProceduralStatus B "2.9.3.2.7.36" "proceduralStatus(36)" StandbyStatus B "2.9.3.2.7.37" "standbyStatus(37)" UnknownStatus B "2.9.3.2.7.38" "unknownStatus(38)" UsageState B "2.9.3.2.7.39" "usageState(39)" -BackUpRelationshipObject B "2.9.3.2.7.40" "backUpObject(40)" -BackUpRelationshipObject B "2.9.3.2.7.41" "backedUpObject(41)" -GroupObjects B "2.9.3.2.7.42" "member(42)" -GroupObjects B "2.9.3.2.7.43" "owner(43)" -BackUpRelationshipObject B "2.9.3.2.7.44" "peer(44)" -PrioritisedObject B "2.9.3.2.7.45" "primary(45)" -PrioritisedObject B "2.9.3.2.7.46" "providerObject(46)" -PrioritisedObject B "2.9.3.2.7.47" "secondary(47)" -PrioritisedObject B "2.9.3.2.7.48" "userObject(48)" +BackUpRelationshipObject B "2.9.3.2.7.40" "backUpObject(40)" +BackUpRelationshipObject B "2.9.3.2.7.41" "backedUpObject(41)" +GroupObjects B "2.9.3.2.7.42" "member(42)" +GroupObjects B "2.9.3.2.7.43" "owner(43)" +BackUpRelationshipObject B "2.9.3.2.7.44" "peer(44)" +PrioritisedObject B "2.9.3.2.7.45" "primary(45)" +PrioritisedObject B "2.9.3.2.7.46" "providerObject(46)" +PrioritisedObject B "2.9.3.2.7.47" "secondary(47)" +PrioritisedObject B "2.9.3.2.7.48" "userObject(48)" ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)" Allomorphs B "2.9.3.2.7.50" "allomorphs(50)" BackUpDestinationList B "2.9.3.2.7.51" "backUpDestinationList(51)" @@ -162,38 +162,38 @@ StartTime B "2.9.3.2.7.68" "startTime(68)" StopTime B "2.9.3.2.7.69" "stopTime(69)" SupportedFeatures B "2.9.3.2.7.70" "supportedFeatures(70)" WeekMask B "2.9.3.2.7.71" "weekMask(71)" -# corruptedPDUsReceivedCounter(72) -- corruptedPDUsReceivedCounter attribute type -# incomingConnectionRejectErrorCounter(73) -- incomingConnectionRejectErrorCounte... -# incomingConnectionRequestsCounter(74) -- incomingConnectionRequestsCounter attr... -# incomingDisconnectCounter(75) -- incomingDisconnectCounter attribute type -# ncomingDisconnectErrorCounter(76) -- ncomingDisconnectErrorCounter attribute ty... -# incomingProtocolErrorCounter(77) -- incomingProtocolErrorCounter attribute type -# octetsReceivedCounter(78) -- octetsReceivedCounter attribute type -# octetsRetransmittedErrorCounter(79) -- octetsRetransmittedErrorCounter attribut... -# octetsSentCounter(80) -- octetsSentCounter attribute type -# outgoingConnectionRejectErrorCounter(81) -- outgoingConnectionRejectErrorCounte... -# outgoingConnectionRequestsCounter(82) -- outgoingConnectionRequestsCounter attr... -# outgoingDisconnectCounter(83) -- outgoingDisconnectCounter attribute type -# outgoingDisconnectErrorCounter(84) -- outgoingDisconnectErrorCounter attribute ... -# outgoingProtocolErrorCounter(85) -- outgoingProtocolErrorCounter attribute type -# pdusReceivedCounter(86) -- pdusReceivedCounter attribute type (PDU: Protocol Da... -# pdusRetransmittedErrorCounter(87) -- pdusRetransmittedErrorCounter attribute ty... -# pdusSentCounter(88) -- pdusSentCounter attribute type (PDU: Protocol Data Unit) -# corruptedPDUsReceivedThreshold(89) -- corruptedPDUsReceivedThreshold attribute ... -# incomingConnectionRejectErrorThreshold(90) -- incomingConnectionRejectErrorThre... -# incomingConnectionRequestsThreshold(91) -- incomingConnectionRequestsThreshold ... -# incomingDisconnectErrorThreshold(92) -- incomingDisconnectErrorThreshold attrib... -# incomingProtocolErrorThreshold(93) -- incomingProtocolErrorThreshold attribute ... -# octetsReceivedThreshold(94) -- octetsReceivedThreshold attribute type -# octetsRetransmittedThreshold(95) -- octetsRetransmittedThreshold attribute type -# octetsSentThreshold(96) -- octetsSentThreshold attribute type -# outgoingConnectionRejectErrorThreshold(97) -- outgoingConnectionRejectErrorThre... -# outgoingConnectionRequestsThreshold(98) -- outgoingConnectionRequestsThreshold ... -# outgoingDisconnectErrorThreshold(99) -- outgoingDisconnectErrorThreshold attrib... -# outgoingProtocolErrorThreshold(100) -- outgoingProtocolErrorThreshold attribute... -# pdusReceivedThreshold(101) -- pdusReceivedThreshold attribute type (PDU: Protoc... -# pdusRetransmittedErrorThreshold(102) -- pdusRetransmittedErrorThreshold attribu... -# pdusSentThreshold(103) -- pdusSentThreshold attribute type (PDU: Protocol Data ... +# corruptedPDUsReceivedCounter(72) -- corruptedPDUsReceivedCounter attribute type +# incomingConnectionRejectErrorCounter(73) -- incomingConnectionRejectErrorCounte... +# incomingConnectionRequestsCounter(74) -- incomingConnectionRequestsCounter attr... +# incomingDisconnectCounter(75) -- incomingDisconnectCounter attribute type +# ncomingDisconnectErrorCounter(76) -- ncomingDisconnectErrorCounter attribute ty... +# incomingProtocolErrorCounter(77) -- incomingProtocolErrorCounter attribute type +# octetsReceivedCounter(78) -- octetsReceivedCounter attribute type +# octetsRetransmittedErrorCounter(79) -- octetsRetransmittedErrorCounter attribut... +# octetsSentCounter(80) -- octetsSentCounter attribute type +# outgoingConnectionRejectErrorCounter(81) -- outgoingConnectionRejectErrorCounte... +# outgoingConnectionRequestsCounter(82) -- outgoingConnectionRequestsCounter attr... +# outgoingDisconnectCounter(83) -- outgoingDisconnectCounter attribute type +# outgoingDisconnectErrorCounter(84) -- outgoingDisconnectErrorCounter attribute ... +# outgoingProtocolErrorCounter(85) -- outgoingProtocolErrorCounter attribute type +# pdusReceivedCounter(86) -- pdusReceivedCounter attribute type (PDU: Protocol Da... +# pdusRetransmittedErrorCounter(87) -- pdusRetransmittedErrorCounter attribute ty... +# pdusSentCounter(88) -- pdusSentCounter attribute type (PDU: Protocol Data Unit) +# corruptedPDUsReceivedThreshold(89) -- corruptedPDUsReceivedThreshold attribute ... +# incomingConnectionRejectErrorThreshold(90) -- incomingConnectionRejectErrorThre... +# incomingConnectionRequestsThreshold(91) -- incomingConnectionRequestsThreshold ... +# incomingDisconnectErrorThreshold(92) -- incomingDisconnectErrorThreshold attrib... +# incomingProtocolErrorThreshold(93) -- incomingProtocolErrorThreshold attribute ... +# octetsReceivedThreshold(94) -- octetsReceivedThreshold attribute type +# octetsRetransmittedThreshold(95) -- octetsRetransmittedThreshold attribute type +# octetsSentThreshold(96) -- octetsSentThreshold attribute type +# outgoingConnectionRejectErrorThreshold(97) -- outgoingConnectionRejectErrorThre... +# outgoingConnectionRequestsThreshold(98) -- outgoingConnectionRequestsThreshold ... +# outgoingDisconnectErrorThreshold(99) -- outgoingDisconnectErrorThreshold attrib... +# outgoingProtocolErrorThreshold(100) -- outgoingProtocolErrorThreshold attribute... +# pdusReceivedThreshold(101) -- pdusReceivedThreshold attribute type (PDU: Protoc... +# pdusRetransmittedErrorThreshold(102) -- pdusRetransmittedErrorThreshold attribu... +# pdusSentThreshold(103) -- pdusSentThreshold attribute type (PDU: Protocol Data ... LifecycleState B "2.9.3.2.7.115" "lifecycleState(115)" @@ -319,7 +319,7 @@ RejectProblem offset = dissect_cmip_InvokeIDType(FALSE, tvb, offset, actx, tree, -1); break; } - + #.FN_BODY ReturnResult/result/result @@ -354,7 +354,7 @@ RejectProblem break; /* doe this one return any data? */ } /*XXX add more types here */ - + #.FN_BODY ReturnError/parameter switch(opcode){ @@ -373,23 +373,23 @@ RejectProblem case 15: /* invalidArgumentValue */ dissect_cmip_InvalidArgumentValue(FALSE, tvb, offset, actx, tree, -1); break; - case 6: /* invalidAttributeValue */ + case 6: /* invalidAttributeValue */ dissect_cmip_Attribute(FALSE, tvb, offset, actx, tree, -1); break; - case 4: /* invalidFilter */ + case 4: /* invalidFilter */ dissect_cmip_CMISFilter(FALSE, tvb, offset, actx, tree, -1); break; case 17: /* invalidObjectInstance */ dissect_cmip_ObjectInstance(FALSE, tvb, offset, actx, tree, -1); break; - case 16: /* invalidScope */ + case 16: /* invalidScope */ dissect_cmip_Scope(FALSE, tvb, offset, actx, tree, -1); break; case 18: /* missingAttributeValue */ /* Hmmm SET OF AttributeId */ dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1); break; - case 9: /* noSuchAction */ + case 9: /* noSuchAction */ dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1); break; case 14: /* noSuchArgument */ @@ -455,7 +455,7 @@ RejectProblem } else { offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree); } - + #.FN_PARS SpecificErrorInfo/errorId FN_VARIANT = _str HF_INDEX = hf_cmip_errorId_OID VAL_PTR = &object_identifier_id diff --git a/asn1/cmp/cmp.cnf b/asn1/cmp/cmp.cnf index 744232ee85..3c9b7f804a 100644 --- a/asn1/cmp/cmp.cnf +++ b/asn1/cmp/cmp.cnf @@ -5,7 +5,7 @@ PKIX1Explicit88 pkix1explicit PKIX1Implicit88 pkix1implicit PKIXCRMF-2005 crmf - + #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf #.IMPORT ../crmf/crmf-exp.cnf diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 644195fd80..6bbdf60e63 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -144,7 +144,7 @@ RevocationInfoChoice/other otherRIC int old_offset = offset; %(DEFAULT_BODY)s - + pi = actx->created_item; /* move past TLV */ diff --git a/asn1/credssp/credssp.cnf b/asn1/credssp/credssp.cnf index 720fb85dc8..26b1d57df0 100644 --- a/asn1/credssp/credssp.cnf +++ b/asn1/credssp/credssp.cnf @@ -25,7 +25,7 @@ TSRequest %(DEFAULT_BODY)s - if((decr_tvb != NULL) && + if((decr_tvb != NULL) && ((creds_type == TS_PASSWORD_CREDS) || (creds_type == TS_SMARTCARD_CREDS))) { switch(creds_type) { @@ -47,7 +47,7 @@ TSRequest %(DEFAULT_BODY)s if(token_tvb != NULL) - dissector_try_heuristic(credssp_heur_subdissector_list, + dissector_try_heuristic(credssp_heur_subdissector_list, token_tvb, actx->pinfo, proto_tree_get_root(tree), NULL); diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index d7812b9e47..abfd986275 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -92,15 +92,15 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - /* Look for SEQUENCE, CONTEXT 0, and INTEGER 2 */ + /* Look for SEQUENCE, CONTEXT 0, and INTEGER 2 */ if(tvb_length(tvb) > 7) { - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_SEQUENCE) && (pc == TRUE)) { offset = get_ber_length(tvb, offset, NULL, NULL); - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_CON) && (tag == 0)) { offset = get_ber_length(tvb, offset, NULL, NULL); - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_INTEGER)) { offset = get_ber_length(tvb, offset, &length, NULL); if((length == 1) && (tvb_get_guint8(tvb, offset) == 2)) { @@ -111,7 +111,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, (EXP_PDU_TAG_IP_SRC_BIT | EXP_PDU_TAG_IP_DST_BIT | EXP_PDU_TAG_SRC_PORT_BIT | EXP_PDU_TAG_DST_PORT_BIT | EXP_PDU_TAG_ORIG_FNO_BIT)); - exp_pdu_data->tvb_length = tvb_length(tvb); + exp_pdu_data->tvb_length = tvb_length(tvb); exp_pdu_data->pdu_tvb = tvb; tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data); diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf index 92dc3e9ddd..42e6563f85 100644 --- a/asn1/crmf/crmf.cnf +++ b/asn1/crmf/crmf.cnf @@ -5,7 +5,7 @@ PKIX1Explicit88 pkix1explicit PKIX1Implicit88 pkix1implicit CryptographicMessageSyntax2004 cms - + #.IMPORT ../cms/cms-exp.cnf #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf diff --git a/asn1/dsp/packet-dsp-template.h b/asn1/dsp/packet-dsp-template.h index 225911d036..436cc1db8d 100644 --- a/asn1/dsp/packet-dsp-template.h +++ b/asn1/dsp/packet-dsp-template.h @@ -24,6 +24,6 @@ #ifndef PACKET_DSP_H #define PACKET_DSP_H -#include "packet-dsp-exp.h" +#include "packet-dsp-exp.h" #endif /* PACKET_DSP_H */ diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index 5a6e605cf4..85d040dad1 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -56,46 +56,46 @@ FreeFormField/bitSetAttributes informativeAttributeFlags #.FN_PARS PermissiveTag/tagName FN_VARIANT = _str VAL_PTR = &object_identifier_id - + #.FN_PARS InformativeTag/tagName FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_PARS SecurityAttribute VAL_PTR = &attribute - + #.FN_BODY SecurityAttribute guint32 attribute; - + %(DEFAULT_BODY)s ess_dissect_attribute (attribute, actx); - + #.FN_PARS RestrictiveTag/attributeFlags VAL_PTR = &attributes - + #.FN_BODY RestrictiveTag/attributeFlags tvbuff_t *attributes; - + %(DEFAULT_BODY)s ess_dissect_attribute_flags (attributes, actx); - + #.FN_PARS PermissiveTag/attributeFlags VAL_PTR = &attributes - + #.FN_BODY PermissiveTag/attributeFlags tvbuff_t *attributes; - + %(DEFAULT_BODY)s ess_dissect_attribute_flags (attributes, actx); - + #.FN_PARS FreeFormField/bitSetAttributes VAL_PTR = &attributes - + #.FN_BODY FreeFormField/bitSetAttributes tvbuff_t *attributes; - + %(DEFAULT_BODY)s ess_dissect_attribute_flags (attributes, actx); - + #.FN_BODY Receipt col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "ESS"); col_set_str(actx->pinfo->cinfo, COL_INFO, "Signed Receipt"); diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index bda3d14d36..f3282b5036 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -91,7 +91,7 @@ Legal-Qualification-Attribute/actual-values actual_values9 gint branch_taken; %(DEFAULT_BODY)s - + if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr); } diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 2eba9ff402..3c34b69f2b 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -67,7 +67,7 @@ static gint ett_ftam = -1; static void dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); } /* @@ -76,7 +76,7 @@ dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static void dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_NA); } /* diff --git a/asn1/gnm/gnm.cnf b/asn1/gnm/gnm.cnf index fe485c07ca..4694d8df42 100644 --- a/asn1/gnm/gnm.cnf +++ b/asn1/gnm/gnm.cnf @@ -81,7 +81,7 @@ ListOfCharacteristicInformation B "0.0.13.3100.0.7.26" "listOfCharacteristicInfo Replaceable B "0.0.13.3100.0.7.27" "locationName(27)" NameType B "0.0.13.3100.0.7.28" "managedElementId(28)" NameType B "0.0.13.3100.0.7.29" "mpCrossConnectionId(29)" - + NameType B "0.0.13.3100.0.7.30" "networkId(30)" #ObjectInstance B "0.0.13.3100.0.7.31" "networkLevelPointer(31)" Boolean B "0.0.13.3100.0.7.32" "protected(32)" diff --git a/asn1/gprscdr/gprscdr.cnf b/asn1/gprscdr/gprscdr.cnf index 20046f5c1f..4166d69882 100644 --- a/asn1/gprscdr/gprscdr.cnf +++ b/asn1/gprscdr/gprscdr.cnf @@ -52,7 +52,7 @@ GPRSRecord #.FN_BODY ManagementExtension/information proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); - + #.FN_BODY TimeStamp VAL_PTR = ¶meter_tvb /* * @@ -74,7 +74,7 @@ GPRSRecord */ tvbuff_t *parameter_tvb; - + %(DEFAULT_BODY)s if (!parameter_tvb) @@ -91,7 +91,7 @@ GPRSRecord tvb_get_guint8(parameter_tvb,7), /* Hour */ tvb_get_guint8(parameter_tvb,8) /* Minute */ ); - + #.FN_BODY MSTimeZone VAL_PTR = ¶meter_tvb /* * @@ -111,14 +111,14 @@ GPRSRecord data = (data >> 4) + (data & 0x07) * 10; data2 = tvb_get_guint8(tvb, 1) & 0x3; - - proto_item_append_text(actx->created_item, " (GMT %%c %%d hours %%d minutes %%s)", - sign, - data / 4, + + proto_item_append_text(actx->created_item, " (GMT %%c %%d hours %%d minutes %%s)", + sign, + data / 4, data %% 4 * 15, val_to_str_const(data2, gprscdr_daylight_saving_time_vals, "Unknown") ); - + #.FN_BODY PLMN-Id VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -127,11 +127,11 @@ GPRSRecord if (!parameter_tvb) return offset; - - subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id); + + subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id); dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, TRUE); - + #.TYPE_ATTR -IPBinaryAddress/iPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE -IPBinaryAddress/iPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE +IPBinaryAddress/iPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE +IPBinaryAddress/iPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE #.END diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index 7c768c6776..5cda5a8b8d 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -1,4 +1,4 @@ -#.OPT +#.OPT -b #-d satcom #-s packet-gsm_map-tmp @@ -863,7 +863,7 @@ if (!actx->value_ptr) # APN ::= OCTET STRING (SIZE (2..63)) -# Octets are coded according to TS 3GPP TS 23.003 +# Octets are coded according to TS 3GPP TS 23.003 # 9.1 Structure of APN # : # The APN consists of one or more labels. Each label is coded as a one octet length field followed by that number of diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index fea78e0760..342d9808ec 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -1184,7 +1184,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_gsm_map_om_DeactivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1); break; /* reserved traceSubscriberActivity (52) */ - + case 53: /* UpdateVcsgLocation 53 */ offset=dissect_gsm_map_ms_UpdateVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1); break; @@ -2636,7 +2636,7 @@ void proto_reg_handoff_gsm_map(void) { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); } - + ssn_range = range_copy(global_ssn_range); range_foreach(ssn_range, range_add_callback); diff --git a/asn1/h225/packet-h225-template.h b/asn1/h225/packet-h225-template.h index 676dca539c..9166603cce 100644 --- a/asn1/h225/packet-h225-template.h +++ b/asn1/h225/packet-h225-template.h @@ -70,14 +70,14 @@ typedef struct _h225_packet_info { /* * the following allows TAP code access to the messages - * without having to duplicate it. With MSVC and a + * without having to duplicate it. With MSVC and a * libwireshark.dll, we need a special declaration. */ #include <epan/asn1.h> #include <epan/dissectors/packet-per.h> -#include "packet-h225-exp.h" +#include "packet-h225-exp.h" #endif /* PACKET_H225_H */ diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index 8bddbaa9af..15b3a6c1b0 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -138,7 +138,7 @@ void proto_reg_handoff_h235(void) { dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DH_SIGN "/nonCollapsing/75", mikey_handle); /* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */ - dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw", + dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw", new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235)); } diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index caf711c66d..bb8dc7ff8d 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -38,7 +38,7 @@ AudioCapability TYPE_PREFIX G723AnnexCAudioMode G7231AnnexCCapability/g723AnnexCAudioMode G7231AnnexCMode/g723AnnexCAudioMode Application DataApplicationCapability/application Nlpid Application/nlpid DataMode/application/nlpid -Al3 H223LogicalChannelParameters/adaptationLayerType/al3 H223ModeParameters/adaptationLayerType/al3 +Al3 H223LogicalChannelParameters/adaptationLayerType/al3 H223ModeParameters/adaptationLayerType/al3 ArqType H223AL1MParameters/arqType H223AL3MParameters/arqType Restriction FlowControlCommand/restriction FlowControlIndication/restriction Scope FlowControlCommand/scope FlowControlIndication/scope JitterIndication/scope @@ -148,8 +148,8 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format if (fast_start) { h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc); } else { - g_hash_table_insert(h245_pending_olc_reqs, - wmem_strdup(wmem_file_scope(), gen_olc_key(upcoming_olc->fwd_lc_num, &%(ACTX)s->pinfo->dst, &%(ACTX)s->pinfo->src)), + g_hash_table_insert(h245_pending_olc_reqs, + wmem_strdup(wmem_file_scope(), gen_olc_key(upcoming_olc->fwd_lc_num, &%(ACTX)s->pinfo->dst, &%(ACTX)s->pinfo->src)), upcoming_olc); } } @@ -195,7 +195,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format upcoming_channel = (upcoming_olc) ? &upcoming_olc->rev_lc : NULL; %(DEFAULT_BODY)s - + if (upcoming_channel && codec_type) { g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } @@ -225,12 +225,12 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format h223_fw_lc_num = 0; h223_rev_lc_num = 0; - + %(DEFAULT_BODY)s temp = h223_fw_lc_num; p2p_dir = %(ACTX)s->pinfo->p2p_dir; - + if(%(ACTX)s->pinfo->p2p_dir == P2P_DIR_SENT) %(ACTX)s->pinfo->p2p_dir = P2P_DIR_RECV; else @@ -280,7 +280,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format upcoming_channel = (upcoming_olc) ? &upcoming_olc->fwd_lc : NULL; %(DEFAULT_BODY)s - + upcoming_channel = NULL; #.END #---------------------------------------------------------------------------------------- @@ -611,7 +611,7 @@ if (h245_pi != NULL) gefx = gef_ctx_alloc(NULL, "GenericMessage"); actx->private_data = gefx; } -#.FN_FTR +#.FN_FTR actx->private_data = priv_data; #.END @@ -628,7 +628,7 @@ if (h245_pi != NULL) hf_index = hf_h245_subMessageIdentifier_standard; } } - + %(DEFAULT_BODY)s if (gefx) { gefx->subid = wmem_strdup_printf(wmem_packet_scope(), "%%u", subMessageIdentifer); @@ -655,7 +655,7 @@ if (h245_pi != NULL) #.FN_HDR GenericInformation void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "GenericInformation"); -#.FN_FTR +#.FN_FTR actx->private_data = priv_data; #.END @@ -681,7 +681,7 @@ if (h245_pi != NULL) parent_gefx = gef_ctx_get(actx->private_data); actx->private_data = gef_ctx_alloc(parent_gefx, "nonCollapsing"); -#.FN_FTR +#.FN_FTR actx->private_data = parent_gefx; #.END @@ -705,7 +705,7 @@ if (h245_pi != NULL) #.FN_HDR EncryptionSync void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "EncryptionSync"); -#.FN_FTR +#.FN_FTR actx->private_data = priv_data; #.END #---------------------------------------------------------------------------------------- @@ -969,7 +969,7 @@ NonStandardIdentifier/object FN_VARIANT = _str VAL_PTR = &nsiOID #.FN_FTR NonStandardIdentifier/h221NonStandard h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); -#.FN_PARS +#.FN_PARS NonStandardIdentifier/h221NonStandard/t35CountryCode VAL_PTR = &t35CountryCode NonStandardIdentifier/h221NonStandard/t35Extension VAL_PTR = &t35Extension NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode @@ -1061,7 +1061,7 @@ FunctionNotSupported/cause FunctionNotSupportedCause AudioMode/g7231 Mode_g7231 DataMode/application DataModeApplication -DataMode/application/t38fax T38faxApp +DataMode/application/t38fax T38faxApp DepFECData/rfc2733 RFC2733Data @@ -1222,7 +1222,7 @@ H262VideoMode/profileAndLevel/profileAndLevel-SpatialatH-14 profileAndLevel_Spat H262VideoMode/profileAndLevel/profileAndLevel-HPatML profileAndLevel_HPatMLMode H262VideoMode/profileAndLevel/profileAndLevel-HPatH-14 profileAndLevel_HPatH-14Mode H262VideoMode/profileAndLevel/profileAndLevel-HPatHL profileAndLevel_HPatHLMode - + RedundancyEncodingMode/secondaryEncoding/audioData audioMode RedundancyEncodingMode/secondaryEncoding secondaryEncodingMode RedundancyEncodingCapability/secondaryEncoding secondaryEncodingCapability @@ -1231,7 +1231,7 @@ UnicastAddress/iPAddress/network ip4_network UnicastAddress/iP6Address/network ip6_network MulticastAddress/iP6Address/network mip6_network MulticastAddress/iPAddress mIPAddress -MulticastAddress/iP6Address mIP6Address +MulticastAddress/iP6Address mIP6Address MulticastAddress/iPAddress/network mip4_network RTPPayloadType/payloadType rtpPayloadType @@ -1260,36 +1260,36 @@ VCCapability/aal1/srtsClockRecovery srtsClockRecovery_bool VCCapability/aal1ViaGateway/srtsClockRecovery srtsClockRecoveryflag DataMode/application/t84 t84DataProtocolCapability DataMode/application/t38fax t38faxDataProtocolCapability -H2250LogicalChannelParameters/sessionID sessionID_0_255 +H2250LogicalChannelParameters/sessionID sessionID_0_255 H223Capability/mobileOperationTransmitCapability/h223AnnexADoubleFlag h223AnnexADoubleFlagFlag SendTerminalCapabilitySet/genericRequest genericRequestFlag H2250LogicalChannelParameters/mediaPacketization/h261aVideoPacketization h261aVideoPacketizationFlag RemoteMCResponse/reject/functionNotSupported functionNotSupportedFlag -NewATMVCCommand/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag +NewATMVCCommand/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag NewATMVCIndication/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag MiscellaneousCommand/type/videoFastUpdateMB/firstGOB firstGOB_0_255 -H263VideoCapability/sqcifMPI sqcifMPI_1_32 +H263VideoCapability/sqcifMPI sqcifMPI_1_32 EnhancementOptions/sqcifMPI sqcifMPI_1_32 NewATMVCCommand/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag NewATMVCIndication/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag -NewATMVCCommand/multiplex/programStream programStreamFlag +NewATMVCCommand/multiplex/programStream programStreamFlag NewATMVCCommand/reverseParameters/multiplex/programStream programStreamFlag NewATMVCIndication/multiplex/programStream programStreamFlag NewATMVCIndication/reverseParameters/multiplex/programStream programStreamFlag H263ModeComboFlags/enhancedReferencePicSelect enhancedReferencePicSelectBool -NewATMVCCommand/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag +NewATMVCCommand/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag NewATMVCIndication/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag UserInputCapability/extendedAlphanumeric extendedAlphanumericFlag MultiplexElement/repeatCount/finite me_repeatCount_finite MiscellaneousCommand/type/videoFastUpdateMB/firstMB firstMB_1_8192 MiscellaneousIndication/type/videoNotDecodedMBs/firstMB firstMB_1_8192 H261VideoCapability/cifMPI cifMPI_1_4 -CustomPictureClockFrequency/cifMPI cifMPI2_1_2048 +CustomPictureClockFrequency/cifMPI cifMPI2_1_2048 H263VideoCapability/cif16MPI cif16MPI_1_32 EnhancementOptions/cif16MPI cif16MPI_1_32 H263VideoCapability/cif4MPI cif4MPI_1_32 EnhancementOptions/cif4MPI cif4MPI_1_32 -H263Version3Options/pictureNumber pictureNumberBoolean +H263Version3Options/pictureNumber pictureNumberBoolean MiscellaneousCommand/type/videoBadMBs/numberOfMBs numberOfMBs1_1_9216 MiscellaneousCommand/type/lostPartialPicture/numberOfMBs numberOfMBs1_1_9216 DataApplicationCapability/maxBitRate maxBitRate2_0_4294967295 @@ -1297,18 +1297,18 @@ GenericCapability/maxBitRate maxBitRate2_0_4294967295 H261VideoCapability/maxBitRate maxBitRate_1_19200 IS13818AudioCapability/bitRate bitRate2_1_1130 IS13818AudioMode/bitRate bitRate2_1_1130 -IS11172AudioCapability/bitRate bitRate_1_448 +IS11172AudioCapability/bitRate bitRate_1_448 IS11172AudioMode/bitRate bitRate_1_448 DataMode/bitRate bitRate_0_4294967295 H223Capability/bitRate bitRate_1_19200 H261VideoMode/bitRate bitRate_1_19200 H263VideoMode/bitRate bitRate_1_19200 DialingInformationNumber/networkAddress networkAddressNum -NewATMVCCommand/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag +NewATMVCCommand/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag NewATMVCIndication/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag -NewATMVCCommand/aal/aal1/clockRecovery/nullClockRecovery nullClockRecoveryflag +NewATMVCCommand/aal/aal1/clockRecovery/nullClockRecovery nullClockRecoveryflag NewATMVCIndication/aal/aal1/clockRecovery/nullClockRecovery nullClockRecoveryflag -NewATMVCCommand/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag +NewATMVCCommand/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag NewATMVCIndication/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag H223AL2MParameters/headerFEC aL2HeaderFEC H223AL1MParameters/headerFEC aL1HeaderFEC @@ -1367,8 +1367,8 @@ VBDCapability/type vbd_cap_type OpenLogicalChannelAck/reverseLogicalChannelParameters olc_ack_reverseLogicalChannelParameters H2250LogicalChannelAckParameters/mediaChannel ack_mediaChannel H2250LogicalChannelAckParameters/mediaControlChannel ack_mediaControlChannel -UnicastAddress/iP6Address/tsapIdentifier ipv6_tsapIdentifier -UnicastAddress/iPSourceRouteAddress/tsapIdentifier iPSrcRoute_tsapIdentifier +UnicastAddress/iP6Address/tsapIdentifier ipv6_tsapIdentifier +UnicastAddress/iPSourceRouteAddress/tsapIdentifier iPSrcRoute_tsapIdentifier MulticastAddress/iPAddress/tsapIdentifier multicast_tsapIdentifier MulticastAddress/iP6Address/tsapIdentifier multicast_IPv6_tsapIdentifier CommunicationModeTableEntry/mediaChannel cm_mediaChannel diff --git a/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h index 97f367658e..8042d84a71 100644 --- a/asn1/h245/packet-h245-template.h +++ b/asn1/h245/packet-h245-template.h @@ -34,7 +34,7 @@ typedef enum _h245_msg_type { H245_OpenLogChn, H245_OpenLogChnCnf, H245_OpenLogChnAck, - H245_OpenLogChnRjc, + H245_OpenLogChnRjc, H245_CloseLogChn, H245_CloseLogChnAck, H245_MastSlvDet, diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 7a634f239d..ee1afdb022 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -97,12 +97,12 @@ AuditReplyV1/auditResult audit_result #.FN_FTR Message col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data)); - + if (keep_persistent_data) gcp_analyze_msg(h248_tree, actx->pinfo, h248_tvb, curr_info.msg, &h248_arrel, &ei_h248_errored_command); #.END -#.FN_BODY Message/version VAL_PTR = &h248_version +#.FN_BODY Message/version VAL_PTR = &h248_version %(DEFAULT_BODY)s #.END @@ -119,7 +119,7 @@ AuditReplyV1/auditResult audit_result curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_PENDING, keep_persistent_data); error_code = 0; -#.FN_BODY TransactionReply/transactionId +#.FN_BODY TransactionReply/transactionId guint32 trx_id = 0; offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id); curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REPLY, keep_persistent_data); @@ -299,13 +299,13 @@ AuditReplyV1/auditResult audit_result #.FN_BODY ErrorDescriptor/errorCode offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &error_code); expert_add_info(actx->pinfo, actx->created_item, &ei_h248_errored_command); - + if (curr_info.cmd) { gcp_cmd_set_error(curr_info.cmd,error_code); } else if (curr_info.trx) { gcp_trx_set_error(curr_info.trx,error_code); } - + return offset; #.END @@ -325,13 +325,13 @@ AuditReplyV1/auditResult audit_result wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL; /* limitation: assume only one wildcard is used */ wild_card = tvb_get_guint8(new_tvb,0); - + #.END #.FN_BODY TerminationID/id tvbuff_t* new_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); - + if (new_tvb) { curr_info.term->len = tvb_length(new_tvb); curr_info.term->type = 0; /* unknown */ @@ -345,7 +345,7 @@ AuditReplyV1/auditResult audit_result if (h248_term_handle) { call_dissector_with_data(h248_term_handle, new_tvb, actx->pinfo, tree, &wild_card); - wild_card = 0xFF; + wild_card = 0xFF; } } else { curr_info.term->len = 0; @@ -356,14 +356,14 @@ AuditReplyV1/auditResult audit_result #.FN_BODY SCreasonValue /* H248 v1 support */ - if ( h248_version > 1 ) { + if ( h248_version > 1 ) { /* Not V1, so call "standard" function */ -%(DEFAULT_BODY)s +%(DEFAULT_BODY)s } else { /* V1 so Value == octet string */ offset = dissect_h248_ValueV1( implicit_tag, tvb, offset, actx, tree, hf_index); }; - + #.END #.FN_BODY SCreasonValueOctetStr VAL_PTR = ¶meter_tvb @@ -391,19 +391,19 @@ AuditReplyV1/auditResult audit_result for( i=0;i<len;i++) { if(!isascii(tvb_get_guint8(tvb, offset+i)) || tvb_get_guint8(tvb, offset+i) == 0) { /* not ascii or NULL character so do string as hex string */ - proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", + proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", (proto_registrar_get_nth(hf_index))->name, tvb_bytes_to_ep_str(tvb, 0, len)); return len; }; }; /* if here, then string is ascii */ - proto_tree_add_text(tree, tvb, offset, len,"%s: %s", + proto_tree_add_text(tree, tvb, offset, len,"%s: %s", (proto_registrar_get_nth(hf_index))->name, tvb_format_text(tvb, 0, len)); } offset = len; - + #.END diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 48782ee59a..d457458668 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -906,7 +906,7 @@ static gboolean is_pkg_default(guint16 pkgid) { void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) { h248_package_t *pkg_found = NULL, *pkg_high = NULL, *pkg_low = NULL; s_h248_package_t *s_pkg = NULL; - value_string *vst; + value_string *vst; gboolean pkg_default = FALSE; gint j = 0, idx = 0, i = 0, k = 0; if (! packages) { @@ -926,7 +926,7 @@ void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) { if (j != -1) { j++; idx=j; while((base_event_name_vals[j].strptr!=NULL) && (((base_event_name_vals[j].value)>>16) == (pkg_found->id))) { - j++; + j++; }; if (idx < j) { vst = (value_string *)wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*(j-idx+1)); @@ -1011,7 +1011,7 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse proto_tree *package_tree=NULL; guint16 name_major, name_minor; const h248_package_t* pkg = NULL; - + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -1613,7 +1613,7 @@ void proto_register_h248(void) { proto_register_subtree_array(ett, array_length(ett)); expert_h248 = expert_register_protocol(proto_h248); expert_register_field_array(expert_h248, ei, array_length(ei)); - + subdissector_table = register_dissector_table("h248.magic_num", "H248 Magic Num", FT_UINT32, BASE_HEX); h248_module = prefs_register_protocol(proto_h248, proto_reg_handoff_h248); diff --git a/asn1/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h index 42dda61864..1ce51341d9 100644 --- a/asn1/h248/packet-h248-template.h +++ b/asn1/h248/packet-h248-template.h @@ -60,7 +60,7 @@ typedef struct _h248_pkg_sig_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_sig_t; @@ -68,7 +68,7 @@ typedef struct _h248_pkg_evt_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_evt_t; @@ -76,7 +76,7 @@ typedef struct _h248_pkg_stat_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_stat_t; diff --git a/asn1/h282/h282.cnf b/asn1/h282/h282.cnf index ab4ca3be13..af6654c08f 100644 --- a/asn1/h282/h282.cnf +++ b/asn1/h282/h282.cnf @@ -16,7 +16,7 @@ RDCPDU NonCollapsingCapabilities #.END -#.FN_PARS RequestPDU +#.FN_PARS RequestPDU VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; @@ -27,7 +27,7 @@ NonCollapsingCapabilities col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p); #.END -#.FN_PARS ResponsePDU +#.FN_PARS ResponsePDU VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; @@ -38,7 +38,7 @@ NonCollapsingCapabilities col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p); #.END -#.FN_PARS IndicationPDU +#.FN_PARS IndicationPDU VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; diff --git a/asn1/h283/h283.cnf b/asn1/h283/h283.cnf index 970b59ae5e..f1d5844ea7 100644 --- a/asn1/h283/h283.cnf +++ b/asn1/h283/h283.cnf @@ -11,7 +11,7 @@ ALIGNED LCTPDU #.END -#.FN_PARS LCTPDU/pduType +#.FN_PARS LCTPDU/pduType VAL_PTR = &pdu_type #.FN_HDR gint32 pdu_type = -1; @@ -24,7 +24,7 @@ LCTPDU } #.END -#.FN_PARS RDCData/dataType +#.FN_PARS RDCData/dataType VAL_PTR = &data_type #.FN_HDR gint32 data_type = -1; @@ -37,7 +37,7 @@ LCTPDU } #.END -#.FN_PARS LCTMessage +#.FN_PARS LCTMessage VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; @@ -50,7 +50,7 @@ LCTPDU } #.END -#.FN_PARS LCTRequest +#.FN_PARS LCTRequest VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; @@ -63,7 +63,7 @@ LCTPDU } #.END -#.FN_PARS LCTResponse +#.FN_PARS LCTResponse VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; @@ -76,7 +76,7 @@ LCTPDU } #.END -#.FN_PARS LCTIndication +#.FN_PARS LCTIndication VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c index a601e36896..498f922632 100644 --- a/asn1/h323/packet-h323-template.c +++ b/asn1/h323/packet-h323-template.c @@ -59,13 +59,13 @@ gef_ctx_t* gef_ctx_get(void *ptr) { gef_ctx_t *gefx = (gef_ctx_t*)ptr; asn1_ctx_t *actx = (asn1_ctx_t*)ptr; - if (!asn1_ctx_check_signature(actx)) + if (!asn1_ctx_check_signature(actx)) actx = NULL; if (actx) gefx = (gef_ctx_t *)actx->private_data; - if (!gef_ctx_check_signature(gefx)) + if (!gef_ctx_check_signature(gefx)) gefx = NULL; return gefx; @@ -76,7 +76,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) { if (!gefx) return; parent_key = (gefx->parent) ? gefx->parent->key : NULL; - gefx->key = wmem_strdup_printf(wmem_packet_scope(), + gefx->key = wmem_strdup_printf(wmem_packet_scope(), "%s%s" /* parent prefix */ "%s%s%s" /* type, id */ "%s%s" /* subid */, @@ -119,9 +119,9 @@ void proto_register_h323(void) { /*--- proto_reg_handoff_h323 -------------------------------------------*/ -void proto_reg_handoff_h323(void) +void proto_reg_handoff_h323(void) { - dissector_handle_t q931_handle; + dissector_handle_t q931_handle; q931_handle = find_dissector("q931"); @@ -129,11 +129,11 @@ void proto_reg_handoff_h323(void) dissector_add_string("h225.tp", "1.3.12.9", q931_handle); /* H.323, Annex M4, Tunnelling of narrow-band signalling syntax (NSS) for H.323 */ - dissector_add_string("h225.gef.content", "GenericData/1000/1", + dissector_add_string("h225.gef.content", "GenericData/1000/1", new_create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323)); /* H.323, Annex R, Robustness methods for H.323 entities */ - dissector_add_string("h225.gef.content", "GenericData/1/1", + dissector_add_string("h225.gef.content", "GenericData/1/1", new_create_dissector_handle(dissect_RobustnessData_PDU, proto_h323)); } diff --git a/asn1/h323/packet-h323-template.h b/asn1/h323/packet-h323-template.h index fe98719079..1d2750fb27 100644 --- a/asn1/h323/packet-h323-template.h +++ b/asn1/h323/packet-h323-template.h @@ -31,7 +31,7 @@ typedef struct _gef_ctx_t { guint32 signature; struct _gef_ctx_t *parent; - /* + /* H323-MESSAGES FeatureDescriptor/<id> <id> diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 87e053f5df..1c7c26c22c 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -41,17 +41,17 @@ void proto_reg_handoff_h450_ros(void); /* Initialize the protocol and registered fields */ static int proto_h450_ros = -1; -#include "packet-h450-ros-hf.c" +#include "packet-h450-ros-hf.c" /* Initialize the subtree pointers */ -#include "packet-h450-ros-ett.c" +#include "packet-h450-ros-ett.c" static expert_field ei_ros_undecoded = EI_INIT; /* Preferences */ /* Subdissectors */ -static dissector_handle_t data_handle = NULL; +static dissector_handle_t data_handle = NULL; /* Gloabl variables */ static gint32 problem_val; @@ -73,19 +73,19 @@ error_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_) { err_next_tvb = tvb; } -#include "packet-h450-ros-fn.c" +#include "packet-h450-ros-fn.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { /* List of fields */ static hf_register_info hf[] = { -#include "packet-h450-ros-hfarr.c" +#include "packet-h450-ros-hfarr.c" }; /* List of subtrees */ static gint *ett[] = { -#include "packet-h450-ros-ettarr.c" +#include "packet-h450-ros-ettarr.c" }; static ei_register_info ei[] = { diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index f877ba6eca..caf504eebd 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -1,6 +1,6 @@ # h450.cnf # H.450 conformation file -# Copyright 2004 Anders Broman +# Copyright 2004 Anders Broman #.OPT PER @@ -10,7 +10,7 @@ GROUP_BY_PROT #.END #.IMPORT ../h225/h225-exp.cnf -#.IMPORT ../h450-ros/h450-ros-exp.cnf +#.IMPORT ../h450-ros/h450-ros-exp.cnf #.MODULE @@ -86,11 +86,11 @@ IntResult/extension IntResult_extension #PresentedNumberUnscreened/presentationRestrictedAddress numberUnscreened_presentationRestrictedAddress #PresentedAddressUnscreened/presentationRestrictedAddress addressUnscreened_presentationRestrictedAddress -CTInitiateArg/argumentExtension cTInitiateArg_argumentExtension -CTSetupArg/argumentExtension cTSetupArg_argumentExtension +CTInitiateArg/argumentExtension cTInitiateArg_argumentExtension +CTSetupArg/argumentExtension cTSetupArg_argumentExtension CTUpdateArg/argumentExtension cTUpdateArg_argumentExtension -SubaddressTransferArg/argumentExtension subaddressTransferArg_argumentExtension -CTCompleteArg/argumentExtension cTCompleteArg_argumentExtension +SubaddressTransferArg/argumentExtension subaddressTransferArg_argumentExtension +CTCompleteArg/argumentExtension cTCompleteArg_argumentExtension CTActiveArg/argumentExtension cTActiveArg_argumentExtension MixedExtension/extension mixedExtension_extension PAR-unspecified/extension unspecified_extension @@ -105,21 +105,21 @@ CoReqOptArg/extension coReqOptArg_extension RUAlertOptArg/extension rUAlertOptArg_extension CfbOvrOptArg/extension cfbOvrOptArg_extension CmnArg/extension cmnArg_extension -ARG-activateDiversionQ/extension activateDiversionQArg_extension +ARG-activateDiversionQ/extension activateDiversionQArg_extension ARG-interrogateDiversionQ/extension interrogateDiversionQ_extension -ARG-callRerouting/extension callReroutingArg_extension -ARG-divertingLegInformation4/extension divertingLegInformation4Arg_extension -ARG-divertingLegInformation3/extension divertingLegInformation3Arg_extension -ARG-deactivateDiversionQ/extension deactivateDiversionQArg_extension +ARG-callRerouting/extension callReroutingArg_extension +ARG-divertingLegInformation4/extension divertingLegInformation4Arg_extension +ARG-divertingLegInformation3/extension divertingLegInformation3Arg_extension +ARG-deactivateDiversionQ/extension deactivateDiversionQArg_extension IntResult/extension intResult_extension -MWIActivateArg/extensionArg mWIActivateArg_extensionArg -MWIDeactivateArg/extensionArg mWIDeactivateArg_extensionArg -MWIInterrogateArg/extensionArg mWIInterrogateArg_extensionArg +MWIActivateArg/extensionArg mWIActivateArg_extensionArg +MWIDeactivateArg/extensionArg mWIDeactivateArg_extensionArg +MWIInterrogateArg/extensionArg mWIInterrogateArg_extensionArg MWIInterrogateResElt/extensionArg mWIInterrogateResElt_extensionArg -HoldNotificArg/extensionArg holdNotificArg_extensionArg -RetrieveNotificArg/extensionArg retrieveNotificArg_extensionArg +HoldNotificArg/extensionArg holdNotificArg_extensionArg +RetrieveNotificArg/extensionArg retrieveNotificArg_extensionArg RemoteHoldArg/extensionArg remoteHoldArg_extensionArg RemoteRetrieveArg/extensionArg remoteRetrieveArg_extensionArg @@ -133,7 +133,7 @@ PickExeArg/extensionArg pickExeArg_extensionArg CpNotifyArg/extensionArg cpNotifyArg_extensionArg CpickupNotifyArg/extensionArg cpickupNotifyArg_extensionArg CallWaitingArg/extensionArg callWaitingArg_extensionArg -CIRequestArg/argumentExtension cIRequestArg_argumentExtension +CIRequestArg/argumentExtension cIRequestArg_argumentExtension CIGetCIPLOptArg/argumentExtension cIGetCIPLOptArg_argumentExtension CIIsOptArg/argumentExtension cIIsOptArg_argumentExtension CIFrcRelArg/argumentExtension cIFrcRelArg_argumentExtension diff --git a/asn1/h501/h501.cnf b/asn1/h501/h501.cnf index a880261eb6..6185f92650 100644 --- a/asn1/h501/h501.cnf +++ b/asn1/h501/h501.cnf @@ -14,7 +14,7 @@ ALIGNED Message #.END -#.FN_PARS MessageBody +#.FN_PARS MessageBody VAL_PTR = &msg_type #.FN_HDR gint32 msg_type = -1; diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf index 852c6271c1..aea26a198b 100644 --- a/asn1/hnbap/hnbap.cnf +++ b/asn1/hnbap/hnbap.cnf @@ -52,12 +52,12 @@ AccessResult } #.END -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode -#.FN_FTR ProcedureCode +#.FN_FTR ProcedureCode if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) { col_set_str(actx->pinfo->cinfo, COL_INFO, "Unknown Message"); diff --git a/asn1/idmp/idmp.cnf b/asn1/idmp/idmp.cnf index db679308a6..eb85638e88 100644 --- a/asn1/idmp/idmp.cnf +++ b/asn1/idmp/idmp.cnf @@ -1,10 +1,10 @@ #.IMPORT ../x509ce/x509ce-exp.cnf -#.CLASS OPERATION -&ArgumentType +#.CLASS OPERATION +&ArgumentType &argumentTypeOptional BooleanType -&ResultType +&ResultType &resultTypeOptional BooleanType &Errors _FixedTypeValueSetFieldSpec &errorsOptional BooleanType diff --git a/asn1/ilp/ilp.cnf b/asn1/ilp/ilp.cnf index 5b04ad05ca..cfd6c4abf6 100644 --- a/asn1/ilp/ilp.cnf +++ b/asn1/ilp/ilp.cnf @@ -68,6 +68,6 @@ guint32 IlpMessage; #.TYPE_ATTR -IPAddress/ipv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL -IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL +IPAddress/ipv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL +IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL #.END diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf index 6b6993b162..6b7cbd147a 100644 --- a/asn1/inap/inap.cnf +++ b/asn1/inap/inap.cnf @@ -207,7 +207,7 @@ static const inap_err_t inap_err_tab[] = { #.FN_HDR ExtensionField obj_id = NULL; - + #.FN_PARS Code/global FN_VARIANT = _str VAL_PTR = &obj_id #.FN_BODY ExtensionField/value @@ -217,7 +217,7 @@ static const inap_err_t inap_err_tab[] = { }else{ call_dissector(data_handle, tvb, actx->pinfo, tree); offset = tvb_length_remaining(tvb,offset); - } + } diff --git a/asn1/isdn-sup/isdn-sup.cnf b/asn1/isdn-sup/isdn-sup.cnf index 5fdef4343c..e78d478e2a 100644 --- a/asn1/isdn-sup/isdn-sup.cnf +++ b/asn1/isdn-sup/isdn-sup.cnf @@ -38,7 +38,7 @@ AOCECurrencyInfo/cc AOCECurrencyCc AOCECurrencyInfo/cc/specificCurrency AOCECcSpecificCurrency AOCSCurrencyInfo/chargingtype/specificCurrency AOCSChargingTypeSpecificCurrency RecordedUnits/cc RecoredUnitsCc -#.END +#.END #.FIELD_RENAME AOCDChargingUnitInfo/specificChargingUnits aocdspecificchargingunits @@ -53,7 +53,7 @@ PresentedAddressScreened/presentationRestrictedAddress presentationrestrictedad PresentedNumberScreened/presentationAllowedNumber presentationallowednumberscreened PresentedNumberScreened/presentationRestrictedNumber presentationrestrictednumberscreened RecordedUnits/cc recoredunitscc -#.END +#.END #.TABLE10_BODY OPERATION.#&operationCode.local { %(&operationCode)3s, "%(_name)s" }, diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index 7d14ddf73d..09bf7961e8 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -1,6 +1,6 @@ # kerberos.cnf # kerberos conformation file -# Copyright 2008 Anders Broman +# Copyright 2008 Anders Broman #.FIELD_RENAME #EncryptedData/etype encryptedData_etype @@ -70,7 +70,7 @@ guint32 msgtype; /* append the application type to the tree */ proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x")); - + #.FN_BODY ERROR-CODE VAL_PTR = &krb5_errorcode %(DEFAULT_BODY)s @@ -369,7 +369,7 @@ guint32 msgtype; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); - + #.FN_BODY KDC-REQ-BODY conversation_t *conversation; diff --git a/asn1/kerberos/packet-kerberos-template.h b/asn1/kerberos/packet-kerberos-template.h index 4fd5f3b363..fb86397b95 100644 --- a/asn1/kerberos/packet-kerberos-template.h +++ b/asn1/kerberos/packet-kerberos-template.h @@ -94,7 +94,7 @@ void read_keytab_file_from_preferences(void); #endif /* HAVE_KERBEROS */ -#include "packet-kerberos-exp.h" +#include "packet-kerberos-exp.h" #endif /* __PACKET_KERBEROS_H */ diff --git a/asn1/lcsap/packet-lcsap-template.c b/asn1/lcsap/packet-lcsap-template.c index 6fabe80f75..760810927b 100644 --- a/asn1/lcsap/packet-lcsap-template.c +++ b/asn1/lcsap/packet-lcsap-template.c @@ -105,7 +105,7 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); -/* 7.4.13 Positioning Data +/* 7.4.13 Positioning Data * Coding of positioning method (bits 8-4) */ static const value_string lcsap_pos_method_vals[] = { diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf index 65f41db4b1..cc89328255 100644 --- a/asn1/lpp/lpp.cnf +++ b/asn1/lpp/lpp.cnf @@ -1,6 +1,6 @@ # lpp.cnf # llp conformation file -# Copyright 2011-2013 Pascal Quantin +# Copyright 2011-2013 Pascal Quantin #.OPT PER @@ -23,13 +23,13 @@ GNSS-SystemTime SV-ID ECID-SignalMeasurementInformation CellGlobalIdGERAN -CellGlobalIdEUTRA-AndUTRA +CellGlobalIdEUTRA-AndUTRA OTDOA-ReferenceCellInfo OTDOA-NeighbourCellInfoElement ARFCN-ValueEUTRA Ellipsoid-Point EllipsoidPointWithAltitude -EllipsoidPointWithAltitudeAndUncertaintyEllipsoid +EllipsoidPointWithAltitudeAndUncertaintyEllipsoid NetworkTime GNSS-ID-Bitmap ARFCN-ValueUTRA diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c index 86c7f8f0dc..4e473740ba 100644 --- a/asn1/lpp/packet-lpp-template.c +++ b/asn1/lpp/packet-lpp-template.c @@ -1380,7 +1380,7 @@ void proto_register_lpp(void) { proto_register_field_array(proto_lpp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/asn1/lppa/lppa.cnf b/asn1/lppa/lppa.cnf index 2d508d62aa..11508fbd95 100644 --- a/asn1/lppa/lppa.cnf +++ b/asn1/lppa/lppa.cnf @@ -1,6 +1,6 @@ # lppa.cnf # llpa conformation file -# Copyright 2011 Pascal Quantin +# Copyright 2011 Pascal Quantin #.OPT PER @@ -46,16 +46,16 @@ ProtocolIE-Field/value ie_field_value "unknown message")); #.END -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS InitiatingMessage/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_InitiatingMessageValue #.FN_PARS SuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_SuccessfulOutcomeValue #.FN_PARS UnsuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_UnsuccessfulOutcomeValue - + #.FN_HDR LPPA-PDU - + proto_tree_add_item(tree, proto_lppa, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPa"); diff --git a/asn1/lppe/lppe.cnf b/asn1/lppe/lppe.cnf index 8ad37008b4..16540ae2e2 100644 --- a/asn1/lppe/lppe.cnf +++ b/asn1/lppe/lppe.cnf @@ -1,6 +1,6 @@ # lppe.cnf # llpe conformation file -# Copyright 2012 Pascal Quantin +# Copyright 2012 Pascal Quantin #.OPT PER @@ -14,7 +14,7 @@ OMA-LPPe-MessageExtension #.END #.FN_HDR OMA-LPPe-MessageExtension - + proto_tree_add_item(tree, proto_lppe, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPe"); diff --git a/asn1/lppe/packet-lppe-template.c b/asn1/lppe/packet-lppe-template.c index 1253f8afb0..27c61db1a9 100644 --- a/asn1/lppe/packet-lppe-template.c +++ b/asn1/lppe/packet-lppe-template.c @@ -84,7 +84,7 @@ void proto_register_lppe(void) { proto_register_field_array(proto_lppe, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index b89d7f22bd..f9a1ea44bb 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -668,7 +668,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 TYPE = FT_UINT64 #.FN_FTR SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo); - ts.secs = (time_t)(timeInfo/100)-2208988800U; /* epoch is 00:00:00 (midnight) UTC on 1900-01-01 */ + ts.secs = (time_t)(timeInfo/100)-2208988800U; /* epoch is 00:00:00 (midnight) UTC on 1900-01-01 */ ts.nsecs = (int)(timeInfo%100)*10000000; proto_tree_add_text(subtree, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, "UTC time: %s", abs_time_to_ep_str(&ts, ABSOLUTE_TIME_UTC, FALSE)); @@ -1103,7 +1103,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) } col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); - + #.FN_HDR UECapabilityInformation @@ -1152,7 +1152,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) #.FN_HDR MBMSInterestIndication-r11 col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSInterestIndication-r11"); - + #.FN_BODY Paging/systemInfoModification %(DEFAULT_BODY)s col_append_str(actx->pinfo->cinfo, COL_INFO, " (systemInfoModification)"); @@ -1171,7 +1171,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) /* Show SFN in info column */ sfn = tvb_get_guint8(value_tvb, 0); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (SFN=%%u)", sfn); - + #.FN_BODY SystemInformationBlockType1/systemInfoValueTag VAL_PTR=&value guint32 value; %(DEFAULT_BODY)s diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index eea1eee160..1f64e39ff0 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -228,7 +228,7 @@ ProtocolIE-Field/value ie_field_value col_set_str(actx->pinfo->cinfo, COL_INFO,"Private Message "); #.FN_HDR MCEConfigurationUpdate col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update "); -#.FN_HDR MCEConfigurationUpdateAcknowledge +#.FN_HDR MCEConfigurationUpdateAcknowledge col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Acknowledge "); #.FN_HDR MCEConfigurationUpdateFailure col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Failure "); @@ -281,7 +281,7 @@ id-Time-ofMBMS-DataStop ProtocolIE-ID #M3AP-PROTOCOL-IES MME-MBMS-M3AP-ID N m3ap.ies id-MME-MBMS-M3AP-ID MCE-MBMS-M3AP-ID N m3ap.ies id-MCE-MBMS-M3AP-ID -TMGI N m3ap.ies id-TMGI +TMGI N m3ap.ies id-TMGI MBMS-Session-ID N m3ap.ies id-MBMS-Session-ID MBMS-E-RAB-QoS-Parameters N m3ap.ies id-MBMS-E-RAB-QoS-Parameters MBMS-Session-Duration N m3ap.ies id-MBMS-Session-Duration @@ -301,7 +301,7 @@ Global-MCE-ID N m3ap.ies id-Global-MCE-ID MCEname N m3ap.ies id-MCEname MBMSServiceAreaListItem N m3ap.ies id-MBMSServiceAreaList Absolute-Time-ofMBMS-Data N m3ap.ies id-Time-ofMBMS-DataTransfer -Absolute-Time-ofMBMS-Data N m3ap.ies id-Time-ofMBMS-DataStop +Absolute-Time-ofMBMS-Data N m3ap.ies id-Time-ofMBMS-DataStop #M3AP-ELEMENTARY-PROCEDURE MBMSSessionStartRequest N m3ap.proc.imsg id-mBMSsessionStart @@ -323,13 +323,13 @@ ResetAcknowledge N m3ap.proc.sout id-Reset PrivateMessage N m3ap.proc.imsg id-privateMessage MCEConfigurationUpdate N m3ap.proc.imsg id-mCEConfigurationUpdate -MCEConfigurationUpdateAcknowledge N m3ap.proc.sout id-mCEConfigurationUpdate +MCEConfigurationUpdateAcknowledge N m3ap.proc.sout id-mCEConfigurationUpdate MCEConfigurationUpdateFailure N m3ap.proc.uout id-mCEConfigurationUpdate M3SetupRequest N m3ap.proc.imsg id-m3Setup M3SetupResponse N m3ap.proc.sout id-m3Setup M3SetupFailure N m3ap.proc.uout id-m3Setup -#.TYPE_ATTR +#.TYPE_ATTR BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL #.END diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c index 34b41df149..22a77aa5f2 100644 --- a/asn1/m3ap/packet-m3ap-template.c +++ b/asn1/m3ap/packet-m3ap-template.c @@ -171,7 +171,7 @@ void proto_register_m3ap(void) { m3ap_extension_dissector_table = register_dissector_table("m3ap.extension", "M3AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC); m3ap_proc_imsg_dissector_table = register_dissector_table("m3ap.proc.imsg", "M3AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC); m3ap_proc_sout_dissector_table = register_dissector_table("m3ap.proc.sout", "M3AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC); - m3ap_proc_uout_dissector_table = register_dissector_table("m3ap.proc.uout", "M3AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); + m3ap_proc_uout_dissector_table = register_dissector_table("m3ap.proc.uout", "M3AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); } diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf index 9b2e209fa4..2de0d7dd6a 100644 --- a/asn1/mms/mms.cnf +++ b/asn1/mms/mms.cnf @@ -86,7 +86,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE return offset; } - proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_timeofday_encoding, + proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_timeofday_encoding, tvb, offset, len, "BER Error: malformed TimeOfDay encoding, length must be 4 or 6 bytes"); if(hf_index >= 0) { @@ -108,7 +108,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE if(len != 8) { - proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_utctime_encoding, + proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_utctime_encoding, tvb, offset, len, "BER Error: malformed IEC61850 UTCTime encoding, length must be 8 bytes"); if(hf_index >= 0) { diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 27cc0d0b1f..50c3ff5983 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -66,7 +66,7 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; if (!MPA_LAYER_VALID(&mpa)) return FALSE; - + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "MPEG-%s", version_names[mpa_version(&mpa)]); col_add_fstr(pinfo->cinfo, COL_INFO, diff --git a/asn1/p22/p22.cnf b/asn1/p22/p22.cnf index f66f253739..4d51ee5d8b 100644 --- a/asn1/p22/p22.cnf +++ b/asn1/p22/p22.cnf @@ -3,7 +3,7 @@ #.TYPE_ATTR Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 -# Permitted-Actions-Attribute is exported from FTAM as DISPLAY = BASE_HEX - +# Permitted-Actions-Attribute is exported from FTAM as DISPLAY = BASE_HEX - # but this causes a runtime error. # We override the definition here until we can identify the fix correct fix Permitted-Actions-Attribute TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 @@ -220,9 +220,9 @@ IpnSecurityResponse B "2.6.1.18.1" "id-sec-security-common-fields" const char *name = NULL; %(DEFAULT_BODY)s - + name = oid_resolved_from_string(actx->external.direct_reference); - proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); + proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); #.FN_BODY IPMSExtension/value diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c index 3834ca59e7..f9204b3906 100644 --- a/asn1/p22/packet-p22-template.c +++ b/asn1/p22/packet-p22-template.c @@ -138,7 +138,7 @@ void proto_register_p22(void) { /*--- proto_reg_handoff_p22 --- */ void proto_reg_handoff_p22(void) { -#include "packet-p22-dis-tab.c" +#include "packet-p22-dis-tab.c" register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); diff --git a/asn1/p772/packet-p772-template.c b/asn1/p772/packet-p772-template.c index 7d1972f519..45b517dbda 100644 --- a/asn1/p772/packet-p772-template.c +++ b/asn1/p772/packet-p772-template.c @@ -32,8 +32,8 @@ #include "packet-x509if.h" #include "packet-p772.h" -#include "packet-p1.h" -#include "packet-p22.h" +#include "packet-p1.h" +#include "packet-p22.h" #define PNAME "STANAG 4406 Message" #define PSNAME "P772" @@ -105,7 +105,7 @@ void proto_register_p772(void) { proto_register_field_array(proto_p772, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); + register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); register_ber_oid_syntax(".p772", NULL, "STANAG 4406"); } diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index 70d9552f76..d29a6f7e31 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -72,7 +72,7 @@ ProtocolIE-Field/value ie_field_value -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue @@ -216,7 +216,7 @@ id-GANSS-CommonAssistanceData ProtocolIE-ID id-GANSS-GenericAssistanceDataList ProtocolIE-ID id-GANSS-MeasuredResultsList ProtocolIE-ID id-GANSS-UTRAN-TRU ProtocolIE-ID -id-GANSSPositioning ProtocolIE-ID +id-GANSSPositioning ProtocolIE-ID id-GANSS-PositioningDataSet ProtocolIE-ID id-GNSS-PositioningMethod ProtocolIE-ID id-NetworkAssistedGANSSSuport ProtocolIE-ID diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index fc5b14ebb5..e8d008f998 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -21,7 +21,7 @@ SafeContents B "1.2.840.113549.1.12.10.1.6" "safeContentsBag" # PKCS#9 Attributes - see master list in x509sat.cnf PFX B "2.16.840.1.113730.3.1.216" "pkcs-9-at-PKCS12" -EncryptedPrivateKeyInfo B "1.2.840.113549.1.9.25.2" "pkcs-9-at-encryptedPrivateKeyInfo" +EncryptedPrivateKeyInfo B "1.2.840.113549.1.9.25.2" "pkcs-9-at-encryptedPrivateKeyInfo" # Password Based Encryption PBEParameter B "1.2.840.113549.1.12.1.1" "pbeWithSHAAnd128BitRC4" @@ -104,11 +104,11 @@ PrivateKeyInfo append_oid(tree, object_identifier_id); #.END -#.FN_BODY SafeBag/bagValue +#.FN_BODY SafeBag/bagValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); -#.FN_BODY PKCS12Attribute/attrValues/_item +#.FN_BODY PKCS12Attribute/attrValues/_item if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -123,7 +123,7 @@ PrivateKeyInfo #.FN_BODY SecretBag/secretValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); - + #.FN_HDR PBEParameter /* initialise the encryption parameters */ PBE_reset_parameters(); @@ -138,21 +138,21 @@ PrivateKeyInfo #.FN_HDR EncryptedData tvbuff_t *encrypted_tvb; dissector_handle_t dissector_handle; - + #.END #.FN_FTR EncryptedData - + dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_change_string("ber.oid", object_identifier_id, dissector_handle); - + PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); - + /* restore the original dissector */ dissector_reset_string("ber.oid", object_identifier_id); - + #.END diff --git a/asn1/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf index ca467be5d1..5d14dce5ea 100644 --- a/asn1/pkix1explicit/pkix1explicit.cnf +++ b/asn1/pkix1explicit/pkix1explicit.cnf @@ -60,7 +60,7 @@ ASIdentifiers B "1.3.6.1.5.5.7.1.8" "id-pe-autonomousSysIds" offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); -# IPAddrAndASCertExtn +# IPAddrAndASCertExtn #.FN_BODY IPAddressFamily/addressFamily VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; diff --git a/asn1/pkixac/packet-pkixac-template.c b/asn1/pkixac/packet-pkixac-template.c index 1eda5319cc..52d03f8825 100644 --- a/asn1/pkixac/packet-pkixac-template.c +++ b/asn1/pkixac/packet-pkixac-template.c @@ -1,7 +1,7 @@ /* packet-pkixac.c * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. - * + * * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * * Wireshark - Network traffic analyzer diff --git a/asn1/pkixac/packet-pkixac-template.h b/asn1/pkixac/packet-pkixac-template.h index 8453aa8a35..a78793cdfc 100644 --- a/asn1/pkixac/packet-pkixac-template.h +++ b/asn1/pkixac/packet-pkixac-template.h @@ -1,7 +1,7 @@ /* packet-pkixac.h * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. - * + * * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * * Wireshark - Network traffic analyzer diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index efdd0439d4..f0f3cac3fa 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -13,7 +13,7 @@ UDC-type #.TYPE_RENAME CPA-PPDU/normal-mode-parameters T_CPA_PPDU_normal_mode_parameters -CPR-PPDU/normal-mode-parameters T_CPR_PPDU_normal_mode_parameters +CPR-PPDU/normal-mode-parameters T_CPR_PPDU_normal_mode_parameters ARU-PPDU/normal-mode-parameters T_ARU_PPDU_normal_mode_parameters #.FIELD_RENAME @@ -34,7 +34,7 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason #.FN_BODY PDV-list/presentation-data-values/single-ASN1-type tvbuff_t *next_tvb; - char *oid; + char *oid; oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ @@ -48,7 +48,7 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason #.FN_BODY PDV-list/presentation-data-values/octet-aligned tvbuff_t *next_tvb; - char *oid; + char *oid; oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 78ccbd1db7..5e3df6db11 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -68,7 +68,7 @@ static gint g_facility_encoding = 0; /* Default to QSIG */ void proto_reg_handoff_q932(void); /* Subdissectors */ -static dissector_handle_t q932_ros_handle; +static dissector_handle_t q932_ros_handle; #define Q932_IE_EXTENDED_FACILITY 0x0D #define Q932_IE_FACILITY 0x1C @@ -252,7 +252,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s", val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)")); - ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); + ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; @@ -331,13 +331,13 @@ void proto_register_q932(void) { q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932.ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE); q932_rose_ctx.err_global_dissector_table = register_dissector_table("q932.ros.global.err", "Q.932 Error (global opcode)", FT_STRING, BASE_NONE); - qsig_arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); - qsig_res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); - qsig_err_local_dissector_table = register_dissector_table("q932.ros.local.err", "Q.932 Error (local opcode)", FT_UINT32, BASE_HEX); + qsig_arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); + qsig_res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); + qsig_err_local_dissector_table = register_dissector_table("q932.ros.local.err", "Q.932 Error (local opcode)", FT_UINT32, BASE_HEX); - etsi_arg_local_dissector_table = register_dissector_table("q932.ros.etsi.local.arg", "Q.932 ETSI Operation Argument (local opcode)", FT_UINT32, BASE_HEX); - etsi_res_local_dissector_table = register_dissector_table("q932.ros.etsi.local.res", "Q.932 ETSI Operation Result (local opcode)", FT_UINT32, BASE_HEX); - etsi_err_local_dissector_table = register_dissector_table("q932.ros.etsi.local.err", "Q.932 ETSI Error (local opcode)", FT_UINT32, BASE_HEX); + etsi_arg_local_dissector_table = register_dissector_table("q932.ros.etsi.local.arg", "Q.932 ETSI Operation Argument (local opcode)", FT_UINT32, BASE_HEX); + etsi_res_local_dissector_table = register_dissector_table("q932.ros.etsi.local.res", "Q.932 ETSI Operation Result (local opcode)", FT_UINT32, BASE_HEX); + etsi_err_local_dissector_table = register_dissector_table("q932.ros.etsi.local.err", "Q.932 ETSI Error (local opcode)", FT_UINT32, BASE_HEX); q932_module = prefs_register_protocol(proto_q932, proto_reg_handoff_q932); @@ -356,7 +356,7 @@ void proto_reg_handoff_q932(void) { if (!q931_prefs_initialized) { q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932); /* Facility */ - dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); + dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); /* Notification indicator */ dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); q932_ros_handle = find_dissector("q932.ros"); @@ -371,7 +371,7 @@ void proto_reg_handoff_q932(void) { q932_rose_ctx.res_local_dissector_table = etsi_res_local_dissector_table; q932_rose_ctx.err_local_dissector_table = etsi_err_local_dissector_table; } - + } /*---------------------------------------------------------------------------*/ diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf index a1231c4c0e..1d77bad080 100644 --- a/asn1/qsig/qsig.cnf +++ b/asn1/qsig/qsig.cnf @@ -86,7 +86,7 @@ MCMNewMsgArg/argumentExt MCMNewArgumentExt MCMNoNewMsgArg/argumentExt MCMNoNewArgumentExt MCMUpdateReqArg/argumentExt MCMUpdArgArgumentExt MCMUpdateReqResElt/argumentExt MCMUpdResArgumentExt -#.END +#.END #.FIELD_RENAME NameArg/nameSequence/extension extensionNA @@ -115,7 +115,7 @@ DNDOverrideArg/argumentExtension argumentExtensionDNDO SSCTInitiateArg/argumentExtension argumentExtensionSSCTI SSCTSetupArg/argumentExtension argumentExtensionSSCTS SSCTDigitInfoArg/argumentExtension argumentExtensionSSCTD -PumRegistrArg/pumUserId pumRUserId +PumRegistrArg/pumUserId pumRUserId PumDelRegArg/pumUserId pumXUserId PumDe-regArg/pumUserId pumDUserId PumInterrogArg/pumUserId pumIUserId @@ -130,7 +130,7 @@ KeypadArg/extension sdextension AddressHeader/priority ahpriority WtmoArg/extension wtmoaextension PumoArg/extension pumoaextension -#.END +#.END #.TYPE_ATTR @@ -167,7 +167,7 @@ NameData TYPE = FT_STRING DISPLAY = BASE_NONE proto_tree *data_tree; %(DEFAULT_BODY)s - data_tree = proto_item_add_subtree(%(ACTX)s->created_item, ett_cnq_PSS1InformationElement); + data_tree = proto_item_add_subtree(%(ACTX)s->created_item, ett_cnq_PSS1InformationElement); if (out_tvb && (tvb_length(out_tvb) > 0) && q931_ie_handle) call_dissector(q931_ie_handle, out_tvb, %(ACTX)s->pinfo, data_tree); #.END diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index e0168f8496..0359ea547d 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -134,7 +134,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create the rnsap protocol tree */ rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA); rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap); - + dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree); } @@ -159,7 +159,7 @@ void proto_register_rnsap(void) { /* Register fields and subtrees */ proto_register_field_array(proto_rnsap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("rnsap", dissect_rnsap, proto_rnsap); diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index 9091a3fc52..25f7198d45 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -8,7 +8,7 @@ ALIGNED #.END #.OMIT_ASSIGNMENT -EDPCH-Information-RLReconfPrepare-FDD +EDPCH-Information-RLReconfPrepare-FDD Non-Serving-RL-Preconfig-Info #.PDU diff --git a/asn1/ros/packet-ros-template.h b/asn1/ros/packet-ros-template.h index e2a00837b0..3ee979b775 100644 --- a/asn1/ros/packet-ros-template.h +++ b/asn1/ros/packet-ros-template.h @@ -29,7 +29,7 @@ # include "packet-ses.h" /* for use in the SESSION_DATA_STRUCTURE ros_op argument - top byte indicates ROS invocation + top byte indicates ROS invocation bottom three bytes indicate operation code */ # define ROS_OP_MASK 0xff000000 diff --git a/asn1/ros/ros-err.cnf b/asn1/ros/ros-err.cnf index af9e90cdac..76aa331dcb 100644 --- a/asn1/ros/ros-err.cnf +++ b/asn1/ros/ros-err.cnf @@ -18,7 +18,7 @@ err_handle = NULL; } - if (!err_handle || + if (!err_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); @@ -39,7 +39,7 @@ err_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!err_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } diff --git a/asn1/ros/ros-inv.cnf b/asn1/ros/ros-inv.cnf index f6289e65d5..1bc9251c49 100644 --- a/asn1/ros/ros-inv.cnf +++ b/asn1/ros/ros-inv.cnf @@ -18,7 +18,7 @@ arg_handle = NULL; } - if (!arg_handle || + if (!arg_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); diff --git a/asn1/ros/ros-res.cnf b/asn1/ros/ros-res.cnf index eae08ce24c..f0900906cb 100644 --- a/asn1/ros/ros-res.cnf +++ b/asn1/ros/ros-res.cnf @@ -19,7 +19,7 @@ res_handle = NULL; } - if (!res_handle || + if (!res_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); @@ -41,7 +41,7 @@ res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!res_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } diff --git a/asn1/rrc/packet-rrc-template.h b/asn1/rrc/packet-rrc-template.h index f511d0160a..6ae2b0661d 100644 --- a/asn1/rrc/packet-rrc-template.h +++ b/asn1/rrc/packet-rrc-template.h @@ -53,9 +53,9 @@ typedef struct rrc_ciph_info_ GTree * /*guint32*/ start_ps; /*Start value for PS counter*/ guint32 conf_algo_indicator; /*Indicates which type of ciphering algorithm used*/ guint32 int_algo_indiccator; /*Indicates which type of integrity algorithm used*/ - unsigned int setup_frame; /*Store which frame contained this information*/ + unsigned int setup_frame; /*Store which frame contained this information*/ guint32 ps_conf_counters[31][2]; /*This should also be made for CS*/ - + } rrc_ciphering_info; extern GTree * hsdsch_muxed_flows; diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 7c42d8e9bd..531400fceb 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -819,16 +819,16 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE */ break; case RRC_NAS_SYS_INFO_PS: - + /*Find the entry for the communication context (taken from FP)*/ if( (c_inf =(rrc_ciphering_info *)g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id))) == NULL ){ c_inf = g_new0(rrc_ciphering_info,1); - + /*Initiate tree with START_PS values.*/ if(!c_inf->start_ps) c_inf->start_ps = g_tree_new_full(rrc_key_cmp, NULL,rrc_free_key,rrc_free_value); - + /*Clear and initialize seq_no matrix*/ for(i = 0; i< 31; i++){ c_inf->seq_no[i][0] = -1; @@ -836,14 +836,14 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE } g_tree_insert(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id), c_inf); } - + /*Retrieve and store the value*/ start = g_new(guint32,1); *start = tvb_get_bits32(start_val,0,20,ENC_BIG_ENDIAN); if(c_inf && c_inf->start_ps) /*Insert the value based on current frame num since this might vary over time*/ g_tree_insert(c_inf->start_ps, GUINT_TO_POINTER(actx->pinfo->fd->num), start); - + break; default: break; diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c index ae4af276f2..96a05320b5 100644 --- a/asn1/rrlp/packet-rrlp-template.c +++ b/asn1/rrlp/packet-rrlp-template.c @@ -89,7 +89,7 @@ void proto_register_rrlp(void) { proto_register_field_array(proto_rrlp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index 4f1b853ddd..7a44431a8b 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -1,6 +1,6 @@ # rrlp.cnf # rrlp conformation file -# Copyright 2006 Anders Broman +# Copyright 2006 Anders Broman #.OPT PER @@ -22,7 +22,7 @@ SLR-Arg-PCS-Extensions #.END #.FN_HDR PDU - + proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "RRLP"); diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index 6764227dc9..b76612df1b 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -107,7 +107,7 @@ RTABapdu %(DEFAULT_BODY)s #.END - + #.FN_BODY CallingSSuserReference/t61String VAL_PTR=&string tvbuff_t *string = NULL; %(DEFAULT_BODY)s @@ -123,7 +123,7 @@ RTABapdu col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string))); #.END - + #.FN_BODY CallingSSuserReference/octetString VAL_PTR=&string tvbuff_t *string = NULL; %(DEFAULT_BODY)s diff --git a/asn1/rua/rua.cnf b/asn1/rua/rua.cnf index 9e1fc6b58a..90cd62a099 100644 --- a/asn1/rua/rua.cnf +++ b/asn1/rua/rua.cnf @@ -43,7 +43,7 @@ ProtocolIE-Single-Container } #.END -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue @@ -60,33 +60,33 @@ ProtocolIE-Single-Container #.FN_PARS UnsuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_UnsuccessfulOutcomeValue -#.FN_BODY Connect +#.FN_BODY Connect col_set_str(actx->pinfo->cinfo, COL_INFO, "CONNECT "); %(DEFAULT_BODY)s -#.FN_BODY DirectTransfer +#.FN_BODY DirectTransfer col_set_str(actx->pinfo->cinfo, COL_INFO, "DIRECT_TRANSFER "); %(DEFAULT_BODY)s -#.FN_BODY Disconnect +#.FN_BODY Disconnect col_set_str(actx->pinfo->cinfo, COL_INFO, "DISCONNECT "); %(DEFAULT_BODY)s -#.FN_BODY ConnectionlessTransfer +#.FN_BODY ConnectionlessTransfer col_set_str(actx->pinfo->cinfo, COL_INFO, "CONNECTIONLESS_TRANSFER "); %(DEFAULT_BODY)s -#.FN_BODY ErrorIndication +#.FN_BODY ErrorIndication col_set_str(actx->pinfo->cinfo, COL_INFO, "ERROR_INDICATION "); col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */ %(DEFAULT_BODY)s -#.FN_BODY PrivateMessage +#.FN_BODY PrivateMessage col_set_str(actx->pinfo->cinfo, COL_INFO, "PRIVATE_MESSAGE "); %(DEFAULT_BODY)s @@ -96,8 +96,8 @@ ProtocolIE-Single-Container %(DEFAULT_BODY)s if ((tvb_length(ranap_message_tvb)>0)&&(ranap_handle)) { /* RUA has a RANAP-PDU */ col_set_str(actx->pinfo->cinfo, COL_INFO, - "(RUA) "); /* Set info to (RUA) to make room for RANAP */ - col_set_fence(actx->pinfo->cinfo, COL_INFO); + "(RUA) "); /* Set info to (RUA) to make room for RANAP */ + col_set_fence(actx->pinfo->cinfo, COL_INFO); call_dissector(ranap_handle,ranap_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree)); } #.END diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index d67a3e5a24..5cea0c0179 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -391,7 +391,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") Transparent Container 48.018 */ de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0); - + break; case 3: /* utrantolte */ diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index 6733f19a51..e7811cbbb4 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -137,7 +137,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nr_pages = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_sabp_no_of_pages, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* + /* * NOTE: n equal to or less than 15 */ if(nr_pages > 15){ @@ -166,7 +166,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; } - + } static guint diff --git a/asn1/sabp/sabp.cnf b/asn1/sabp/sabp.cnf index ee0550d6ba..873946cd53 100644 --- a/asn1/sabp/sabp.cnf +++ b/asn1/sabp/sabp.cnf @@ -1,6 +1,6 @@ # sabp.cnf # sabp conformation file -# Copyright 2007 Tomas Kukosa +# Copyright 2007 Tomas Kukosa #.OPT PER @@ -47,7 +47,7 @@ MessageStructure/_item/repetitionNumber repetitionNumber1 #.END -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS ProtocolExtensionID VAL_PTR=&ProtocolExtensionID #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue @@ -98,7 +98,7 @@ id-MessageStructure ProtocolIE-ID id-TypeOfError ProtocolIE-ID id-Paging-ETWS-Indicator ProtocolIE-ID id-Warning-Type ProtocolIE-ID -id-WarningSecurityInfo ProtocolIE-ID +id-WarningSecurityInfo ProtocolIE-ID id-Broadcast-Message-Content-Validity-Indicator ProtocolIE-ID #.END @@ -128,7 +128,7 @@ MessageStructure N sabp.extension id-MessageStructure TypeOfError N sabp.extension id-TypeOfError Paging-ETWS-Indicator N sabp.extension id-Paging-ETWS-Indicator Warning-Type N sabp.extension id-Warning-Type -WarningSecurityInfo N sabp.extension id-WarningSecurityInfo +WarningSecurityInfo N sabp.extension id-WarningSecurityInfo Broadcast-Message-Content-Validity-Indicator N sabp.extension id-Broadcast-Message-Content-Validity-Indicator #SABP-ELEMENTARY-PROCEDURE diff --git a/asn1/sbc-ap/packet-sbc-ap-template.c b/asn1/sbc-ap/packet-sbc-ap-template.c index 5126bbd490..5cc5f8b318 100644 --- a/asn1/sbc-ap/packet-sbc-ap-template.c +++ b/asn1/sbc-ap/packet-sbc-ap-template.c @@ -166,7 +166,7 @@ void proto_register_sbc_ap(void) { proto_register_field_array(proto_sbc_ap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector tables */ sbc_ap_ies_dissector_table = register_dissector_table("sbc_ap.ies", "SBC-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); sbc_ap_extension_dissector_table = register_dissector_table("sbc_ap.extension", "SBC-AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC); diff --git a/asn1/sbc-ap/sbc-ap.cnf b/asn1/sbc-ap/sbc-ap.cnf index e892cab3b2..cc2af8be7e 100644 --- a/asn1/sbc-ap/sbc-ap.cnf +++ b/asn1/sbc-ap/sbc-ap.cnf @@ -100,9 +100,9 @@ ProtocolIE-Field/value ie_field_value offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 3, 3, FALSE, ¶meter_tvb); - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -136,9 +136,9 @@ id-List-of-TAIs ProtocolIE-ID id-Warning-Area-List ProtocolIE-ID id-Warning-Message-Content ProtocolIE-ID id-Warning-Security-Information ProtocolIE-ID -id-Warning-Type ProtocolIE-ID -id-Omc-Id ProtocolIE-ID -id-Concurrent-Warning-Message-Indicator ProtocolIE-ID +id-Warning-Type ProtocolIE-ID +id-Omc-Id ProtocolIE-ID +id-Concurrent-Warning-Message-Indicator ProtocolIE-ID id-Extended-Repetition-Period ProtocolIE-ID diff --git a/asn1/snmp/packet-snmp-template.h b/asn1/snmp/packet-snmp-template.h index faa6ec4ff4..aeb3824497 100644 --- a/asn1/snmp/packet-snmp-template.h +++ b/asn1/snmp/packet-snmp-template.h @@ -43,7 +43,7 @@ typedef struct _snmp_usm_auth_model_t { typedef struct _snmp_user_t { snmp_usm_key_t userName; - + snmp_usm_auth_model_t* authModel; snmp_usm_key_t authPassword; snmp_usm_key_t authKey; @@ -71,7 +71,7 @@ struct _snmp_usm_params_t { gboolean encrypted; guint start_offset; guint auth_offset; - + guint32 boots; guint32 time; tvbuff_t* engine_tvb; diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index db610ad951..a204c5a50a 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -207,7 +207,7 @@ void proto_register_t124(void) { &ett_t124_connectGCCPDU, #include "packet-t124-ettarr.c" }; - + /* Register protocol */ proto_t124 = proto_register_protocol(PNAME, PSNAME, PFNAME); /* Register fields and subtrees */ diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index 11c71b6d2d..69238eeb74 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -52,43 +52,43 @@ RegistryItem RegistryEntryOwner RequestPDU DomainParameters -DynamicTokenID -NodeProperties -AlternativeNodeID -ChannelType -CapabilityID -CapabilityClass -ConferenceAddRequest -ConferenceLockRequest -ConferenceUnlockRequest -ConferenceTerminateRequest -ConferenceEjectUserRequest -ConferenceTransferRequest -RegistryRegisterChannelRequest -RegistryAssignTokenRequest -RegistrySetParameterRequest -RegistryRetrieveEntryRequest -RegistryDeleteEntryRequest -RegistryMonitorEntryRequest -RegistryAllocateHandleRequest +DynamicTokenID +NodeProperties +AlternativeNodeID +ChannelType +CapabilityID +CapabilityClass +ConferenceAddRequest +ConferenceLockRequest +ConferenceUnlockRequest +ConferenceTerminateRequest +ConferenceEjectUserRequest +ConferenceTransferRequest +RegistryRegisterChannelRequest +RegistryAssignTokenRequest +RegistrySetParameterRequest +RegistryRetrieveEntryRequest +RegistryDeleteEntryRequest +RegistryMonitorEntryRequest +RegistryAllocateHandleRequest NonStandardPDU -NetworkAddressV2 -EntityID -RegistryKey +NetworkAddressV2 +EntityID +RegistryKey RegistryModificationRights -MediaList -ChannelAggregationMethod -Profile -NetworkConnection +MediaList +ChannelAggregationMethod +Profile +NetworkConnection SessionKey -ChannelID -GSTNConnection -ISDNConnection -CSDNConnection -PSDNConnection +ChannelID +GSTNConnection +ISDNConnection +CSDNConnection +PSDNConnection ATMConnection ExtendedE164NetworkAddress -TransportAddress +TransportAddress #.PDU #---------------------------------------------------------------------------------------- @@ -131,7 +131,7 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult /* This length MUST be ignored by the client." */ /* Not sure why - but lets ignore the length. */ - /* We assume the OCTET STRING is all of the remaining bytes */ + /* We assume the OCTET STRING is all of the remaining bytes */ if(tvb_length(next_tvb) == 42) { /* this is perhaps a naive ... */ @@ -222,9 +222,9 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult %(DEFAULT_BODY)s - if(hf_index == hf_t124_channelId_03) + if(hf_index == hf_t124_channelId_03) col_append_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "%%d", channelId); - + #.OMIT_ASSIGNMENT StaticChannelID diff --git a/asn1/t125/t125.cnf b/asn1/t125/t125.cnf index 91bc6f04d9..8e015a93da 100644 --- a/asn1/t125/t125.cnf +++ b/asn1/t125/t125.cnf @@ -57,13 +57,13 @@ TokenAttributes TokenGrabRequest Reason Diagnostic -StaticChannelId -UserId -PrivateChannelId -AssignedChannelId +StaticChannelId +UserId +PrivateChannelId +AssignedChannelId TokenId DynamicChannelId -ChannelId +ChannelId #.PDU #---------------------------------------------------------------------------------------- @@ -97,7 +97,7 @@ ConnectMCSPDU #.FN_BODY Connect-Initial/_untag/userData tvbuff_t *next_tvb = NULL; %(DEFAULT_BODY)s - if(next_tvb) + if(next_tvb) dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, actx->pinfo, top_tree, NULL); #.END @@ -106,7 +106,7 @@ ConnectMCSPDU #.FN_BODY Connect-Response/_untag/userData tvbuff_t *next_tvb = NULL; %(DEFAULT_BODY)s - if(next_tvb) + if(next_tvb) dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, actx->pinfo, top_tree, NULL); #.END diff --git a/asn1/t38/packet-t38-template.h b/asn1/t38/packet-t38-template.h index 60642dc430..a2ef4b949b 100644 --- a/asn1/t38/packet-t38-template.h +++ b/asn1/t38/packet-t38-template.h @@ -38,7 +38,7 @@ typedef struct _t38_packet_info { guint8 t30_Facsimile_Control; gchar desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */ gchar desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Anlaysis */ - double time_first_t4_data; + double time_first_t4_data; guint32 frame_num_first_t4_data; } t38_packet_info; @@ -49,17 +49,17 @@ typedef struct _t38_packet_info { /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ typedef struct _t38_conv_info { - + guint32 reass_ID; int reass_start_seqnum; guint32 reass_data_type; gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */ guint32 packet_lost; guint32 burst_lost; - double time_first_t4_data; + double time_first_t4_data; guint32 additional_hdlc_data_field_counter; gint32 seqnum_prev_data_field; - + } t38_conv_info; /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index c1b5eb0bf5..684ca195d8 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -64,7 +64,7 @@ ABRT-apdu/_untag/user-information abrt_user_information %(DEFAULT_BODY)s #---------------------------------------------------------------------------------------- -#.FN_BODY Dialog1 +#.FN_BODY Dialog1 offset = dissect_tcap_DialoguePDU(TRUE, tvb, offset, actx, tree, -1); diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf index df8145ea52..8c4aab8a48 100644 --- a/asn1/tetra/tetra.cnf +++ b/asn1/tetra/tetra.cnf @@ -12,7 +12,7 @@ ExtendCarrier SPEECHMODE DATAMODE CALLMODE - + #.EXPORTS #U-ALERT diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 8c046184f2..801edb1c11 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -1,6 +1,6 @@ # upl.cnf # upl conformation file -# Copyright 2006-2010 Anders Broman +# Copyright 2006-2010 Anders Broman #.OPT PER @@ -85,6 +85,6 @@ guint32 UlpMessage; #.TYPE_ATTR -IPAddress/ipv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL -IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL +IPAddress/ipv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL +IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL #.END diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf index 7b77b9a519..761c050ba4 100644 --- a/asn1/x2ap/x2ap.cnf +++ b/asn1/x2ap/x2ap.cnf @@ -1,6 +1,6 @@ # x2ap.cnf # x2ap conformation file -# Copyright 2007 Anders Broman +# Copyright 2007 Anders Broman #.OPT PER @@ -30,11 +30,11 @@ UnsuccessfulOutcome/value UnsuccessfulOutcome_value #.FIELD_RENAME ProtocolExtensionField/id extension_id PrivateIE-Field/id private_id -InitiatingMessage/value initiatingMessage_value +InitiatingMessage/value initiatingMessage_value -ProtocolIE-Field/value protocolIE_Field_value -SuccessfulOutcome/value successfulOutcome_value -PrivateIE-Field/value privateIE_Field_value +ProtocolIE-Field/value protocolIE_Field_value +SuccessfulOutcome/value successfulOutcome_value +PrivateIE-Field/value privateIE_Field_value #.OMIT_ASSIGNMENT Presence @@ -51,7 +51,7 @@ ProtocolIE-ContainerPairList } #.END -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue @@ -78,9 +78,9 @@ ProtocolIE-ContainerPairList %(DEFAULT_BODY)s - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -88,13 +88,13 @@ ProtocolIE-ContainerPairList #.FN_BODY TargeteNBtoSource-eNBTransparentContainer VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; - + %(DEFAULT_BODY)s if (!parameter_tvb) return offset; - + dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree, NULL); - + #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_ProtocolIE_ID_vals) #.END @@ -110,7 +110,7 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; - + %(DEFAULT_BODY)s if (!parameter_tvb) return offset; @@ -233,7 +233,7 @@ id-CSG-Id ProtocolIE-ID id-CSGMembershipStatus ProtocolIE-ID id-MDTConfiguration ProtocolIE-ID id-ManagementBasedMDTallowed ProtocolIE-ID -id-RRCConnSetupIndicator ProtocolIE-ID +id-RRCConnSetupIndicator ProtocolIE-ID #.REGISTER_NEW @@ -243,8 +243,8 @@ E-RABs-Admitted-List N x2ap.ies id-E-RABs-Admitted-List E-RAB-Item N x2ap.ies id-E-RAB-Item E-RAB-List N x2ap.ies id-E-RABs-NotAdmitted-List E-RABs-ToBeSetup-Item N x2ap.ies id-E-RABs-ToBeSetup-Item -Cause N x2ap.ies id-Cause -CellInformation-List N x2ap.ies id-CellInformation +Cause N x2ap.ies id-Cause +CellInformation-List N x2ap.ies id-CellInformation CellInformation-Item N x2ap.ies id-CellInformation-Item UE-X2AP-ID N x2ap.ies id-New-eNB-UE-X2AP-ID UE-X2AP-ID N x2ap.ies id-Old-eNB-UE-X2AP-ID @@ -300,7 +300,7 @@ MeasurementFailureCause-Item N x2ap.ies id-MeasurementFailureCause-Item CompleteFailureCauseInformation-List N x2ap.ies id-CompleteFailureCauseInformation-List CompleteFailureCauseInformation-Item N x2ap.ies id-CompleteFailureCauseInformation-Item CSGMembershipStatus N x2ap.ies id-CSGMembershipStatus -RRCConnSetupIndicator N x2ap.ies id-RRCConnSetupIndicator +RRCConnSetupIndicator N x2ap.ies id-RRCConnSetupIndicator #X2AP-PROTOCOL-EXTENSION diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 0534a7de03..b64a474ae2 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -110,9 +110,9 @@ void proto_register_x509af(void) { proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); - register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); - register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); + register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); + register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); + register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); register_ber_oid_syntax(".cer", NULL, "Certificate"); register_ber_oid_syntax(".crt", NULL, "Certificate"); @@ -132,7 +132,7 @@ void proto_reg_handoff_x509af(void) { /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time being. - Only implemented those algorithms that take no parameters + Only implemented those algorithms that take no parameters for the time being, ronnie */ /* from http://www.alvestrand.no/objectid/1.3.14.3.2.html */ @@ -162,7 +162,7 @@ void proto_reg_handoff_x509af(void) { register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af); - + register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af); register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af); diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index d70d8b2f28..0a86365714 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -50,7 +50,7 @@ AttributeCertificateInfo/subject InfoSubject AttributeCertificateAssertion/subject AssertionSubject #.FIELD_RENAME -AttributeCertificateInfo/issuer issuerName +AttributeCertificateInfo/issuer issuerName AttributeCertificateInfo/subject info_subject AttributeCertificateAssertion/subject assertion_subject @@ -58,7 +58,7 @@ AttributeCertificateAssertion/issuer assertionIssuer AttributeCertificateInfo/subject/subjectName infoSubjectName AttributeCertificateAssertion/subject/subjectName assertionSubjectName -IssuerSerial/issuer issuerName +IssuerSerial/issuer issuerName CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate revokedUserCertificate #.END @@ -75,7 +75,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate if(actx->external.direct_reference) { name = oid_resolved_from_string(actx->external.direct_reference); - proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); + proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); } #.FN_BODY AlgorithmIdentifier/parameters diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index 25ad4c542f..58b15602a8 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -109,7 +109,7 @@ void proto_register_x509ce(void) { { "invalidityDate", "x509ce.id_ce_invalidityDate", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_x509ce_object_identifier_id, + { &hf_x509ce_object_identifier_id, { "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0, "Object identifier Id", HFILL }}, { &hf_x509ce_IPAddress, diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 7b1de06b99..454ea8958e 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -9,26 +9,26 @@ # Forward declaration #.CLASS CERT-POLICY-QUALIFIER &id ObjectIdentifierType -&Qualifier +&Qualifier #.END # InformationFramework classes ##.CLASS ATTRIBUTE #&derivation ClassReference ATTRIBUTE -#&Type +#&Type #&equality-match ClassReference MATCHING-RULE #&ordering-match ClassReference MATCHING-RULE #&substrings-match ClassReference MATCHING-RULE #&single-valued BooleanType #&collective BooleanType #&no-user-modification BooleanType -#&usage +#&usage #&id ObjectIdentifierType ##.END #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END @@ -161,7 +161,7 @@ CertificatePairExactAssertion/issuedByThisCAAssertion cpea_issuedByThisCAAsserti CertificateGroup/serialNumberRange certificateGroupNumberRange CertificateAssertion/subjectAltName subjectAltNameType EnhancedCertificateAssertion/pathToName enhancedPathToName - + #.FN_PARS PolicyQualifierInfo/policyQualifierId FN_VARIANT = _str HF_INDEX = hf_x509ce_object_identifier_id VAL_PTR = &actx->external.direct_reference @@ -179,7 +179,7 @@ EnhancedCertificateAssertion/pathToName enhancedPathToName offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); #.FN_FTR GeneralName/uniformResourceIdentifier - + PROTO_ITEM_SET_URL(actx->created_item); #.END diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index c77badd5a7..ecca0a946d 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -109,7 +109,7 @@ gboolean x509if_register_fmt(int hf_index, const gchar *fmt) return TRUE; - } else + } else return FALSE; /* couldn't register it */ } @@ -124,13 +124,13 @@ void proto_register_x509if(void) { /* List of fields */ static hf_register_info hf[] = { - { &hf_x509if_object_identifier_id, + { &hf_x509if_object_identifier_id, { "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0, "Object identifier Id", HFILL }}, - { &hf_x509if_any_string, + { &hf_x509if_any_string, { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE, NULL, 0, "This is any String", HFILL }}, - + #include "packet-x509if-hfarr.c" }; diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index cc770518b1..ab4b47a147 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -11,7 +11,7 @@ ObjectClassKind #.END #.CLASS ATTRIBUTE &derivation ClassReference ATTRIBUTE -&Type +&Type &equality-match ClassReference MATCHING-RULE &ordering-match ClassReference MATCHING-RULE &substrings-match ClassReference MATCHING-RULE @@ -22,8 +22,8 @@ ObjectClassKind &id ObjectIdentifierType #.END #.CLASS CONTEXT -&Type -&Assertion +&Type +&Assertion &id ObjectIdentifierType #.END #.CLASS OBJECT-CLASS @@ -35,14 +35,14 @@ ObjectClassKind #.END #.CLASS MATCHING-RESTRICTION -&Restriction +&Restriction &Rules _FixedTypeValueSetFieldSpec &id ObjectIdentifierType #.END #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END @@ -187,7 +187,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &actx->external.direct_reference #.FN_BODY AttributeTypeAndDistinguishedValue/type - const char *fmt; + const char *fmt; const char *name; %(DEFAULT_BODY)s @@ -195,7 +195,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(actx->external.direct_reference) { /* see if we can find a nice name */ name = oid_resolved_from_string(actx->external.direct_reference); - if(!name) name = actx->external.direct_reference; + if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); @@ -224,7 +224,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; - const char *fmt; + const char *fmt; const char *name = NULL; const char *orig_oid = actx->external.direct_reference; @@ -236,7 +236,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" /* try and dissect as a string */ dissect_ber_octet_string(FALSE, actx, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb); - + /* should also try and dissect as an OID and integer */ /* of course, if I can look up the syntax .... */ @@ -360,7 +360,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" top_of_rdn = tree; } else { - if(last_rdn) + if(last_rdn) /* this is an additional value - delimit */ g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -370,7 +370,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" rdn_one_value = TRUE; #.FN_BODY RDNSequence - const char *fmt; + const char *fmt; dn_one_rdn = FALSE; /* reset */ last_dn = (char *)wmem_alloc(wmem_packet_scope(), MAX_DN_STR_LEN); *last_dn = '\0'; @@ -395,7 +395,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(!dn_one_rdn) { /* this is the first element - record the top */ top_of_dn = tree; - } + } %(DEFAULT_BODY)s diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 0117eb8b42..24d3a7b769 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -105,7 +105,7 @@ void proto_reg_handoff_x509sat(void) { oid_add_from_string("dmd","2.5.6.20"); oid_add_from_string("pkiUser","2.5.6.21"); oid_add_from_string("pkiCA","2.5.6.22"); - + oid_add_from_string("parent","2.5.6.28"); oid_add_from_string("child","2.5.6.29"); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 8ef47729ea..6b525c39ad 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1216,7 +1216,7 @@ static int dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 112 "../../asn1/acse/acse.cnf" int reason = -1; - + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &reason); @@ -1275,7 +1275,7 @@ static int dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 128 "../../asn1/acse/acse.cnf" int reason = -1; - + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &reason); @@ -1340,7 +1340,7 @@ dissect_acse_ABRT_source(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse if(source != -1) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%s)", val_to_str(source, acse_ABRT_source_vals, "source(%d)")); - + return offset; diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 56236d08d0..d9e3f70f8d 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -458,13 +458,13 @@ dissect_ansi_tcap_T_national(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int start_offset = offset; guint8 family; guint8 specifier; - + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &ansi_tcap_private.d.OperationCode_national); /* mask off the H bit */ ansi_tcap_private.d.OperationCode_national = (ansi_tcap_private.d.OperationCode_national&0x7fff); - + subtree = proto_item_add_subtree(actx->created_item, ett_ansi_tcap_op_code_nat); /* Bit H is used to distinguish between Operations that require a reply and those that do not. A value of 1 * indicates that a reply is required; a value of 0 indicates that a reply is not required. @@ -516,7 +516,7 @@ dissect_ansi_tcap_T_national(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o default: break; } - + @@ -616,10 +616,10 @@ guint8 len; if(next_tvb) { len = tvb_length_remaining(next_tvb, 0); if(len !=0){ - /* 0 octets for the Unidirectional, + /* 0 octets for the Unidirectional, * 4 octets for Query, Response & Abort * 8 octets for Conversation in the order Originating then Responding TID - * + * * In order to match this it seems like we should only use the last 4 octets * in the 8 octets case. */ @@ -876,7 +876,7 @@ dissect_ansi_tcap_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if(find_tcap_subdissector(tvb, actx, tree)) offset = tvb_length(tvb); - + diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h index c8ea3c86ab..874d5d7151 100644 --- a/epan/dissectors/packet-ansi_tcap.h +++ b/epan/dissectors/packet-ansi_tcap.h @@ -44,16 +44,16 @@ struct ansi_tcap_private_t { gchar *TransactionID_str; struct { /* "dynamic" data */ gint pdu; - /* - 1 : invoke, - 2 : returnResult, + /* + 1 : invoke, + 2 : returnResult, 3 : returnError, 4 : reject */ - gint OperationCode; - /* - 0 : national, - 1 : private + gint OperationCode; + /* + 0 : national, + 1 : private */ gint32 OperationCode_national; gint32 OperationCode_private; diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index 9bf2dcbde3..91ae0a1322 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -649,7 +649,7 @@ dissect_atn_cm( int type = no_msg; proto_item *ti = NULL; proto_tree *sub_tree = NULL; - + ti = proto_tree_add_text( tree, tvb, @@ -660,10 +660,10 @@ dissect_atn_cm( sub_tree = proto_item_add_subtree( ti, ett_atn_cm); - + /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */ - + /* determine whether it is uplink or downlink */ type = check_heur_msg_type(pinfo); @@ -703,7 +703,7 @@ dissect_atn_cm_heur( /* heuristically decode message */ switch(type){ case um: - TRY { + TRY { dissect_CMGroundMessage_PDU( tvb, pinfo, @@ -729,13 +729,13 @@ dissect_atn_cm_heur( default: break; } - + if (is_atn_cm == TRUE) { /* note: */ /* all subsequent PDU's belonging to this conversation are considered CM */ /* if the first CM PDU has been decoded succesfully */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ @@ -971,7 +971,7 @@ void proto_register_atn_cm (void) #line 220 "../../asn1/atn-cm/packet-atn-cm-template.c" &ett_atn_cm }; - + /* register CM application */ proto_atn_cm = proto_register_protocol( ATN_CM_PROTO , diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 2fe88be0b3..417ec2bb88 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -5321,7 +5321,7 @@ dissect_atn_cpdlc( /* "protected mode" for this largely depends on */ /* upgraded avionics packages */ - /*note:*/ + /*note:*/ /* The use of CPDLC is *optional* as the pilot */ /* may always use a voice radio channel to talk to the controller.*/ @@ -5333,7 +5333,7 @@ dissect_atn_cpdlc( /* we need the ae qualifier stored within the conversation */ /* to decode "plain old cpdlc" or */ /* "protected mode cpdlc correctly " */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ atn_cv = find_atn_conversation( @@ -5358,7 +5358,7 @@ dissect_atn_cpdlc( if(!atn_cv){ /* atn conversation not found */ return 0; } - + ti = proto_tree_add_text( tree, tvb, @@ -5369,7 +5369,7 @@ dissect_atn_cpdlc( atn_cpdlc_tree = proto_item_add_subtree( ti, ett_atn_cpdlc); - + switch(atn_cv->ae_qualifier){ case pmcpdlc: if( check_heur_msg_type(pinfo) == um ) { @@ -5402,7 +5402,7 @@ dissect_atn_cpdlc( default: break; } - return tvb_reported_length_remaining(tvb, 0); + return tvb_reported_length_remaining(tvb, 0); } static gboolean @@ -5418,7 +5418,7 @@ dissect_atn_cpdlc_heur( int type = no_msg; type = check_heur_msg_type(pinfo); - + switch(type){ case um: TRY { @@ -5451,7 +5451,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE; } ENDTRY; TRY{ - dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); is_atn_cpdlc = TRUE; is_pm = FALSE; break;} @@ -5463,14 +5463,14 @@ dissect_atn_cpdlc_heur( default: break; } - + if(is_atn_cpdlc){ /* note: */ /* all subsequent PDU's belonging to this conversation */ /* are considered CPDLC */ /* if the first CPDLC PDU has been decoded succesfully */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ - + /* DT: dstref present, srcref is always zero */ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ atn_cv = find_atn_conversation(&pinfo->dst, @@ -5496,11 +5496,11 @@ dissect_atn_cpdlc_heur( else { atn_cv->ae_qualifier = cpdlc; } dissect_atn_cpdlc(tvb, pinfo, tree, NULL); - } + } }else { /* there should *always* be an atn conversation */ - is_atn_cpdlc = FALSE; + is_atn_cpdlc = FALSE; } - + return is_atn_cpdlc; } @@ -8070,7 +8070,7 @@ void proto_register_atn_cpdlc (void) /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ #line 320 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" - &ett_atn_cpdlc + &ett_atn_cpdlc }; /* register CPDLC */ diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 953271a79b..730e340215 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -69,7 +69,7 @@ why not using existing ses, pres and acse dissectors ? and ommitted otherwise. Instead of adapting existing dissectors it seemed simpler and cleaner to implement everything the new atn-ulcs dissector. - + why using conversations ? PER encoded user data is ambigous; the same encoding may apply to a CM or CPDLC PDU. The workaround is to decode on a transport connection basis. @@ -98,7 +98,7 @@ which ATN standard is supported ? note: The ATN upper layers are derived from OSI standards (ICAO DOC 9705) while ATN/IPS (ICAO DOC 9896) which is entirely based on IPV6. - + */ /* @@ -115,8 +115,8 @@ which ATN standard is supported ? This means that after some time these references get reused for new conversations. This almost certain happens for traces longer than one day rendering this dissector unsuitable for captures exceeding - this one day. - + this one day. + */ #include "config.h" @@ -179,12 +179,12 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary( asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); - + static void dissect_ACSE_apdu_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); - + guint32 dissect_per_object_descriptor_t( tvbuff_t *tvb, guint32 offset, @@ -1765,7 +1765,7 @@ static guint32 atn_per_external_type( &actx->external, '\0', sizeof(actx->external)); - + actx->external.hf_index = -1; actx->external.encoding = -1; @@ -1781,7 +1781,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( const guint8* addr = NULL; guint32 ars =0; guint32 adr_prefix =0; - + /* check NSAP address type*/ if( (pinfo->src.type != AT_OSI) || (pinfo->dst.type != AT_OSI)) { @@ -1796,7 +1796,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( /* first try source address */ /* if the src address originates */ /* from an aircraft it's downlink */ - + /* convert addr into 32-bit integer */ addr = (const guint8 *)pinfo->src.data; adr_prefix = @@ -1829,7 +1829,7 @@ guint32 get_aircraft_24_bit_address_from_nsap( (addr[1]<<16) | (addr[2]<<8) | addr[3] ); - + /* according to ICAO doc9507 Ed2 SV5 */ /* clause 5.4.3.8.1.5 and 5.4.3.8.1.3 */ /* mobile addresses contain "c1" of "41" */ @@ -1974,7 +1974,7 @@ dissect_atn_ulcs( proto_tree *atn_ulcs_tree = NULL; guint8 value_pres = 0; guint8 value_ses = 0; - guint16 value_ses_pres = 0; + guint16 value_ses_pres = 0; root_tree = tree; @@ -1989,26 +1989,26 @@ dissect_atn_ulcs( 0, 0 , FALSE); - + atn_ulcs_tree = proto_item_add_subtree( ti, ett_atn_ulcs); - + dissect_Fully_encoded_data_PDU( tvb, pinfo, atn_ulcs_tree); - + return offset + tvb_reported_length_remaining(tvb, offset ) ; } - + /* decode as SPDU, PPDU and ACSE PDU */ if ( (int)(intptr_t) data == TRUE ) { /* get session and presentation PDU's */ value_ses_pres = tvb_get_ntohs(tvb, offset); - + /* SPDU: dissect session layer */ ti = proto_tree_add_text( tree, @@ -2067,7 +2067,7 @@ dissect_atn_ulcs( break; } offset++; - + /* PPDU: dissect presentation layer */ ti = proto_tree_add_text( tree, @@ -2075,7 +2075,7 @@ dissect_atn_ulcs( offset, 0, ATN_PRES_PROTO ); - + atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_pres); value_pres = tvb_get_guint8(tvb, offset); @@ -2092,7 +2092,7 @@ dissect_atn_ulcs( "%s (0x%02x)", val_to_str( value_ses_pres & ATN_SES_PRES_MASK , atn_pres_vals, "?"), value_pres); - + /* PPDU errorcode in case of SRF/CPR */ switch(value_ses & SES_PDU_TYPE_MASK){ case SES_ATN_SRF: @@ -2118,7 +2118,7 @@ dissect_atn_ulcs( offset, 0, ATN_ACSE_PROTO ); - + atn_ulcs_tree = proto_item_add_subtree( ti, ett_atn_acse); @@ -2139,12 +2139,12 @@ static gboolean dissect_atn_ulcs_heur( packet_info *pinfo, proto_tree *tree, void *data _U_) -{ +{ /* do we have enough data*/ /* at least session + presentation data or pdv-list */ if (tvb_reported_length_remaining(tvb, 0) < 2){ return FALSE; } - + /* check for session/presentation/ACSE PDU's */ /* SPDU and PPDU are one octet each */ switch( tvb_get_ntohs(tvb, 0) & 0xf8ff ){ diff --git a/epan/dissectors/packet-atn-ulcs.h b/epan/dissectors/packet-atn-ulcs.h index 9c289b2e79..981cb188a1 100644 --- a/epan/dissectors/packet-atn-ulcs.h +++ b/epan/dissectors/packet-atn-ulcs.h @@ -61,7 +61,7 @@ enum msg_type { }; enum ae_qualifier { - ads = 0, + ads = 0, cma =1, /* contact management (CM) */ cpdlc = 2, /* "plain old" CPDLC */ ati = 3 , diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index f3934850c5..4b2e63c31e 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -87,7 +87,7 @@ #define C1222_CMD_WAIT 0x70 #define C1222_CMD_TIMING_SETUP 0x71 -void proto_register_c1222(void); +void proto_register_c1222(void); static dissector_handle_t c1222_handle=NULL; static dissector_handle_t c1222_udp_handle=NULL; @@ -2022,7 +2022,7 @@ void proto_register_c1222(void) { "Reassemble all C12.22 messages spanning multiple TCP segments", "Whether the C12.22 dissector should reassemble all messages spanning multiple TCP segments", &c1222_desegment); - prefs_register_string_preference(c1222_module, "baseoid", "Base OID to use for relative OIDs", + prefs_register_string_preference(c1222_module, "baseoid", "Base OID to use for relative OIDs", "Base object identifier for use in resolving relative object identifiers", &c1222_baseoid_str); #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 8548092ba2..cd5ecb94d8 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -2079,15 +2079,15 @@ dissect_camel_CalledPartyBCDNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, * identification' and 'number digit' fields defined in 3GPP TS 24.008 [9]; * it does not carry the 'called party BCD number IEI' or 'length of called * party BCD number contents'. - * In the context of the DestinationSubscriberNumber field in ConnectSMSArg or - * InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric - * character string. In this case, type-of-number '101'B is used, in accordance - * with 3GPP TS 23.040 [6]. The address is coded in accordance with the - * GSM 7-bit default alphabet definition and the SMS packing rules + * In the context of the DestinationSubscriberNumber field in ConnectSMSArg or + * InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric + * character string. In this case, type-of-number '101'B is used, in accordance + * with 3GPP TS 23.040 [6]. The address is coded in accordance with the + * GSM 7-bit default alphabet definition and the SMS packing rules * as specified in 3GPP TS 23.038 [15] in this case. */ - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -2146,8 +2146,8 @@ dissect_isup_calling_party_number_parameter(parameter_tvb, subtree, NULL); static int dissect_camel_CallResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -3984,7 +3984,7 @@ dissect_camel_EventTypeSMS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_camel_FCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -4002,8 +4002,8 @@ dissect_camel_FCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuf static int dissect_camel_FCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - tvbuff_t *parameter_tvb; - proto_tree *subtree; + tvbuff_t *parameter_tvb; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -4022,13 +4022,13 @@ dissect_camel_FCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, t static int dissect_camel_FCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); if (!parameter_tvb) - return offset; + return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_FCISMSBillingChargingCharacteristics); dissect_camel_CAMEL_FCISMSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCISMSBillingChargingCharacteristics); @@ -4458,7 +4458,7 @@ dissect_camel_T_cellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbu dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_cellGlobalIdOrServiceAreaIdFixedLength); }else{ dissect_gsm_map_LAIFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_locationAreaId); - } + } return offset; } @@ -4909,7 +4909,7 @@ proto_tree *subtree; static int dissect_camel_SCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -4928,13 +4928,13 @@ dissect_camel_SCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuf static int dissect_camel_SCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { tvbuff_t *parameter_tvb; - proto_tree *subtree; + proto_tree *subtree; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); if (!parameter_tvb) - return offset; + return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_SCIGPRSBillingChargingCharacteristics); dissect_camel_CAMEL_SCIGPRSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics); diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index 6100992bea..4cf0815532 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -31,8 +31,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * References: ETSI 300 374 */ -/* - * Indentation logic: this file is indented with 2 spaces indentation. +/* + * Indentation logic: this file is indented with 2 spaces indentation. * there are no tabs. */ @@ -56,7 +56,7 @@ WS_DLL_PUBLIC const value_string camel_opr_code_strings[]; */ #define NB_CAMELSRT_CATEGORY 9+1 /**< Number of type of message */ /* for example TC_BEGIN with InitalDP, and TC_CONT with RequestReportBCSMEvent - is a category, we want to measure the delay between the two messages */ + is a category, we want to measure the delay between the two messages */ #define CAMELSRT_SESSION 1 @@ -75,7 +75,7 @@ WS_DLL_PUBLIC const value_string camelSRTtype_naming[]; /** If we have a request message and its response, (eg: ApplyCharging, ApplyChargingReport) - the frames numbers are stored in this structure */ + the frames numbers are stored in this structure */ struct camelsrt_category_t { guint32 req_num; /**< frame number request seen */ @@ -96,7 +96,7 @@ struct camelsrt_call_t { }; -/** The Key for the hash table is the TCAP origine transaction identifier +/** The Key for the hash table is the TCAP origine transaction identifier of the TC_BEGIN containing the InitialDP */ struct camelsrt_call_info_key_t { @@ -104,8 +104,8 @@ struct camelsrt_call_info_key_t { }; /** Info for a couple of messages (or category) - The request must be available, not duplicated, - and once the corresponding response received, + The request must be available, not duplicated, + and once the corresponding response received, we can deduce the Delta Time between Request/response */ struct camelsrt_msginfo_t { @@ -118,7 +118,7 @@ struct camelsrt_msginfo_t { /** List of infos to store for the analyse */ -struct camelsrt_info_t { +struct camelsrt_info_t { guint32 tcap_session_id; void * tcap_context; guint8 opcode; /**< operation code of message received */ diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index f76e424de5..e05a792900 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -120,8 +120,8 @@ dissect_cdt_AlgorithmID_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%s ", - val_to_str (value, cdt_AlgorithmID_ShortForm_vals, + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%s ", + val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); @@ -179,11 +179,11 @@ dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, &content_type); proto_item_append_text (cdt_item, ", %s", - val_to_str (content_type, cdt_ContentType_ShortForm_vals, + val_to_str (content_type, cdt_ContentType_ShortForm_vals, "unknown")); - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%s ", - val_to_str (content_type, cdt_ContentType_ShortForm_vals, + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%s ", + val_to_str (content_type, cdt_ContentType_ShortForm_vals, "unknown")); @@ -253,17 +253,17 @@ dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if (compr_tvb == NULL) { proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_compress_content, tvb, save_offset, -1); - col_append_str (actx->pinfo->cinfo, COL_INFO, + col_append_str (actx->pinfo->cinfo, COL_INFO, "[Error: Unable to get compressed content]"); return offset; } - + next_tvb = tvb_child_uncompress (tvb, compr_tvb, 0, tvb_length (compr_tvb)); if (next_tvb == NULL) { proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_uncompress_content, tvb, save_offset, -1); - col_append_str (actx->pinfo->cinfo, COL_INFO, + col_append_str (actx->pinfo->cinfo, COL_INFO, "[Error: Unable to uncompress content]"); return offset; } @@ -284,7 +284,7 @@ dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int call_dissector (data_handle, next_tvb, actx->pinfo, top_tree); break; } - + return offset; diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h index 040d6b963c..c5f80b4075 100644 --- a/epan/dissectors/packet-cdt.h +++ b/epan/dissectors/packet-cdt.h @@ -10,7 +10,7 @@ * * Routines for Compressed Data Type packet dissection. * - * Copyright 2005, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS + * Copyright 2005, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index ced7cfe03b..0145416006 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -503,30 +503,30 @@ static const value_string cmip_Opcode_vals[] = { /* CMIP ERRORS */ static const value_string cmip_error_code_vals[] = { - { 2, "accessDenied" }, - { 19, "classInstanceConflict" }, - { 20, "complexityLimitation" }, - { 11, "duplicateManagedObjectInstance" }, - { 7, "getListError" }, - { 15, "invalidArgumentValue" }, - { 6, "invalidAttributeValue" }, - { 4, "invalidFilter" }, - { 17, "invalidObjectInstance" }, - { 16, "invalidScope" }, - { 18, "missingAttributeValue" }, - { 21, "mistypedOperation" }, - { 9, "noSuchAction" }, - { 14, "noSuchArgument" }, - { 5, "noSuchAttribute" }, - { 13, "noSuchEventType" }, - { 22, "noSuchInvokeId" }, - { 0, "noSuchObjectClass" }, - { 1, "noSuchObjectInstance" }, - { 12, "noSuchReferenceObject" }, - { 23, "operationCancelled" }, - { 10, "processingFailure" }, - { 8, "setListError" }, - { 3, "syncNotSupported" }, + { 2, "accessDenied" }, + { 19, "classInstanceConflict" }, + { 20, "complexityLimitation" }, + { 11, "duplicateManagedObjectInstance" }, + { 7, "getListError" }, + { 15, "invalidArgumentValue" }, + { 6, "invalidAttributeValue" }, + { 4, "invalidFilter" }, + { 17, "invalidObjectInstance" }, + { 16, "invalidScope" }, + { 18, "missingAttributeValue" }, + { 21, "mistypedOperation" }, + { 9, "noSuchAction" }, + { 14, "noSuchArgument" }, + { 5, "noSuchAttribute" }, + { 13, "noSuchEventType" }, + { 22, "noSuchInvokeId" }, + { 0, "noSuchObjectClass" }, + { 1, "noSuchObjectInstance" }, + { 12, "noSuchReferenceObject" }, + { 23, "operationCancelled" }, + { 10, "processingFailure" }, + { 8, "setListError" }, + { 3, "syncNotSupported" }, { 0, NULL } }; @@ -2109,7 +2109,7 @@ dissect_cmip_T_attributevalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } else { offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree); } - + return offset; @@ -3720,7 +3720,7 @@ dissect_cmip_InvokeArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of offset = dissect_cmip_InvokeIDType(FALSE, tvb, offset, actx, tree, -1); break; } - + @@ -3785,7 +3785,7 @@ dissect_cmip_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of break; /* doe this one return any data? */ } /*XXX add more types here */ - + return offset; @@ -3847,23 +3847,23 @@ dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse case 15: /* invalidArgumentValue */ dissect_cmip_InvalidArgumentValue(FALSE, tvb, offset, actx, tree, -1); break; - case 6: /* invalidAttributeValue */ + case 6: /* invalidAttributeValue */ dissect_cmip_Attribute(FALSE, tvb, offset, actx, tree, -1); break; - case 4: /* invalidFilter */ + case 4: /* invalidFilter */ dissect_cmip_CMISFilter(FALSE, tvb, offset, actx, tree, -1); break; case 17: /* invalidObjectInstance */ dissect_cmip_ObjectInstance(FALSE, tvb, offset, actx, tree, -1); break; - case 16: /* invalidScope */ + case 16: /* invalidScope */ dissect_cmip_Scope(FALSE, tvb, offset, actx, tree, -1); break; case 18: /* missingAttributeValue */ /* Hmmm SET OF AttributeId */ dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1); break; - case 9: /* noSuchAction */ + case 9: /* noSuchAction */ dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1); break; case 14: /* noSuchArgument */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 14be0874f2..904499b75b 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1520,7 +1520,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); - + pi = actx->created_item; /* move past TLV */ diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index 5e0a2e374a..240e0c56cc 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -119,7 +119,7 @@ dissect_credssp_T_negoToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of if(token_tvb != NULL) - dissector_try_heuristic(credssp_heur_subdissector_list, + dissector_try_heuristic(credssp_heur_subdissector_list, token_tvb, actx->pinfo, proto_tree_get_root(tree), NULL); @@ -248,7 +248,7 @@ dissect_credssp_T_credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int &creds_tvb); - if((decr_tvb != NULL) && + if((decr_tvb != NULL) && ((creds_type == TS_PASSWORD_CREDS) || (creds_type == TS_SMARTCARD_CREDS))) { switch(creds_type) { @@ -364,15 +364,15 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - /* Look for SEQUENCE, CONTEXT 0, and INTEGER 2 */ + /* Look for SEQUENCE, CONTEXT 0, and INTEGER 2 */ if(tvb_length(tvb) > 7) { - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_SEQUENCE) && (pc == TRUE)) { offset = get_ber_length(tvb, offset, NULL, NULL); - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_CON) && (tag == 0)) { offset = get_ber_length(tvb, offset, NULL, NULL); - offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_INTEGER)) { offset = get_ber_length(tvb, offset, &length, NULL); if((length == 1) && (tvb_get_guint8(tvb, offset) == 2)) { @@ -383,7 +383,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, (EXP_PDU_TAG_IP_SRC_BIT | EXP_PDU_TAG_IP_DST_BIT | EXP_PDU_TAG_SRC_PORT_BIT | EXP_PDU_TAG_DST_PORT_BIT | EXP_PDU_TAG_ORIG_FNO_BIT)); - exp_pdu_data->tvb_length = tvb_length(tvb); + exp_pdu_data->tvb_length = tvb_length(tvb); exp_pdu_data->pdu_tvb = tvb; tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data); diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 3c10999b40..db51222599 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -615,13 +615,13 @@ static int dissect_ess_T_restrictiveAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 76 "../../asn1/ess/ess.cnf" tvbuff_t *attributes; - + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); - + return offset; @@ -657,12 +657,12 @@ static int dissect_ess_SecurityAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 67 "../../asn1/ess/ess.cnf" guint32 attribute; - + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute); ess_dissect_attribute (attribute, actx); - + return offset; @@ -711,13 +711,13 @@ static int dissect_ess_T_permissiveAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 85 "../../asn1/ess/ess.cnf" tvbuff_t *attributes; - + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); - + return offset; @@ -753,13 +753,13 @@ static int dissect_ess_T_informativeAttributeFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 94 "../../asn1/ess/ess.cnf" tvbuff_t *attributes; - + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, NULL, hf_index, -1, &attributes); ess_dissect_attribute_flags (attributes, actx); - + return offset; diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 8b28956390..5e6fce36b0 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -1314,7 +1314,7 @@ dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU, &branch_taken); - + if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr); } @@ -4752,7 +4752,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static void dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); } /* @@ -4761,7 +4761,7 @@ dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static void dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_length_remaining(tvb, 0), ENC_NA); } /* diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 8a144d6757..dfdbd36c3c 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -598,7 +598,7 @@ dissect_gprscdr_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int #line 53 "../../asn1/gprscdr/gprscdr.cnf" proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); - + return offset; @@ -1045,14 +1045,14 @@ dissect_gprscdr_MSTimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off data = (data >> 4) + (data & 0x07) * 10; data2 = tvb_get_guint8(tvb, 1) & 0x3; - - proto_item_append_text(actx->created_item, " (GMT %c %d hours %d minutes %s)", - sign, - data / 4, + + proto_item_append_text(actx->created_item, " (GMT %c %d hours %d minutes %s)", + sign, + data / 4, data % 4 * 15, val_to_str_const(data2, gprscdr_daylight_saving_time_vals, "Unknown") ); - + return offset; @@ -1286,7 +1286,7 @@ dissect_gprscdr_TimeStamp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs */ tvbuff_t *parameter_tvb; - + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, ¶meter_tvb); @@ -1305,7 +1305,7 @@ dissect_gprscdr_TimeStamp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs tvb_get_guint8(parameter_tvb,7), /* Hour */ tvb_get_guint8(parameter_tvb,8) /* Minute */ ); - + return offset; @@ -1751,10 +1751,10 @@ dissect_gprscdr_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset if (!parameter_tvb) return offset; - - subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id); + + subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id); dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, TRUE); - + return offset; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index ea3a4794d1..b35a5d7ad6 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -20740,7 +20740,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_gsm_map_om_DeactivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1); break; /* reserved traceSubscriberActivity (52) */ - + case 53: /* UpdateVcsgLocation 53 */ offset=dissect_gsm_map_ms_UpdateVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1); break; @@ -22192,7 +22192,7 @@ void proto_reg_handoff_gsm_map(void) { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); } - + ssn_range = range_copy(global_ssn_range); range_foreach(ssn_range, range_add_callback); diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index cd50091062..b016f72d0d 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -78,7 +78,7 @@ typedef struct _h225_packet_info { /* * the following allows TAP code access to the messages - * without having to duplicate it. With MSVC and a + * without having to duplicate it. With MSVC and a * libwireshark.dll, we need a special declaration. */ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index cb4736df27..c0f437c605 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -1572,7 +1572,7 @@ void proto_reg_handoff_h235(void) { dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DH_SIGN "/nonCollapsing/75", mikey_handle); /* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */ - dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw", + dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw", new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235)); } diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 02c9eb14d1..6b3dc986ae 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -6648,7 +6648,7 @@ dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ hf_index = hf_h245_subMessageIdentifier_standard; } } - + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 127U, &subMessageIdentifer, FALSE); @@ -8487,7 +8487,7 @@ dissect_h245_OLC_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OLC_reverseLogicalChannelParameters, OLC_reverseLogicalChannelParameters_sequence); - + if (upcoming_channel && codec_type) { g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } @@ -8718,8 +8718,8 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a if (fast_start) { h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc); } else { - g_hash_table_insert(h245_pending_olc_reqs, - wmem_strdup(wmem_file_scope(), gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)), + g_hash_table_insert(h245_pending_olc_reqs, + wmem_strdup(wmem_file_scope(), gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)), upcoming_olc); } } @@ -11025,7 +11025,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_, ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, NULL); - + upcoming_channel = NULL; @@ -11056,14 +11056,14 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t h223_fw_lc_num = 0; h223_rev_lc_num = 0; - + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelAck, OpenLogicalChannelAck_sequence); temp = h223_fw_lc_num; p2p_dir = actx->pinfo->p2p_dir; - + if(actx->pinfo->p2p_dir == P2P_DIR_SENT) actx->pinfo->p2p_dir = P2P_DIR_RECV; else diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index 033d680d4c..f3a1087a13 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -42,7 +42,7 @@ typedef enum _h245_msg_type { H245_OpenLogChn, H245_OpenLogChnCnf, H245_OpenLogChnAck, - H245_OpenLogChnRjc, + H245_OpenLogChnRjc, H245_CloseLogChn, H245_CloseLogChnAck, H245_MastSlvDet, diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index f4aedce90c..2a95052819 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1381,7 +1381,7 @@ static gboolean is_pkg_default(guint16 pkgid) { void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) { h248_package_t *pkg_found = NULL, *pkg_high = NULL, *pkg_low = NULL; s_h248_package_t *s_pkg = NULL; - value_string *vst; + value_string *vst; gboolean pkg_default = FALSE; gint j = 0, idx = 0, i = 0, k = 0; if (! packages) { @@ -1401,7 +1401,7 @@ void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) { if (j != -1) { j++; idx=j; while((base_event_name_vals[j].strptr!=NULL) && (((base_event_name_vals[j].value)>>16) == (pkg_found->id))) { - j++; + j++; }; if (idx < j) { vst = (value_string *)wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*(j-idx+1)); @@ -1486,7 +1486,7 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse proto_tree *package_tree=NULL; guint16 name_major, name_minor; const h248_package_t* pkg = NULL; - + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -2085,13 +2085,13 @@ dissect_h248_T_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse #line 300 "../../asn1/h248/h248.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &error_code); expert_add_info(actx->pinfo, actx->created_item, &ei_h248_errored_command); - + if (curr_info.cmd) { gcp_cmd_set_error(curr_info.cmd,error_code); } else if (curr_info.trx) { gcp_trx_set_error(curr_info.trx,error_code); } - + return offset; @@ -2198,7 +2198,7 @@ dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL; /* limitation: assume only one wildcard is used */ wild_card = tvb_get_guint8(new_tvb,0); - + return offset; @@ -2224,7 +2224,7 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 332 "../../asn1/h248/h248.cnf" tvbuff_t* new_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); - + if (new_tvb) { curr_info.term->len = tvb_length(new_tvb); curr_info.term->type = 0; /* unknown */ @@ -2238,7 +2238,7 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if (h248_term_handle) { call_dissector_with_data(h248_term_handle, new_tvb, actx->pinfo, tree, &wild_card); - wild_card = 0xFF; + wild_card = 0xFF; } } else { curr_info.term->len = 0; @@ -4392,16 +4392,16 @@ static int dissect_h248_SCreasonValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 358 "../../asn1/h248/h248.cnf" /* H248 v1 support */ - if ( h248_version > 1 ) { + if ( h248_version > 1 ) { /* Not V1, so call "standard" function */ offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SCreasonValue_sequence_of, hf_index, ett_h248_SCreasonValue); - + } else { /* V1 so Value == octet string */ offset = dissect_h248_ValueV1( implicit_tag, tvb, offset, actx, tree, hf_index); }; - + return offset; @@ -5225,7 +5225,7 @@ dissect_h248_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U #line 99 "../../asn1/h248/h248.cnf" col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data)); - + if (keep_persistent_data) gcp_analyze_msg(h248_tree, actx->pinfo, h248_tvb, curr_info.msg, &h248_arrel, &ei_h248_errored_command); @@ -5348,19 +5348,19 @@ dissect_h248_ValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U for( i=0;i<len;i++) { if(!isascii(tvb_get_guint8(tvb, offset+i)) || tvb_get_guint8(tvb, offset+i) == 0) { /* not ascii or NULL character so do string as hex string */ - proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", + proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", (proto_registrar_get_nth(hf_index))->name, tvb_bytes_to_ep_str(tvb, 0, len)); return len; }; }; /* if here, then string is ascii */ - proto_tree_add_text(tree, tvb, offset, len,"%s: %s", + proto_tree_add_text(tree, tvb, offset, len,"%s: %s", (proto_registrar_get_nth(hf_index))->name, tvb_format_text(tvb, 0, len)); } offset = len; - + return offset; @@ -6978,7 +6978,7 @@ void proto_register_h248(void) { proto_register_subtree_array(ett, array_length(ett)); expert_h248 = expert_register_protocol(proto_h248); expert_register_field_array(expert_h248, ei, array_length(ei)); - + subdissector_table = register_dissector_table("h248.magic_num", "H248 Magic Num", FT_UINT32, BASE_HEX); h248_module = prefs_register_protocol(proto_h248, proto_reg_handoff_h248); diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index a1c5a19866..5204170d57 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -68,7 +68,7 @@ typedef struct _h248_pkg_sig_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_sig_t; @@ -76,7 +76,7 @@ typedef struct _h248_pkg_evt_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_evt_t; @@ -84,7 +84,7 @@ typedef struct _h248_pkg_stat_t { guint32 id; int* hfid; gint* ett; - const h248_pkg_param_t* parameters; + const h248_pkg_param_t* parameters; const value_string* param_names; } h248_pkg_stat_t; diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index ae089cc01e..f06af3c03e 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -67,13 +67,13 @@ gef_ctx_t* gef_ctx_get(void *ptr) { gef_ctx_t *gefx = (gef_ctx_t*)ptr; asn1_ctx_t *actx = (asn1_ctx_t*)ptr; - if (!asn1_ctx_check_signature(actx)) + if (!asn1_ctx_check_signature(actx)) actx = NULL; if (actx) gefx = (gef_ctx_t *)actx->private_data; - if (!gef_ctx_check_signature(gefx)) + if (!gef_ctx_check_signature(gefx)) gefx = NULL; return gefx; @@ -84,7 +84,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) { if (!gefx) return; parent_key = (gefx->parent) ? gefx->parent->key : NULL; - gefx->key = wmem_strdup_printf(wmem_packet_scope(), + gefx->key = wmem_strdup_printf(wmem_packet_scope(), "%s%s" /* parent prefix */ "%s%s%s" /* type, id */ "%s%s" /* subid */, @@ -602,9 +602,9 @@ void proto_register_h323(void) { /*--- proto_reg_handoff_h323 -------------------------------------------*/ -void proto_reg_handoff_h323(void) +void proto_reg_handoff_h323(void) { - dissector_handle_t q931_handle; + dissector_handle_t q931_handle; q931_handle = find_dissector("q931"); @@ -612,11 +612,11 @@ void proto_reg_handoff_h323(void) dissector_add_string("h225.tp", "1.3.12.9", q931_handle); /* H.323, Annex M4, Tunnelling of narrow-band signalling syntax (NSS) for H.323 */ - dissector_add_string("h225.gef.content", "GenericData/1000/1", + dissector_add_string("h225.gef.content", "GenericData/1000/1", new_create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323)); /* H.323, Annex R, Robustness methods for H.323 entities */ - dissector_add_string("h225.gef.content", "GenericData/1/1", + dissector_add_string("h225.gef.content", "GenericData/1/1", new_create_dissector_handle(dissect_RobustnessData_PDU, proto_h323)); } diff --git a/epan/dissectors/packet-h323.h b/epan/dissectors/packet-h323.h index 79a64b954e..fd00377a1e 100644 --- a/epan/dissectors/packet-h323.h +++ b/epan/dissectors/packet-h323.h @@ -39,7 +39,7 @@ typedef struct _gef_ctx_t { guint32 signature; struct _gef_ctx_t *parent; - /* + /* H323-MESSAGES FeatureDescriptor/<id> <id> diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 103860415f..3a3dee4676 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -97,7 +97,7 @@ static expert_field ei_ros_undecoded = EI_INIT; /* Preferences */ /* Subdissectors */ -static dissector_handle_t data_handle = NULL; +static dissector_handle_t data_handle = NULL; /* Gloabl variables */ static gint32 problem_val; @@ -226,7 +226,7 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, arg_handle = NULL; } - if (!arg_handle || + if (!arg_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); @@ -309,7 +309,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act res_handle = NULL; } - if (!res_handle || + if (!res_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); @@ -331,7 +331,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!res_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } @@ -379,7 +379,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx err_handle = NULL; } - if (!err_handle || + if (!err_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); @@ -400,7 +400,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx err_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!err_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 46246664b3..a4cd70b068 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1522,7 +1522,7 @@ dissect_inap_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U }else{ call_dissector(data_handle, tvb, actx->pinfo, tree); offset = tvb_length_remaining(tvb,offset); - } + } @@ -1543,7 +1543,7 @@ static int dissect_inap_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 209 "../../asn1/inap/inap.cnf" obj_id = NULL; - + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ExtensionField_sequence, hf_index, ett_inap_ExtensionField); diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index d55fa6518f..e7d579ce27 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -320,7 +320,7 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); -/* 7.4.13 Positioning Data +/* 7.4.13 Positioning Data * Coding of positioning method (bits 8-4) */ static const value_string lcsap_pos_method_vals[] = { diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 7bd94ff080..bb3fd9d012 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -904,7 +904,7 @@ static int hf_lpp_T_requestedMeasurements_ueRxTxReq = -1; static int hf_lpp_T_ecid_MeasSupported_rsrpSup = -1; static int hf_lpp_T_ecid_MeasSupported_rsrqSup = -1; static int hf_lpp_T_ecid_MeasSupported_ueRxTxSup = -1; -static int hf_lpp_dummy_eag_field = -1; /* never registered */ +static int hf_lpp_dummy_eag_field = -1; /* never registered */ /*--- End of included file: packet-lpp-hf.c ---*/ #line 48 "../../asn1/lpp/packet-lpp-template.c" @@ -14303,7 +14303,7 @@ void proto_register_lpp(void) { proto_register_field_array(proto_lpp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c index 0ea92a99e7..73cd0d9b79 100644 --- a/epan/dissectors/packet-lppa.c +++ b/epan/dissectors/packet-lppa.c @@ -682,7 +682,7 @@ static const per_choice_t LPPA_PDU_choice[] = { static int dissect_lppa_LPPA_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 58 "../../asn1/lppa/lppa.cnf" - + proto_tree_add_item(tree, proto_lppa, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPa"); diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index 35f3cf1b01..df5ae73f49 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -14935,7 +14935,7 @@ static const per_sequence_t OMA_LPPe_MessageExtension_sequence[] = { static int dissect_lppe_OMA_LPPe_MessageExtension(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 17 "../../asn1/lppe/lppe.cnf" - + proto_tree_add_item(tree, proto_lppe, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPe"); @@ -21720,7 +21720,7 @@ void proto_register_lppe(void) { proto_register_field_array(proto_lppe, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index d10ea0f9fc..338863b5a1 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -2322,7 +2322,7 @@ static int hf_lte_rrc_key_eNodeB_Star = -1; /* Key_eNodeB_Star */ static int hf_lte_rrc_ue_InactiveTime = -1; /* T_ue_InactiveTime */ static int hf_lte_rrc_candidateCellInfoList_r10 = -1; /* CandidateCellInfoList_r10 */ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1; /* CandidateCellInfo_r10 */ -static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ +static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ #line 83 "../../asn1/lte-rrc/packet-lte-rrc-template.c" @@ -5641,7 +5641,7 @@ dissect_lte_rrc_T_systemFrameNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ /* Show SFN in info column */ sfn = tvb_get_guint8(value_tvb, 0); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (SFN=%u)", sfn); - + return offset; } @@ -10192,7 +10192,7 @@ dissect_lte_rrc_T_timeInfoUTC_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo); - ts.secs = (time_t)(timeInfo/100)-2208988800U; /* epoch is 00:00:00 (midnight) UTC on 1900-01-01 */ + ts.secs = (time_t)(timeInfo/100)-2208988800U; /* epoch is 00:00:00 (midnight) UTC on 1900-01-01 */ ts.nsecs = (int)(timeInfo%100)*10000000; proto_tree_add_text(subtree, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, "UTC time: %s", abs_time_to_ep_str(&ts, ABSOLUTE_TIME_UTC, FALSE)); @@ -27959,7 +27959,7 @@ dissect_lte_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); - + return offset; @@ -30601,7 +30601,7 @@ static int dissect_lte_rrc_MBMSInterestIndication_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSInterestIndication-r11"); - + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_lte_rrc_MBMSInterestIndication_r11, MBMSInterestIndication_r11_sequence); diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index f8adefe9e3..f1bb8b7d4b 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -2519,7 +2519,7 @@ void proto_register_m3ap(void) { m3ap_extension_dissector_table = register_dissector_table("m3ap.extension", "M3AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC); m3ap_proc_imsg_dissector_table = register_dissector_table("m3ap.proc.imsg", "M3AP-ELEMENTARY-PROCEDURE InitiatingMessage", FT_UINT32, BASE_DEC); m3ap_proc_sout_dissector_table = register_dissector_table("m3ap.proc.sout", "M3AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", FT_UINT32, BASE_DEC); - m3ap_proc_uout_dissector_table = register_dissector_table("m3ap.proc.uout", "M3AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); + m3ap_proc_uout_dissector_table = register_dissector_table("m3ap.proc.uout", "M3AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", FT_UINT32, BASE_DEC); } diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index e39eddde1f..fa1a756cfb 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1874,7 +1874,7 @@ dissect_mms_TimeOfDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } - proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_timeofday_encoding, + proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_timeofday_encoding, tvb, offset, len, "BER Error: malformed TimeOfDay encoding, length must be 4 or 6 bytes"); if(hf_index >= 0) { @@ -1925,7 +1925,7 @@ dissect_mms_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ if(len != 8) { - proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_utctime_encoding, + proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_utctime_encoding, tvb, offset, len, "BER Error: malformed IEC61850 UTCTime encoding, length must be 8 bytes"); if(hf_index >= 0) { diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 8191419dde..466cde97b8 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -478,7 +478,7 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; if (!MPA_LAYER_VALID(&mpa)) return FALSE; - + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "MPEG-%s", version_names[mpa_version(&mpa)]); col_add_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index b5d05ad8f8..40d983f71f 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -1035,9 +1035,9 @@ dissect_p22_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &actx->external.direct_reference); - + name = oid_resolved_from_string(actx->external.direct_reference); - proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); + proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index d75168b049..f20c18c8fc 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -40,8 +40,8 @@ #include "packet-x509if.h" #include "packet-p772.h" -#include "packet-p1.h" -#include "packet-p22.h" +#include "packet-p1.h" +#include "packet-p22.h" #define PNAME "STANAG 4406 Message" #define PSNAME "P772" @@ -1637,7 +1637,7 @@ void proto_register_p772(void) { proto_register_field_array(proto_p772, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); + register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); register_ber_oid_syntax(".p772", NULL, "STANAG 4406"); } diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 31810c4bdd..fbcd8fa900 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -798,23 +798,23 @@ dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 139 "../../asn1/pkcs12/pkcs12.cnf" tvbuff_t *encrypted_tvb; dissector_handle_t dissector_handle; - + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &encrypted_tvb); #line 145 "../../asn1/pkcs12/pkcs12.cnf" - + dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_change_string("ber.oid", object_identifier_id, dissector_handle); - + PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); - + /* restore the original dissector */ dissector_reset_string("ber.oid", object_identifier_id); - + return offset; } @@ -942,7 +942,7 @@ dissect_pkcs12_T_secretValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 124 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); - + return offset; diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 38ae176451..bd1442bb36 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -9,7 +9,7 @@ /* packet-pkixac.c * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. - * + * * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * * Wireshark - Network traffic analyzer diff --git a/epan/dissectors/packet-pkixac.h b/epan/dissectors/packet-pkixac.h index 8ff76d4b6f..ee70a13a53 100644 --- a/epan/dissectors/packet-pkixac.h +++ b/epan/dissectors/packet-pkixac.h @@ -9,7 +9,7 @@ /* packet-pkixac.h * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. - * + * * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * * Wireshark - Network traffic analyzer diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index c9d9bfdaed..01f0e23843 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -636,7 +636,7 @@ dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in #line 35 "../../asn1/pres/pres.cnf" tvbuff_t *next_tvb; - char *oid; + char *oid; oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ @@ -659,7 +659,7 @@ dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 49 "../../asn1/pres/pres.cnf" tvbuff_t *next_tvb; - char *oid; + char *oid; oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 63e4d02ace..8e7d06b5b8 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -290,7 +290,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset arg_handle = NULL; } - if (!arg_handle || + if (!arg_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); @@ -383,7 +383,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int res_handle = NULL; } - if (!res_handle || + if (!res_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); @@ -405,7 +405,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!res_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } @@ -463,7 +463,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o err_handle = NULL; } - if (!err_handle || + if (!err_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); @@ -484,7 +484,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o err_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!err_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 60a956b2db..eab682fc2d 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -136,7 +136,7 @@ static gint g_facility_encoding = 0; /* Default to QSIG */ void proto_reg_handoff_q932(void); /* Subdissectors */ -static dissector_handle_t q932_ros_handle; +static dissector_handle_t q932_ros_handle; #define Q932_IE_EXTENDED_FACILITY 0x0D #define Q932_IE_FACILITY 0x1C @@ -766,7 +766,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s", val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)")); - ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); + ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; @@ -1016,13 +1016,13 @@ void proto_register_q932(void) { q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932.ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE); q932_rose_ctx.err_global_dissector_table = register_dissector_table("q932.ros.global.err", "Q.932 Error (global opcode)", FT_STRING, BASE_NONE); - qsig_arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); - qsig_res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); - qsig_err_local_dissector_table = register_dissector_table("q932.ros.local.err", "Q.932 Error (local opcode)", FT_UINT32, BASE_HEX); + qsig_arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); + qsig_res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); + qsig_err_local_dissector_table = register_dissector_table("q932.ros.local.err", "Q.932 Error (local opcode)", FT_UINT32, BASE_HEX); - etsi_arg_local_dissector_table = register_dissector_table("q932.ros.etsi.local.arg", "Q.932 ETSI Operation Argument (local opcode)", FT_UINT32, BASE_HEX); - etsi_res_local_dissector_table = register_dissector_table("q932.ros.etsi.local.res", "Q.932 ETSI Operation Result (local opcode)", FT_UINT32, BASE_HEX); - etsi_err_local_dissector_table = register_dissector_table("q932.ros.etsi.local.err", "Q.932 ETSI Error (local opcode)", FT_UINT32, BASE_HEX); + etsi_arg_local_dissector_table = register_dissector_table("q932.ros.etsi.local.arg", "Q.932 ETSI Operation Argument (local opcode)", FT_UINT32, BASE_HEX); + etsi_res_local_dissector_table = register_dissector_table("q932.ros.etsi.local.res", "Q.932 ETSI Operation Result (local opcode)", FT_UINT32, BASE_HEX); + etsi_err_local_dissector_table = register_dissector_table("q932.ros.etsi.local.err", "Q.932 ETSI Error (local opcode)", FT_UINT32, BASE_HEX); q932_module = prefs_register_protocol(proto_q932, proto_reg_handoff_q932); @@ -1041,7 +1041,7 @@ void proto_reg_handoff_q932(void) { if (!q931_prefs_initialized) { q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932); /* Facility */ - dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); + dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); /* Notification indicator */ dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); q932_ros_handle = find_dissector("q932.ros"); @@ -1056,7 +1056,7 @@ void proto_reg_handoff_q932(void) { q932_rose_ctx.res_local_dissector_table = etsi_res_local_dissector_table; q932_rose_ctx.err_local_dissector_table = etsi_err_local_dissector_table; } - + } /*---------------------------------------------------------------------------*/ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 3ef68c4712..461b0e15a8 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -2121,7 +2121,7 @@ dissect_qsig_PSS1InformationElement_U(gboolean implicit_tag _U_, tvbuff_t *tvb _ offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &out_tvb); - data_tree = proto_item_add_subtree(actx->created_item, ett_cnq_PSS1InformationElement); + data_tree = proto_item_add_subtree(actx->created_item, ett_cnq_PSS1InformationElement); if (out_tvb && (tvb_length(out_tvb) > 0) && q931_ie_handle) call_dissector(q931_ie_handle, out_tvb, actx->pinfo, data_tree); diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 84b94c3bfb..af01e6b6e8 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -43149,7 +43149,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create the rnsap protocol tree */ rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA); rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap); - + dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree); } @@ -55347,7 +55347,7 @@ void proto_register_rnsap(void) { /* Register fields and subtrees */ proto_register_field_array(proto_rnsap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector */ register_dissector("rnsap", dissect_rnsap, proto_rnsap); diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index 75fdc5f0b8..f468451816 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -48,7 +48,7 @@ int dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U # include "packet-ses.h" /* for use in the SESSION_DATA_STRUCTURE ros_op argument - top byte indicates ROS invocation + top byte indicates ROS invocation bottom three bytes indicate operation code */ # define ROS_OP_MASK 0xff000000 diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 09d7f55cfa..177ed17089 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -87567,16 +87567,16 @@ dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, */ break; case RRC_NAS_SYS_INFO_PS: - + /*Find the entry for the communication context (taken from FP)*/ if( (c_inf =(rrc_ciphering_info *)g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id))) == NULL ){ c_inf = g_new0(rrc_ciphering_info,1); - + /*Initiate tree with START_PS values.*/ if(!c_inf->start_ps) c_inf->start_ps = g_tree_new_full(rrc_key_cmp, NULL,rrc_free_key,rrc_free_value); - + /*Clear and initialize seq_no matrix*/ for(i = 0; i< 31; i++){ c_inf->seq_no[i][0] = -1; @@ -87584,14 +87584,14 @@ dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } g_tree_insert(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id), c_inf); } - + /*Retrieve and store the value*/ start = g_new(guint32,1); *start = tvb_get_bits32(start_val,0,20,ENC_BIG_ENDIAN); if(c_inf && c_inf->start_ps) /*Insert the value based on current frame num since this might vary over time*/ g_tree_insert(c_inf->start_ps, GUINT_TO_POINTER(actx->pinfo->fd->num), start); - + break; default: break; diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 5dfe827196..4b55813a38 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -77,9 +77,9 @@ typedef struct rrc_ciph_info_ GTree * /*guint32*/ start_ps; /*Start value for PS counter*/ guint32 conf_algo_indicator; /*Indicates which type of ciphering algorithm used*/ guint32 int_algo_indiccator; /*Indicates which type of integrity algorithm used*/ - unsigned int setup_frame; /*Store which frame contained this information*/ + unsigned int setup_frame; /*Store which frame contained this information*/ guint32 ps_conf_counters[31][2]; /*This should also be made for CS*/ - + } rrc_ciphering_info; extern GTree * hsdsch_muxed_flows; diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 16a944d3bc..ac18001121 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -7131,7 +7131,7 @@ static const per_sequence_t PDU_sequence[] = { static int dissect_rrlp_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 25 "../../asn1/rrlp/rrlp.cnf" - + proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, ENC_NA); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "RRLP"); @@ -10721,7 +10721,7 @@ void proto_register_rrlp(void) { proto_register_field_array(proto_rrlp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + } diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index d00cb28bdd..0634596b50 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -837,8 +837,8 @@ dissect_rua_RANAP_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U if ((tvb_length(ranap_message_tvb)>0)&&(ranap_handle)) { /* RUA has a RANAP-PDU */ col_set_str(actx->pinfo->cinfo, COL_INFO, - "(RUA) "); /* Set info to (RUA) to make room for RANAP */ - col_set_fence(actx->pinfo->cinfo, COL_INFO); + "(RUA) "); /* Set info to (RUA) to make room for RANAP */ + col_set_fence(actx->pinfo->cinfo, COL_INFO); call_dissector(ranap_handle,ranap_message_tvb,actx->pinfo, proto_tree_get_root(tree)); } diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index c3807e9b95..6374a9fece 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -4980,7 +4980,7 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset Transparent Container 48.018 */ de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0); - + break; case 3: /* utrantolte */ diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 8874b1eb14..69e4a45ed8 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -1774,7 +1774,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nr_pages = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_sabp_no_of_pages, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* + /* * NOTE: n equal to or less than 15 */ if(nr_pages > 15){ @@ -1803,7 +1803,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; } - + } static guint diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 7ca2027ede..09358e099a 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -558,9 +558,9 @@ dissect_sbc_ap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 3, 3, FALSE, ¶meter_tvb); - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -1460,7 +1460,7 @@ void proto_register_sbc_ap(void) { proto_register_field_array(proto_sbc_ap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + /* Register dissector tables */ sbc_ap_ies_dissector_table = register_dissector_table("sbc_ap.ies", "SBC-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); sbc_ap_extension_dissector_table = register_dissector_table("sbc_ap.extension", "SBC-AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h index f09e39f8e5..de7e313306 100644 --- a/epan/dissectors/packet-snmp.h +++ b/epan/dissectors/packet-snmp.h @@ -51,7 +51,7 @@ typedef struct _snmp_usm_auth_model_t { typedef struct _snmp_user_t { snmp_usm_key_t userName; - + snmp_usm_auth_model_t* authModel; snmp_usm_key_t authPassword; snmp_usm_key_t authKey; @@ -79,7 +79,7 @@ struct _snmp_usm_params_t { gboolean encrypted; guint start_offset; guint auth_offset; - + guint32 boots; guint32 time; tvbuff_t* engine_tvb; diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index 24471680a6..4459513e21 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -1513,7 +1513,7 @@ dissect_t124_T_connectPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U /* This length MUST be ignored by the client." */ /* Not sure why - but lets ignore the length. */ - /* We assume the OCTET STRING is all of the remaining bytes */ + /* We assume the OCTET STRING is all of the remaining bytes */ if(tvb_length(next_tvb) == 42) { /* this is perhaps a naive ... */ @@ -1589,9 +1589,9 @@ dissect_t124_ChannelId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, 0U, 65535U, &channelId, FALSE); - if(hf_index == hf_t124_channelId_03) + if(hf_index == hf_t124_channelId_03) col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%d", channelId); - + @@ -4016,7 +4016,7 @@ void proto_register_t124(void) { /*--- End of included file: packet-t124-ettarr.c ---*/ #line 209 "../../asn1/t124/packet-t124-template.c" }; - + /* Register protocol */ proto_t124 = proto_register_protocol(PNAME, PSNAME, PFNAME); /* Register fields and subtrees */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index ba84f8730e..a0f1516fe1 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -185,7 +185,7 @@ dissect_t125_T_userData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb); - if(next_tvb) + if(next_tvb) dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, actx->pinfo, top_tree, NULL); @@ -262,7 +262,7 @@ dissect_t125_T_userData_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb); - if(next_tvb) + if(next_tvb) dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, actx->pinfo, top_tree, NULL); diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h index 97512dd394..d06de23f01 100644 --- a/epan/dissectors/packet-t38.h +++ b/epan/dissectors/packet-t38.h @@ -46,7 +46,7 @@ typedef struct _t38_packet_info { guint8 t30_Facsimile_Control; gchar desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */ gchar desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Anlaysis */ - double time_first_t4_data; + double time_first_t4_data; guint32 frame_num_first_t4_data; } t38_packet_info; @@ -57,17 +57,17 @@ typedef struct _t38_packet_info { /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ typedef struct _t38_conv_info { - + guint32 reass_ID; int reass_start_seqnum; guint32 reass_data_type; gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */ guint32 packet_lost; guint32 burst_lost; - double time_first_t4_data; + double time_first_t4_data; guint32 additional_hdlc_data_field_counter; gint32 seqnum_prev_data_field; - + } t38_conv_info; /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 618ac69c7e..88b899b849 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -1334,9 +1334,9 @@ dissect_x2ap_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ 3, 3, FALSE, ¶meter_tvb); - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -2403,7 +2403,7 @@ dissect_x2ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; - + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 1, 160, TRUE, ¶meter_tvb, NULL); @@ -3523,15 +3523,15 @@ static int dissect_x2ap_TargeteNBtoSource_eNBTransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 90 "../../asn1/x2ap/x2ap.cnf" tvbuff_t *parameter_tvb=NULL; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); if (!parameter_tvb) return offset; - + dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree, NULL); - + return offset; diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 9b33f13ba8..94853471cf 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -221,7 +221,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if(actx->external.direct_reference) { name = oid_resolved_from_string(actx->external.direct_reference); - proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); + proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); } @@ -1283,9 +1283,9 @@ void proto_register_x509af(void) { proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); - register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); - register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); + register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); + register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); + register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); register_ber_oid_syntax(".cer", NULL, "Certificate"); register_ber_oid_syntax(".crt", NULL, "Certificate"); @@ -1320,7 +1320,7 @@ void proto_reg_handoff_x509af(void) { /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time being. - Only implemented those algorithms that take no parameters + Only implemented those algorithms that take no parameters for the time being, ronnie */ /* from http://www.alvestrand.no/objectid/1.3.14.3.2.html */ @@ -1350,7 +1350,7 @@ void proto_reg_handoff_x509af(void) { register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af); - + register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af); register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af); diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 0e17591ce9..346a17acb9 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -410,7 +410,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t * NULL); #line 182 "../../asn1/x509ce/x509ce.cnf" - + PROTO_ITEM_SET_URL(actx->created_item); @@ -1925,7 +1925,7 @@ void proto_register_x509ce(void) { { "invalidityDate", "x509ce.id_ce_invalidityDate", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_x509ce_object_identifier_id, + { &hf_x509ce_object_identifier_id, { "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0, "Object identifier Id", HFILL }}, { &hf_x509ce_IPAddress, diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 8386360cc2..fe6cae6de4 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -722,7 +722,7 @@ dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 190 "../../asn1/x509if/x509if.cnf" - const char *fmt; + const char *fmt; const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &actx->external.direct_reference); @@ -731,7 +731,7 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse if(actx->external.direct_reference) { /* see if we can find a nice name */ name = oid_resolved_from_string(actx->external.direct_reference); - if(!name) name = actx->external.direct_reference; + if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); @@ -769,7 +769,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; - const char *fmt; + const char *fmt; const char *name = NULL; const char *orig_oid = actx->external.direct_reference; @@ -781,7 +781,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o /* try and dissect as a string */ dissect_ber_octet_string(FALSE, actx, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb); - + /* should also try and dissect as an OID and integer */ /* of course, if I can look up the syntax .... */ @@ -884,7 +884,7 @@ dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_ top_of_rdn = tree; } else { - if(last_rdn) + if(last_rdn) /* this is an additional value - delimit */ g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -949,7 +949,7 @@ dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in if(!dn_one_rdn) { /* this is the first element - record the top */ top_of_dn = tree; - } + } offset = dissect_x509if_RelativeDistinguishedName(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -969,7 +969,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 373 "../../asn1/x509if/x509if.cnf" - const char *fmt; + const char *fmt; dn_one_rdn = FALSE; /* reset */ last_dn = (char *)wmem_alloc(wmem_packet_scope(), MAX_DN_STR_LEN); *last_dn = '\0'; @@ -2120,7 +2120,7 @@ gboolean x509if_register_fmt(int hf_index, const gchar *fmt) return TRUE; - } else + } else return FALSE; /* couldn't register it */ } @@ -2135,13 +2135,13 @@ void proto_register_x509if(void) { /* List of fields */ static hf_register_info hf[] = { - { &hf_x509if_object_identifier_id, + { &hf_x509if_object_identifier_id, { "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0, "Object identifier Id", HFILL }}, - { &hf_x509if_any_string, + { &hf_x509if_any_string, { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE, NULL, 0, "This is any String", HFILL }}, - + /*--- Included file: packet-x509if-hfarr.c ---*/ #line 1 "../../asn1/x509if/packet-x509if-hfarr.c" diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index e2c6acb29f..cf240e3766 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -2844,7 +2844,7 @@ void proto_reg_handoff_x509sat(void) { oid_add_from_string("dmd","2.5.6.20"); oid_add_from_string("pkiUser","2.5.6.21"); oid_add_from_string("pkiCA","2.5.6.22"); - + oid_add_from_string("parent","2.5.6.28"); oid_add_from_string("child","2.5.6.29"); |