Get rid of few warnings (unused generated code, signed/unsigned mismatch)

svn path=/trunk/; revision=25839
This commit is contained in:
Tomas Kukosa 2008-07-26 15:28:04 +00:00
parent 4ac15ee6d4
commit 1644e4138a
17 changed files with 134 additions and 268 deletions

View File

@ -73,6 +73,7 @@ ExtendedAliasAddress
#.OMIT_ASSIGNMENT
EncodedFastStartToken
FastStartToken
#.END
#.VIRTUAL_ASSGN
@ -455,83 +456,83 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY FacilityReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY GatekeeperRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY UnregRequestReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY UnregRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY BandRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY DisengageReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#----------------------------------------------------------------------------------------
#.FN_BODY DisengageRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY AdmissionRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY LocationRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY RegistrationRejectReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY InfoRequestNakReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
#.END
#----------------------------------------------------------------------------------------
#.FN_BODY ReleaseCompleteReason VAL_PTR = &value
guint32 value;
gint32 value;
%(DEFAULT_BODY)s
h225_pi->reason = value;
@ -586,7 +587,7 @@ NonStandardIdentifier/object FN_VARIANT = _str VAL_PTR = &nsiOID
#.END
#.FN_BODY NonStandardIdentifier VAL_PTR = &value
guint32 value;
gint32 value;
nsiOID = "";
h221NonStandard = 0;

View File

@ -63,7 +63,7 @@ ReturnErrorProblem VAL_PTR = &problem_val
#--- INVOKE ---
# body is impleneted manually as asn2wrs is not able to handle subtype constraint event passed through parameter
# body is implemented manually as asn2wrs is not able to handle subtype constraint event passed through parameter
#.FN_BODY Invoke/invokeId
offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s,
0U, 65535U, %(VAL_PTR)s, TRUE);

View File

@ -54,7 +54,7 @@ int proto_h450_ros = -1;
static dissector_handle_t data_handle = NULL;
/* Gloabl variables */
static guint32 problem_val;
static gint32 problem_val;
static gchar problem_str[64];
static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb;

View File

@ -38,6 +38,11 @@ PresentedAddressScreened
PresentedAddressUnscreened
PresentedNumberScreened
PresentedNumberUnscreened
AddressScreened
NumberScreened
Address
# implemented manually in h450-ros as asn2wrs is not able to handle subtype constraint event passed through parameter
InvokeIDs
#.END
#.PDU_NEW

View File

@ -17,6 +17,7 @@ GROUP_BY_PROT
#.OMIT_ASSIGNMENT
MessageBroadcastGroups
GroupAttributes
#.END
#.MODULE

View File

@ -131,9 +131,9 @@ static const value_string str_nd[] = {
/*--- dissect_q932_facility_ie -------------------------------------------------------*/
/*static*/ void
dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int length) {
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int hoffset, eoffset;
int ie_end;

View File

@ -121,7 +121,7 @@ static dissector_handle_t rtp_handle;
static dissector_handle_t t30_hdlc_handle;
static dissector_handle_t data_handle;
static guint32 Type_of_msg_value;
static gint32 Type_of_msg_value;
static guint32 Data_Field_field_type_value;
static guint32 Data_value;
static guint32 T30ind_value;

View File

@ -30,7 +30,7 @@
typedef struct _t38_packet_info {
guint16 seq_num; /* UDPTLPacket sequence number */
guint32 type_msg; /* 0=t30-indicator 1=data */
gint32 type_msg; /* 0=t30-indicator 1=data */
guint32 t30ind_value;
guint32 data_value; /* standard and speed */
guint32 setup_frame_number;

View File

@ -1184,7 +1184,7 @@ dissect_h225_ProtocolIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 319 "h225.cnf"
#line 320 "h225.cnf"
tvbuff_t *value_tvb;
ipv4_address = 0;
@ -1424,7 +1424,7 @@ static const per_sequence_t H221NonStandard_sequence[] = {
static int
dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 608 "h225.cnf"
#line 609 "h225.cnf"
t35CountryCode = 0;
t35Extension = 0;
manufacturerCode = 0;
@ -1432,7 +1432,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_H221NonStandard, H221NonStandard_sequence);
#line 612 "h225.cnf"
#line 613 "h225.cnf"
h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
@ -1454,8 +1454,8 @@ static const per_choice_t NonStandardIdentifier_choice[] = {
static int
dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 589 "h225.cnf"
guint32 value;
#line 590 "h225.cnf"
gint32 value;
nsiOID = "";
h221NonStandard = 0;
@ -1483,7 +1483,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_h225_T_nsp_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 623 "h225.cnf"
#line 624 "h225.cnf"
tvbuff_t *next_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -1506,7 +1506,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = {
int
dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 621 "h225.cnf"
#line 622 "h225.cnf"
nsp_handle = NULL;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -1540,7 +1540,7 @@ static const per_choice_t H245TransportAddress_choice[] = {
static int
dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 429 "h225.cnf"
#line 430 "h225.cnf"
ipv4_address=0;
ipv4_port=0;
@ -1549,7 +1549,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
ett_h225_H245TransportAddress, H245TransportAddress_choice,
NULL);
#line 435 "h225.cnf"
#line 436 "h225.cnf"
/* we need this info for TAPing */
h225_pi->is_h245 = TRUE;
h225_pi->h245_address = ipv4_address;
@ -1578,7 +1578,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_h225_DialedDigits(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 301 "h225.cnf"
#line 302 "h225.cnf"
tvbuff_t *value_tvb = NULL;
guint len = 0;
@ -1895,7 +1895,7 @@ dissect_h225_PartyNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_h225_TBCD_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 704 "h225.cnf"
#line 705 "h225.cnf"
int min_len, max_len;
gboolean has_extension;
@ -2694,13 +2694,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = {
int
dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 566 "h225.cnf"
#line 567 "h225.cnf"
tpOID = "";
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_TunnelledProtocol, TunnelledProtocol_sequence);
#line 568 "h225.cnf"
#line 569 "h225.cnf"
tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID);
return offset;
@ -2878,7 +2878,7 @@ dissect_h225_CallType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
static int
dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 541 "h225.cnf"
#line 542 "h225.cnf"
tvbuff_t *guid_tvb;
actx->value_ptr = &guid_tvb;
@ -3091,7 +3091,7 @@ dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1
static int
dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 268 "h225.cnf"
#line 269 "h225.cnf"
tvbuff_t *value_tvb = NULL;
char codec_str[50];
@ -3679,7 +3679,7 @@ dissect_h225_CircuitIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
static int
dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 680 "h225.cnf"
#line 681 "h225.cnf"
gint32 value_int = -1;
gef_ctx_t *gefx;
@ -3697,7 +3697,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_h225_T_oid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 689 "h225.cnf"
#line 690 "h225.cnf"
const gchar *oid_str = NULL;
gef_ctx_t *gefx;
@ -3727,14 +3727,14 @@ static const per_choice_t GenericIdentifier_choice[] = {
int
dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 666 "h225.cnf"
#line 667 "h225.cnf"
gef_ctx_t *gefx;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_GenericIdentifier, GenericIdentifier_choice,
NULL);
#line 668 "h225.cnf"
#line 669 "h225.cnf"
gef_ctx_update_key(gef_ctx_get(actx->private_data));
/* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG GenericIdentifier: %s", gef_ctx_get(actx->private_data)->key);*/
gefx = gef_ctx_get(actx->private_data);
@ -3867,7 +3867,7 @@ dissect_h225_EnumeratedParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
static int
dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 648 "h225.cnf"
#line 649 "h225.cnf"
gef_ctx_t *parent_gefx;
parent_gefx = gef_ctx_get(actx->private_data);
@ -3875,7 +3875,7 @@ dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
offset = dissect_h225_EnumeratedParameter(tvb, offset, actx, tree, hf_index);
#line 653 "h225.cnf"
#line 654 "h225.cnf"
actx->private_data = parent_gefx;
return offset;
@ -3904,7 +3904,7 @@ static const per_sequence_t GenericData_sequence[] = {
int
dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 634 "h225.cnf"
#line 635 "h225.cnf"
void *priv_data = actx->private_data;
gef_ctx_t *gefx;
@ -3918,7 +3918,7 @@ dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_GenericData, GenericData_sequence);
#line 644 "h225.cnf"
#line 645 "h225.cnf"
actx->private_data = priv_data;
return offset;
@ -3957,13 +3957,13 @@ dissect_h225_CircuitInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_h225_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 658 "h225.cnf"
#line 659 "h225.cnf"
void *priv_data = actx->private_data;
actx->private_data = gef_ctx_alloc(NULL, "FeatureDescriptor");
offset = dissect_h225_GenericData(tvb, offset, actx, tree, hf_index);
#line 661 "h225.cnf"
#line 662 "h225.cnf"
actx->private_data = priv_data;
return offset;
@ -3986,7 +3986,7 @@ dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, as
static int
dissect_h225_ParallelH245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 330 "h225.cnf"
#line 331 "h225.cnf"
tvbuff_t *h245_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -4097,13 +4097,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = {
static int
dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 383 "h225.cnf"
#line 384 "h225.cnf"
contains_faststart = FALSE;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Setup_UUIE, Setup_UUIE_sequence);
#line 387 "h225.cnf"
#line 388 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_SETUP;
if (contains_faststart == TRUE )
@ -4153,7 +4153,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence);
#line 396 "h225.cnf"
#line 397 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_CALL_PROCEDING;
if (contains_faststart == TRUE )
@ -4193,7 +4193,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Connect_UUIE, Connect_UUIE_sequence);
#line 420 "h225.cnf"
#line 421 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_CONNECT;
if (contains_faststart == TRUE )
@ -4231,7 +4231,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Alerting_UUIE, Alerting_UUIE_sequence);
#line 405 "h225.cnf"
#line 406 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_ALERTING;
if (contains_faststart == TRUE )
@ -4259,7 +4259,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Information_UUIE, Information_UUIE_sequence);
#line 354 "h225.cnf"
#line 355 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_INFORMATION;
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@ -4378,8 +4378,8 @@ static const per_choice_t ReleaseCompleteReason_choice[] = {
int
dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 534 "h225.cnf"
guint32 value;
#line 535 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice,
@ -4412,7 +4412,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence);
#line 414 "h225.cnf"
#line 415 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_RELEASE_COMPLET;
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@ -4453,8 +4453,8 @@ static const per_choice_t FacilityReason_choice[] = {
static int
dissect_h225_FacilityReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 458 "h225.cnf"
guint32 value;
#line 459 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_FacilityReason, FacilityReason_choice,
@ -4526,7 +4526,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Facility_UUIE, Facility_UUIE_sequence);
#line 375 "h225.cnf"
#line 376 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_FACILITY;
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@ -4555,7 +4555,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Progress_UUIE, Progress_UUIE_sequence);
#line 360 "h225.cnf"
#line 361 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_PROGRESS;
if (contains_faststart == TRUE )
@ -4572,7 +4572,7 @@ static int
dissect_h225_T_empty_flg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_null(tvb, offset, actx, tree, hf_index);
#line 344 "h225.cnf"
#line 345 "h225.cnf"
h225_pi->cs_type = H225_EMPTY;
return offset;
@ -4592,7 +4592,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Status_UUIE, Status_UUIE_sequence);
#line 348 "h225.cnf"
#line 349 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_STATUS;
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@ -4631,7 +4631,7 @@ dissect_h225_SetupAcknowledge_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence);
#line 369 "h225.cnf"
#line 370 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_SETUP_ACK;
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@ -4696,7 +4696,7 @@ static const per_choice_t T_h323_message_body_choice[] = {
static int
dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 241 "h225.cnf"
#line 242 "h225.cnf"
guint32 message_body_val;
contains_faststart = FALSE;
@ -4733,7 +4733,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
static int
dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 554 "h225.cnf"
#line 555 "h225.cnf"
tvbuff_t *h4501_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -4773,7 +4773,7 @@ dissect_h225_T_h245Tunneling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
dissect_h225_H245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 337 "h225.cnf"
#line 338 "h225.cnf"
tvbuff_t *h245_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -4830,7 +4830,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_h225_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 576 "h225.cnf"
#line 577 "h225.cnf"
tvbuff_t *next_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -4866,7 +4866,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = {
static int
dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 574 "h225.cnf"
#line 575 "h225.cnf"
tp_handle = NULL;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -5285,15 +5285,6 @@ dissect_h225_ICV(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
}
static int
dissect_h225_FastStartToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_h235_ClearToken(tvb, offset, actx, tree, hf_index);
return offset;
}
static const per_sequence_t CapacityReportingCapability_sequence[] = {
{ &hf_h225_canReportCallCapacity, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_BOOLEAN },
{ NULL, 0, 0, NULL }
@ -5713,8 +5704,8 @@ static const per_choice_t GatekeeperRejectReason_choice[] = {
static int
dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 465 "h225.cnf"
guint32 value;
#line 466 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice,
@ -6015,8 +6006,8 @@ static const per_choice_t RegistrationRejectReason_choice[] = {
static int
dissect_h225_RegistrationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 520 "h225.cnf"
guint32 value;
#line 521 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice,
@ -6078,8 +6069,8 @@ static const per_choice_t UnregRequestReason_choice[] = {
static int
dissect_h225_UnregRequestReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 472 "h225.cnf"
guint32 value;
#line 473 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_UnregRequestReason, UnregRequestReason_choice,
@ -6163,8 +6154,8 @@ static const per_choice_t UnregRejectReason_choice[] = {
static int
dissect_h225_UnregRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 479 "h225.cnf"
guint32 value;
#line 480 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_UnregRejectReason, UnregRejectReason_choice,
@ -6223,7 +6214,7 @@ dissect_h225_CallModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_h225_DestinationInfo_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 296 "h225.cnf"
#line 297 "h225.cnf"
h225_pi->is_destinationInfo = TRUE;
@ -6431,8 +6422,8 @@ static const per_choice_t AdmissionRejectReason_choice[] = {
static int
dissect_h225_AdmissionRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 506 "h225.cnf"
guint32 value;
#line 507 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice,
@ -6563,8 +6554,8 @@ static const per_choice_t BandRejectReason_choice[] = {
static int
dissect_h225_BandRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 486 "h225.cnf"
guint32 value;
#line 487 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_BandRejectReason, BandRejectReason_choice,
@ -6615,8 +6606,8 @@ static const per_choice_t DisengageReason_choice[] = {
static int
dissect_h225_DisengageReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 493 "h225.cnf"
guint32 value;
#line 494 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_DisengageReason, DisengageReason_choice,
@ -6702,8 +6693,8 @@ static const per_choice_t DisengageRejectReason_choice[] = {
static int
dissect_h225_DisengageRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 499 "h225.cnf"
guint32 value;
#line 500 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_DisengageRejectReason, DisengageRejectReason_choice,
@ -6848,8 +6839,8 @@ static const per_choice_t LocationRejectReason_choice[] = {
static int
dissect_h225_LocationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 513 "h225.cnf"
guint32 value;
#line 514 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_LocationRejectReason, LocationRejectReason_choice,
@ -7219,8 +7210,8 @@ static const per_choice_t InfoRequestNakReason_choice[] = {
static int
dissect_h225_InfoRequestNakReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 527 "h225.cnf"
guint32 value;
#line 528 "h225.cnf"
gint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice,
@ -7430,7 +7421,7 @@ static const per_choice_t RasMessage_choice[] = {
int
dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 284 "h225.cnf"
#line 285 "h225.cnf"
guint32 rasmessage_value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,

View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-h450-ros.c */
/* ../../tools/asn2wrs.py -e -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */
/* ../../tools/asn2wrs.py -e -p h450.ros -c h450-ros.cnf -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */
/* Input file: packet-h450-ros-template.c */
@ -100,7 +100,7 @@ static gint ett_h450_ros_T_problem = -1;
static dissector_handle_t data_handle = NULL;
/* Gloabl variables */
static guint32 problem_val;
static gint32 problem_val;
static gchar problem_str[64];
static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb;

View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-h450-ros.h */
/* ../../tools/asn2wrs.py -e -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */
/* ../../tools/asn2wrs.py -e -p h450.ros -c h450-ros.cnf -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */
/* Input file: packet-h450-ros-template.h */

View File

@ -82,9 +82,6 @@ static int hf_h450_clearCallIfAnyInvokePduNotRecognized = -1; /* NULL */
static int hf_h450_rejectAnyUnrecognizedInvokePdu = -1; /* NULL */
static int hf_h450_rosApdus = -1; /* T_rosApdus */
static int hf_h450_rosApdus_item = -1; /* T_rosApdus_item */
static int hf_h450_partyNumber = -1; /* PartyNumber */
static int hf_h450_screeningIndicator = -1; /* ScreeningIndicator */
static int hf_h450_partySubaddress = -1; /* PartySubaddress */
static int hf_h450_destinationAddress = -1; /* SEQUENCE_OF_AliasAddress */
static int hf_h450_destinationAddress_item = -1; /* AliasAddress */
static int hf_h450_remoteExtensionAddress = -1; /* AliasAddress */
@ -468,9 +465,6 @@ static gint ett_h450_EntityType = -1;
static gint ett_h450_InterpretationApdu = -1;
static gint ett_h450_ServiceApdus = -1;
static gint ett_h450_T_rosApdus = -1;
static gint ett_h450_AddressScreened = -1;
static gint ett_h450_NumberScreened = -1;
static gint ett_h450_Address = -1;
static gint ett_h450_EndpointAddress = -1;
static gint ett_h450_SEQUENCE_OF_AliasAddress = -1;
static gint ett_h450_PartySubaddress = -1;
@ -928,7 +922,7 @@ dissect_h450_InterpretationApdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_h450_T_rosApdus_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 57 "h450.cnf"
#line 62 "h450.cnf"
h450_rose_ctx.apdu_depth = 1;
actx->rose_ctx = &h450_rose_ctx;
@ -981,7 +975,7 @@ static const per_sequence_t h450_H4501SupplementaryService_sequence[] = {
static int
dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 50 "h450.cnf"
#line 55 "h450.cnf"
proto_item *hidden_item;
hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE);
@ -994,11 +988,33 @@ dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_c
}
static const per_sequence_t h450_SEQUENCE_OF_AliasAddress_sequence_of[1] = {
{ &hf_h450_destinationAddress_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_AliasAddress },
};
static int
dissect_h450_InvokeIDs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 65535U, NULL, FALSE);
dissect_h450_SEQUENCE_OF_AliasAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
ett_h450_SEQUENCE_OF_AliasAddress, h450_SEQUENCE_OF_AliasAddress_sequence_of);
return offset;
}
static const per_sequence_t h450_EndpointAddress_sequence[] = {
{ &hf_h450_destinationAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h450_SEQUENCE_OF_AliasAddress },
{ &hf_h450_remoteExtensionAddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_AliasAddress },
{ &hf_h450_destinationAddressPresentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_PresentationIndicator },
{ &hf_h450_destinationAddressScreeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ScreeningIndicator },
{ &hf_h450_remoteExtensionAddressPresentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_PresentationIndicator },
{ &hf_h450_remoteExtensionAddressScreeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ScreeningIndicator },
{ NULL, 0, 0, NULL }
};
static int
dissect_h450_EndpointAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h450_EndpointAddress, h450_EndpointAddress_sequence);
return offset;
}
@ -1070,84 +1086,6 @@ dissect_h450_PartySubaddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
static const per_sequence_t h450_AddressScreened_sequence[] = {
{ &hf_h450_partyNumber , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
{ &hf_h450_screeningIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_ScreeningIndicator },
{ &hf_h450_partySubaddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h450_PartySubaddress },
{ NULL, 0, 0, NULL }
};
static int
dissect_h450_AddressScreened(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h450_AddressScreened, h450_AddressScreened_sequence);
return offset;
}
static const per_sequence_t h450_NumberScreened_sequence[] = {
{ &hf_h450_partyNumber , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
{ &hf_h450_screeningIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_ScreeningIndicator },
{ NULL, 0, 0, NULL }
};
static int
dissect_h450_NumberScreened(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h450_NumberScreened, h450_NumberScreened_sequence);
return offset;
}
static const per_sequence_t h450_Address_sequence[] = {
{ &hf_h450_partyNumber , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
{ &hf_h450_partySubaddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h450_PartySubaddress },
{ NULL, 0, 0, NULL }
};
static int
dissect_h450_Address(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h450_Address, h450_Address_sequence);
return offset;
}
static const per_sequence_t h450_SEQUENCE_OF_AliasAddress_sequence_of[1] = {
{ &hf_h450_destinationAddress_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_AliasAddress },
};
static int
dissect_h450_SEQUENCE_OF_AliasAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
ett_h450_SEQUENCE_OF_AliasAddress, h450_SEQUENCE_OF_AliasAddress_sequence_of);
return offset;
}
static const per_sequence_t h450_EndpointAddress_sequence[] = {
{ &hf_h450_destinationAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h450_SEQUENCE_OF_AliasAddress },
{ &hf_h450_remoteExtensionAddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_AliasAddress },
{ &hf_h450_destinationAddressPresentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_PresentationIndicator },
{ &hf_h450_destinationAddressScreeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ScreeningIndicator },
{ &hf_h450_remoteExtensionAddressPresentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_PresentationIndicator },
{ &hf_h450_remoteExtensionAddressScreeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ScreeningIndicator },
{ NULL, 0, 0, NULL }
};
static int
dissect_h450_EndpointAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h450_EndpointAddress, h450_EndpointAddress_sequence);
return offset;
}
static int
dissect_h450_PresentationAllowedIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -4976,18 +4914,6 @@ void proto_register_h450(void) {
{ "Item", "h450.rosApdus_item",
FT_UINT32, BASE_DEC, VALS(h450_ros_ROS_vals), 0,
"h450.T_rosApdus_item", HFILL }},
{ &hf_h450_partyNumber,
{ "partyNumber", "h450.partyNumber",
FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
"h225.PartyNumber", HFILL }},
{ &hf_h450_screeningIndicator,
{ "screeningIndicator", "h450.screeningIndicator",
FT_UINT32, BASE_DEC, VALS(h225_ScreeningIndicator_vals), 0,
"h225.ScreeningIndicator", HFILL }},
{ &hf_h450_partySubaddress,
{ "partySubaddress", "h450.partySubaddress",
FT_UINT32, BASE_DEC, VALS(h450_PartySubaddress_vals), 0,
"h450.PartySubaddress", HFILL }},
{ &hf_h450_destinationAddress,
{ "destinationAddress", "h450.destinationAddress",
FT_UINT32, BASE_DEC, NULL, 0,
@ -6372,9 +6298,6 @@ void proto_register_h450(void) {
&ett_h450_InterpretationApdu,
&ett_h450_ServiceApdus,
&ett_h450_T_rosApdus,
&ett_h450_AddressScreened,
&ett_h450_NumberScreened,
&ett_h450_Address,
&ett_h450_EndpointAddress,
&ett_h450_SEQUENCE_OF_AliasAddress,
&ett_h450_PartySubaddress,

View File

@ -258,9 +258,6 @@ static int hf_h460_21_maxGroups = -1; /* INTEGER_1_65535 */
static int hf_h460_21_groupIdentifer = -1; /* GloballyUniqueID */
static int hf_h460_21_capability = -1; /* Capability */
static int hf_h460_21_sourceAddress = -1; /* UnicastAddress */
static int hf_h460_21_priority = -1; /* INTEGER_0_255 */
static int hf_h460_21_groupAddress = -1; /* MulticastAddress */
static int hf_h460_21_alertUser = -1; /* BOOLEAN */
/*--- End of included file: packet-h460-hf.c ---*/
#line 51 "packet-h460-template.c"
@ -358,7 +355,6 @@ static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities = -1;
static gint ett_h460_21_ReceiveCapabilities = -1;
static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability = -1;
static gint ett_h460_21_TransmitCapabilities = -1;
static gint ett_h460_21_GroupAttributes = -1;
/*--- End of included file: packet-h460-ett.c ---*/
#line 54 "packet-h460-template.c"
@ -1959,44 +1955,6 @@ dissect_h460_21_CapabilityAdvertisement(tvbuff_t *tvb _U_, int offset _U_, asn1_
return offset;
}
static int
dissect_h460_21_INTEGER_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, NULL, FALSE);
return offset;
}
static int
dissect_h460_21_BOOLEAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, NULL);
return offset;
}
static const per_sequence_t h460_21_GroupAttributes_sequence[] = {
{ &hf_h460_21_priority , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h460_21_INTEGER_0_255 },
{ &hf_h460_21_groupIdentifer, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h460_21_GloballyUniqueID },
{ &hf_h460_21_capability , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245_Capability },
{ &hf_h460_21_groupAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245_MulticastAddress },
{ &hf_h460_21_sourceAddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h245_UnicastAddress },
{ &hf_h460_21_alertUser , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h460_21_BOOLEAN },
{ NULL, 0, 0, NULL }
};
static int
dissect_h460_21_GroupAttributes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h460_21_GroupAttributes, h460_21_GroupAttributes_sequence);
return offset;
}
/*--- PDUs ---*/
static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@ -2913,18 +2871,6 @@ void proto_register_h460(void) {
{ "sourceAddress", "h460.21.sourceAddress",
FT_UINT32, BASE_DEC, VALS(h245_UnicastAddress_vals), 0,
"h245.UnicastAddress", HFILL }},
{ &hf_h460_21_priority,
{ "priority", "h460.21.priority",
FT_UINT32, BASE_DEC, NULL, 0,
"h460_21.INTEGER_0_255", HFILL }},
{ &hf_h460_21_groupAddress,
{ "groupAddress", "h460.21.groupAddress",
FT_UINT32, BASE_DEC, VALS(h245_MulticastAddress_vals), 0,
"h245.MulticastAddress", HFILL }},
{ &hf_h460_21_alertUser,
{ "alertUser", "h460.21.alertUser",
FT_BOOLEAN, 8, NULL, 0,
"h460_21.BOOLEAN", HFILL }},
/*--- End of included file: packet-h460-hfarr.c ---*/
#line 250 "packet-h460-template.c"
@ -3024,7 +2970,6 @@ void proto_register_h460(void) {
&ett_h460_21_ReceiveCapabilities,
&ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability,
&ett_h460_21_TransmitCapabilities,
&ett_h460_21_GroupAttributes,
/*--- End of included file: packet-h460-ettarr.c ---*/
#line 255 "packet-h460-template.c"

View File

@ -269,19 +269,19 @@ dissect_per_open_type_internal(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx,
guint32
dissect_per_open_type(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, per_type_fn type_cb)
{
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, type_cb, CB_ASN1_ENC);
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, (void*)type_cb, CB_ASN1_ENC);
}
guint32
dissect_per_open_type_pdu(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, dissector_t type_cb)
{
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, type_cb, CB_DISSECTOR);
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, (void*)type_cb, CB_DISSECTOR);
}
guint32
dissect_per_open_type_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, new_dissector_t type_cb)
{
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, type_cb, CB_NEW_DISSECTOR);
return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, (void*)type_cb, CB_NEW_DISSECTOR);
}
/* 10.9 General rules for encoding a length determinant --------------------

View File

@ -645,9 +645,9 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info *
/*--- dissect_q932_facility_ie -------------------------------------------------------*/
/*static*/ void
dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int length) {
guint8 class;
gint8 class;
gboolean pc;
guint32 tag;
gint32 tag;
guint32 len;
int hoffset, eoffset;
int ie_end;

View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-t38.c */
/* ../../tools/asn2wrs.py -p t38 -c ./t38.cnf -s ./packet-t38-template -D . T38_2002.asn */
/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38_2002.asn */
/* Input file: packet-t38-template.c */
@ -129,7 +129,7 @@ static dissector_handle_t rtp_handle;
static dissector_handle_t t30_hdlc_handle;
static dissector_handle_t data_handle;
static guint32 Type_of_msg_value;
static gint32 Type_of_msg_value;
static guint32 Data_Field_field_type_value;
static guint32 Data_value;
static guint32 T30ind_value;

View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-t38.h */
/* ../../tools/asn2wrs.py -p t38 -c ./t38.cnf -s ./packet-t38-template -D . T38_2002.asn */
/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38_2002.asn */
/* Input file: packet-t38-template.h */
@ -38,7 +38,7 @@
typedef struct _t38_packet_info {
guint16 seq_num; /* UDPTLPacket sequence number */
guint32 type_msg; /* 0=t30-indicator 1=data */
gint32 type_msg; /* 0=t30-indicator 1=data */
guint32 t30ind_value;
guint32 data_value; /* standard and speed */
guint32 setup_frame_number;