Skip to content

Commit

Permalink
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Rege…
Browse files Browse the repository at this point in the history
…nerate 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>
  • Loading branch information
Bill Meier committed Feb 26, 2014
1 parent b485014 commit 1dff4e3
Show file tree
Hide file tree
Showing 167 changed files with 824 additions and 824 deletions.
2 changes: 1 addition & 1 deletion asn1/acp133/packet-acp133-template.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
10 changes: 5 additions & 5 deletions asn1/acse/acse.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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"

Expand Down
12 changes: 6 additions & 6 deletions asn1/ansi_tcap/ansi_tcap.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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.
*/
Expand Down
14 changes: 7 additions & 7 deletions asn1/ansi_tcap/packet-ansi_tcap-template.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions asn1/atn-cm/packet-atn-cm-template.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);

Expand Down Expand Up @@ -136,7 +136,7 @@ dissect_atn_cm_heur(
/* heuristically decode message */
switch(type){
case um:
TRY {
TRY {
dissect_CMGroundMessage_PDU(
tvb,
pinfo,
Expand All @@ -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)){
Expand Down Expand Up @@ -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 ,
Expand Down
28 changes: 14 additions & 14 deletions asn1/atn-cpdlc/packet-atn-cpdlc-template.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.*/

Expand All @@ -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(
Expand All @@ -161,7 +161,7 @@ dissect_atn_cpdlc(

if(!atn_cv){ /* atn conversation not found */
return 0; }

ti = proto_tree_add_text(
tree,
tvb,
Expand All @@ -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 ) {
Expand Down Expand Up @@ -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
Expand All @@ -221,7 +221,7 @@ dissect_atn_cpdlc_heur(
int type = no_msg;

type = check_heur_msg_type(pinfo);

switch(type){
case um:
TRY {
Expand Down Expand Up @@ -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;}
Expand All @@ -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,
Expand All @@ -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;
}

Expand All @@ -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 */
Expand Down
Loading

0 comments on commit 1dff4e3

Please sign in to comment.