cd tcap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
- cd t38
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
- cd ..
cd ulp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
-t38::
- cd t38
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
- cd ..
-
ulp::
cd ulp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
ScreeningIndicator
CallIdentifier
GenericData
+#.END
#----------------------------------------------------------------------------------------
+#.OMIT_ASSIGNMENT
+EncodedFastStartToken
+#.END
+
#.VIRTUAL_ASSGN
FastStart Setup-UUIE/fastStart
#.SET_TYPE
SrtpCryptoCapability
SrtpKeys
+#.END
#.OMIT_ASSIGNMENT
-
ECGDSASignature
H235CertificateSignature
-
+
+EncodedGeneralToken
+EncodedPwdCertToken
+EncodedKeySignedMaterial
+EncodedReturnSig
+EncodedKeySyncMaterial
+#.END
+
#.FIELD_RENAME
TypedCertificate/certificate certificatedata
#.PDU
PDU
-#.OMIT_ASSIGNMENTS_EXCEPT MAP-LCS-DataTypes
+#.OMIT_ASSIGNMENTS_EXCEPT MAP-LCS-DataTypes
Ext-GeographicalInformation
maxExt-GeographicalInformation
VelocityEstimate
#.END
+#.OMIT_ASSIGNMENT MAP-ExtensionDataTypes
+SLR-ArgExtensionContainer
+#.END
+
#.CLASS MAP-EXTENSION
ExtensionType
extensionId ObjectIdentifierType
#.PDU
ULP-PDU
+#.END
+
+
+#.TYPE_RENAME
+FrequencyInfo/modeSpecificInfo FrequencySpecificInfo
+#.END
+
+#.FIELD_RENAME
+FrequencyInfo/modeSpecificInfo modeSpecificFrequencyInfo
+FrequencyInfo/modeSpecificInfo/fdd fdd_fr
+FrequencyInfo/modeSpecificInfo/tdd tdd_fr
+SlpSessionID/sessionID sessionSlpID
+SETId/min minsi
+#.END
#.FN_HDR ULP-PDU
proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, FALSE);
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 276 "h225.cnf"
+#line 281 "h225.cnf"
tvbuff_t *value_tvb;
ipv4_address = 0;
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 565 "h225.cnf"
+#line 570 "h225.cnf"
t35CountryCode = 0;
t35Extension = 0;
manufacturerCode = 0;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_H221NonStandard, H221NonStandard_sequence);
-#line 569 "h225.cnf"
+#line 574 "h225.cnf"
h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
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 546 "h225.cnf"
+#line 551 "h225.cnf"
guint32 value;
nsiOID = "";
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 580 "h225.cnf"
+#line 585 "h225.cnf"
tvbuff_t *next_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
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 578 "h225.cnf"
+#line 583 "h225.cnf"
nsp_handle = NULL;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
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 386 "h225.cnf"
+#line 391 "h225.cnf"
ipv4_address=0;
ipv4_port=0;
ett_h225_H245TransportAddress, H245TransportAddress_choice,
NULL);
-#line 392 "h225.cnf"
+#line 397 "h225.cnf"
/* we need this info for TAPing */
h225_pi->is_h245 = TRUE;
h225_pi->h245_address = ipv4_address;
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 258 "h225.cnf"
+#line 263 "h225.cnf"
tvbuff_t *value_tvb = NULL;
guint len = 0;
static 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 523 "h225.cnf"
+#line 528 "h225.cnf"
tpOID = "";
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_TunnelledProtocol, TunnelledProtocol_sequence);
-#line 525 "h225.cnf"
+#line 530 "h225.cnf"
tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID);
return offset;
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 498 "h225.cnf"
+#line 503 "h225.cnf"
tvbuff_t *guid_tvb;
actx->value_ptr = &guid_tvb;
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 225 "h225.cnf"
+#line 230 "h225.cnf"
tvbuff_t *value_tvb = NULL;
char codec_str[50];
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 287 "h225.cnf"
+#line 292 "h225.cnf"
tvbuff_t *h245_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
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 340 "h225.cnf"
+#line 345 "h225.cnf"
contains_faststart = FALSE;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Setup_UUIE, Setup_UUIE_sequence);
-#line 344 "h225.cnf"
+#line 349 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_SETUP;
if (contains_faststart == TRUE )
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence);
-#line 353 "h225.cnf"
+#line 358 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_CALL_PROCEDING;
if (contains_faststart == TRUE )
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Connect_UUIE, Connect_UUIE_sequence);
-#line 377 "h225.cnf"
+#line 382 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_CONNECT;
if (contains_faststart == TRUE )
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Alerting_UUIE, Alerting_UUIE_sequence);
-#line 362 "h225.cnf"
+#line 367 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_ALERTING;
if (contains_faststart == TRUE )
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Information_UUIE, Information_UUIE_sequence);
-#line 311 "h225.cnf"
+#line 316 "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>"));
static 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 491 "h225.cnf"
+#line 496 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence);
-#line 371 "h225.cnf"
+#line 376 "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>"));
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 415 "h225.cnf"
+#line 420 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Facility_UUIE, Facility_UUIE_sequence);
-#line 332 "h225.cnf"
+#line 337 "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>"));
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Progress_UUIE, Progress_UUIE_sequence);
-#line 317 "h225.cnf"
+#line 322 "h225.cnf"
/* Add to packet info */
h225_pi->cs_type = H225_PROGRESS;
if (contains_faststart == TRUE )
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 301 "h225.cnf"
+#line 306 "h225.cnf"
h225_pi->cs_type = H225_EMPTY;
return offset;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_Status_UUIE, Status_UUIE_sequence);
-#line 305 "h225.cnf"
+#line 310 "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>"));
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence);
-#line 326 "h225.cnf"
+#line 331 "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>"));
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 198 "h225.cnf"
+#line 203 "h225.cnf"
guint32 message_body_val;
contains_faststart = FALSE;
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 511 "h225.cnf"
+#line 516 "h225.cnf"
tvbuff_t *h4501_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
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 294 "h225.cnf"
+#line 299 "h225.cnf"
tvbuff_t *h245_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
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 533 "h225.cnf"
+#line 538 "h225.cnf"
tvbuff_t *next_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
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 531 "h225.cnf"
+#line 536 "h225.cnf"
tp_handle = NULL;
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
}
-
-static int
-dissect_h225_EncodedFastStartToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h225_FastStartToken);
-
- 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 }
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 422 "h225.cnf"
+#line 427 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 477 "h225.cnf"
+#line 482 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 429 "h225.cnf"
+#line 434 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 436 "h225.cnf"
+#line 441 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 253 "h225.cnf"
+#line 258 "h225.cnf"
h225_pi->is_destinationInfo = TRUE;
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 463 "h225.cnf"
+#line 468 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 443 "h225.cnf"
+#line 448 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 450 "h225.cnf"
+#line 455 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 456 "h225.cnf"
+#line 461 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 470 "h225.cnf"
+#line 475 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 484 "h225.cnf"
+#line 489 "h225.cnf"
guint32 value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
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 241 "h225.cnf"
+#line 246 "h225.cnf"
guint32 rasmessage_value;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
int
dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 49 "h235.cnf"
+#line 56 "h235.cnf"
proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
int
dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 46 "h235.cnf"
+#line 53 "h235.cnf"
proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
int
dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 56 "h235.cnf"
+#line 63 "h235.cnf"
proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
int
dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 52 "h235.cnf"
+#line 59 "h235.cnf"
proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-static int
-dissect_h235_EncodedGeneralToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ClearToken);
-
- return offset;
-}
-
-
-
static int
dissect_h235_PwdCertToken(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);
}
-
-static int
-dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_PwdCertToken);
-
- return offset;
-}
-
-
static const per_sequence_t T_cryptoEncryptedToken_sequence[] = {
{ &hf_h235_tokenOID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER },
{ &hf_h235_encryptedToken , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTED },
int
dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 60 "h235.cnf"
+#line 67 "h235.cnf"
proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
}
-
-static int
-dissect_h235_EncodedKeySignedMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySignedMaterial);
-
- return offset;
-}
-
-
static const per_sequence_t ReturnSig_sequence[] = {
{ &hf_h235_generalId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_Identifier },
{ &hf_h235_responseRandom , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal },
}
-
-static int
-dissect_h235_EncodedReturnSig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ReturnSig);
-
- return offset;
-}
-
-
static const per_sequence_t KeySyncMaterial_sequence[] = {
{ &hf_h235_generalID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_Identifier },
{ &hf_h235_keyMaterial , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h235_KeyMaterial },
-static int
-dissect_h235_EncodedKeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySyncMaterial);
-
- return offset;
-}
-
-
-
static int
dissect_h235_INTEGER_0_24(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,
static int hf_rrlp_adr = -1; /* INTEGER_0_33554431 */
static int hf_rrlp_privateExtensionList = -1; /* PrivateExtensionList */
static int hf_rrlp_pcs_Extensions = -1; /* PCS_Extensions */
-static int hf_rrlp_slr_Arg_PCS_Extensions = -1; /* SLR_Arg_PCS_Extensions */
static int hf_rrlp_PrivateExtensionList_item = -1; /* PrivateExtension */
static int hf_rrlp_extId = -1; /* OBJECT_IDENTIFIER */
static int hf_rrlp_extType = -1; /* T_extType */
static gint ett_rrlp_GANSS_SgnElement = -1;
static gint ett_rrlp_Rel7_AssistanceData_Extension = -1;
static gint ett_rrlp_ExtensionContainer = -1;
-static gint ett_rrlp_SLR_ArgExtensionContainer = -1;
static gint ett_rrlp_PrivateExtensionList = -1;
static gint ett_rrlp_PrivateExtension = -1;
static gint ett_rrlp_PCS_Extensions = -1;
static int
dissect_rrlp_Ext_GeographicalInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 35 "rrlp.cnf"
+#line 39 "rrlp.cnf"
tvbuff_t *parameter_tvb = NULL;
static int
dissect_rrlp_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 26 "rrlp.cnf"
+#line 30 "rrlp.cnf"
proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE);
return offset;
}
-
-static const per_sequence_t SLR_ArgExtensionContainer_sequence[] = {
- { &hf_rrlp_privateExtensionList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rrlp_PrivateExtensionList },
- { &hf_rrlp_slr_Arg_PCS_Extensions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rrlp_SLR_Arg_PCS_Extensions },
- { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_rrlp_SLR_ArgExtensionContainer(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_rrlp_SLR_ArgExtensionContainer, SLR_ArgExtensionContainer_sequence);
-
- return offset;
-}
-
/*--- PDUs ---*/
static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
{ "pcs-Extensions", "rrlp.pcs_Extensions",
FT_NONE, BASE_NONE, NULL, 0,
"rrlp.PCS_Extensions", HFILL }},
- { &hf_rrlp_slr_Arg_PCS_Extensions,
- { "slr-Arg-PCS-Extensions", "rrlp.slr_Arg_PCS_Extensions",
- FT_NONE, BASE_NONE, NULL, 0,
- "rrlp.SLR_Arg_PCS_Extensions", HFILL }},
{ &hf_rrlp_PrivateExtensionList_item,
{ "Item", "rrlp.PrivateExtensionList_item",
FT_NONE, BASE_NONE, NULL, 0,
&ett_rrlp_GANSS_SgnElement,
&ett_rrlp_Rel7_AssistanceData_Extension,
&ett_rrlp_ExtensionContainer,
- &ett_rrlp_SLR_ArgExtensionContainer,
&ett_rrlp_PrivateExtensionList,
&ett_rrlp_PrivateExtension,
&ett_rrlp_PCS_Extensions,
static int hf_ulp_setId = -1; /* SETId */
static int hf_ulp_msisdn = -1; /* OCTET_STRING_SIZE_8 */
static int hf_ulp_mdn = -1; /* OCTET_STRING_SIZE_8 */
-static int hf_ulp_min_01 = -1; /* BIT_STRING_SIZE_34 */
+static int hf_ulp_minsi = -1; /* BIT_STRING_SIZE_34 */
static int hf_ulp_imsi = -1; /* OCTET_STRING_SIZE_8 */
static int hf_ulp_nai = -1; /* IA5String_SIZE_1_1000 */
static int hf_ulp_iPAddress = -1; /* IPAddress */
-static int hf_ulp_sessionID_01 = -1; /* OCTET_STRING_SIZE_4 */
+static int hf_ulp_sessionSlpID = -1; /* OCTET_STRING_SIZE_4 */
static int hf_ulp_slpId = -1; /* SLPAddress */
static int hf_ulp_ipv4Address = -1; /* OCTET_STRING_SIZE_4 */
static int hf_ulp_ipv6Address = -1; /* OCTET_STRING_SIZE_16 */
static int hf_ulp_frequencyInfo = -1; /* FrequencyInfo */
static int hf_ulp_primaryScramblingCode = -1; /* INTEGER_0_511 */
static int hf_ulp_measuredResultsList = -1; /* MeasuredResultsList */
-static int hf_ulp_modeSpecificInfo = -1; /* T_modeSpecificInfo */
-static int hf_ulp_fdd = -1; /* FrequencyInfoFDD */
-static int hf_ulp_tdd = -1; /* FrequencyInfoTDD */
+static int hf_ulp_modeSpecificFrequencyInfo = -1; /* FrequencySpecificInfo */
+static int hf_ulp_fdd_fr = -1; /* FrequencyInfoFDD */
+static int hf_ulp_tdd_fr = -1; /* FrequencyInfoTDD */
static int hf_ulp_uarfcn_UL = -1; /* UARFCN */
static int hf_ulp_uarfcn_DL = -1; /* UARFCN */
static int hf_ulp_uarfcn_Nt = -1; /* UARFCN */
static int hf_ulp_cellMeasuredResultsList = -1; /* CellMeasuredResultsList */
static int hf_ulp_CellMeasuredResultsList_item = -1; /* CellMeasuredResults */
static int hf_ulp_cellIdentity = -1; /* INTEGER_0_268435455 */
-static int hf_ulp_modeSpecificInfo_01 = -1; /* T_modeSpecificInfo_01 */
-static int hf_ulp_fdd_01 = -1; /* T_fdd */
+static int hf_ulp_modeSpecificInfo = -1; /* T_modeSpecificInfo */
+static int hf_ulp_fdd = -1; /* T_fdd */
static int hf_ulp_primaryCPICH_Info = -1; /* PrimaryCPICH_Info */
static int hf_ulp_cpich_Ec_N0 = -1; /* CPICH_Ec_N0 */
static int hf_ulp_cpich_RSCP = -1; /* CPICH_RSCP */
static int hf_ulp_pathloss = -1; /* Pathloss */
-static int hf_ulp_tdd_01 = -1; /* T_tdd */
+static int hf_ulp_tdd = -1; /* T_tdd */
static int hf_ulp_cellParametersID = -1; /* CellParametersID */
static int hf_ulp_proposedTGSN = -1; /* TGSN */
static int hf_ulp_primaryCCPCH_RSCP = -1; /* PrimaryCCPCH_RSCP */
static gint ett_ulp_GsmCellInformation = -1;
static gint ett_ulp_WcdmaCellInformation = -1;
static gint ett_ulp_FrequencyInfo = -1;
-static gint ett_ulp_T_modeSpecificInfo = -1;
+static gint ett_ulp_FrequencySpecificInfo = -1;
static gint ett_ulp_FrequencyInfoFDD = -1;
static gint ett_ulp_FrequencyInfoTDD = -1;
static gint ett_ulp_NMR = -1;
static gint ett_ulp_MeasuredResults = -1;
static gint ett_ulp_CellMeasuredResultsList = -1;
static gint ett_ulp_CellMeasuredResults = -1;
-static gint ett_ulp_T_modeSpecificInfo_01 = -1;
+static gint ett_ulp_T_modeSpecificInfo = -1;
static gint ett_ulp_T_fdd = -1;
static gint ett_ulp_T_tdd = -1;
static gint ett_ulp_TimeslotISCP_List = -1;
static const per_choice_t SETId_choice[] = {
{ 0, &hf_ulp_msisdn , ASN1_EXTENSION_ROOT , dissect_ulp_OCTET_STRING_SIZE_8 },
{ 1, &hf_ulp_mdn , ASN1_EXTENSION_ROOT , dissect_ulp_OCTET_STRING_SIZE_8 },
- { 2, &hf_ulp_min_01 , ASN1_EXTENSION_ROOT , dissect_ulp_BIT_STRING_SIZE_34 },
+ { 2, &hf_ulp_minsi , ASN1_EXTENSION_ROOT , dissect_ulp_BIT_STRING_SIZE_34 },
{ 3, &hf_ulp_imsi , ASN1_EXTENSION_ROOT , dissect_ulp_OCTET_STRING_SIZE_8 },
{ 4, &hf_ulp_nai , ASN1_EXTENSION_ROOT , dissect_ulp_IA5String_SIZE_1_1000 },
{ 5, &hf_ulp_iPAddress , ASN1_EXTENSION_ROOT , dissect_ulp_IPAddress },
static const per_sequence_t SlpSessionID_sequence[] = {
- { &hf_ulp_sessionID_01 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
+ { &hf_ulp_sessionSlpID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
{ &hf_ulp_slpId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ulp_SLPAddress },
{ NULL, 0, 0, NULL }
};
}
-static const value_string ulp_T_modeSpecificInfo_vals[] = {
+static const value_string ulp_FrequencySpecificInfo_vals[] = {
{ 0, "fdd" },
{ 1, "tdd" },
{ 0, NULL }
};
-static const per_choice_t T_modeSpecificInfo_choice[] = {
- { 0, &hf_ulp_fdd , ASN1_EXTENSION_ROOT , dissect_ulp_FrequencyInfoFDD },
- { 1, &hf_ulp_tdd , ASN1_EXTENSION_ROOT , dissect_ulp_FrequencyInfoTDD },
+static const per_choice_t FrequencySpecificInfo_choice[] = {
+ { 0, &hf_ulp_fdd_fr , ASN1_EXTENSION_ROOT , dissect_ulp_FrequencyInfoFDD },
+ { 1, &hf_ulp_tdd_fr , ASN1_EXTENSION_ROOT , dissect_ulp_FrequencyInfoTDD },
{ 0, NULL, 0, NULL }
};
static int
-dissect_ulp_T_modeSpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ulp_FrequencySpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_ulp_T_modeSpecificInfo, T_modeSpecificInfo_choice,
+ ett_ulp_FrequencySpecificInfo, FrequencySpecificInfo_choice,
NULL);
return offset;
static const per_sequence_t FrequencyInfo_sequence[] = {
- { &hf_ulp_modeSpecificInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo },
+ { &hf_ulp_modeSpecificFrequencyInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ulp_FrequencySpecificInfo },
{ NULL, 0, 0, NULL }
};
}
-static const value_string ulp_T_modeSpecificInfo_01_vals[] = {
+static const value_string ulp_T_modeSpecificInfo_vals[] = {
{ 0, "fdd" },
{ 1, "tdd" },
{ 0, NULL }
};
-static const per_choice_t T_modeSpecificInfo_01_choice[] = {
- { 0, &hf_ulp_fdd_01 , ASN1_NO_EXTENSIONS , dissect_ulp_T_fdd },
- { 1, &hf_ulp_tdd_01 , ASN1_NO_EXTENSIONS , dissect_ulp_T_tdd },
+static const per_choice_t T_modeSpecificInfo_choice[] = {
+ { 0, &hf_ulp_fdd , ASN1_NO_EXTENSIONS , dissect_ulp_T_fdd },
+ { 1, &hf_ulp_tdd , ASN1_NO_EXTENSIONS , dissect_ulp_T_tdd },
{ 0, NULL, 0, NULL }
};
static int
-dissect_ulp_T_modeSpecificInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ulp_T_modeSpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_ulp_T_modeSpecificInfo_01, T_modeSpecificInfo_01_choice,
+ ett_ulp_T_modeSpecificInfo, T_modeSpecificInfo_choice,
NULL);
return offset;
static const per_sequence_t CellMeasuredResults_sequence[] = {
{ &hf_ulp_cellIdentity , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ulp_INTEGER_0_268435455 },
- { &hf_ulp_modeSpecificInfo_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo_01 },
+ { &hf_ulp_modeSpecificInfo, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo },
{ NULL, 0, 0, NULL }
};
static int
dissect_ulp_T_rrlpPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 36 "ulp.cnf"
+#line 50 "ulp.cnf"
tvbuff_t *rrlp_tvb;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
static int
dissect_ulp_UlpMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 24 "ulp.cnf"
+#line 38 "ulp.cnf"
guint32 UlpMessage;
static int
dissect_ulp_ULP_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 15 "ulp.cnf"
+#line 29 "ulp.cnf"
proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, FALSE);
if (check_col(actx->pinfo->cinfo, COL_PROTOCOL))
{ "mdn", "ulp.mdn",
FT_BYTES, BASE_HEX, NULL, 0,
"ulp.OCTET_STRING_SIZE_8", HFILL }},
- { &hf_ulp_min_01,
+ { &hf_ulp_minsi,
{ "min", "ulp.min",
FT_BYTES, BASE_HEX, NULL, 0,
"ulp.BIT_STRING_SIZE_34", HFILL }},
{ "iPAddress", "ulp.iPAddress",
FT_UINT32, BASE_DEC, VALS(ulp_IPAddress_vals), 0,
"ulp.IPAddress", HFILL }},
- { &hf_ulp_sessionID_01,
+ { &hf_ulp_sessionSlpID,
{ "sessionID", "ulp.sessionID",
FT_BYTES, BASE_HEX, NULL, 0,
"ulp.OCTET_STRING_SIZE_4", HFILL }},
{ "measuredResultsList", "ulp.measuredResultsList",
FT_UINT32, BASE_DEC, NULL, 0,
"ulp.MeasuredResultsList", HFILL }},
- { &hf_ulp_modeSpecificInfo,
+ { &hf_ulp_modeSpecificFrequencyInfo,
{ "modeSpecificInfo", "ulp.modeSpecificInfo",
- FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
- "ulp.T_modeSpecificInfo", HFILL }},
- { &hf_ulp_fdd,
+ FT_UINT32, BASE_DEC, VALS(ulp_FrequencySpecificInfo_vals), 0,
+ "ulp.FrequencySpecificInfo", HFILL }},
+ { &hf_ulp_fdd_fr,
{ "fdd", "ulp.fdd",
FT_NONE, BASE_NONE, NULL, 0,
"ulp.FrequencyInfoFDD", HFILL }},
- { &hf_ulp_tdd,
+ { &hf_ulp_tdd_fr,
{ "tdd", "ulp.tdd",
FT_NONE, BASE_NONE, NULL, 0,
"ulp.FrequencyInfoTDD", HFILL }},
{ "cellIdentity", "ulp.cellIdentity",
FT_UINT32, BASE_DEC, NULL, 0,
"ulp.INTEGER_0_268435455", HFILL }},
- { &hf_ulp_modeSpecificInfo_01,
+ { &hf_ulp_modeSpecificInfo,
{ "modeSpecificInfo", "ulp.modeSpecificInfo",
- FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_01_vals), 0,
- "ulp.T_modeSpecificInfo_01", HFILL }},
- { &hf_ulp_fdd_01,
+ FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
+ "ulp.T_modeSpecificInfo", HFILL }},
+ { &hf_ulp_fdd,
{ "fdd", "ulp.fdd",
FT_NONE, BASE_NONE, NULL, 0,
"ulp.T_fdd", HFILL }},
{ "pathloss", "ulp.pathloss",
FT_UINT32, BASE_DEC, NULL, 0,
"ulp.Pathloss", HFILL }},
- { &hf_ulp_tdd_01,
+ { &hf_ulp_tdd,
{ "tdd", "ulp.tdd",
FT_NONE, BASE_NONE, NULL, 0,
"ulp.T_tdd", HFILL }},
&ett_ulp_GsmCellInformation,
&ett_ulp_WcdmaCellInformation,
&ett_ulp_FrequencyInfo,
- &ett_ulp_T_modeSpecificInfo,
+ &ett_ulp_FrequencySpecificInfo,
&ett_ulp_FrequencyInfoFDD,
&ett_ulp_FrequencyInfoTDD,
&ett_ulp_NMR,
&ett_ulp_MeasuredResults,
&ett_ulp_CellMeasuredResultsList,
&ett_ulp_CellMeasuredResults,
- &ett_ulp_T_modeSpecificInfo_01,
+ &ett_ulp_T_modeSpecificInfo,
&ett_ulp_T_fdd,
&ett_ulp_T_tdd,
&ett_ulp_TimeslotISCP_List,