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

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>
This commit is contained in:
Bill Meier 2014-02-26 14:29:17 -05:00
parent b4850149dd
commit 1dff4e309d
167 changed files with 824 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/acp133/packet-acp133-template.c
View File

@ -86,7 +86,7 @@ void proto_register_acp133(void) {
/*--- proto_reg_handoff_acp133 --- */ /*--- proto_reg_handoff_acp133 --- */
void proto_reg_handoff_acp133(void) { void proto_reg_handoff_acp133(void) {
#include "packet-acp133-dis-tab.c" #include "packet-acp133-dis-tab.c"
/* X.402 Object Classes */ /* X.402 Object Classes */
oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0");

10
asn1/acse/acse.cnf
View File

@ -19,7 +19,7 @@ AE-invocation-identifier
#.TYPE_RENAME #.TYPE_RENAME
AARQ-apdu/_untag/protocol-version T_AARQ_protocol_version AARQ-apdu/_untag/protocol-version T_AARQ_protocol_version
AARE-apdu/_untag/protocol-version T_AARE_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 AARE-apdu/_untag/aSO-context-name T_AARE_aSO_context_name
ACRQ-apdu/_untag/aSO-context-name T_ACRQ_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 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 ACRQ-apdu/_untag/aSO-context-name aCRQ_aSO_context_name
PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned 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_VARIANT = _str VAL_PTR = &object_identifier_id
#.FN_BODY Authentication-value-other/other-mechanism-value #.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 #.FN_BODY Release-request-reason
int reason = -1; int reason = -1;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(reason != -1) if(reason != -1)
@ -126,7 +126,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
#.FN_BODY Release-response-reason #.FN_BODY Release-response-reason
int reason = -1; int reason = -1;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(reason != -1) if(reason != -1)
@ -144,7 +144,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
if(source != -1) if(source != -1)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(source, acse_ABRT_source_vals, "source(%%d)")); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(source, acse_ABRT_source_vals, "source(%%d)"));
#.FIELD_ATTR #.FIELD_ATTR
Association-data/_item NAME = "Association-data" Association-data/_item NAME = "Association-data"

12
asn1/ansi_tcap/ansi_tcap.cnf
View File

@ -21,11 +21,11 @@ OperationCode/private VAL_PTR = &ansi_tcap_private.d.OperationCode_private
int start_offset = offset; int start_offset = offset;
guint8 family; guint8 family;
guint8 specifier; guint8 specifier;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
/* mask off the H bit */ /* mask off the H bit */
ansi_tcap_private.d.OperationCode_national = (ansi_tcap_private.d.OperationCode_national&0x7fff); 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); 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 /* 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. * 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: default:
break; break;
} }
#--- INVOKE --- #--- INVOKE ---
#.FN_BODY Invoke/parameter #.FN_BODY Invoke/parameter
if(find_tcap_subdissector(tvb, actx, tree)) if(find_tcap_subdissector(tvb, actx, tree))
offset = tvb_length(tvb); offset = tvb_length(tvb);
#.FN_HDR Invoke #.FN_HDR Invoke
ansi_tcap_private.d.pdu = 1; ansi_tcap_private.d.pdu = 1;
@ -157,10 +157,10 @@ guint8 len;
if(next_tvb) { if(next_tvb) {
len = tvb_length_remaining(next_tvb, 0); len = tvb_length_remaining(next_tvb, 0);
if(len !=0){ if(len !=0){
/* 0 octets for the Unidirectional, /* 0 octets for the Unidirectional,
* 4 octets for Query, Response & Abort * 4 octets for Query, Response & Abort
* 8 octets for Conversation in the order Originating then Responding TID * 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 order to match this it seems like we should only use the last 4 octets
* in the 8 octets case. * in the 8 octets case.
*/ */

14
asn1/ansi_tcap/packet-ansi_tcap-template.h
View File

@ -36,16 +36,16 @@ struct ansi_tcap_private_t {
gchar *TransactionID_str; gchar *TransactionID_str;
struct { /* "dynamic" data */ struct { /* "dynamic" data */
gint pdu; gint pdu;
/* /*
1 : invoke, 1 : invoke,
2 : returnResult, 2 : returnResult,
3 : returnError, 3 : returnError,
4 : reject 4 : reject
*/ */
gint OperationCode; gint OperationCode;
/* /*
0 : national, 0 : national,
1 : private 1 : private
*/ */
gint32 OperationCode_national; gint32 OperationCode_national;
gint32 OperationCode_private; gint32 OperationCode_private;

14
asn1/atn-cm/packet-atn-cm-template.c
View File

@ -82,7 +82,7 @@ dissect_atn_cm(
int type = no_msg; int type = no_msg;
proto_item *ti = NULL; proto_item *ti = NULL;
proto_tree *sub_tree = NULL; proto_tree *sub_tree = NULL;
ti = proto_tree_add_text( ti = proto_tree_add_text(
tree, tree,
tvb, tvb,
@ -93,10 +93,10 @@ dissect_atn_cm(
sub_tree = proto_item_add_subtree( sub_tree = proto_item_add_subtree(
ti, ti,
ett_atn_cm); ett_atn_cm);
/* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */ /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */
/* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */
/* determine whether it is uplink or downlink */ /* determine whether it is uplink or downlink */
type = check_heur_msg_type(pinfo); type = check_heur_msg_type(pinfo);
@ -136,7 +136,7 @@ dissect_atn_cm_heur(
/* heuristically decode message */ /* heuristically decode message */
switch(type){ switch(type){
case um: case um:
TRY { TRY {
dissect_CMGroundMessage_PDU( dissect_CMGroundMessage_PDU(
tvb, tvb,
pinfo, pinfo,
@ -162,13 +162,13 @@ dissect_atn_cm_heur(
default: default:
break; break;
} }
if (is_atn_cm == TRUE) { if (is_atn_cm == TRUE) {
/* note: */ /* note: */
/* all subsequent PDU's belonging to this conversation are considered CM */ /* all subsequent PDU's belonging to this conversation are considered CM */
/* if the first CM PDU has been decoded succesfully */ /* if the first CM PDU has been decoded succesfully */
/* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */
/* DT: dstref present, srcref is always zero */ /* DT: dstref present, srcref is always zero */
if((pinfo->clnp_dstref) && if((pinfo->clnp_dstref) &&
(!pinfo->clnp_srcref)){ (!pinfo->clnp_srcref)){
@ -219,7 +219,7 @@ void proto_register_atn_cm (void)
#include "packet-atn-cm-ettarr.c" #include "packet-atn-cm-ettarr.c"
&ett_atn_cm &ett_atn_cm
}; };
/* register CM application */ /* register CM application */
proto_atn_cm = proto_register_protocol( proto_atn_cm = proto_register_protocol(
ATN_CM_PROTO , ATN_CM_PROTO ,

28
asn1/atn-cpdlc/packet-atn-cpdlc-template.c
View File

@ -124,7 +124,7 @@ dissect_atn_cpdlc(
/* "protected mode" for this largely depends on */ /* "protected mode" for this largely depends on */
/* upgraded avionics packages */ /* upgraded avionics packages */
/*note:*/ /*note:*/
/* The use of CPDLC is *optional* as the pilot */ /* The use of CPDLC is *optional* as the pilot */
/* may always use a voice radio channel to talk to the controller.*/ /* 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 */ /* we need the ae qualifier stored within the conversation */
/* to decode "plain old cpdlc" or */ /* to decode "plain old cpdlc" or */
/* "protected mode cpdlc correctly " */ /* "protected mode cpdlc correctly " */
/* DT: dstref present, srcref is always zero */ /* DT: dstref present, srcref is always zero */
if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){
atn_cv = find_atn_conversation( atn_cv = find_atn_conversation(
@ -161,7 +161,7 @@ dissect_atn_cpdlc(
if(!atn_cv){ /* atn conversation not found */ if(!atn_cv){ /* atn conversation not found */
return 0; } return 0; }
ti = proto_tree_add_text( ti = proto_tree_add_text(
tree, tree,
tvb, tvb,
@ -172,7 +172,7 @@ dissect_atn_cpdlc(
atn_cpdlc_tree = proto_item_add_subtree( atn_cpdlc_tree = proto_item_add_subtree(
ti, ti,
ett_atn_cpdlc); ett_atn_cpdlc);
switch(atn_cv->ae_qualifier){ switch(atn_cv->ae_qualifier){
case pmcpdlc: case pmcpdlc:
if( check_heur_msg_type(pinfo) == um ) { if( check_heur_msg_type(pinfo) == um ) {
@ -205,7 +205,7 @@ dissect_atn_cpdlc(
default: default:
break; break;
} }
return tvb_reported_length_remaining(tvb, 0); return tvb_reported_length_remaining(tvb, 0);
} }
static gboolean static gboolean
@ -221,7 +221,7 @@ dissect_atn_cpdlc_heur(
int type = no_msg; int type = no_msg;
type = check_heur_msg_type(pinfo); type = check_heur_msg_type(pinfo);
switch(type){ switch(type){
case um: case um:
TRY { TRY {
@ -254,7 +254,7 @@ dissect_atn_cpdlc_heur(
is_pm = FALSE; } is_pm = FALSE; }
ENDTRY; ENDTRY;
TRY{ TRY{
dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); dissect_AircraftPDUs_PDU(tvb, pinfo, NULL);
is_atn_cpdlc = TRUE; is_atn_cpdlc = TRUE;
is_pm = FALSE; is_pm = FALSE;
break;} break;}
@ -266,14 +266,14 @@ dissect_atn_cpdlc_heur(
default: default:
break; break;
} }
if(is_atn_cpdlc){ if(is_atn_cpdlc){
/* note: */ /* note: */
/* all subsequent PDU's belonging to this conversation */ /* all subsequent PDU's belonging to this conversation */
/* are considered CPDLC */ /* are considered CPDLC */
/* if the first CPDLC PDU has been decoded succesfully */ /* if the first CPDLC PDU has been decoded succesfully */
/* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */
/* DT: dstref present, srcref is always zero */ /* DT: dstref present, srcref is always zero */
if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){ if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){
atn_cv = find_atn_conversation(&pinfo->dst, atn_cv = find_atn_conversation(&pinfo->dst,
@ -299,11 +299,11 @@ dissect_atn_cpdlc_heur(
else { else {
atn_cv->ae_qualifier = cpdlc; } atn_cv->ae_qualifier = cpdlc; }
dissect_atn_cpdlc(tvb, pinfo, tree, NULL); dissect_atn_cpdlc(tvb, pinfo, tree, NULL);
} }
}else { /* there should *always* be an atn conversation */ }else { /* there should *always* be an atn conversation */
is_atn_cpdlc = FALSE; is_atn_cpdlc = FALSE;
} }
return is_atn_cpdlc; return is_atn_cpdlc;
} }
@ -316,8 +316,8 @@ void proto_register_atn_cpdlc (void)
}; };
static gint *ett[] = { static gint *ett[] = {
#include "packet-atn-cpdlc-ettarr.c" #include "packet-atn-cpdlc-ettarr.c"
&ett_atn_cpdlc &ett_atn_cpdlc
}; };
/* register CPDLC */ /* register CPDLC */

44
asn1/atn-ulcs/packet-atn-ulcs-template.c
View File

@ -61,7 +61,7 @@ why not using existing ses, pres and acse dissectors ?
and ommitted otherwise. and ommitted otherwise.
Instead of adapting existing dissectors it seemed simpler and cleaner Instead of adapting existing dissectors it seemed simpler and cleaner
to implement everything the new atn-ulcs dissector. to implement everything the new atn-ulcs dissector.
why using conversations ? why using conversations ?
PER encoded user data is ambigous; the same encoding may apply to a CM or 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. CPDLC PDU. The workaround is to decode on a transport connection basis.
@ -90,7 +90,7 @@ which ATN standard is supported ?
note: note:
The ATN upper layers are derived from OSI standards (ICAO DOC 9705) The ATN upper layers are derived from OSI standards (ICAO DOC 9705)
while ATN/IPS (ICAO DOC 9896) which is entirely based on IPV6. 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 This means that after some time these references get reused for
new conversations. This almost certain happens for traces longer new conversations. This almost certain happens for traces longer
than one day rendering this dissector unsuitable for captures exceeding than one day rendering this dissector unsuitable for captures exceeding
this one day. this one day.
*/ */
#include "config.h" #include "config.h"
@ -171,12 +171,12 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary(
asn1_ctx_t *actx _U_, asn1_ctx_t *actx _U_,
proto_tree *tree _U_, proto_tree *tree _U_,
int hf_index _U_); int hf_index _U_);
static void dissect_ACSE_apdu_PDU( static void dissect_ACSE_apdu_PDU(
tvbuff_t *tvb _U_, tvbuff_t *tvb _U_,
packet_info *pinfo _U_, packet_info *pinfo _U_,
proto_tree *tree _U_); proto_tree *tree _U_);
guint32 dissect_per_object_descriptor_t( guint32 dissect_per_object_descriptor_t(
tvbuff_t *tvb, tvbuff_t *tvb,
guint32 offset, guint32 offset,
@ -369,7 +369,7 @@ static guint32 atn_per_external_type(
&actx->external, &actx->external,
'\0', '\0',
sizeof(actx->external)); sizeof(actx->external));
actx->external.hf_index = -1; actx->external.hf_index = -1;
actx->external.encoding = -1; actx->external.encoding = -1;
@ -385,7 +385,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
const guint8* addr = NULL; const guint8* addr = NULL;
guint32 ars =0; guint32 ars =0;
guint32 adr_prefix =0; guint32 adr_prefix =0;
/* check NSAP address type*/ /* check NSAP address type*/
if( (pinfo->src.type != AT_OSI) || if( (pinfo->src.type != AT_OSI) ||
(pinfo->dst.type != AT_OSI)) { (pinfo->dst.type != AT_OSI)) {
@ -400,7 +400,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
/* first try source address */ /* first try source address */
/* if the src address originates */ /* if the src address originates */
/* from an aircraft it's downlink */ /* from an aircraft it's downlink */
/* convert addr into 32-bit integer */ /* convert addr into 32-bit integer */
addr = (const guint8 *)pinfo->src.data; addr = (const guint8 *)pinfo->src.data;
adr_prefix = adr_prefix =
@ -433,7 +433,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
(addr[1]<<16) | (addr[1]<<16) |
(addr[2]<<8) | (addr[2]<<8) |
addr[3] ); addr[3] );
/* according to ICAO doc9507 Ed2 SV5 */ /* according to ICAO doc9507 Ed2 SV5 */
/* clause 5.4.3.8.1.5 and 5.4.3.8.1.3 */ /* clause 5.4.3.8.1.5 and 5.4.3.8.1.3 */
/* mobile addresses contain "c1" of "41" */ /* mobile addresses contain "c1" of "41" */
@ -578,7 +578,7 @@ dissect_atn_ulcs(
proto_tree *atn_ulcs_tree = NULL; proto_tree *atn_ulcs_tree = NULL;
guint8 value_pres = 0; guint8 value_pres = 0;
guint8 value_ses = 0; guint8 value_ses = 0;
guint16 value_ses_pres = 0; guint16 value_ses_pres = 0;
root_tree = tree; root_tree = tree;
@ -593,26 +593,26 @@ dissect_atn_ulcs(
0, 0,
0 , 0 ,
FALSE); FALSE);
atn_ulcs_tree = proto_item_add_subtree( atn_ulcs_tree = proto_item_add_subtree(
ti, ti,
ett_atn_ulcs); ett_atn_ulcs);
dissect_Fully_encoded_data_PDU( dissect_Fully_encoded_data_PDU(
tvb, tvb,
pinfo, pinfo,
atn_ulcs_tree); atn_ulcs_tree);
return offset + return offset +
tvb_reported_length_remaining(tvb, offset ) ; tvb_reported_length_remaining(tvb, offset ) ;
} }
/* decode as SPDU, PPDU and ACSE PDU */ /* decode as SPDU, PPDU and ACSE PDU */
if ( (int)(intptr_t) data == TRUE ) if ( (int)(intptr_t) data == TRUE )
{ {
/* get session and presentation PDU's */ /* get session and presentation PDU's */
value_ses_pres = tvb_get_ntohs(tvb, offset); value_ses_pres = tvb_get_ntohs(tvb, offset);
/* SPDU: dissect session layer */ /* SPDU: dissect session layer */
ti = proto_tree_add_text( ti = proto_tree_add_text(
tree, tree,
@ -671,7 +671,7 @@ dissect_atn_ulcs(
break; break;
} }
offset++; offset++;
/* PPDU: dissect presentation layer */ /* PPDU: dissect presentation layer */
ti = proto_tree_add_text( ti = proto_tree_add_text(
tree, tree,
@ -679,7 +679,7 @@ dissect_atn_ulcs(
offset, offset,
0, 0,
ATN_PRES_PROTO ); ATN_PRES_PROTO );
atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_pres); atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_pres);
value_pres = tvb_get_guint8(tvb, offset); value_pres = tvb_get_guint8(tvb, offset);
@ -696,7 +696,7 @@ dissect_atn_ulcs(
"%s (0x%02x)", "%s (0x%02x)",
val_to_str( value_ses_pres & ATN_SES_PRES_MASK , atn_pres_vals, "?"), val_to_str( value_ses_pres & ATN_SES_PRES_MASK , atn_pres_vals, "?"),
value_pres); value_pres);
/* PPDU errorcode in case of SRF/CPR */ /* PPDU errorcode in case of SRF/CPR */
switch(value_ses & SES_PDU_TYPE_MASK){ switch(value_ses & SES_PDU_TYPE_MASK){
case SES_ATN_SRF: case SES_ATN_SRF:
@ -722,7 +722,7 @@ dissect_atn_ulcs(
offset, offset,
0, 0,
ATN_ACSE_PROTO ); ATN_ACSE_PROTO );
atn_ulcs_tree = proto_item_add_subtree( atn_ulcs_tree = proto_item_add_subtree(
ti, ti,
ett_atn_acse); ett_atn_acse);
@ -743,12 +743,12 @@ static gboolean dissect_atn_ulcs_heur(
packet_info *pinfo, packet_info *pinfo,
proto_tree *tree, proto_tree *tree,
void *data _U_) void *data _U_)
{ {
/* do we have enough data*/ /* do we have enough data*/
/* at least session + presentation data or pdv-list */ /* at least session + presentation data or pdv-list */
if (tvb_reported_length_remaining(tvb, 0) < 2){ if (tvb_reported_length_remaining(tvb, 0) < 2){
return FALSE; } return FALSE; }
/* check for session/presentation/ACSE PDU's */ /* check for session/presentation/ACSE PDU's */
/* SPDU and PPDU are one octet each */ /* SPDU and PPDU are one octet each */
switch( tvb_get_ntohs(tvb, 0) & 0xf8ff ){ switch( tvb_get_ntohs(tvb, 0) & 0xf8ff ){

2
asn1/atn-ulcs/packet-atn-ulcs-template.h
View File

@ -53,7 +53,7 @@ enum msg_type {
}; };
enum ae_qualifier { enum ae_qualifier {
ads = 0, ads = 0,
cma =1, /* contact management (CM) */ cma =1, /* contact management (CM) */
cpdlc = 2, /* "plain old" CPDLC */ cpdlc = 2, /* "plain old" CPDLC */
ati = 3 , ati = 3 ,

4
asn1/c1222/packet-c1222-template.c
View File

@ -79,7 +79,7 @@
#define C1222_CMD_WAIT 0x70 #define C1222_CMD_WAIT 0x70
#define C1222_CMD_TIMING_SETUP 0x71 #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_handle=NULL;
static dissector_handle_t c1222_udp_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", "Reassemble all C12.22 messages spanning multiple TCP segments",
"Whether the C12.22 dissector should reassemble all messages spanning multiple TCP segments", "Whether the C12.22 dissector should reassemble all messages spanning multiple TCP segments",
&c1222_desegment); &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", "Base object identifier for use in resolving relative object identifiers",
&c1222_baseoid_str); &c1222_baseoid_str);
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT

38
asn1/camel/camel.cnf
View File

@ -535,7 +535,7 @@ proto_tree *subtree;
#.END #.END
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
#.FN_BODY LocationInformationGPRS/cellGlobalIdOrServiceAreaIdOrLAI #.FN_BODY LocationInformationGPRS/cellGlobalIdOrServiceAreaIdOrLAI
proto_tree *subtree; proto_tree *subtree;
int start_offset; int start_offset;
@ -548,7 +548,7 @@ proto_tree *subtree;
dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_cellGlobalIdOrServiceAreaIdFixedLength); dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_cellGlobalIdOrServiceAreaIdFixedLength);
}else{ }else{
dissect_gsm_map_LAIFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_locationAreaId); dissect_gsm_map_LAIFixedLength(TRUE, tvb, start_offset, actx, subtree, hf_camel_locationAreaId);
} }
#.END #.END
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
@ -567,7 +567,7 @@ proto_tree *subtree;
#.FN_BODY FCIBillingChargingCharacteristics VAL_PTR = &parameter_tvb #.FN_BODY FCIBillingChargingCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
@ -576,8 +576,8 @@ proto_tree *subtree;
dissect_camel_CAMEL_FCIBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCIBillingChargingCharacteristics); dissect_camel_CAMEL_FCIBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCIBillingChargingCharacteristics);
#.FN_BODY FCIGPRSBillingChargingCharacteristics VAL_PTR = &parameter_tvb #.FN_BODY FCIGPRSBillingChargingCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
@ -587,17 +587,17 @@ proto_tree *subtree;
#.FN_BODY FCISMSBillingChargingCharacteristics VAL_PTR = &parameter_tvb #.FN_BODY FCISMSBillingChargingCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_FCISMSBillingChargingCharacteristics); 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); dissect_camel_CAMEL_FCISMSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_FCISMSBillingChargingCharacteristics);
#.FN_BODY SCIBillingChargingCharacteristics VAL_PTR = &parameter_tvb #.FN_BODY SCIBillingChargingCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
@ -607,17 +607,17 @@ proto_tree *subtree;
#.FN_BODY SCIGPRSBillingChargingCharacteristics VAL_PTR = &parameter_tvb #.FN_BODY SCIGPRSBillingChargingCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_camel_CAMEL_SCIGPRSBillingChargingCharacteristics); 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); dissect_camel_CAMEL_SCIGPRSBillingChargingCharacteristics(FALSE, parameter_tvb, 0, actx, subtree, hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics);
#.FN_BODY CallResult VAL_PTR = &parameter_tvb #.FN_BODY CallResult VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
@ -641,15 +641,15 @@ proto_tree *subtree;
* identification' and 'number digit' fields defined in 3GPP TS 24.008 [9]; * 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 * it does not carry the 'called party BCD number IEI' or 'length of called
* party BCD number contents'. * party BCD number contents'.
* In the context of the DestinationSubscriberNumber field in ConnectSMSArg or * In the context of the DestinationSubscriberNumber field in ConnectSMSArg or
* InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric * InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric
* character string. In this case, type-of-number '101'B is used, in accordance * 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 * 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 * GSM 7-bit default alphabet definition and the SMS packing rules
* as specified in 3GPP TS 23.038 [15] in this case. * as specified in 3GPP TS 23.038 [15] in this case.
*/ */
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s

16
asn1/camel/packet-camel-template.h
View File

@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* References: ETSI 300 374 * 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. * 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 */ #define NB_CAMELSRT_CATEGORY 9+1 /**< Number of type of message */
/* for example TC_BEGIN with InitalDP, and TC_CONT with RequestReportBCSMEvent /* 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 #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, /** If we have a request message and its response,
(eg: ApplyCharging, ApplyChargingReport) (eg: ApplyCharging, ApplyChargingReport)
the frames numbers are stored in this structure */ the frames numbers are stored in this structure */
struct camelsrt_category_t { struct camelsrt_category_t {
guint32 req_num; /**< frame number request seen */ 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 */ of the TC_BEGIN containing the InitialDP */
struct camelsrt_call_info_key_t { struct camelsrt_call_info_key_t {
@ -96,8 +96,8 @@ struct camelsrt_call_info_key_t {
}; };
/** Info for a couple of messages (or category) /** Info for a couple of messages (or category)
The request must be available, not duplicated, The request must be available, not duplicated,
and once the corresponding response received, and once the corresponding response received,
we can deduce the Delta Time between Request/response */ we can deduce the Delta Time between Request/response */
struct camelsrt_msginfo_t { struct camelsrt_msginfo_t {
@ -110,7 +110,7 @@ struct camelsrt_msginfo_t {
/** List of infos to store for the analyse */ /** List of infos to store for the analyse */
struct camelsrt_info_t { struct camelsrt_info_t {
guint32 tcap_session_id; guint32 tcap_session_id;
void * tcap_context; void * tcap_context;
guint8 opcode; /**< operation code of message received */ guint8 opcode; /**< operation code of message received */

18
asn1/cdt/cdt.cnf
View File

@ -23,8 +23,8 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt"
val_to_str (value, cdt_AlgorithmID_ShortForm_vals, val_to_str (value, cdt_AlgorithmID_ShortForm_vals,
"unknown")); "unknown"));
col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ",
val_to_str (value, cdt_AlgorithmID_ShortForm_vals, val_to_str (value, cdt_AlgorithmID_ShortForm_vals,
"unknown")); "unknown"));
#.FN_PARS ContentType-ShortForm #.FN_PARS ContentType-ShortForm
@ -34,11 +34,11 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt"
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
proto_item_append_text (cdt_item, ", %%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")); "unknown"));
col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ",
val_to_str (content_type, cdt_ContentType_ShortForm_vals, val_to_str (content_type, cdt_ContentType_ShortForm_vals,
"unknown")); "unknown"));
#.FN_PARS CompressedContentInfo/contentType/contentType-OID #.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) { if (compr_tvb == NULL) {
proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_compress_content, proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_compress_content,
tvb, save_offset, -1); 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]"); "[Error: Unable to get compressed content]");
return offset; return offset;
} }
next_tvb = tvb_child_uncompress (tvb, compr_tvb, 0, tvb_length (compr_tvb)); next_tvb = tvb_child_uncompress (tvb, compr_tvb, 0, tvb_length (compr_tvb));
if (next_tvb == NULL) { if (next_tvb == NULL) {
proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_uncompress_content, proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_uncompress_content,
tvb, save_offset, -1); 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]"); "[Error: Unable to uncompress content]");
return offset; 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); call_dissector (data_handle, next_tvb, actx->pinfo, top_tree);
break; break;
} }
#.END #.END

2
asn1/cdt/packet-cdt-template.h
View File

@ -2,7 +2,7 @@
* *
* Routines for Compressed Data Type packet dissection. * 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 * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>

100
asn1/cmip/cmip.cnf
View File

@ -80,7 +80,7 @@ static const value_string cmip_Opcode_vals[] = {
/* CMIP ERRORS */ /* CMIP ERRORS */
static const value_string cmip_error_code_vals[] = { static const value_string cmip_error_code_vals[] = {
#.TABLE_BODY ERROR #.TABLE_BODY ERROR
{ %(&errorCode)s, "%(_ident)s" }, { %(&errorCode)s, "%(_ident)s" },
#.TABLE_FTR #.TABLE_FTR
{ 0, NULL } { 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)" EventTime B "2.9.3.2.7.13" "eventTime(13)"
EventTypeId B "2.9.3.2.7.14" "eventType(14)" EventTypeId B "2.9.3.2.7.14" "eventType(14)"
MonitoredAttributes B "2.9.3.2.7.15" "monitoredAttributes(15)" 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)" PerceivedSeverity B "2.9.3.2.7.17" "perceivedSeverity(17)"
ProbableCause B "2.9.3.2.7.18" "probableCause(18)" ProbableCause B "2.9.3.2.7.18" "probableCause(18)"
ProposedRepairActions B "2.9.3.2.7.19" "proposedRepairActions(19)" 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)" StandbyStatus B "2.9.3.2.7.37" "standbyStatus(37)"
UnknownStatus B "2.9.3.2.7.38" "unknownStatus(38)" UnknownStatus B "2.9.3.2.7.38" "unknownStatus(38)"
UsageState B "2.9.3.2.7.39" "usageState(39)" 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.40" "backUpObject(40)"
BackUpRelationshipObject B "2.9.3.2.7.41" "backedUpObject(41)" 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.42" "member(42)"
GroupObjects B "2.9.3.2.7.43" "owner(43)" GroupObjects B "2.9.3.2.7.43" "owner(43)"
BackUpRelationshipObject B "2.9.3.2.7.44" "peer(44)" 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.45" "primary(45)"
PrioritisedObject B "2.9.3.2.7.46" "providerObject(46)" 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.47" "secondary(47)"
PrioritisedObject B "2.9.3.2.7.48" "userObject(48)" PrioritisedObject B "2.9.3.2.7.48" "userObject(48)"
ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)" ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)"
Allomorphs B "2.9.3.2.7.50" "allomorphs(50)" Allomorphs B "2.9.3.2.7.50" "allomorphs(50)"
BackUpDestinationList B "2.9.3.2.7.51" "backUpDestinationList(51)" 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)" StopTime B "2.9.3.2.7.69" "stopTime(69)"
SupportedFeatures B "2.9.3.2.7.70" "supportedFeatures(70)" SupportedFeatures B "2.9.3.2.7.70" "supportedFeatures(70)"
WeekMask B "2.9.3.2.7.71" "weekMask(71)" WeekMask B "2.9.3.2.7.71" "weekMask(71)"
# corruptedPDUsReceivedCounter(72) -- corruptedPDUsReceivedCounter attribute type # corruptedPDUsReceivedCounter(72) -- corruptedPDUsReceivedCounter attribute type
# incomingConnectionRejectErrorCounter(73) -- incomingConnectionRejectErrorCounte... # incomingConnectionRejectErrorCounter(73) -- incomingConnectionRejectErrorCounte...
# incomingConnectionRequestsCounter(74) -- incomingConnectionRequestsCounter attr... # incomingConnectionRequestsCounter(74) -- incomingConnectionRequestsCounter attr...
# incomingDisconnectCounter(75) -- incomingDisconnectCounter attribute type # incomingDisconnectCounter(75) -- incomingDisconnectCounter attribute type
# ncomingDisconnectErrorCounter(76) -- ncomingDisconnectErrorCounter attribute ty... # ncomingDisconnectErrorCounter(76) -- ncomingDisconnectErrorCounter attribute ty...
# incomingProtocolErrorCounter(77) -- incomingProtocolErrorCounter attribute type # incomingProtocolErrorCounter(77) -- incomingProtocolErrorCounter attribute type
# octetsReceivedCounter(78) -- octetsReceivedCounter attribute type # octetsReceivedCounter(78) -- octetsReceivedCounter attribute type
# octetsRetransmittedErrorCounter(79) -- octetsRetransmittedErrorCounter attribut... # octetsRetransmittedErrorCounter(79) -- octetsRetransmittedErrorCounter attribut...
# octetsSentCounter(80) -- octetsSentCounter attribute type # octetsSentCounter(80) -- octetsSentCounter attribute type
# outgoingConnectionRejectErrorCounter(81) -- outgoingConnectionRejectErrorCounte... # outgoingConnectionRejectErrorCounter(81) -- outgoingConnectionRejectErrorCounte...
# outgoingConnectionRequestsCounter(82) -- outgoingConnectionRequestsCounter attr... # outgoingConnectionRequestsCounter(82) -- outgoingConnectionRequestsCounter attr...
# outgoingDisconnectCounter(83) -- outgoingDisconnectCounter attribute type # outgoingDisconnectCounter(83) -- outgoingDisconnectCounter attribute type
# outgoingDisconnectErrorCounter(84) -- outgoingDisconnectErrorCounter attribute ... # outgoingDisconnectErrorCounter(84) -- outgoingDisconnectErrorCounter attribute ...
# outgoingProtocolErrorCounter(85) -- outgoingProtocolErrorCounter attribute type # outgoingProtocolErrorCounter(85) -- outgoingProtocolErrorCounter attribute type
# pdusReceivedCounter(86) -- pdusReceivedCounter attribute type (PDU: Protocol Da... # pdusReceivedCounter(86) -- pdusReceivedCounter attribute type (PDU: Protocol Da...
# pdusRetransmittedErrorCounter(87) -- pdusRetransmittedErrorCounter attribute ty... # pdusRetransmittedErrorCounter(87) -- pdusRetransmittedErrorCounter attribute ty...
# pdusSentCounter(88) -- pdusSentCounter attribute type (PDU: Protocol Data Unit) # pdusSentCounter(88) -- pdusSentCounter attribute type (PDU: Protocol Data Unit)
# corruptedPDUsReceivedThreshold(89) -- corruptedPDUsReceivedThreshold attribute ... # corruptedPDUsReceivedThreshold(89) -- corruptedPDUsReceivedThreshold attribute ...
# incomingConnectionRejectErrorThreshold(90) -- incomingConnectionRejectErrorThre... # incomingConnectionRejectErrorThreshold(90) -- incomingConnectionRejectErrorThre...
# incomingConnectionRequestsThreshold(91) -- incomingConnectionRequestsThreshold ... # incomingConnectionRequestsThreshold(91) -- incomingConnectionRequestsThreshold ...
# incomingDisconnectErrorThreshold(92) -- incomingDisconnectErrorThreshold attrib... # incomingDisconnectErrorThreshold(92) -- incomingDisconnectErrorThreshold attrib...
# incomingProtocolErrorThreshold(93) -- incomingProtocolErrorThreshold attribute ... # incomingProtocolErrorThreshold(93) -- incomingProtocolErrorThreshold attribute ...
# octetsReceivedThreshold(94) -- octetsReceivedThreshold attribute type # octetsReceivedThreshold(94) -- octetsReceivedThreshold attribute type
# octetsRetransmittedThreshold(95) -- octetsRetransmittedThreshold attribute type # octetsRetransmittedThreshold(95) -- octetsRetransmittedThreshold attribute type
# octetsSentThreshold(96) -- octetsSentThreshold attribute type # octetsSentThreshold(96) -- octetsSentThreshold attribute type
# outgoingConnectionRejectErrorThreshold(97) -- outgoingConnectionRejectErrorThre... # outgoingConnectionRejectErrorThreshold(97) -- outgoingConnectionRejectErrorThre...
# outgoingConnectionRequestsThreshold(98) -- outgoingConnectionRequestsThreshold ... # outgoingConnectionRequestsThreshold(98) -- outgoingConnectionRequestsThreshold ...
# outgoingDisconnectErrorThreshold(99) -- outgoingDisconnectErrorThreshold attrib... # outgoingDisconnectErrorThreshold(99) -- outgoingDisconnectErrorThreshold attrib...
# outgoingProtocolErrorThreshold(100) -- outgoingProtocolErrorThreshold attribute... # outgoingProtocolErrorThreshold(100) -- outgoingProtocolErrorThreshold attribute...
# pdusReceivedThreshold(101) -- pdusReceivedThreshold attribute type (PDU: Protoc... # pdusReceivedThreshold(101) -- pdusReceivedThreshold attribute type (PDU: Protoc...
# pdusRetransmittedErrorThreshold(102) -- pdusRetransmittedErrorThreshold attribu... # pdusRetransmittedErrorThreshold(102) -- pdusRetransmittedErrorThreshold attribu...
# pdusSentThreshold(103) -- pdusSentThreshold attribute type (PDU: Protocol Data ... # pdusSentThreshold(103) -- pdusSentThreshold attribute type (PDU: Protocol Data ...
LifecycleState B "2.9.3.2.7.115" "lifecycleState(115)" 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); offset = dissect_cmip_InvokeIDType(FALSE, tvb, offset, actx, tree, -1);
break; break;
} }
#.FN_BODY ReturnResult/result/result #.FN_BODY ReturnResult/result/result
@ -354,7 +354,7 @@ RejectProblem
break; /* doe this one return any data? */ break; /* doe this one return any data? */
} }
/*XXX add more types here */ /*XXX add more types here */
#.FN_BODY ReturnError/parameter #.FN_BODY ReturnError/parameter
switch(opcode){ switch(opcode){
@ -373,23 +373,23 @@ RejectProblem
case 15: /* invalidArgumentValue */ case 15: /* invalidArgumentValue */
dissect_cmip_InvalidArgumentValue(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_InvalidArgumentValue(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 6: /* invalidAttributeValue */ case 6: /* invalidAttributeValue */
dissect_cmip_Attribute(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_Attribute(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 4: /* invalidFilter */ case 4: /* invalidFilter */
dissect_cmip_CMISFilter(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_CMISFilter(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 17: /* invalidObjectInstance */ case 17: /* invalidObjectInstance */
dissect_cmip_ObjectInstance(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_ObjectInstance(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 16: /* invalidScope */ case 16: /* invalidScope */
dissect_cmip_Scope(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_Scope(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 18: /* missingAttributeValue */ case 18: /* missingAttributeValue */
/* Hmmm SET OF AttributeId */ /* Hmmm SET OF AttributeId */
dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_PAR_missingAttributeValue(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 9: /* noSuchAction */ case 9: /* noSuchAction */
dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1); dissect_cmip_NoSuchAction(FALSE, tvb, offset, actx, tree, -1);
break; break;
case 14: /* noSuchArgument */ case 14: /* noSuchArgument */
@ -455,7 +455,7 @@ RejectProblem
} else { } else {
offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree); offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
} }
#.FN_PARS SpecificErrorInfo/errorId #.FN_PARS SpecificErrorInfo/errorId
FN_VARIANT = _str HF_INDEX = hf_cmip_errorId_OID VAL_PTR = &object_identifier_id FN_VARIANT = _str HF_INDEX = hf_cmip_errorId_OID VAL_PTR = &object_identifier_id

2
asn1/cmp/cmp.cnf
View File

@ -5,7 +5,7 @@
PKIX1Explicit88 pkix1explicit PKIX1Explicit88 pkix1explicit
PKIX1Implicit88 pkix1implicit PKIX1Implicit88 pkix1implicit
PKIXCRMF-2005 crmf PKIXCRMF-2005 crmf
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
#.IMPORT ../crmf/crmf-exp.cnf #.IMPORT ../crmf/crmf-exp.cnf

2
asn1/cms/cms.cnf
View File

@ -144,7 +144,7 @@ RevocationInfoChoice/other otherRIC
int old_offset = offset; int old_offset = offset;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
pi = actx->created_item; pi = actx->created_item;
/* move past TLV */ /* move past TLV */

4
asn1/credssp/credssp.cnf
View File

@ -25,7 +25,7 @@ TSRequest
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if((decr_tvb != NULL) && if((decr_tvb != NULL) &&
((creds_type == TS_PASSWORD_CREDS) || (creds_type == TS_SMARTCARD_CREDS))) { ((creds_type == TS_PASSWORD_CREDS) || (creds_type == TS_SMARTCARD_CREDS))) {
switch(creds_type) { switch(creds_type) {
@ -47,7 +47,7 @@ TSRequest
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(token_tvb != NULL) 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); token_tvb, actx->pinfo, proto_tree_get_root(tree), NULL);

10
asn1/credssp/packet-credssp-template.c
View File

@ -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); 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) { 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)) { if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_SEQUENCE) && (pc == TRUE)) {
offset = get_ber_length(tvb, offset, NULL, NULL); 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)) { if((ber_class == BER_CLASS_CON) && (tag == 0)) {
offset = get_ber_length(tvb, offset, NULL, NULL); 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)) { if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_INTEGER)) {
offset = get_ber_length(tvb, offset, &length, NULL); offset = get_ber_length(tvb, offset, &length, NULL);
if((length == 1) && (tvb_get_guint8(tvb, offset) == 2)) { 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_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_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; exp_pdu_data->pdu_tvb = tvb;
tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data); tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data);

2
asn1/crmf/crmf.cnf
View File

@ -5,7 +5,7 @@
PKIX1Explicit88 pkix1explicit PKIX1Explicit88 pkix1explicit
PKIX1Implicit88 pkix1implicit PKIX1Implicit88 pkix1implicit
CryptographicMessageSyntax2004 cms CryptographicMessageSyntax2004 cms
#.IMPORT ../cms/cms-exp.cnf #.IMPORT ../cms/cms-exp.cnf
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf

2
asn1/dsp/packet-dsp-template.h
View File

@ -24,6 +24,6 @@
#ifndef PACKET_DSP_H #ifndef PACKET_DSP_H
#define PACKET_DSP_H #define PACKET_DSP_H
#include "packet-dsp-exp.h" #include "packet-dsp-exp.h"
#endif /* PACKET_DSP_H */ #endif /* PACKET_DSP_H */

26
asn1/ess/ess.cnf
View File

@ -56,46 +56,46 @@ FreeFormField/bitSetAttributes informativeAttributeFlags
#.FN_PARS PermissiveTag/tagName #.FN_PARS PermissiveTag/tagName
FN_VARIANT = _str VAL_PTR = &object_identifier_id FN_VARIANT = _str VAL_PTR = &object_identifier_id
#.FN_PARS InformativeTag/tagName #.FN_PARS InformativeTag/tagName
FN_VARIANT = _str VAL_PTR = &object_identifier_id FN_VARIANT = _str VAL_PTR = &object_identifier_id
#.FN_PARS SecurityAttribute #.FN_PARS SecurityAttribute
VAL_PTR = &attribute VAL_PTR = &attribute
#.FN_BODY SecurityAttribute #.FN_BODY SecurityAttribute
guint32 attribute; guint32 attribute;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
ess_dissect_attribute (attribute, actx); ess_dissect_attribute (attribute, actx);
#.FN_PARS RestrictiveTag/attributeFlags #.FN_PARS RestrictiveTag/attributeFlags
VAL_PTR = &attributes VAL_PTR = &attributes
#.FN_BODY RestrictiveTag/attributeFlags #.FN_BODY RestrictiveTag/attributeFlags
tvbuff_t *attributes; tvbuff_t *attributes;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
ess_dissect_attribute_flags (attributes, actx); ess_dissect_attribute_flags (attributes, actx);
#.FN_PARS PermissiveTag/attributeFlags #.FN_PARS PermissiveTag/attributeFlags
VAL_PTR = &attributes VAL_PTR = &attributes
#.FN_BODY PermissiveTag/attributeFlags #.FN_BODY PermissiveTag/attributeFlags
tvbuff_t *attributes; tvbuff_t *attributes;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
ess_dissect_attribute_flags (attributes, actx); ess_dissect_attribute_flags (attributes, actx);
#.FN_PARS FreeFormField/bitSetAttributes #.FN_PARS FreeFormField/bitSetAttributes
VAL_PTR = &attributes VAL_PTR = &attributes
#.FN_BODY FreeFormField/bitSetAttributes #.FN_BODY FreeFormField/bitSetAttributes
tvbuff_t *attributes; tvbuff_t *attributes;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
ess_dissect_attribute_flags (attributes, actx); ess_dissect_attribute_flags (attributes, actx);
#.FN_BODY Receipt #.FN_BODY Receipt
col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "ESS"); col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "ESS");
col_set_str(actx->pinfo->cinfo, COL_INFO, "Signed Receipt"); col_set_str(actx->pinfo->cinfo, COL_INFO, "Signed Receipt");

2
asn1/ftam/ftam.cnf
View File

@ -91,7 +91,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
gint branch_taken; gint branch_taken;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ 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); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
} }

4
asn1/ftam/packet-ftam-template.c
View File

@ -67,7 +67,7 @@ static gint ett_ftam = -1;
static void static void
dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) 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 static void
dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) 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);
} }
/* /*

2
asn1/gnm/gnm.cnf
View File

@ -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)" 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.28" "managedElementId(28)"
NameType B "0.0.13.3100.0.7.29" "mpCrossConnectionId(29)" NameType B "0.0.13.3100.0.7.29" "mpCrossConnectionId(29)"
NameType B "0.0.13.3100.0.7.30" "networkId(30)" NameType B "0.0.13.3100.0.7.30" "networkId(30)"
#ObjectInstance B "0.0.13.3100.0.7.31" "networkLevelPointer(31)" #ObjectInstance B "0.0.13.3100.0.7.31" "networkLevelPointer(31)"
Boolean B "0.0.13.3100.0.7.32" "protected(32)" Boolean B "0.0.13.3100.0.7.32" "protected(32)"

26
asn1/gprscdr/gprscdr.cnf
View File

@ -52,7 +52,7 @@ GPRSRecord
#.FN_BODY ManagementExtension/information #.FN_BODY ManagementExtension/information
proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); proto_tree_add_text(tree, tvb, offset, -1, "Not dissected");
#.FN_BODY TimeStamp VAL_PTR = &parameter_tvb #.FN_BODY TimeStamp VAL_PTR = &parameter_tvb
/* /*
* *
@ -74,7 +74,7 @@ GPRSRecord
*/ */
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
@ -91,7 +91,7 @@ GPRSRecord
tvb_get_guint8(parameter_tvb,7), /* Hour */ tvb_get_guint8(parameter_tvb,7), /* Hour */
tvb_get_guint8(parameter_tvb,8) /* Minute */ tvb_get_guint8(parameter_tvb,8) /* Minute */
); );
#.FN_BODY MSTimeZone VAL_PTR = &parameter_tvb #.FN_BODY MSTimeZone VAL_PTR = &parameter_tvb
/* /*
* *
@ -111,14 +111,14 @@ GPRSRecord
data = (data >> 4) + (data & 0x07) * 10; data = (data >> 4) + (data & 0x07) * 10;
data2 = tvb_get_guint8(tvb, 1) & 0x3; data2 = tvb_get_guint8(tvb, 1) & 0x3;
proto_item_append_text(actx->created_item, " (GMT %%c %%d hours %%d minutes %%s)", proto_item_append_text(actx->created_item, " (GMT %%c %%d hours %%d minutes %%s)",
sign, sign,
data / 4, data / 4,
data %% 4 * 15, data %% 4 * 15,
val_to_str_const(data2, gprscdr_daylight_saving_time_vals, "Unknown") val_to_str_const(data2, gprscdr_daylight_saving_time_vals, "Unknown")
); );
#.FN_BODY PLMN-Id VAL_PTR = &parameter_tvb #.FN_BODY PLMN-Id VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;
proto_tree *subtree; proto_tree *subtree;
@ -127,11 +127,11 @@ GPRSRecord
if (!parameter_tvb) if (!parameter_tvb)
return offset; 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); dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, TRUE);
#.TYPE_ATTR #.TYPE_ATTR
IPBinaryAddress/iPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE IPBinaryAddress/iPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE
IPBinaryAddress/iPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE IPBinaryAddress/iPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE
#.END #.END

4
asn1/gsm_map/gsm_map.cnf
View File

@ -1,4 +1,4 @@
#.OPT #.OPT
-b -b
#-d satcom #-d satcom
#-s packet-gsm_map-tmp #-s packet-gsm_map-tmp
@ -863,7 +863,7 @@ if (!actx->value_ptr)
# APN ::= OCTET STRING (SIZE (2..63)) # 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 # 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 # The APN consists of one or more labels. Each label is coded as a one octet length field followed by that number of

4
asn1/gsm_map/packet-gsm_map-template.c
View File

@ -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); offset=dissect_gsm_map_om_DeactivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1);
break; break;
/* reserved traceSubscriberActivity (52) */ /* reserved traceSubscriberActivity (52) */
case 53: /* UpdateVcsgLocation 53 */ case 53: /* UpdateVcsgLocation 53 */
offset=dissect_gsm_map_ms_UpdateVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1); offset=dissect_gsm_map_ms_UpdateVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1);
break; break;
@ -2636,7 +2636,7 @@ void proto_reg_handoff_gsm_map(void) {
range_foreach(ssn_range, range_delete_callback); range_foreach(ssn_range, range_delete_callback);
g_free(ssn_range); g_free(ssn_range);
} }
ssn_range = range_copy(global_ssn_range); ssn_range = range_copy(global_ssn_range);
range_foreach(ssn_range, range_add_callback); range_foreach(ssn_range, range_add_callback);

4
asn1/h225/packet-h225-template.h
View File

@ -70,14 +70,14 @@ typedef struct _h225_packet_info {
/* /*
* the following allows TAP code access to the messages * 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. * libwireshark.dll, we need a special declaration.
*/ */
#include <epan/asn1.h> #include <epan/asn1.h>
#include <epan/dissectors/packet-per.h> #include <epan/dissectors/packet-per.h>
#include "packet-h225-exp.h" #include "packet-h225-exp.h"
#endif /* PACKET_H225_H */ #endif /* PACKET_H225_H */

2
asn1/h235/packet-h235-template.c
View File

@ -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); dissector_add_string("h245.gef.content", "GenericCapability/" OID_MIKEY_DH_SIGN "/nonCollapsing/75", mikey_handle);
/* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */ /* 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)); new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235));
} }

58
asn1/h245/h245.cnf
View File

@ -38,7 +38,7 @@ AudioCapability TYPE_PREFIX
G723AnnexCAudioMode G7231AnnexCCapability/g723AnnexCAudioMode G7231AnnexCMode/g723AnnexCAudioMode G723AnnexCAudioMode G7231AnnexCCapability/g723AnnexCAudioMode G7231AnnexCMode/g723AnnexCAudioMode
Application DataApplicationCapability/application Application DataApplicationCapability/application
Nlpid Application/nlpid DataMode/application/nlpid 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 ArqType H223AL1MParameters/arqType H223AL3MParameters/arqType
Restriction FlowControlCommand/restriction FlowControlIndication/restriction Restriction FlowControlCommand/restriction FlowControlIndication/restriction
Scope FlowControlCommand/scope FlowControlIndication/scope JitterIndication/scope Scope FlowControlCommand/scope FlowControlIndication/scope JitterIndication/scope
@ -148,8 +148,8 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format
if (fast_start) { if (fast_start) {
h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc); h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc);
} else { } else {
g_hash_table_insert(h245_pending_olc_reqs, 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)), wmem_strdup(wmem_file_scope(), gen_olc_key(upcoming_olc->fwd_lc_num, &%(ACTX)s->pinfo->dst, &%(ACTX)s->pinfo->src)),
upcoming_olc); upcoming_olc);
} }
} }
@ -195,7 +195,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format
upcoming_channel = (upcoming_olc) ? &upcoming_olc->rev_lc : NULL; upcoming_channel = (upcoming_olc) ? &upcoming_olc->rev_lc : NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (upcoming_channel && codec_type) { if (upcoming_channel && codec_type) {
g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); 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_fw_lc_num = 0;
h223_rev_lc_num = 0; h223_rev_lc_num = 0;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
temp = h223_fw_lc_num; temp = h223_fw_lc_num;
p2p_dir = %(ACTX)s->pinfo->p2p_dir; p2p_dir = %(ACTX)s->pinfo->p2p_dir;
if(%(ACTX)s->pinfo->p2p_dir == P2P_DIR_SENT) if(%(ACTX)s->pinfo->p2p_dir == P2P_DIR_SENT)
%(ACTX)s->pinfo->p2p_dir = P2P_DIR_RECV; %(ACTX)s->pinfo->p2p_dir = P2P_DIR_RECV;
else else
@ -280,7 +280,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format
upcoming_channel = (upcoming_olc) ? &upcoming_olc->fwd_lc : NULL; upcoming_channel = (upcoming_olc) ? &upcoming_olc->fwd_lc : NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
upcoming_channel = NULL; upcoming_channel = NULL;
#.END #.END
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
@ -611,7 +611,7 @@ if (h245_pi != NULL)
gefx = gef_ctx_alloc(NULL, "GenericMessage"); gefx = gef_ctx_alloc(NULL, "GenericMessage");
actx->private_data = gefx; actx->private_data = gefx;
} }
#.FN_FTR #.FN_FTR
actx->private_data = priv_data; actx->private_data = priv_data;
#.END #.END
@ -628,7 +628,7 @@ if (h245_pi != NULL)
hf_index = hf_h245_subMessageIdentifier_standard; hf_index = hf_h245_subMessageIdentifier_standard;
} }
} }
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (gefx) { if (gefx) {
gefx->subid = wmem_strdup_printf(wmem_packet_scope(), "%%u", subMessageIdentifer); gefx->subid = wmem_strdup_printf(wmem_packet_scope(), "%%u", subMessageIdentifer);
@ -655,7 +655,7 @@ if (h245_pi != NULL)
#.FN_HDR GenericInformation #.FN_HDR GenericInformation
void *priv_data = actx->private_data; void *priv_data = actx->private_data;
actx->private_data = gef_ctx_alloc(NULL, "GenericInformation"); actx->private_data = gef_ctx_alloc(NULL, "GenericInformation");
#.FN_FTR #.FN_FTR
actx->private_data = priv_data; actx->private_data = priv_data;
#.END #.END
@ -681,7 +681,7 @@ if (h245_pi != NULL)
parent_gefx = gef_ctx_get(actx->private_data); parent_gefx = gef_ctx_get(actx->private_data);
actx->private_data = gef_ctx_alloc(parent_gefx, "nonCollapsing"); actx->private_data = gef_ctx_alloc(parent_gefx, "nonCollapsing");
#.FN_FTR #.FN_FTR
actx->private_data = parent_gefx; actx->private_data = parent_gefx;
#.END #.END
@ -705,7 +705,7 @@ if (h245_pi != NULL)
#.FN_HDR EncryptionSync #.FN_HDR EncryptionSync
void *priv_data = actx->private_data; void *priv_data = actx->private_data;
actx->private_data = gef_ctx_alloc(NULL, "EncryptionSync"); actx->private_data = gef_ctx_alloc(NULL, "EncryptionSync");
#.FN_FTR #.FN_FTR
actx->private_data = priv_data; actx->private_data = priv_data;
#.END #.END
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
@ -969,7 +969,7 @@ NonStandardIdentifier/object FN_VARIANT = _str VAL_PTR = &nsiOID
#.FN_FTR NonStandardIdentifier/h221NonStandard #.FN_FTR NonStandardIdentifier/h221NonStandard
h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); 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/t35CountryCode VAL_PTR = &t35CountryCode
NonStandardIdentifier/h221NonStandard/t35Extension VAL_PTR = &t35Extension NonStandardIdentifier/h221NonStandard/t35Extension VAL_PTR = &t35Extension
NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode
@ -1061,7 +1061,7 @@ FunctionNotSupported/cause FunctionNotSupportedCause
AudioMode/g7231 Mode_g7231 AudioMode/g7231 Mode_g7231
DataMode/application DataModeApplication DataMode/application DataModeApplication
DataMode/application/t38fax T38faxApp DataMode/application/t38fax T38faxApp
DepFECData/rfc2733 RFC2733Data DepFECData/rfc2733 RFC2733Data
@ -1222,7 +1222,7 @@ H262VideoMode/profileAndLevel/profileAndLevel-SpatialatH-14 profileAndLevel_Spat
H262VideoMode/profileAndLevel/profileAndLevel-HPatML profileAndLevel_HPatMLMode H262VideoMode/profileAndLevel/profileAndLevel-HPatML profileAndLevel_HPatMLMode
H262VideoMode/profileAndLevel/profileAndLevel-HPatH-14 profileAndLevel_HPatH-14Mode H262VideoMode/profileAndLevel/profileAndLevel-HPatH-14 profileAndLevel_HPatH-14Mode
H262VideoMode/profileAndLevel/profileAndLevel-HPatHL profileAndLevel_HPatHLMode H262VideoMode/profileAndLevel/profileAndLevel-HPatHL profileAndLevel_HPatHLMode
RedundancyEncodingMode/secondaryEncoding/audioData audioMode RedundancyEncodingMode/secondaryEncoding/audioData audioMode
RedundancyEncodingMode/secondaryEncoding secondaryEncodingMode RedundancyEncodingMode/secondaryEncoding secondaryEncodingMode
RedundancyEncodingCapability/secondaryEncoding secondaryEncodingCapability RedundancyEncodingCapability/secondaryEncoding secondaryEncodingCapability
@ -1231,7 +1231,7 @@ UnicastAddress/iPAddress/network ip4_network
UnicastAddress/iP6Address/network ip6_network UnicastAddress/iP6Address/network ip6_network
MulticastAddress/iP6Address/network mip6_network MulticastAddress/iP6Address/network mip6_network
MulticastAddress/iPAddress mIPAddress MulticastAddress/iPAddress mIPAddress
MulticastAddress/iP6Address mIP6Address MulticastAddress/iP6Address mIP6Address
MulticastAddress/iPAddress/network mip4_network MulticastAddress/iPAddress/network mip4_network
RTPPayloadType/payloadType rtpPayloadType RTPPayloadType/payloadType rtpPayloadType
@ -1260,36 +1260,36 @@ VCCapability/aal1/srtsClockRecovery srtsClockRecovery_bool
VCCapability/aal1ViaGateway/srtsClockRecovery srtsClockRecoveryflag VCCapability/aal1ViaGateway/srtsClockRecovery srtsClockRecoveryflag
DataMode/application/t84 t84DataProtocolCapability DataMode/application/t84 t84DataProtocolCapability
DataMode/application/t38fax t38faxDataProtocolCapability DataMode/application/t38fax t38faxDataProtocolCapability
H2250LogicalChannelParameters/sessionID sessionID_0_255 H2250LogicalChannelParameters/sessionID sessionID_0_255
H223Capability/mobileOperationTransmitCapability/h223AnnexADoubleFlag h223AnnexADoubleFlagFlag H223Capability/mobileOperationTransmitCapability/h223AnnexADoubleFlag h223AnnexADoubleFlagFlag
SendTerminalCapabilitySet/genericRequest genericRequestFlag SendTerminalCapabilitySet/genericRequest genericRequestFlag
H2250LogicalChannelParameters/mediaPacketization/h261aVideoPacketization h261aVideoPacketizationFlag H2250LogicalChannelParameters/mediaPacketization/h261aVideoPacketization h261aVideoPacketizationFlag
RemoteMCResponse/reject/functionNotSupported functionNotSupportedFlag RemoteMCResponse/reject/functionNotSupported functionNotSupportedFlag
NewATMVCCommand/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag NewATMVCCommand/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag
NewATMVCIndication/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag NewATMVCIndication/aal/aal1/errorCorrection/longInterleaver longInterleaverFlag
MiscellaneousCommand/type/videoFastUpdateMB/firstGOB firstGOB_0_255 MiscellaneousCommand/type/videoFastUpdateMB/firstGOB firstGOB_0_255
H263VideoCapability/sqcifMPI sqcifMPI_1_32 H263VideoCapability/sqcifMPI sqcifMPI_1_32
EnhancementOptions/sqcifMPI sqcifMPI_1_32 EnhancementOptions/sqcifMPI sqcifMPI_1_32
NewATMVCCommand/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag NewATMVCCommand/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag
NewATMVCIndication/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag NewATMVCIndication/aal/aal1/errorCorrection/shortInterleaver shortInterleaverFlag
NewATMVCCommand/multiplex/programStream programStreamFlag NewATMVCCommand/multiplex/programStream programStreamFlag
NewATMVCCommand/reverseParameters/multiplex/programStream programStreamFlag NewATMVCCommand/reverseParameters/multiplex/programStream programStreamFlag
NewATMVCIndication/multiplex/programStream programStreamFlag NewATMVCIndication/multiplex/programStream programStreamFlag
NewATMVCIndication/reverseParameters/multiplex/programStream programStreamFlag NewATMVCIndication/reverseParameters/multiplex/programStream programStreamFlag
H263ModeComboFlags/enhancedReferencePicSelect enhancedReferencePicSelectBool H263ModeComboFlags/enhancedReferencePicSelect enhancedReferencePicSelectBool
NewATMVCCommand/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag NewATMVCCommand/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag
NewATMVCIndication/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag NewATMVCIndication/aal/aal1/errorCorrection/errorCorrectionOnly errorCorrectionOnlyFlag
UserInputCapability/extendedAlphanumeric extendedAlphanumericFlag UserInputCapability/extendedAlphanumeric extendedAlphanumericFlag
MultiplexElement/repeatCount/finite me_repeatCount_finite MultiplexElement/repeatCount/finite me_repeatCount_finite
MiscellaneousCommand/type/videoFastUpdateMB/firstMB firstMB_1_8192 MiscellaneousCommand/type/videoFastUpdateMB/firstMB firstMB_1_8192
MiscellaneousIndication/type/videoNotDecodedMBs/firstMB firstMB_1_8192 MiscellaneousIndication/type/videoNotDecodedMBs/firstMB firstMB_1_8192
H261VideoCapability/cifMPI cifMPI_1_4 H261VideoCapability/cifMPI cifMPI_1_4
CustomPictureClockFrequency/cifMPI cifMPI2_1_2048 CustomPictureClockFrequency/cifMPI cifMPI2_1_2048
H263VideoCapability/cif16MPI cif16MPI_1_32 H263VideoCapability/cif16MPI cif16MPI_1_32
EnhancementOptions/cif16MPI cif16MPI_1_32 EnhancementOptions/cif16MPI cif16MPI_1_32
H263VideoCapability/cif4MPI cif4MPI_1_32 H263VideoCapability/cif4MPI cif4MPI_1_32
EnhancementOptions/cif4MPI cif4MPI_1_32 EnhancementOptions/cif4MPI cif4MPI_1_32
H263Version3Options/pictureNumber pictureNumberBoolean H263Version3Options/pictureNumber pictureNumberBoolean
MiscellaneousCommand/type/videoBadMBs/numberOfMBs numberOfMBs1_1_9216 MiscellaneousCommand/type/videoBadMBs/numberOfMBs numberOfMBs1_1_9216
MiscellaneousCommand/type/lostPartialPicture/numberOfMBs numberOfMBs1_1_9216 MiscellaneousCommand/type/lostPartialPicture/numberOfMBs numberOfMBs1_1_9216
DataApplicationCapability/maxBitRate maxBitRate2_0_4294967295 DataApplicationCapability/maxBitRate maxBitRate2_0_4294967295
@ -1297,18 +1297,18 @@ GenericCapability/maxBitRate maxBitRate2_0_4294967295
H261VideoCapability/maxBitRate maxBitRate_1_19200 H261VideoCapability/maxBitRate maxBitRate_1_19200
IS13818AudioCapability/bitRate bitRate2_1_1130 IS13818AudioCapability/bitRate bitRate2_1_1130
IS13818AudioMode/bitRate bitRate2_1_1130 IS13818AudioMode/bitRate bitRate2_1_1130
IS11172AudioCapability/bitRate bitRate_1_448 IS11172AudioCapability/bitRate bitRate_1_448
IS11172AudioMode/bitRate bitRate_1_448 IS11172AudioMode/bitRate bitRate_1_448
DataMode/bitRate bitRate_0_4294967295 DataMode/bitRate bitRate_0_4294967295
H223Capability/bitRate bitRate_1_19200 H223Capability/bitRate bitRate_1_19200
H261VideoMode/bitRate bitRate_1_19200 H261VideoMode/bitRate bitRate_1_19200
H263VideoMode/bitRate bitRate_1_19200 H263VideoMode/bitRate bitRate_1_19200
DialingInformationNumber/networkAddress networkAddressNum DialingInformationNumber/networkAddress networkAddressNum
NewATMVCCommand/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag NewATMVCCommand/aal/aal1/clockRecovery/adaptiveClockRecovery adaptiveClockRecoveryFlag
NewATMVCIndication/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 NewATMVCIndication/aal/aal1/clockRecovery/nullClockRecovery nullClockRecoveryflag
NewATMVCCommand/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag NewATMVCCommand/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag
NewATMVCIndication/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag NewATMVCIndication/aal/aal1/errorCorrection/nullErrorCorrection nullErrorCorrectionFlag
H223AL2MParameters/headerFEC aL2HeaderFEC H223AL2MParameters/headerFEC aL2HeaderFEC
H223AL1MParameters/headerFEC aL1HeaderFEC H223AL1MParameters/headerFEC aL1HeaderFEC
@ -1367,8 +1367,8 @@ VBDCapability/type vbd_cap_type
OpenLogicalChannelAck/reverseLogicalChannelParameters olc_ack_reverseLogicalChannelParameters OpenLogicalChannelAck/reverseLogicalChannelParameters olc_ack_reverseLogicalChannelParameters
H2250LogicalChannelAckParameters/mediaChannel ack_mediaChannel H2250LogicalChannelAckParameters/mediaChannel ack_mediaChannel
H2250LogicalChannelAckParameters/mediaControlChannel ack_mediaControlChannel H2250LogicalChannelAckParameters/mediaControlChannel ack_mediaControlChannel
UnicastAddress/iP6Address/tsapIdentifier ipv6_tsapIdentifier UnicastAddress/iP6Address/tsapIdentifier ipv6_tsapIdentifier
UnicastAddress/iPSourceRouteAddress/tsapIdentifier iPSrcRoute_tsapIdentifier UnicastAddress/iPSourceRouteAddress/tsapIdentifier iPSrcRoute_tsapIdentifier
MulticastAddress/iPAddress/tsapIdentifier multicast_tsapIdentifier MulticastAddress/iPAddress/tsapIdentifier multicast_tsapIdentifier
MulticastAddress/iP6Address/tsapIdentifier multicast_IPv6_tsapIdentifier MulticastAddress/iP6Address/tsapIdentifier multicast_IPv6_tsapIdentifier
CommunicationModeTableEntry/mediaChannel cm_mediaChannel CommunicationModeTableEntry/mediaChannel cm_mediaChannel

2
asn1/h245/packet-h245-template.h
View File

@ -34,7 +34,7 @@ typedef enum _h245_msg_type {
H245_OpenLogChn, H245_OpenLogChn,
H245_OpenLogChnCnf, H245_OpenLogChnCnf,
H245_OpenLogChnAck, H245_OpenLogChnAck,
H245_OpenLogChnRjc, H245_OpenLogChnRjc,
H245_CloseLogChn, H245_CloseLogChn,
H245_CloseLogChnAck, H245_CloseLogChnAck,
H245_MastSlvDet, H245_MastSlvDet,

28
asn1/h248/h248.cnf
View File

@ -97,12 +97,12 @@ AuditReplyV1/auditResult audit_result
#.FN_FTR Message #.FN_FTR Message
col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data)); col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data));
if (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); gcp_analyze_msg(h248_tree, actx->pinfo, h248_tvb, curr_info.msg, &h248_arrel, &ei_h248_errored_command);
#.END #.END
#.FN_BODY Message/version VAL_PTR = &h248_version #.FN_BODY Message/version VAL_PTR = &h248_version
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.END #.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); curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_PENDING, keep_persistent_data);
error_code = 0; error_code = 0;
#.FN_BODY TransactionReply/transactionId #.FN_BODY TransactionReply/transactionId
guint32 trx_id = 0; guint32 trx_id = 0;
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id); 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); 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 #.FN_BODY ErrorDescriptor/errorCode
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &error_code); 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); expert_add_info(actx->pinfo, actx->created_item, &ei_h248_errored_command);
if (curr_info.cmd) { if (curr_info.cmd) {
gcp_cmd_set_error(curr_info.cmd,error_code); gcp_cmd_set_error(curr_info.cmd,error_code);
} else if (curr_info.trx) { } else if (curr_info.trx) {
gcp_trx_set_error(curr_info.trx,error_code); gcp_trx_set_error(curr_info.trx,error_code);
} }
return offset; return offset;
#.END #.END
@ -325,13 +325,13 @@ AuditReplyV1/auditResult audit_result
wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL; wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL;
/* limitation: assume only one wildcard is used */ /* limitation: assume only one wildcard is used */
wild_card = tvb_get_guint8(new_tvb,0); wild_card = tvb_get_guint8(new_tvb,0);
#.END #.END
#.FN_BODY TerminationID/id #.FN_BODY TerminationID/id
tvbuff_t* new_tvb; tvbuff_t* new_tvb;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
if (new_tvb) { if (new_tvb) {
curr_info.term->len = tvb_length(new_tvb); curr_info.term->len = tvb_length(new_tvb);
curr_info.term->type = 0; /* unknown */ curr_info.term->type = 0; /* unknown */
@ -345,7 +345,7 @@ AuditReplyV1/auditResult audit_result
if (h248_term_handle) { if (h248_term_handle) {
call_dissector_with_data(h248_term_handle, new_tvb, actx->pinfo, tree, &wild_card); call_dissector_with_data(h248_term_handle, new_tvb, actx->pinfo, tree, &wild_card);
wild_card = 0xFF; wild_card = 0xFF;
} }
} else { } else {
curr_info.term->len = 0; curr_info.term->len = 0;
@ -356,14 +356,14 @@ AuditReplyV1/auditResult audit_result
#.FN_BODY SCreasonValue #.FN_BODY SCreasonValue
/* H248 v1 support */ /* H248 v1 support */
if ( h248_version > 1 ) { if ( h248_version > 1 ) {
/* Not V1, so call "standard" function */ /* Not V1, so call "standard" function */
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
} else { } else {
/* V1 so Value == octet string */ /* V1 so Value == octet string */
offset = dissect_h248_ValueV1( implicit_tag, tvb, offset, actx, tree, hf_index); offset = dissect_h248_ValueV1( implicit_tag, tvb, offset, actx, tree, hf_index);
}; };
#.END #.END
#.FN_BODY SCreasonValueOctetStr VAL_PTR = &parameter_tvb #.FN_BODY SCreasonValueOctetStr VAL_PTR = &parameter_tvb
@ -391,19 +391,19 @@ AuditReplyV1/auditResult audit_result
for( i=0;i<len;i++) { for( i=0;i<len;i++) {
if(!isascii(tvb_get_guint8(tvb, offset+i)) || tvb_get_guint8(tvb, offset+i) == 0) { 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 */ /* 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, (proto_registrar_get_nth(hf_index))->name,
tvb_bytes_to_ep_str(tvb, 0, len)); tvb_bytes_to_ep_str(tvb, 0, len));
return len; return len;
}; };
}; };
/* if here, then string is ascii */ /* 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, (proto_registrar_get_nth(hf_index))->name,
tvb_format_text(tvb, 0, len)); tvb_format_text(tvb, 0, len));
} }
offset = len; offset = len;
#.END #.END

8
asn1/h248/packet-h248-template.c
View File

@ -906,7 +906,7 @@ static gboolean is_pkg_default(guint16 pkgid) {
void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) { 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; h248_package_t *pkg_found = NULL, *pkg_high = NULL, *pkg_low = NULL;
s_h248_package_t *s_pkg = NULL; s_h248_package_t *s_pkg = NULL;
value_string *vst; value_string *vst;
gboolean pkg_default = FALSE; gboolean pkg_default = FALSE;
gint j = 0, idx = 0, i = 0, k = 0; gint j = 0, idx = 0, i = 0, k = 0;
if (! packages) { if (! packages) {
@ -926,7 +926,7 @@ void h248_register_package(h248_package_t* pkg, pkg_reg_action reg_action) {
if (j != -1) { if (j != -1) {
j++; idx=j; j++; idx=j;
while((base_event_name_vals[j].strptr!=NULL) && (((base_event_name_vals[j].value)>>16) == (pkg_found->id))) { while((base_event_name_vals[j].strptr!=NULL) && (((base_event_name_vals[j].value)>>16) == (pkg_found->id))) {
j++; j++;
}; };
if (idx < j) { if (idx < j) {
vst = (value_string *)wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*(j-idx+1)); 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; proto_tree *package_tree=NULL;
guint16 name_major, name_minor; guint16 name_major, name_minor;
const h248_package_t* pkg = NULL; const h248_package_t* pkg = NULL;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
if (new_tvb) { if (new_tvb) {
@ -1613,7 +1613,7 @@ void proto_register_h248(void) {
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
expert_h248 = expert_register_protocol(proto_h248); expert_h248 = expert_register_protocol(proto_h248);
expert_register_field_array(expert_h248, ei, array_length(ei)); 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); 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); h248_module = prefs_register_protocol(proto_h248, proto_reg_handoff_h248);

6
asn1/h248/packet-h248-template.h
View File

@ -60,7 +60,7 @@ typedef struct _h248_pkg_sig_t {
guint32 id; guint32 id;
int* hfid; int* hfid;
gint* ett; gint* ett;
const h248_pkg_param_t* parameters; const h248_pkg_param_t* parameters;
const value_string* param_names; const value_string* param_names;
} h248_pkg_sig_t; } h248_pkg_sig_t;
@ -68,7 +68,7 @@ typedef struct _h248_pkg_evt_t {
guint32 id; guint32 id;
int* hfid; int* hfid;
gint* ett; gint* ett;
const h248_pkg_param_t* parameters; const h248_pkg_param_t* parameters;
const value_string* param_names; const value_string* param_names;
} h248_pkg_evt_t; } h248_pkg_evt_t;
@ -76,7 +76,7 @@ typedef struct _h248_pkg_stat_t {
guint32 id; guint32 id;
int* hfid; int* hfid;
gint* ett; gint* ett;
const h248_pkg_param_t* parameters; const h248_pkg_param_t* parameters;
const value_string* param_names; const value_string* param_names;
} h248_pkg_stat_t; } h248_pkg_stat_t;

6
asn1/h282/h282.cnf
View File

@ -16,7 +16,7 @@ RDCPDU
NonCollapsingCapabilities NonCollapsingCapabilities
#.END #.END
#.FN_PARS RequestPDU #.FN_PARS RequestPDU
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;
@ -27,7 +27,7 @@ NonCollapsingCapabilities
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p); col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p);
#.END #.END
#.FN_PARS ResponsePDU #.FN_PARS ResponsePDU
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;
@ -38,7 +38,7 @@ NonCollapsingCapabilities
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p); col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p);
#.END #.END
#.FN_PARS IndicationPDU #.FN_PARS IndicationPDU
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;

12
asn1/h283/h283.cnf
View File

@ -11,7 +11,7 @@ ALIGNED
LCTPDU LCTPDU
#.END #.END
#.FN_PARS LCTPDU/pduType #.FN_PARS LCTPDU/pduType
VAL_PTR = &pdu_type VAL_PTR = &pdu_type
#.FN_HDR #.FN_HDR
gint32 pdu_type = -1; gint32 pdu_type = -1;
@ -24,7 +24,7 @@ LCTPDU
} }
#.END #.END
#.FN_PARS RDCData/dataType #.FN_PARS RDCData/dataType
VAL_PTR = &data_type VAL_PTR = &data_type
#.FN_HDR #.FN_HDR
gint32 data_type = -1; gint32 data_type = -1;
@ -37,7 +37,7 @@ LCTPDU
} }
#.END #.END
#.FN_PARS LCTMessage #.FN_PARS LCTMessage
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;
@ -50,7 +50,7 @@ LCTPDU
} }
#.END #.END
#.FN_PARS LCTRequest #.FN_PARS LCTRequest
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;
@ -63,7 +63,7 @@ LCTPDU
} }
#.END #.END
#.FN_PARS LCTResponse #.FN_PARS LCTResponse
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;
@ -76,7 +76,7 @@ LCTPDU
} }
#.END #.END
#.FN_PARS LCTIndication #.FN_PARS LCTIndication
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;

14
asn1/h323/packet-h323-template.c
View File

@ -59,13 +59,13 @@ gef_ctx_t* gef_ctx_get(void *ptr) {
gef_ctx_t *gefx = (gef_ctx_t*)ptr; gef_ctx_t *gefx = (gef_ctx_t*)ptr;
asn1_ctx_t *actx = (asn1_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; actx = NULL;
if (actx) if (actx)
gefx = (gef_ctx_t *)actx->private_data; gefx = (gef_ctx_t *)actx->private_data;
if (!gef_ctx_check_signature(gefx)) if (!gef_ctx_check_signature(gefx))
gefx = NULL; gefx = NULL;
return gefx; return gefx;
@ -76,7 +76,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) {
if (!gefx) return; if (!gefx) return;
parent_key = (gefx->parent) ? gefx->parent->key : NULL; 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" /* parent prefix */
"%s%s%s" /* type, id */ "%s%s%s" /* type, id */
"%s%s" /* subid */, "%s%s" /* subid */,
@ -119,9 +119,9 @@ void proto_register_h323(void) {
/*--- proto_reg_handoff_h323 -------------------------------------------*/ /*--- 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"); 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); 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 */ /* 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)); new_create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323));
/* H.323, Annex R, Robustness methods for H.323 entities */ /* 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)); new_create_dissector_handle(dissect_RobustnessData_PDU, proto_h323));
} }

2
asn1/h323/packet-h323-template.h
View File

@ -31,7 +31,7 @@
typedef struct _gef_ctx_t { typedef struct _gef_ctx_t {
guint32 signature; guint32 signature;
struct _gef_ctx_t *parent; struct _gef_ctx_t *parent;
/* /*
H323-MESSAGES H323-MESSAGES
FeatureDescriptor/<id> FeatureDescriptor/<id>
<id> <id>

12
asn1/h450-ros/packet-h450-ros-template.c
View File

@ -41,17 +41,17 @@ void proto_reg_handoff_h450_ros(void);
/* Initialize the protocol and registered fields */ /* Initialize the protocol and registered fields */
static int proto_h450_ros = -1; static int proto_h450_ros = -1;
#include "packet-h450-ros-hf.c" #include "packet-h450-ros-hf.c"
/* Initialize the subtree pointers */ /* Initialize the subtree pointers */
#include "packet-h450-ros-ett.c" #include "packet-h450-ros-ett.c"
static expert_field ei_ros_undecoded = EI_INIT; static expert_field ei_ros_undecoded = EI_INIT;
/* Preferences */ /* Preferences */
/* Subdissectors */ /* Subdissectors */
static dissector_handle_t data_handle = NULL; static dissector_handle_t data_handle = NULL;
/* Gloabl variables */ /* Gloabl variables */
static gint32 problem_val; 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; err_next_tvb = tvb;
} }
#include "packet-h450-ros-fn.c" #include "packet-h450-ros-fn.c"
/*--- proto_register_h450_ros -----------------------------------------------*/ /*--- proto_register_h450_ros -----------------------------------------------*/
void proto_register_h450_ros(void) { void proto_register_h450_ros(void) {
/* List of fields */ /* List of fields */
static hf_register_info hf[] = { static hf_register_info hf[] = {
#include "packet-h450-ros-hfarr.c" #include "packet-h450-ros-hfarr.c"
}; };
/* List of subtrees */ /* List of subtrees */
static gint *ett[] = { static gint *ett[] = {
#include "packet-h450-ros-ettarr.c" #include "packet-h450-ros-ettarr.c"
}; };
static ei_register_info ei[] = { static ei_register_info ei[] = {

34
asn1/h450/h450.cnf
View File

@ -1,6 +1,6 @@
# h450.cnf # h450.cnf
# H.450 conformation file # H.450 conformation file
# Copyright 2004 Anders Broman # Copyright 2004 Anders Broman
#.OPT #.OPT
PER PER
@ -10,7 +10,7 @@ GROUP_BY_PROT
#.END #.END
#.IMPORT ../h225/h225-exp.cnf #.IMPORT ../h225/h225-exp.cnf
#.IMPORT ../h450-ros/h450-ros-exp.cnf #.IMPORT ../h450-ros/h450-ros-exp.cnf
#.MODULE #.MODULE
@ -86,11 +86,11 @@ IntResult/extension IntResult_extension
#PresentedNumberUnscreened/presentationRestrictedAddress numberUnscreened_presentationRestrictedAddress #PresentedNumberUnscreened/presentationRestrictedAddress numberUnscreened_presentationRestrictedAddress
#PresentedAddressUnscreened/presentationRestrictedAddress addressUnscreened_presentationRestrictedAddress #PresentedAddressUnscreened/presentationRestrictedAddress addressUnscreened_presentationRestrictedAddress
CTInitiateArg/argumentExtension cTInitiateArg_argumentExtension CTInitiateArg/argumentExtension cTInitiateArg_argumentExtension
CTSetupArg/argumentExtension cTSetupArg_argumentExtension CTSetupArg/argumentExtension cTSetupArg_argumentExtension
CTUpdateArg/argumentExtension cTUpdateArg_argumentExtension CTUpdateArg/argumentExtension cTUpdateArg_argumentExtension
SubaddressTransferArg/argumentExtension subaddressTransferArg_argumentExtension SubaddressTransferArg/argumentExtension subaddressTransferArg_argumentExtension
CTCompleteArg/argumentExtension cTCompleteArg_argumentExtension CTCompleteArg/argumentExtension cTCompleteArg_argumentExtension
CTActiveArg/argumentExtension cTActiveArg_argumentExtension CTActiveArg/argumentExtension cTActiveArg_argumentExtension
MixedExtension/extension mixedExtension_extension MixedExtension/extension mixedExtension_extension
PAR-unspecified/extension unspecified_extension PAR-unspecified/extension unspecified_extension
@ -105,21 +105,21 @@ CoReqOptArg/extension coReqOptArg_extension
RUAlertOptArg/extension rUAlertOptArg_extension RUAlertOptArg/extension rUAlertOptArg_extension
CfbOvrOptArg/extension cfbOvrOptArg_extension CfbOvrOptArg/extension cfbOvrOptArg_extension
CmnArg/extension cmnArg_extension CmnArg/extension cmnArg_extension
ARG-activateDiversionQ/extension activateDiversionQArg_extension ARG-activateDiversionQ/extension activateDiversionQArg_extension
ARG-interrogateDiversionQ/extension interrogateDiversionQ_extension ARG-interrogateDiversionQ/extension interrogateDiversionQ_extension
ARG-callRerouting/extension callReroutingArg_extension ARG-callRerouting/extension callReroutingArg_extension
ARG-divertingLegInformation4/extension divertingLegInformation4Arg_extension ARG-divertingLegInformation4/extension divertingLegInformation4Arg_extension
ARG-divertingLegInformation3/extension divertingLegInformation3Arg_extension ARG-divertingLegInformation3/extension divertingLegInformation3Arg_extension
ARG-deactivateDiversionQ/extension deactivateDiversionQArg_extension ARG-deactivateDiversionQ/extension deactivateDiversionQArg_extension
IntResult/extension intResult_extension IntResult/extension intResult_extension
MWIActivateArg/extensionArg mWIActivateArg_extensionArg MWIActivateArg/extensionArg mWIActivateArg_extensionArg
MWIDeactivateArg/extensionArg mWIDeactivateArg_extensionArg MWIDeactivateArg/extensionArg mWIDeactivateArg_extensionArg
MWIInterrogateArg/extensionArg mWIInterrogateArg_extensionArg MWIInterrogateArg/extensionArg mWIInterrogateArg_extensionArg
MWIInterrogateResElt/extensionArg mWIInterrogateResElt_extensionArg MWIInterrogateResElt/extensionArg mWIInterrogateResElt_extensionArg
HoldNotificArg/extensionArg holdNotificArg_extensionArg HoldNotificArg/extensionArg holdNotificArg_extensionArg
RetrieveNotificArg/extensionArg retrieveNotificArg_extensionArg RetrieveNotificArg/extensionArg retrieveNotificArg_extensionArg
RemoteHoldArg/extensionArg remoteHoldArg_extensionArg RemoteHoldArg/extensionArg remoteHoldArg_extensionArg
RemoteRetrieveArg/extensionArg remoteRetrieveArg_extensionArg RemoteRetrieveArg/extensionArg remoteRetrieveArg_extensionArg
@ -133,7 +133,7 @@ PickExeArg/extensionArg pickExeArg_extensionArg
CpNotifyArg/extensionArg cpNotifyArg_extensionArg CpNotifyArg/extensionArg cpNotifyArg_extensionArg
CpickupNotifyArg/extensionArg cpickupNotifyArg_extensionArg CpickupNotifyArg/extensionArg cpickupNotifyArg_extensionArg
CallWaitingArg/extensionArg callWaitingArg_extensionArg CallWaitingArg/extensionArg callWaitingArg_extensionArg
CIRequestArg/argumentExtension cIRequestArg_argumentExtension CIRequestArg/argumentExtension cIRequestArg_argumentExtension
CIGetCIPLOptArg/argumentExtension cIGetCIPLOptArg_argumentExtension CIGetCIPLOptArg/argumentExtension cIGetCIPLOptArg_argumentExtension
CIIsOptArg/argumentExtension cIIsOptArg_argumentExtension CIIsOptArg/argumentExtension cIIsOptArg_argumentExtension
CIFrcRelArg/argumentExtension cIFrcRelArg_argumentExtension CIFrcRelArg/argumentExtension cIFrcRelArg_argumentExtension

2
asn1/h501/h501.cnf
View File

@ -14,7 +14,7 @@ ALIGNED
Message Message
#.END #.END
#.FN_PARS MessageBody #.FN_PARS MessageBody
VAL_PTR = &msg_type VAL_PTR = &msg_type
#.FN_HDR #.FN_HDR
gint32 msg_type = -1; gint32 msg_type = -1;

4
asn1/hnbap/hnbap.cnf
View File

@ -52,12 +52,12 @@ AccessResult
} }
#.END #.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 ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue
#.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode
#.FN_FTR ProcedureCode #.FN_FTR ProcedureCode
if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) { if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) {
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"Unknown Message"); "Unknown Message");

6
asn1/idmp/idmp.cnf
View File

@ -1,10 +1,10 @@
#.IMPORT ../x509ce/x509ce-exp.cnf #.IMPORT ../x509ce/x509ce-exp.cnf
#.CLASS OPERATION #.CLASS OPERATION
&ArgumentType &ArgumentType
&argumentTypeOptional BooleanType &argumentTypeOptional BooleanType
&ResultType &ResultType
&resultTypeOptional BooleanType &resultTypeOptional BooleanType
&Errors _FixedTypeValueSetFieldSpec &Errors _FixedTypeValueSetFieldSpec
&errorsOptional BooleanType &errorsOptional BooleanType

4
asn1/ilp/ilp.cnf
View File

@ -68,6 +68,6 @@ guint32 IlpMessage;
#.TYPE_ATTR #.TYPE_ATTR
IPAddress/ipv4Address TYPE = FT_IPv4 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 IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
#.END #.END

4
asn1/inap/inap.cnf
View File

@ -207,7 +207,7 @@ static const inap_err_t inap_err_tab[] = {
#.FN_HDR ExtensionField #.FN_HDR ExtensionField
obj_id = NULL; obj_id = NULL;
#.FN_PARS Code/global FN_VARIANT = _str VAL_PTR = &obj_id #.FN_PARS Code/global FN_VARIANT = _str VAL_PTR = &obj_id
#.FN_BODY ExtensionField/value #.FN_BODY ExtensionField/value
@ -217,7 +217,7 @@ static const inap_err_t inap_err_tab[] = {
}else{ }else{
call_dissector(data_handle, tvb, actx->pinfo, tree); call_dissector(data_handle, tvb, actx->pinfo, tree);
offset = tvb_length_remaining(tvb,offset); offset = tvb_length_remaining(tvb,offset);
} }

4
asn1/isdn-sup/isdn-sup.cnf
View File

@ -38,7 +38,7 @@ AOCECurrencyInfo/cc AOCECurrencyCc
AOCECurrencyInfo/cc/specificCurrency AOCECcSpecificCurrency AOCECurrencyInfo/cc/specificCurrency AOCECcSpecificCurrency
AOCSCurrencyInfo/chargingtype/specificCurrency AOCSChargingTypeSpecificCurrency AOCSCurrencyInfo/chargingtype/specificCurrency AOCSChargingTypeSpecificCurrency
RecordedUnits/cc RecoredUnitsCc RecordedUnits/cc RecoredUnitsCc
#.END #.END
#.FIELD_RENAME #.FIELD_RENAME
AOCDChargingUnitInfo/specificChargingUnits aocdspecificchargingunits AOCDChargingUnitInfo/specificChargingUnits aocdspecificchargingunits
@ -53,7 +53,7 @@ PresentedAddressScreened/presentationRestrictedAddress presentationrestrictedad
PresentedNumberScreened/presentationAllowedNumber presentationallowednumberscreened PresentedNumberScreened/presentationAllowedNumber presentationallowednumberscreened
PresentedNumberScreened/presentationRestrictedNumber presentationrestrictednumberscreened PresentedNumberScreened/presentationRestrictedNumber presentationrestrictednumberscreened
RecordedUnits/cc recoredunitscc RecordedUnits/cc recoredunitscc
#.END #.END
#.TABLE10_BODY OPERATION.#&operationCode.local #.TABLE10_BODY OPERATION.#&operationCode.local
{ %(&operationCode)3s, "%(_name)s" }, { %(&operationCode)3s, "%(_name)s" },

6
asn1/kerberos/kerberos.cnf
View File

@ -1,6 +1,6 @@
# kerberos.cnf # kerberos.cnf
# kerberos conformation file # kerberos conformation file
# Copyright 2008 Anders Broman # Copyright 2008 Anders Broman
#.FIELD_RENAME #.FIELD_RENAME
#EncryptedData/etype encryptedData_etype #EncryptedData/etype encryptedData_etype
@ -70,7 +70,7 @@ guint32 msgtype;
/* append the application type to the tree */ /* append the application type to the tree */
proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x")); proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x"));
#.FN_BODY ERROR-CODE VAL_PTR = &krb5_errorcode #.FN_BODY ERROR-CODE VAL_PTR = &krb5_errorcode
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
@ -369,7 +369,7 @@ guint32 msgtype;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
(guint32*)actx->value_ptr); (guint32*)actx->value_ptr);
#.FN_BODY KDC-REQ-BODY #.FN_BODY KDC-REQ-BODY
conversation_t *conversation; conversation_t *conversation;

2
asn1/kerberos/packet-kerberos-template.h
View File

@ -94,7 +94,7 @@ void read_keytab_file_from_preferences(void);
#endif /* HAVE_KERBEROS */ #endif /* HAVE_KERBEROS */
#include "packet-kerberos-exp.h" #include "packet-kerberos-exp.h"
#endif /* __PACKET_KERBEROS_H */ #endif /* __PACKET_KERBEROS_H */

2
asn1/lcsap/packet-lcsap-template.c
View File

@ -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 *); 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) * Coding of positioning method (bits 8-4)
*/ */
static const value_string lcsap_pos_method_vals[] = { static const value_string lcsap_pos_method_vals[] = {

6
asn1/lpp/lpp.cnf
View File

@ -1,6 +1,6 @@
# lpp.cnf # lpp.cnf
# llp conformation file # llp conformation file
# Copyright 2011-2013 Pascal Quantin # Copyright 2011-2013 Pascal Quantin
#.OPT #.OPT
PER PER
@ -23,13 +23,13 @@ GNSS-SystemTime
SV-ID SV-ID
ECID-SignalMeasurementInformation ECID-SignalMeasurementInformation
CellGlobalIdGERAN CellGlobalIdGERAN
CellGlobalIdEUTRA-AndUTRA CellGlobalIdEUTRA-AndUTRA
OTDOA-ReferenceCellInfo OTDOA-ReferenceCellInfo
OTDOA-NeighbourCellInfoElement OTDOA-NeighbourCellInfoElement
ARFCN-ValueEUTRA ARFCN-ValueEUTRA
Ellipsoid-Point Ellipsoid-Point
EllipsoidPointWithAltitude EllipsoidPointWithAltitude
EllipsoidPointWithAltitudeAndUncertaintyEllipsoid EllipsoidPointWithAltitudeAndUncertaintyEllipsoid
NetworkTime NetworkTime
GNSS-ID-Bitmap GNSS-ID-Bitmap
ARFCN-ValueUTRA ARFCN-ValueUTRA

2
asn1/lpp/packet-lpp-template.c
View File

@ -1380,7 +1380,7 @@ void proto_register_lpp(void) {
proto_register_field_array(proto_lpp, hf, array_length(hf)); proto_register_field_array(proto_lpp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
} }

8
asn1/lppa/lppa.cnf
View File

@ -1,6 +1,6 @@
# lppa.cnf # lppa.cnf
# llpa conformation file # llpa conformation file
# Copyright 2011 Pascal Quantin # Copyright 2011 Pascal Quantin
#.OPT #.OPT
PER PER
@ -46,16 +46,16 @@ ProtocolIE-Field/value ie_field_value
"unknown message")); "unknown message"));
#.END #.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 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 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_PARS UnsuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_UnsuccessfulOutcomeValue
#.FN_HDR LPPA-PDU #.FN_HDR LPPA-PDU
proto_tree_add_item(tree, proto_lppa, tvb, 0, -1, ENC_NA); proto_tree_add_item(tree, proto_lppa, tvb, 0, -1, ENC_NA);
col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPa"); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPa");

4
asn1/lppe/lppe.cnf
View File

@ -1,6 +1,6 @@
# lppe.cnf # lppe.cnf
# llpe conformation file # llpe conformation file
# Copyright 2012 Pascal Quantin # Copyright 2012 Pascal Quantin
#.OPT #.OPT
PER PER
@ -14,7 +14,7 @@ OMA-LPPe-MessageExtension
#.END #.END
#.FN_HDR OMA-LPPe-MessageExtension #.FN_HDR OMA-LPPe-MessageExtension
proto_tree_add_item(tree, proto_lppe, tvb, 0, -1, ENC_NA); proto_tree_add_item(tree, proto_lppe, tvb, 0, -1, ENC_NA);
col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPe"); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPe");

2
asn1/lppe/packet-lppe-template.c
View File

@ -84,7 +84,7 @@ void proto_register_lppe(void) {
proto_register_field_array(proto_lppe, hf, array_length(hf)); proto_register_field_array(proto_lppe, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
} }

8
asn1/lte-rrc/lte-rrc.cnf
View File

@ -668,7 +668,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 TYPE = FT_UINT64
#.FN_FTR SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 #.FN_FTR SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_timeInfo); 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; ts.nsecs = (int)(timeInfo%100)*10000000;
proto_tree_add_text(subtree, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, 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)); "UTC time: %s", abs_time_to_ep_str(&ts, ABSOLUTE_TIME_UTC, FALSE));
@ -1103,7 +1103,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
} }
col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure");
#.FN_HDR UECapabilityInformation #.FN_HDR UECapabilityInformation
@ -1152,7 +1152,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
#.FN_HDR MBMSInterestIndication-r11 #.FN_HDR MBMSInterestIndication-r11
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSInterestIndication-r11"); col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSInterestIndication-r11");
#.FN_BODY Paging/systemInfoModification #.FN_BODY Paging/systemInfoModification
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
col_append_str(actx->pinfo->cinfo, COL_INFO, " (systemInfoModification)"); col_append_str(actx->pinfo->cinfo, COL_INFO, " (systemInfoModification)");
@ -1171,7 +1171,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
/* Show SFN in info column */ /* Show SFN in info column */
sfn = tvb_get_guint8(value_tvb, 0); sfn = tvb_get_guint8(value_tvb, 0);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (SFN=%%u)", sfn); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (SFN=%%u)", sfn);
#.FN_BODY SystemInformationBlockType1/systemInfoValueTag VAL_PTR=&value #.FN_BODY SystemInformationBlockType1/systemInfoValueTag VAL_PTR=&value
guint32 value; guint32 value;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s

10
asn1/m3ap/m3ap.cnf
View File

@ -228,7 +228,7 @@ ProtocolIE-Field/value ie_field_value
col_set_str(actx->pinfo->cinfo, COL_INFO,"Private Message "); col_set_str(actx->pinfo->cinfo, COL_INFO,"Private Message ");
#.FN_HDR MCEConfigurationUpdate #.FN_HDR MCEConfigurationUpdate
col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update "); 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 "); col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Acknowledge ");
#.FN_HDR MCEConfigurationUpdateFailure #.FN_HDR MCEConfigurationUpdateFailure
col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Failure "); 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 #M3AP-PROTOCOL-IES
MME-MBMS-M3AP-ID N m3ap.ies id-MME-MBMS-M3AP-ID MME-MBMS-M3AP-ID N m3ap.ies id-MME-MBMS-M3AP-ID
MCE-MBMS-M3AP-ID N m3ap.ies id-MCE-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-Session-ID N m3ap.ies id-MBMS-Session-ID
MBMS-E-RAB-QoS-Parameters N m3ap.ies id-MBMS-E-RAB-QoS-Parameters MBMS-E-RAB-QoS-Parameters N m3ap.ies id-MBMS-E-RAB-QoS-Parameters
MBMS-Session-Duration N m3ap.ies id-MBMS-Session-Duration 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 MCEname N m3ap.ies id-MCEname
MBMSServiceAreaListItem N m3ap.ies id-MBMSServiceAreaList 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-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 #M3AP-ELEMENTARY-PROCEDURE
MBMSSessionStartRequest N m3ap.proc.imsg id-mBMSsessionStart 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 PrivateMessage N m3ap.proc.imsg id-privateMessage
MCEConfigurationUpdate N m3ap.proc.imsg id-mCEConfigurationUpdate 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 MCEConfigurationUpdateFailure N m3ap.proc.uout id-mCEConfigurationUpdate
M3SetupRequest N m3ap.proc.imsg id-m3Setup M3SetupRequest N m3ap.proc.imsg id-m3Setup
M3SetupResponse N m3ap.proc.sout id-m3Setup M3SetupResponse N m3ap.proc.sout id-m3Setup
M3SetupFailure N m3ap.proc.uout id-m3Setup M3SetupFailure N m3ap.proc.uout id-m3Setup
#.TYPE_ATTR #.TYPE_ATTR
BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
#.END #.END

2
asn1/m3ap/packet-m3ap-template.c
View File

@ -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_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_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_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);
} }

4
asn1/mms/mms.cnf
View File

@ -86,7 +86,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE
return 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"); tvb, offset, len, "BER Error: malformed TimeOfDay encoding, length must be 4 or 6 bytes");
if(hf_index >= 0) if(hf_index >= 0)
{ {
@ -108,7 +108,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE
if(len != 8) 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"); tvb, offset, len, "BER Error: malformed IEC61850 UTCTime encoding, length must be 8 bytes");
if(hf_index >= 0) if(hf_index >= 0)
{ {

2
asn1/mpeg-audio/packet-mpeg-audio-template.c
View File

@ -66,7 +66,7 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return FALSE; return FALSE;
if (!MPA_LAYER_VALID(&mpa)) if (!MPA_LAYER_VALID(&mpa))
return FALSE; return FALSE;
col_add_fstr(pinfo->cinfo, COL_PROTOCOL, col_add_fstr(pinfo->cinfo, COL_PROTOCOL,
"MPEG-%s", version_names[mpa_version(&mpa)]); "MPEG-%s", version_names[mpa_version(&mpa)]);
col_add_fstr(pinfo->cinfo, COL_INFO, col_add_fstr(pinfo->cinfo, COL_INFO,

6
asn1/p22/p22.cnf
View File

@ -3,7 +3,7 @@
#.TYPE_ATTR #.TYPE_ATTR
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 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. # but this causes a runtime error.
# We override the definition here until we can identify the fix correct fix # 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 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; const char *name = NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
name = oid_resolved_from_string(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 IPMSExtension/value #.FN_BODY IPMSExtension/value

2
asn1/p22/packet-p22-template.c
View File

@ -138,7 +138,7 @@ void proto_register_p22(void) {
/*--- proto_reg_handoff_p22 --- */ /*--- proto_reg_handoff_p22 --- */
void proto_reg_handoff_p22(void) { 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.0", dissect_p22, proto_p22, "InterPersonal Message (1984)");
register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)");

6
asn1/p772/packet-p772-template.c
View File

@ -32,8 +32,8 @@
#include "packet-x509if.h" #include "packet-x509if.h"
#include "packet-p772.h" #include "packet-p772.h"
#include "packet-p1.h" #include "packet-p1.h"
#include "packet-p22.h" #include "packet-p22.h"
#define PNAME "STANAG 4406 Message" #define PNAME "STANAG 4406 Message"
#define PSNAME "P772" #define PSNAME "P772"
@ -105,7 +105,7 @@ void proto_register_p772(void) {
proto_register_field_array(proto_p772, hf, array_length(hf)); proto_register_field_array(proto_p772, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); 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"); register_ber_oid_syntax(".p772", NULL, "STANAG 4406");
} }

4
asn1/pcap/pcap.cnf
View File

@ -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 #.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-GenericAssistanceDataList ProtocolIE-ID
id-GANSS-MeasuredResultsList ProtocolIE-ID id-GANSS-MeasuredResultsList ProtocolIE-ID
id-GANSS-UTRAN-TRU ProtocolIE-ID id-GANSS-UTRAN-TRU ProtocolIE-ID
id-GANSSPositioning ProtocolIE-ID id-GANSSPositioning ProtocolIE-ID
id-GANSS-PositioningDataSet ProtocolIE-ID id-GANSS-PositioningDataSet ProtocolIE-ID
id-GNSS-PositioningMethod ProtocolIE-ID id-GNSS-PositioningMethod ProtocolIE-ID
id-NetworkAssistedGANSSSuport ProtocolIE-ID id-NetworkAssistedGANSSSuport ProtocolIE-ID

18
asn1/pkcs12/pkcs12.cnf
View File

@ -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 # PKCS#9 Attributes - see master list in x509sat.cnf
PFX B "2.16.840.1.113730.3.1.216" "pkcs-9-at-PKCS12" 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 # Password Based Encryption
PBEParameter B "1.2.840.113549.1.12.1.1" "pbeWithSHAAnd128BitRC4" PBEParameter B "1.2.840.113549.1.12.1.1" "pbeWithSHAAnd128BitRC4"
@ -104,11 +104,11 @@ PrivateKeyInfo
append_oid(tree, object_identifier_id); append_oid(tree, object_identifier_id);
#.END #.END
#.FN_BODY SafeBag/bagValue #.FN_BODY SafeBag/bagValue
if(object_identifier_id) if(object_identifier_id)
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); 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) if(object_identifier_id)
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
@ -123,7 +123,7 @@ PrivateKeyInfo
#.FN_BODY SecretBag/secretValue #.FN_BODY SecretBag/secretValue
if(object_identifier_id) if(object_identifier_id)
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
#.FN_HDR PBEParameter #.FN_HDR PBEParameter
/* initialise the encryption parameters */ /* initialise the encryption parameters */
PBE_reset_parameters(); PBE_reset_parameters();
@ -138,21 +138,21 @@ PrivateKeyInfo
#.FN_HDR EncryptedData #.FN_HDR EncryptedData
tvbuff_t *encrypted_tvb; tvbuff_t *encrypted_tvb;
dissector_handle_t dissector_handle; dissector_handle_t dissector_handle;
#.END #.END
#.FN_FTR EncryptedData #.FN_FTR EncryptedData
dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
dissector_change_string("ber.oid", object_identifier_id, dissector_handle); dissector_change_string("ber.oid", object_identifier_id, dissector_handle);
PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
/* restore the original dissector */ /* restore the original dissector */
dissector_reset_string("ber.oid", object_identifier_id); dissector_reset_string("ber.oid", object_identifier_id);
#.END #.END

2
asn1/pkix1explicit/pkix1explicit.cnf
View File

@ -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 = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
# IPAddrAndASCertExtn # IPAddrAndASCertExtn
#.FN_BODY IPAddressFamily/addressFamily VAL_PTR = &parameter_tvb #.FN_BODY IPAddressFamily/addressFamily VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;

2
asn1/pkixac/packet-pkixac-template.c
View File

@ -1,7 +1,7 @@
/* packet-pkixac.c /* packet-pkixac.c
* *
* Routines for PKIXAttributeCertificate (RFC3281) packet dissection. * Routines for PKIXAttributeCertificate (RFC3281) packet dissection.
* *
* Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org>
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer

2
asn1/pkixac/packet-pkixac-template.h
View File

@ -1,7 +1,7 @@
/* packet-pkixac.h /* packet-pkixac.h
* *
* Routines for PKIXAttributeCertificate (RFC3281) packet dissection. * Routines for PKIXAttributeCertificate (RFC3281) packet dissection.
* *
* Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org> * Copyright 2010, Stig Bjorlykke <stig@bjorlykke.org>
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer

6
asn1/pres/pres.cnf
View File

@ -13,7 +13,7 @@ UDC-type
#.TYPE_RENAME #.TYPE_RENAME
CPA-PPDU/normal-mode-parameters T_CPA_PPDU_normal_mode_parameters 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 ARU-PPDU/normal-mode-parameters T_ARU_PPDU_normal_mode_parameters
#.FIELD_RENAME #.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 #.FN_BODY PDV-list/presentation-data-values/single-ASN1-type
tvbuff_t *next_tvb; tvbuff_t *next_tvb;
char *oid; char *oid;
oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier);
if(oid){ 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 #.FN_BODY PDV-list/presentation-data-values/octet-aligned
tvbuff_t *next_tvb; tvbuff_t *next_tvb;
char *oid; char *oid;
oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier);
if(oid){ if(oid){

20
asn1/q932/packet-q932-template.c
View File

@ -68,7 +68,7 @@ static gint g_facility_encoding = 0; /* Default to QSIG */
void proto_reg_handoff_q932(void); void proto_reg_handoff_q932(void);
/* Subdissectors */ /* Subdissectors */
static dissector_handle_t q932_ros_handle; static dissector_handle_t q932_ros_handle;
#define Q932_IE_EXTENDED_FACILITY 0x0D #define Q932_IE_EXTENDED_FACILITY 0x0D
#define Q932_IE_FACILITY 0x1C #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", ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)")); 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_type, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
offset += 2; 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.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); 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_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_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_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_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_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_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); 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) { if (!q931_prefs_initialized) {
q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932); q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
/* Facility */ /* 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 */ /* Notification indicator */
dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle);
q932_ros_handle = find_dissector("q932.ros"); 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.res_local_dissector_table = etsi_res_local_dissector_table;
q932_rose_ctx.err_local_dissector_table = etsi_err_local_dissector_table; q932_rose_ctx.err_local_dissector_table = etsi_err_local_dissector_table;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

8
asn1/qsig/qsig.cnf
View File

@ -86,7 +86,7 @@ MCMNewMsgArg/argumentExt MCMNewArgumentExt
MCMNoNewMsgArg/argumentExt MCMNoNewArgumentExt MCMNoNewMsgArg/argumentExt MCMNoNewArgumentExt
MCMUpdateReqArg/argumentExt MCMUpdArgArgumentExt MCMUpdateReqArg/argumentExt MCMUpdArgArgumentExt
MCMUpdateReqResElt/argumentExt MCMUpdResArgumentExt MCMUpdateReqResElt/argumentExt MCMUpdResArgumentExt
#.END #.END
#.FIELD_RENAME #.FIELD_RENAME
NameArg/nameSequence/extension extensionNA NameArg/nameSequence/extension extensionNA
@ -115,7 +115,7 @@ DNDOverrideArg/argumentExtension argumentExtensionDNDO
SSCTInitiateArg/argumentExtension argumentExtensionSSCTI SSCTInitiateArg/argumentExtension argumentExtensionSSCTI
SSCTSetupArg/argumentExtension argumentExtensionSSCTS SSCTSetupArg/argumentExtension argumentExtensionSSCTS
SSCTDigitInfoArg/argumentExtension argumentExtensionSSCTD SSCTDigitInfoArg/argumentExtension argumentExtensionSSCTD
PumRegistrArg/pumUserId pumRUserId PumRegistrArg/pumUserId pumRUserId
PumDelRegArg/pumUserId pumXUserId PumDelRegArg/pumUserId pumXUserId
PumDe-regArg/pumUserId pumDUserId PumDe-regArg/pumUserId pumDUserId
PumInterrogArg/pumUserId pumIUserId PumInterrogArg/pumUserId pumIUserId
@ -130,7 +130,7 @@ KeypadArg/extension sdextension
AddressHeader/priority ahpriority AddressHeader/priority ahpriority
WtmoArg/extension wtmoaextension WtmoArg/extension wtmoaextension
PumoArg/extension pumoaextension PumoArg/extension pumoaextension
#.END #.END
#.TYPE_ATTR #.TYPE_ATTR
@ -167,7 +167,7 @@ NameData TYPE = FT_STRING DISPLAY = BASE_NONE
proto_tree *data_tree; proto_tree *data_tree;
%(DEFAULT_BODY)s %(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) if (out_tvb && (tvb_length(out_tvb) > 0) && q931_ie_handle)
call_dissector(q931_ie_handle, out_tvb, %(ACTX)s->pinfo, data_tree); call_dissector(q931_ie_handle, out_tvb, %(ACTX)s->pinfo, data_tree);
#.END #.END

4
asn1/rnsap/packet-rnsap-template.c
View File

@ -134,7 +134,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* create the rnsap protocol tree */ /* create the rnsap protocol tree */
rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA); rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA);
rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap); rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree); dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
} }
@ -159,7 +159,7 @@ void proto_register_rnsap(void) {
/* Register fields and subtrees */ /* Register fields and subtrees */
proto_register_field_array(proto_rnsap, hf, array_length(hf)); proto_register_field_array(proto_rnsap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
/* Register dissector */ /* Register dissector */
register_dissector("rnsap", dissect_rnsap, proto_rnsap); register_dissector("rnsap", dissect_rnsap, proto_rnsap);

2
asn1/rnsap/rnsap.cnf
View File

@ -8,7 +8,7 @@ ALIGNED
#.END #.END
#.OMIT_ASSIGNMENT #.OMIT_ASSIGNMENT
EDPCH-Information-RLReconfPrepare-FDD EDPCH-Information-RLReconfPrepare-FDD
Non-Serving-RL-Preconfig-Info Non-Serving-RL-Preconfig-Info
#.PDU #.PDU

2
asn1/ros/packet-ros-template.h
View File

@ -29,7 +29,7 @@
# include "packet-ses.h" # include "packet-ses.h"
/* for use in the SESSION_DATA_STRUCTURE ros_op argument /* 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 */ bottom three bytes indicate operation code */
# define ROS_OP_MASK 0xff000000 # define ROS_OP_MASK 0xff000000

4
asn1/ros/ros-err.cnf
View File

@ -18,7 +18,7 @@
err_handle = NULL; err_handle = NULL;
} }
if (!err_handle || if (!err_handle ||
!proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) {
if (actx->rose_ctx->d.code == 0) if (actx->rose_ctx->d.code == 0)
descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); 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); 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) { if (!err_handle) {
expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr);
} }

2
asn1/ros/ros-inv.cnf
View File

@ -18,7 +18,7 @@
arg_handle = NULL; arg_handle = NULL;
} }
if (!arg_handle || if (!arg_handle ||
!proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) {
if (actx->rose_ctx->d.code == 0) if (actx->rose_ctx->d.code == 0)
descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local);

4
asn1/ros/ros-res.cnf
View File

@ -19,7 +19,7 @@
res_handle = NULL; res_handle = NULL;
} }
if (!res_handle || if (!res_handle ||
!proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) {
if (actx->rose_ctx->d.code == 0) if (actx->rose_ctx->d.code == 0)
descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); 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); 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) { if (!res_handle) {
expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr);
} }

4
asn1/rrc/packet-rrc-template.h
View File

@ -53,9 +53,9 @@ typedef struct rrc_ciph_info_
GTree * /*guint32*/ start_ps; /*Start value for PS counter*/ GTree * /*guint32*/ start_ps; /*Start value for PS counter*/
guint32 conf_algo_indicator; /*Indicates which type of ciphering algorithm used*/ guint32 conf_algo_indicator; /*Indicates which type of ciphering algorithm used*/
guint32 int_algo_indiccator; /*Indicates which type of integrity 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*/ guint32 ps_conf_counters[31][2]; /*This should also be made for CS*/
} rrc_ciphering_info; } rrc_ciphering_info;
extern GTree * hsdsch_muxed_flows; extern GTree * hsdsch_muxed_flows;

10
asn1/rrc/rrc.cnf
View File

@ -819,16 +819,16 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
*/ */
break; break;
case RRC_NAS_SYS_INFO_PS: case RRC_NAS_SYS_INFO_PS:
/*Find the entry for the communication context (taken from FP)*/ /*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 ){ 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); c_inf = g_new0(rrc_ciphering_info,1);
/*Initiate tree with START_PS values.*/ /*Initiate tree with START_PS values.*/
if(!c_inf->start_ps) if(!c_inf->start_ps)
c_inf->start_ps = g_tree_new_full(rrc_key_cmp, c_inf->start_ps = g_tree_new_full(rrc_key_cmp,
NULL,rrc_free_key,rrc_free_value); NULL,rrc_free_key,rrc_free_value);
/*Clear and initialize seq_no matrix*/ /*Clear and initialize seq_no matrix*/
for(i = 0; i< 31; i++){ for(i = 0; i< 31; i++){
c_inf->seq_no[i][0] = -1; 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); g_tree_insert(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id), c_inf);
} }
/*Retrieve and store the value*/ /*Retrieve and store the value*/
start = g_new(guint32,1); start = g_new(guint32,1);
*start = tvb_get_bits32(start_val,0,20,ENC_BIG_ENDIAN); *start = tvb_get_bits32(start_val,0,20,ENC_BIG_ENDIAN);
if(c_inf && c_inf->start_ps) if(c_inf && c_inf->start_ps)
/*Insert the value based on current frame num since this might vary over time*/ /*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); g_tree_insert(c_inf->start_ps, GUINT_TO_POINTER(actx->pinfo->fd->num), start);
break; break;
default: default:
break; break;

2
asn1/rrlp/packet-rrlp-template.c
View File

@ -89,7 +89,7 @@ void proto_register_rrlp(void) {
proto_register_field_array(proto_rrlp, hf, array_length(hf)); proto_register_field_array(proto_rrlp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
} }

4
asn1/rrlp/rrlp.cnf
View File

@ -1,6 +1,6 @@
# rrlp.cnf # rrlp.cnf
# rrlp conformation file # rrlp conformation file
# Copyright 2006 Anders Broman # Copyright 2006 Anders Broman
#.OPT #.OPT
PER PER
@ -22,7 +22,7 @@ SLR-Arg-PCS-Extensions
#.END #.END
#.FN_HDR PDU #.FN_HDR PDU
proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, ENC_NA); proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, ENC_NA);
col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "RRLP"); col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "RRLP");

4
asn1/rtse/rtse.cnf
View File

@ -107,7 +107,7 @@ RTABapdu
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.END #.END
#.FN_BODY CallingSSuserReference/t61String VAL_PTR=&string #.FN_BODY CallingSSuserReference/t61String VAL_PTR=&string
tvbuff_t *string = NULL; tvbuff_t *string = NULL;
%(DEFAULT_BODY)s %(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))); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
#.END #.END
#.FN_BODY CallingSSuserReference/octetString VAL_PTR=&string #.FN_BODY CallingSSuserReference/octetString VAL_PTR=&string
tvbuff_t *string = NULL; tvbuff_t *string = NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s

18
asn1/rua/rua.cnf
View File

@ -43,7 +43,7 @@ ProtocolIE-Single-Container
} }
#.END #.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 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_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, col_set_str(actx->pinfo->cinfo, COL_INFO,
"CONNECT "); "CONNECT ");
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.FN_BODY DirectTransfer #.FN_BODY DirectTransfer
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"DIRECT_TRANSFER "); "DIRECT_TRANSFER ");
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.FN_BODY Disconnect #.FN_BODY Disconnect
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"DISCONNECT "); "DISCONNECT ");
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.FN_BODY ConnectionlessTransfer #.FN_BODY ConnectionlessTransfer
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"CONNECTIONLESS_TRANSFER "); "CONNECTIONLESS_TRANSFER ");
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.FN_BODY ErrorIndication #.FN_BODY ErrorIndication
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"ERROR_INDICATION "); "ERROR_INDICATION ");
col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */ col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#.FN_BODY PrivateMessage #.FN_BODY PrivateMessage
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"PRIVATE_MESSAGE "); "PRIVATE_MESSAGE ");
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
@ -96,8 +96,8 @@ ProtocolIE-Single-Container
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if ((tvb_length(ranap_message_tvb)>0)&&(ranap_handle)) { /* RUA has a RANAP-PDU */ if ((tvb_length(ranap_message_tvb)>0)&&(ranap_handle)) { /* RUA has a RANAP-PDU */
col_set_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
"(RUA) "); /* Set info to (RUA) to make room for RANAP */ "(RUA) "); /* Set info to (RUA) to make room for RANAP */
col_set_fence(actx->pinfo->cinfo, COL_INFO); col_set_fence(actx->pinfo->cinfo, COL_INFO);
call_dissector(ranap_handle,ranap_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree)); call_dissector(ranap_handle,ranap_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
} }
#.END #.END

2
asn1/s1ap/s1ap.cnf
View File

@ -391,7 +391,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
Transparent Container 48.018 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); de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
break; break;
case 3: case 3:
/* utrantolte */ /* utrantolte */

4
asn1/sabp/packet-sabp-template.c
View File

@ -137,7 +137,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
nr_pages = tvb_get_guint8(tvb, offset); nr_pages = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_sabp_no_of_pages, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sabp_no_of_pages, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++; offset++;
/* /*
* NOTE: n equal to or less than 15 * NOTE: n equal to or less than 15
*/ */
if(nr_pages > 15){ if(nr_pages > 15){
@ -166,7 +166,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++; offset++;
} }
} }
static guint static guint

8
asn1/sabp/sabp.cnf
View File

@ -1,6 +1,6 @@
# sabp.cnf # sabp.cnf
# sabp conformation file # sabp conformation file
# Copyright 2007 Tomas Kukosa # Copyright 2007 Tomas Kukosa
#.OPT #.OPT
PER PER
@ -47,7 +47,7 @@ MessageStructure/_item/repetitionNumber repetitionNumber1
#.END #.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 ProtocolExtensionID VAL_PTR=&ProtocolExtensionID
#.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue #.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-TypeOfError ProtocolIE-ID
id-Paging-ETWS-Indicator ProtocolIE-ID id-Paging-ETWS-Indicator ProtocolIE-ID
id-Warning-Type ProtocolIE-ID id-Warning-Type ProtocolIE-ID
id-WarningSecurityInfo ProtocolIE-ID id-WarningSecurityInfo ProtocolIE-ID
id-Broadcast-Message-Content-Validity-Indicator ProtocolIE-ID id-Broadcast-Message-Content-Validity-Indicator ProtocolIE-ID
#.END #.END
@ -128,7 +128,7 @@ MessageStructure N sabp.extension id-MessageStructure
TypeOfError N sabp.extension id-TypeOfError TypeOfError N sabp.extension id-TypeOfError
Paging-ETWS-Indicator N sabp.extension id-Paging-ETWS-Indicator Paging-ETWS-Indicator N sabp.extension id-Paging-ETWS-Indicator
Warning-Type N sabp.extension id-Warning-Type 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 Broadcast-Message-Content-Validity-Indicator N sabp.extension id-Broadcast-Message-Content-Validity-Indicator
#SABP-ELEMENTARY-PROCEDURE #SABP-ELEMENTARY-PROCEDURE

2
asn1/sbc-ap/packet-sbc-ap-template.c
View File

@ -166,7 +166,7 @@ void proto_register_sbc_ap(void) {
proto_register_field_array(proto_sbc_ap, hf, array_length(hf)); proto_register_field_array(proto_sbc_ap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
/* Register dissector tables */ /* Register dissector tables */
sbc_ap_ies_dissector_table = register_dissector_table("sbc_ap.ies", "SBC-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); 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); sbc_ap_extension_dissector_table = register_dissector_table("sbc_ap.extension", "SBC-AP-PROTOCOL-EXTENSION", FT_UINT32, BASE_DEC);

10
asn1/sbc-ap/sbc-ap.cnf
View File

@ -100,9 +100,9 @@ ProtocolIE-Field/value ie_field_value
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 3, FALSE, &parameter_tvb); 3, 3, FALSE, &parameter_tvb);
if(tvb_length(tvb)==0) if(tvb_length(tvb)==0)
return offset; return offset;
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); 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-Area-List ProtocolIE-ID
id-Warning-Message-Content ProtocolIE-ID id-Warning-Message-Content ProtocolIE-ID
id-Warning-Security-Information ProtocolIE-ID id-Warning-Security-Information ProtocolIE-ID
id-Warning-Type ProtocolIE-ID id-Warning-Type ProtocolIE-ID
id-Omc-Id ProtocolIE-ID id-Omc-Id ProtocolIE-ID
id-Concurrent-Warning-Message-Indicator ProtocolIE-ID id-Concurrent-Warning-Message-Indicator ProtocolIE-ID
id-Extended-Repetition-Period ProtocolIE-ID id-Extended-Repetition-Period ProtocolIE-ID

4
asn1/snmp/packet-snmp-template.h
View File

@ -43,7 +43,7 @@ typedef struct _snmp_usm_auth_model_t {
typedef struct _snmp_user_t { typedef struct _snmp_user_t {
snmp_usm_key_t userName; snmp_usm_key_t userName;
snmp_usm_auth_model_t* authModel; snmp_usm_auth_model_t* authModel;
snmp_usm_key_t authPassword; snmp_usm_key_t authPassword;
snmp_usm_key_t authKey; snmp_usm_key_t authKey;
@ -71,7 +71,7 @@ struct _snmp_usm_params_t {
gboolean encrypted; gboolean encrypted;
guint start_offset; guint start_offset;
guint auth_offset; guint auth_offset;
guint32 boots; guint32 boots;
guint32 time; guint32 time;
tvbuff_t* engine_tvb; tvbuff_t* engine_tvb;

2
asn1/t124/packet-t124-template.c
View File

@ -207,7 +207,7 @@ void proto_register_t124(void) {
&ett_t124_connectGCCPDU, &ett_t124_connectGCCPDU,
#include "packet-t124-ettarr.c" #include "packet-t124-ettarr.c"
}; };
/* Register protocol */ /* Register protocol */
proto_t124 = proto_register_protocol(PNAME, PSNAME, PFNAME); proto_t124 = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */ /* Register fields and subtrees */

70
asn1/t124/t124.cnf
View File

@ -52,43 +52,43 @@ RegistryItem
RegistryEntryOwner RegistryEntryOwner
RequestPDU RequestPDU
DomainParameters DomainParameters
DynamicTokenID DynamicTokenID
NodeProperties NodeProperties
AlternativeNodeID AlternativeNodeID
ChannelType ChannelType
CapabilityID CapabilityID
CapabilityClass CapabilityClass
ConferenceAddRequest ConferenceAddRequest
ConferenceLockRequest ConferenceLockRequest
ConferenceUnlockRequest ConferenceUnlockRequest
ConferenceTerminateRequest ConferenceTerminateRequest
ConferenceEjectUserRequest ConferenceEjectUserRequest
ConferenceTransferRequest ConferenceTransferRequest
RegistryRegisterChannelRequest RegistryRegisterChannelRequest
RegistryAssignTokenRequest RegistryAssignTokenRequest
RegistrySetParameterRequest RegistrySetParameterRequest
RegistryRetrieveEntryRequest RegistryRetrieveEntryRequest
RegistryDeleteEntryRequest RegistryDeleteEntryRequest
RegistryMonitorEntryRequest RegistryMonitorEntryRequest
RegistryAllocateHandleRequest RegistryAllocateHandleRequest
NonStandardPDU NonStandardPDU
NetworkAddressV2 NetworkAddressV2
EntityID EntityID
RegistryKey RegistryKey
RegistryModificationRights RegistryModificationRights
MediaList MediaList
ChannelAggregationMethod ChannelAggregationMethod
Profile Profile
NetworkConnection NetworkConnection
SessionKey SessionKey
ChannelID ChannelID
GSTNConnection GSTNConnection
ISDNConnection ISDNConnection
CSDNConnection CSDNConnection
PSDNConnection PSDNConnection
ATMConnection ATMConnection
ExtendedE164NetworkAddress ExtendedE164NetworkAddress
TransportAddress TransportAddress
#.PDU #.PDU
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
@ -131,7 +131,7 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult
/* This length MUST be ignored by the client." */ /* This length MUST be ignored by the client." */
/* Not sure why - but lets ignore the length. */ /* 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) { if(tvb_length(next_tvb) == 42) {
/* this is perhaps a naive ... */ /* this is perhaps a naive ... */
@ -222,9 +222,9 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult
%(DEFAULT_BODY)s %(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); col_append_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "%%d", channelId);
#.OMIT_ASSIGNMENT #.OMIT_ASSIGNMENT
StaticChannelID StaticChannelID

14
asn1/t125/t125.cnf
View File

@ -57,13 +57,13 @@ TokenAttributes
TokenGrabRequest TokenGrabRequest
Reason Reason
Diagnostic Diagnostic
StaticChannelId StaticChannelId
UserId UserId
PrivateChannelId PrivateChannelId
AssignedChannelId AssignedChannelId
TokenId TokenId
DynamicChannelId DynamicChannelId
ChannelId ChannelId
#.PDU #.PDU
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
@ -97,7 +97,7 @@ ConnectMCSPDU
#.FN_BODY Connect-Initial/_untag/userData #.FN_BODY Connect-Initial/_untag/userData
tvbuff_t *next_tvb = NULL; tvbuff_t *next_tvb = NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(next_tvb) if(next_tvb)
dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, dissector_try_heuristic(t125_heur_subdissector_list, next_tvb,
actx->pinfo, top_tree, NULL); actx->pinfo, top_tree, NULL);
#.END #.END
@ -106,7 +106,7 @@ ConnectMCSPDU
#.FN_BODY Connect-Response/_untag/userData #.FN_BODY Connect-Response/_untag/userData
tvbuff_t *next_tvb = NULL; tvbuff_t *next_tvb = NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(next_tvb) if(next_tvb)
dissector_try_heuristic(t125_heur_subdissector_list, next_tvb, dissector_try_heuristic(t125_heur_subdissector_list, next_tvb,
actx->pinfo, top_tree, NULL); actx->pinfo, top_tree, NULL);
#.END #.END

8
asn1/t38/packet-t38-template.h
View File

@ -38,7 +38,7 @@ typedef struct _t38_packet_info {
guint8 t30_Facsimile_Control; guint8 t30_Facsimile_Control;
gchar desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */ 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 */ 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; guint32 frame_num_first_t4_data;
} t38_packet_info; } 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 */ /* 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 typedef struct _t38_conv_info
{ {
guint32 reass_ID; guint32 reass_ID;
int reass_start_seqnum; int reass_start_seqnum;
guint32 reass_data_type; guint32 reass_data_type;
gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */ gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */
guint32 packet_lost; guint32 packet_lost;
guint32 burst_lost; guint32 burst_lost;
double time_first_t4_data; double time_first_t4_data;
guint32 additional_hdlc_data_field_counter; guint32 additional_hdlc_data_field_counter;
gint32 seqnum_prev_data_field; gint32 seqnum_prev_data_field;
} t38_conv_info; } t38_conv_info;
/* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */ /* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */

2
asn1/tcap/tcap.cnf
View File

@ -64,7 +64,7 @@ ABRT-apdu/_untag/user-information abrt_user_information
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
#.FN_BODY Dialog1 #.FN_BODY Dialog1
offset = dissect_tcap_DialoguePDU(TRUE, tvb, offset, actx, tree, -1); offset = dissect_tcap_DialoguePDU(TRUE, tvb, offset, actx, tree, -1);

2
asn1/tetra/tetra.cnf
View File

@ -12,7 +12,7 @@ ExtendCarrier
SPEECHMODE SPEECHMODE
DATAMODE DATAMODE
CALLMODE CALLMODE
#.EXPORTS #.EXPORTS
#U-ALERT #U-ALERT

6
asn1/ulp/ulp.cnf
View File

@ -1,6 +1,6 @@
# upl.cnf # upl.cnf
# upl conformation file # upl conformation file
# Copyright 2006-2010 Anders Broman # Copyright 2006-2010 Anders Broman
#.OPT #.OPT
PER PER
@ -85,6 +85,6 @@ guint32 UlpMessage;
#.TYPE_ATTR #.TYPE_ATTR
IPAddress/ipv4Address TYPE = FT_IPv4 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 IPAddress/ipv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
#.END #.END

32
asn1/x2ap/x2ap.cnf
View File

@ -1,6 +1,6 @@
# x2ap.cnf # x2ap.cnf
# x2ap conformation file # x2ap conformation file
# Copyright 2007 Anders Broman # Copyright 2007 Anders Broman
#.OPT #.OPT
PER PER
@ -30,11 +30,11 @@ UnsuccessfulOutcome/value UnsuccessfulOutcome_value
#.FIELD_RENAME #.FIELD_RENAME
ProtocolExtensionField/id extension_id ProtocolExtensionField/id extension_id
PrivateIE-Field/id private_id PrivateIE-Field/id private_id
InitiatingMessage/value initiatingMessage_value InitiatingMessage/value initiatingMessage_value
ProtocolIE-Field/value protocolIE_Field_value ProtocolIE-Field/value protocolIE_Field_value
SuccessfulOutcome/value successfulOutcome_value SuccessfulOutcome/value successfulOutcome_value
PrivateIE-Field/value privateIE_Field_value PrivateIE-Field/value privateIE_Field_value
#.OMIT_ASSIGNMENT #.OMIT_ASSIGNMENT
Presence Presence
@ -51,7 +51,7 @@ ProtocolIE-ContainerPairList
} }
#.END #.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 ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue
@ -78,9 +78,9 @@ ProtocolIE-ContainerPairList
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if(tvb_length(tvb)==0) if(tvb_length(tvb)==0)
return offset; return offset;
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE);
@ -88,13 +88,13 @@ ProtocolIE-ContainerPairList
#.FN_BODY TargeteNBtoSource-eNBTransparentContainer VAL_PTR = &parameter_tvb #.FN_BODY TargeteNBtoSource-eNBTransparentContainer VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL; tvbuff_t *parameter_tvb=NULL;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree, NULL); dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree, NULL);
#.TYPE_ATTR #.TYPE_ATTR
ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_ProtocolIE_ID_vals) ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_ProtocolIE_ID_vals)
#.END #.END
@ -110,7 +110,7 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot
tvbuff_t *parameter_tvb=NULL; tvbuff_t *parameter_tvb=NULL;
proto_tree *subtree; proto_tree *subtree;
gint tvb_len; gint tvb_len;
%(DEFAULT_BODY)s %(DEFAULT_BODY)s
if (!parameter_tvb) if (!parameter_tvb)
return offset; return offset;
@ -233,7 +233,7 @@ id-CSG-Id ProtocolIE-ID
id-CSGMembershipStatus ProtocolIE-ID id-CSGMembershipStatus ProtocolIE-ID
id-MDTConfiguration ProtocolIE-ID id-MDTConfiguration ProtocolIE-ID
id-ManagementBasedMDTallowed ProtocolIE-ID id-ManagementBasedMDTallowed ProtocolIE-ID
id-RRCConnSetupIndicator ProtocolIE-ID id-RRCConnSetupIndicator ProtocolIE-ID
#.REGISTER_NEW #.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-Item N x2ap.ies id-E-RAB-Item
E-RAB-List N x2ap.ies id-E-RABs-NotAdmitted-List E-RAB-List N x2ap.ies id-E-RABs-NotAdmitted-List
E-RABs-ToBeSetup-Item N x2ap.ies id-E-RABs-ToBeSetup-Item E-RABs-ToBeSetup-Item N x2ap.ies id-E-RABs-ToBeSetup-Item
Cause N x2ap.ies id-Cause Cause N x2ap.ies id-Cause
CellInformation-List N x2ap.ies id-CellInformation CellInformation-List N x2ap.ies id-CellInformation
CellInformation-Item N x2ap.ies id-CellInformation-Item 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-New-eNB-UE-X2AP-ID
UE-X2AP-ID N x2ap.ies id-Old-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-List N x2ap.ies id-CompleteFailureCauseInformation-List
CompleteFailureCauseInformation-Item N x2ap.ies id-CompleteFailureCauseInformation-Item CompleteFailureCauseInformation-Item N x2ap.ies id-CompleteFailureCauseInformation-Item
CSGMembershipStatus N x2ap.ies id-CSGMembershipStatus CSGMembershipStatus N x2ap.ies id-CSGMembershipStatus
RRCConnSetupIndicator N x2ap.ies id-RRCConnSetupIndicator RRCConnSetupIndicator N x2ap.ies id-RRCConnSetupIndicator
#X2AP-PROTOCOL-EXTENSION #X2AP-PROTOCOL-EXTENSION

10
asn1/x509af/packet-x509af-template.c
View File

@ -110,9 +110,9 @@ void proto_register_x509af(void) {
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_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("CertificateList", proto_x509af, dissect_CertificateList_PDU);
register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU);
register_ber_oid_syntax(".cer", NULL, "Certificate"); register_ber_oid_syntax(".cer", NULL, "Certificate");
register_ber_oid_syntax(".crt", 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 /*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 I have not that ITU standard, ill put it here for the time
being. being.
Only implemented those algorithms that take no parameters Only implemented those algorithms that take no parameters
for the time being, ronnie for the time being, ronnie
*/ */
/* from http://www.alvestrand.no/objectid/1.3.14.3.2.html */ /* 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("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
register_ldap_name_dissector("userCertificate", 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("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af); register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);

6
asn1/x509af/x509af.cnf
View File

@ -50,7 +50,7 @@ AttributeCertificateInfo/subject InfoSubject
AttributeCertificateAssertion/subject AssertionSubject AttributeCertificateAssertion/subject AssertionSubject
#.FIELD_RENAME #.FIELD_RENAME
AttributeCertificateInfo/issuer issuerName AttributeCertificateInfo/issuer issuerName
AttributeCertificateInfo/subject info_subject AttributeCertificateInfo/subject info_subject
AttributeCertificateAssertion/subject assertion_subject AttributeCertificateAssertion/subject assertion_subject
@ -58,7 +58,7 @@ AttributeCertificateAssertion/issuer assertionIssuer
AttributeCertificateInfo/subject/subjectName infoSubjectName AttributeCertificateInfo/subject/subjectName infoSubjectName
AttributeCertificateAssertion/subject/subjectName assertionSubjectName AttributeCertificateAssertion/subject/subjectName assertionSubjectName
IssuerSerial/issuer issuerName IssuerSerial/issuer issuerName
CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate revokedUserCertificate CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate revokedUserCertificate
#.END #.END
@ -75,7 +75,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
if(actx->external.direct_reference) { if(actx->external.direct_reference) {
name = oid_resolved_from_string(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 #.FN_BODY AlgorithmIdentifier/parameters

2
asn1/x509ce/packet-x509ce-template.c
View File

@ -109,7 +109,7 @@ void proto_register_x509ce(void) {
{ "invalidityDate", "x509ce.id_ce_invalidityDate", { "invalidityDate", "x509ce.id_ce_invalidityDate",
FT_STRING, BASE_NONE, NULL, 0, FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_x509ce_object_identifier_id, { &hf_x509ce_object_identifier_id,
{ "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0, { "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0,
"Object identifier Id", HFILL }}, "Object identifier Id", HFILL }},
{ &hf_x509ce_IPAddress, { &hf_x509ce_IPAddress,

12
asn1/x509ce/x509ce.cnf
View File

@ -9,26 +9,26 @@
# Forward declaration # Forward declaration
#.CLASS CERT-POLICY-QUALIFIER #.CLASS CERT-POLICY-QUALIFIER
&id ObjectIdentifierType &id ObjectIdentifierType
&Qualifier &Qualifier
#.END #.END
# InformationFramework classes # InformationFramework classes
##.CLASS ATTRIBUTE ##.CLASS ATTRIBUTE
#&derivation ClassReference ATTRIBUTE #&derivation ClassReference ATTRIBUTE
#&Type #&Type
#&equality-match ClassReference MATCHING-RULE #&equality-match ClassReference MATCHING-RULE
#&ordering-match ClassReference MATCHING-RULE #&ordering-match ClassReference MATCHING-RULE
#&substrings-match ClassReference MATCHING-RULE #&substrings-match ClassReference MATCHING-RULE
#&single-valued BooleanType #&single-valued BooleanType
#&collective BooleanType #&collective BooleanType
#&no-user-modification BooleanType #&no-user-modification BooleanType
#&usage #&usage
#&id ObjectIdentifierType #&id ObjectIdentifierType
##.END ##.END
#.CLASS MATCHING-RULE #.CLASS MATCHING-RULE
&ParentMatchingRules ClassReference MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE
&AssertionType &AssertionType
&uniqueMatchIndicator ClassReference ATTRIBUTE &uniqueMatchIndicator ClassReference ATTRIBUTE
&id ObjectIdentifierType &id ObjectIdentifierType
#.END #.END
@ -161,7 +161,7 @@ CertificatePairExactAssertion/issuedByThisCAAssertion cpea_issuedByThisCAAsserti
CertificateGroup/serialNumberRange certificateGroupNumberRange CertificateGroup/serialNumberRange certificateGroupNumberRange
CertificateAssertion/subjectAltName subjectAltNameType CertificateAssertion/subjectAltName subjectAltNameType
EnhancedCertificateAssertion/pathToName enhancedPathToName EnhancedCertificateAssertion/pathToName enhancedPathToName
#.FN_PARS PolicyQualifierInfo/policyQualifierId #.FN_PARS PolicyQualifierInfo/policyQualifierId
FN_VARIANT = _str HF_INDEX = hf_x509ce_object_identifier_id VAL_PTR = &actx->external.direct_reference 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); offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
#.FN_FTR GeneralName/uniformResourceIdentifier #.FN_FTR GeneralName/uniformResourceIdentifier
PROTO_ITEM_SET_URL(actx->created_item); PROTO_ITEM_SET_URL(actx->created_item);
#.END #.END

Some files were not shown because too many files have changed in this diff Show More