forked from osmocom/wireshark
As suggested by Jakub Zawadzki: g_free() is NULL safe, so we don't need check against it.
Also (from me): Clean up spacing svn path=/trunk/; revision=27727
This commit is contained in:
Bill Meier
parent
691a5cbed2
commit
0f9f5caf9d
|
|
@ -143,12 +143,8 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
|
|||
struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata = value;
|
||||
gchar *TransactionId_str = key;
|
||||
|
||||
if ( TransactionId_str ){
|
||||
g_free(TransactionId_str);
|
||||
}
|
||||
if (ansi_tcap_saved_invokedata){
|
||||
g_free(ansi_tcap_saved_invokedata);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -468,14 +464,3 @@ proto_register_ansi_tcap(void)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
#define PSNAME "ANSI MAP"
|
||||
#define PFNAME "ansi_map"
|
||||
|
||||
/* Preferenc settings default */
|
||||
/* Preference settings default */
|
||||
#define MAX_SSN 254
|
||||
static range_t *global_ssn_range;
|
||||
|
||||
|
|
@ -385,12 +385,8 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
|
|||
struct ansi_map_invokedata_t *ansi_map_saved_invokedata = value;
|
||||
gchar *TransactionId_str = key;
|
||||
|
||||
if ( TransactionId_str ){
|
||||
g_free(TransactionId_str);
|
||||
}
|
||||
if (ansi_map_saved_invokedata){
|
||||
g_free(ansi_map_saved_invokedata);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -913,7 +909,6 @@ static const value_string ansi_map_AlertCode_Cadence_vals[] = {
|
|||
{ 7, "PBXLong"},
|
||||
{ 8, "PBXShortShort"},
|
||||
{ 9, "PBXShortShortLong"},
|
||||
{ 0, "NoTone"},
|
||||
|
||||
{ 10, "PBXShortLongShort"},
|
||||
{ 11, "PBXShortShortShortShort"},
|
||||
|
|
@ -925,7 +920,7 @@ static const value_string ansi_map_AlertCode_Cadence_vals[] = {
|
|||
{ 17, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 18, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 19, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 20, NULL }
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
/* Alert Action (octet 2, bits A-C) */
|
||||
|
|
@ -2345,7 +2340,7 @@ static const value_string ansi_map_SetupResult_vals[] = {
|
|||
|
||||
/* 6.5.2.122 SMS_AccessDeniedReason (TIA/EIA-41.5-D, page 5-256)
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMS_AccessDeniedReason_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Denied"},
|
||||
|
|
@ -2358,7 +2353,7 @@ static const value_string ansi_map_SMS_AccessDeniedReason_vals[] = {
|
|||
|
||||
/* 6.5.2.125 SMS_CauseCode (TIA/EIA-41.5-D, page 5-262)
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMS_CauseCode_vals[] = {
|
||||
{ 0, "Address vacant"},
|
||||
{ 1, "Address translation failure"},
|
||||
|
|
@ -2418,7 +2413,7 @@ static const value_string ansi_map_SMS_ChargeIndicator_vals[] = {
|
|||
128 through 223 Reserved. Treat the same as value 3, Charge original destination.
|
||||
224 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the same as value 2, Charge
|
||||
original originator.
|
||||
*/
|
||||
*/
|
||||
|
||||
/* 6.5.2.130 SMS_NotificationIndicator N.S0005-0 v 1.0*/
|
||||
static const value_string ansi_map_SMS_NotificationIndicator_vals[] = {
|
||||
|
|
@ -2782,7 +2777,7 @@ static const value_string ansi_map_UniqueChallengeReport_vals[] = {
|
|||
|
||||
/* 6.5.2.e (TSB76) CDMAServiceConfigurationRecord N.S0008-0 v 1.0 */
|
||||
/* a. This field carries the CDMA Service Configuration Record. The bit-layout is the
|
||||
same as that of Service Configuration Record in TSB74, and J-STD-008.
|
||||
same as that of Service Configuration Record in TSB74, and J-STD-008.
|
||||
*/
|
||||
|
||||
/* 6.5.2.f CDMAServiceOption N.S0010-0 v 1.0 */
|
||||
|
|
@ -2896,7 +2891,7 @@ dissect_ansi_map_cdmaserviceoption(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
}
|
||||
/* 6.5.2.f (TSB76) CDMAServiceOption N.S0008-0 v 1.0*/
|
||||
/* This field carries the CDMA Service Option. The bit-layout is the same as that of
|
||||
Service Option in TSB74 and J-STD-008.*/
|
||||
Service Option in TSB74 and J-STD-008.*/
|
||||
|
||||
/* 6.5.2.i (IS-730) TDMAServiceCode N.S0008-0 v 1.0 */
|
||||
static const value_string ansi_map_TDMAServiceCode_vals[] = {
|
||||
|
|
@ -2942,7 +2937,7 @@ static const value_string ansi_map_TDMATerminalCapability_prot_ver_vals[] = {
|
|||
|
||||
/* 6.5.2.aa BaseStationManufacturerCode N.S0007-0 v 1.0 */
|
||||
/* The BaseStationManufacturerCode (BSMC) parameter specifies the manufacturer of the
|
||||
base station that is currently serving the MS (see IS-136 for enumeration of values).*/
|
||||
base station that is currently serving the MS (see IS-136 for enumeration of values).*/
|
||||
|
||||
/* 6.5.2.ab BSMCStatus */
|
||||
|
||||
|
|
@ -3008,7 +3003,7 @@ static const value_string ansi_map_SOCStatus_vals[] = {
|
|||
|
||||
/* 6.5.2.aj SystemOperatorCode N.S0007-0 v 1.0*/
|
||||
/* The SystemOperatorCode (SOC) parameter specifies the system operator that is currently
|
||||
providing service to a MS (see IS-136 for enumeration of values) */
|
||||
providing service to a MS (see IS-136 for enumeration of values) */
|
||||
|
||||
/* 6.5.2.al UserGroup N.S0007-0 v 1.0*/
|
||||
|
||||
|
|
@ -3039,7 +3034,7 @@ static const value_string ansi_map_TDMABandwidth_vals[] = {
|
|||
|
||||
/* 6.5.2.az TDMADataFeaturesIndicator N.S0008-0 v 1.0 */
|
||||
/* TDMADataFeaturesIndicator
|
||||
ansi_map_FeatureActivity_vals
|
||||
ansi_map_FeatureActivity_vals
|
||||
|
||||
ADS FeatureActivity ADS-FA ( octet 1 bit A and B )
|
||||
G3 Fax FeatureActivity G3FAX-FA ( octet 1 bit C and D )
|
||||
|
|
@ -3057,7 +3052,7 @@ ansi_map_FeatureActivity_vals
|
|||
{ 3, "Authorized and activated"},
|
||||
{ 0, NULL }
|
||||
|
||||
};
|
||||
};
|
||||
*/
|
||||
|
||||
/* 6.5.2.ba TDMADataMode N.S0008-0 v 1.0*/
|
||||
|
|
@ -3074,16 +3069,16 @@ ansi_map_FeatureActivity_vals
|
|||
/* 6.5.2.ad CDMAState N.S0008-0 v 1.0 */
|
||||
/* Service Option State Octet 1 */
|
||||
/* a. This field carries the CDMA Service Option State information. The CDMA
|
||||
Service Option State is defined in the current CDMA Service Options standard.
|
||||
If CDMA Service Option State is not explicitly defined within a section of the
|
||||
relevant CDMA Service Option standard, the CDMA Service Option State shall
|
||||
carry the value of the ORD_Q octet of all current Service Option Control Orders
|
||||
(see IS-95), or the contents of all current CDMA Service Option Control
|
||||
Messages (see TSB74) type specific field for this connection reference. */
|
||||
Service Option State is defined in the current CDMA Service Options standard.
|
||||
If CDMA Service Option State is not explicitly defined within a section of the
|
||||
relevant CDMA Service Option standard, the CDMA Service Option State shall
|
||||
carry the value of the ORD_Q octet of all current Service Option Control Orders
|
||||
(see IS-95), or the contents of all current CDMA Service Option Control
|
||||
Messages (see TSB74) type specific field for this connection reference. */
|
||||
|
||||
/* 6.5.2.aj SecondInterMSCCircuitID */
|
||||
/* -- XXX Same code as ISLPinformation???
|
||||
dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
|
||||
dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
|
||||
|
||||
int offset = 0;
|
||||
|
||||
|
|
@ -3096,7 +3091,7 @@ dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, prot
|
|||
offset++;
|
||||
/ Trunk Member Number (M) Octet2 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
}
|
||||
}
|
||||
*/
|
||||
/* 6.5.2.as ChangeServiceAttributes N.S0008-0 v 1.0 */
|
||||
/* Change Facilities Flag (CHGFAC)(octet 1, bits A - B) */
|
||||
|
|
@ -3204,11 +3199,11 @@ dissect_ansi_map_callingpartyname(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
|
|||
/* a. Refer to ANSI T1.610 for field encoding. */
|
||||
|
||||
/* 6.5.2.bz ServiceID
|
||||
Service Identifier (octets 1 to n)
|
||||
0 Not used.
|
||||
1 Calling Name Presentation - No RND.
|
||||
2 Calling Name Presentation with RND.
|
||||
*/
|
||||
Service Identifier (octets 1 to n)
|
||||
0 Not used.
|
||||
1 Calling Name Presentation - No RND.
|
||||
2 Calling Name Presentation with RND.
|
||||
*/
|
||||
|
||||
/* 6.5.2.co GlobalTitle N.S0013-0 v 1.0
|
||||
* Refer to Section 3 of ANSI T1.112 for the encoding of this field.
|
||||
|
|
@ -3452,9 +3447,9 @@ static const value_string ansi_map_Priority_vals[] = {
|
|||
|
||||
/* 6.5.2.gl CallingPartyCategory N.S0027*/
|
||||
/* a. Refer to ITU-T Q.763 (Signalling System No. 7 ISDN user part formats and
|
||||
codes) for encoding of this parameter.
|
||||
b. Refer to national ISDN user part specifications for definitions and encoding of the
|
||||
reserved for national use values.
|
||||
codes) for encoding of this parameter.
|
||||
b. Refer to national ISDN user part specifications for definitions and encoding of the
|
||||
reserved for national use values.
|
||||
*/
|
||||
/* 6.5.2.gm CDMA2000HandoffInvokeIOSData N.S0029-0 v1.0*/
|
||||
/* IOS A1 Element Handoff Invoke Information */
|
||||
|
|
@ -3475,7 +3470,7 @@ reserved for national use values.
|
|||
|
||||
/* Position Request Type (octet 1, bits A-H) */
|
||||
/*
|
||||
static const value_string ansi_map_Position_Request_Type_vals[] = {
|
||||
static const value_string ansi_map_Position_Request_Type_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Initial Position"},
|
||||
{ 2, "Return the updated position"},
|
||||
|
|
@ -3486,31 +3481,31 @@ static const value_string ansi_map_Position_Request_Type_vals[] = {
|
|||
{ 7, "Return the updated position based on the serving cell identity"},
|
||||
*/
|
||||
/*
|
||||
values through 95 Reserved. Treat the same as value 1, Initial position.
|
||||
96 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the
|
||||
same as value 1, Initial position.
|
||||
*
|
||||
values through 95 Reserved. Treat the same as value 1, Initial position.
|
||||
96 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the
|
||||
same as value 1, Initial position.
|
||||
*
|
||||
{ 0, NULL }
|
||||
};
|
||||
};
|
||||
|
||||
*/
|
||||
|
||||
/* LCS Client Type (CTYP) (octet 2, bit A) *
|
||||
0 Emergency services LCS Client.
|
||||
1 Non-emergency services LCS Client.
|
||||
Call-Related Indicator (CALL) (octet 2, bit B)
|
||||
Decimal Value Meaning
|
||||
0 Call-related LCS Client request.
|
||||
1 Non call-related LCS Client request.
|
||||
0 Emergency services LCS Client.
|
||||
1 Non-emergency services LCS Client.
|
||||
Call-Related Indicator (CALL) (octet 2, bit B)
|
||||
Decimal Value Meaning
|
||||
0 Call-related LCS Client request.
|
||||
1 Non call-related LCS Client request.
|
||||
|
||||
Current Serving Cell Information for Coarse Position Determination (CELL) (octet 2, bit C)
|
||||
Decimal Value Meaning
|
||||
0 No specific request.
|
||||
1 Current serving cell information. Current serving cell information for
|
||||
Target MS requested. Radio contact with Target MS is required.
|
||||
Current Serving Cell Information for Coarse Position Determination (CELL) (octet 2, bit C)
|
||||
Decimal Value Meaning
|
||||
0 No specific request.
|
||||
1 Current serving cell information. Current serving cell information for
|
||||
Target MS requested. Radio contact with Target MS is required.
|
||||
*/
|
||||
/* 6.5.2.ft PositionResult *
|
||||
static const value_string ansi_map_PositionResult_vals[] = {
|
||||
static const value_string ansi_map_PositionResult_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Initial position returned"},
|
||||
{ 2, "Updated position returned"},
|
||||
|
|
@ -3541,7 +3536,7 @@ static const value_string ansi_map_PositionResult_vals[] = {
|
|||
{ 27, "Emergency services call precedence"},
|
||||
{ 28, "Request acknowledged"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
};
|
||||
*/
|
||||
/* 6.5.2.bp-1 ServiceRedirectionCause value */
|
||||
static const value_string ansi_map_ServiceRedirectionCause_vals[] = {
|
||||
|
|
@ -3570,7 +3565,7 @@ static const value_string ansi_map_ReauthenticationReport_vals[] = {
|
|||
|
||||
/* 6.5.2.lB AKeyProtocolVersion
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_AKeyProtocolVersion_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "A-key Generation not supported"},
|
||||
|
|
@ -3581,7 +3576,7 @@ static const value_string ansi_map_AKeyProtocolVersion_vals[] = {
|
|||
};
|
||||
/* 6.5.2.sB OTASP_ResultCode
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_OTASP_ResultCode_vals[] = {
|
||||
{ 0, "Accepted - Successful"},
|
||||
{ 1, "Rejected - Unknown cause."},
|
||||
|
|
@ -3595,7 +3590,7 @@ static const value_string ansi_map_OTASP_ResultCode_vals[] = {
|
|||
|
||||
/*6.5.2.wB ServiceIndicator
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_ServiceIndicator_vals[] = {
|
||||
{ 0, "Undefined Service"},
|
||||
{ 1, "CDMA OTASP Service"},
|
||||
|
|
@ -3609,7 +3604,7 @@ static const value_string ansi_map_ServiceIndicator_vals[] = {
|
|||
|
||||
/* 6.5.2.xB SignalingMessageEncryptionReport
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMEReport_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Signaling Message Encryption enabling not attempted"},
|
||||
|
|
@ -3621,7 +3616,7 @@ static const value_string ansi_map_SMEReport_vals[] = {
|
|||
|
||||
/* 6.5.2.zB VoicePrivacyReport
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_VoicePrivacyReport_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Voice Privacy not attempted"},
|
||||
|
|
@ -4025,7 +4020,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
|
||||
return offset;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) {
|
||||
|
||||
|
|
@ -4259,7 +4254,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
|
||||
return offset;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
find_saved_invokedata(asn1_ctx_t *actx){
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@
|
|||
#define PSNAME "ANSI MAP"
|
||||
#define PFNAME "ansi_map"
|
||||
|
||||
/* Preferenc settings default */
|
||||
/* Preference settings default */
|
||||
#define MAX_SSN 254
|
||||
static range_t *global_ssn_range;
|
||||
|
||||
|
|
@ -1156,12 +1156,8 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
|
|||
struct ansi_map_invokedata_t *ansi_map_saved_invokedata = value;
|
||||
gchar *TransactionId_str = key;
|
||||
|
||||
if ( TransactionId_str ){
|
||||
g_free(TransactionId_str);
|
||||
}
|
||||
if (ansi_map_saved_invokedata){
|
||||
g_free(ansi_map_saved_invokedata);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1684,7 +1680,6 @@ static const value_string ansi_map_AlertCode_Cadence_vals[] = {
|
|||
{ 7, "PBXLong"},
|
||||
{ 8, "PBXShortShort"},
|
||||
{ 9, "PBXShortShortLong"},
|
||||
{ 0, "NoTone"},
|
||||
|
||||
{ 10, "PBXShortLongShort"},
|
||||
{ 11, "PBXShortShortShortShort"},
|
||||
|
|
@ -1696,7 +1691,7 @@ static const value_string ansi_map_AlertCode_Cadence_vals[] = {
|
|||
{ 17, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 18, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 19, "Reserved. Treat the same as value 0, NoTone"},
|
||||
{ 20, NULL }
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
/* Alert Action (octet 2, bits A-C) */
|
||||
|
|
@ -3116,7 +3111,7 @@ static const value_string ansi_map_SetupResult_vals[] = {
|
|||
|
||||
/* 6.5.2.122 SMS_AccessDeniedReason (TIA/EIA-41.5-D, page 5-256)
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMS_AccessDeniedReason_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Denied"},
|
||||
|
|
@ -3129,7 +3124,7 @@ static const value_string ansi_map_SMS_AccessDeniedReason_vals[] = {
|
|||
|
||||
/* 6.5.2.125 SMS_CauseCode (TIA/EIA-41.5-D, page 5-262)
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMS_CauseCode_vals[] = {
|
||||
{ 0, "Address vacant"},
|
||||
{ 1, "Address translation failure"},
|
||||
|
|
@ -3189,7 +3184,7 @@ static const value_string ansi_map_SMS_ChargeIndicator_vals[] = {
|
|||
128 through 223 Reserved. Treat the same as value 3, Charge original destination.
|
||||
224 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the same as value 2, Charge
|
||||
original originator.
|
||||
*/
|
||||
*/
|
||||
|
||||
/* 6.5.2.130 SMS_NotificationIndicator N.S0005-0 v 1.0*/
|
||||
static const value_string ansi_map_SMS_NotificationIndicator_vals[] = {
|
||||
|
|
@ -3553,7 +3548,7 @@ static const value_string ansi_map_UniqueChallengeReport_vals[] = {
|
|||
|
||||
/* 6.5.2.e (TSB76) CDMAServiceConfigurationRecord N.S0008-0 v 1.0 */
|
||||
/* a. This field carries the CDMA Service Configuration Record. The bit-layout is the
|
||||
same as that of Service Configuration Record in TSB74, and J-STD-008.
|
||||
same as that of Service Configuration Record in TSB74, and J-STD-008.
|
||||
*/
|
||||
|
||||
/* 6.5.2.f CDMAServiceOption N.S0010-0 v 1.0 */
|
||||
|
|
@ -3667,7 +3662,7 @@ dissect_ansi_map_cdmaserviceoption(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
|
|||
}
|
||||
/* 6.5.2.f (TSB76) CDMAServiceOption N.S0008-0 v 1.0*/
|
||||
/* This field carries the CDMA Service Option. The bit-layout is the same as that of
|
||||
Service Option in TSB74 and J-STD-008.*/
|
||||
Service Option in TSB74 and J-STD-008.*/
|
||||
|
||||
/* 6.5.2.i (IS-730) TDMAServiceCode N.S0008-0 v 1.0 */
|
||||
static const value_string ansi_map_TDMAServiceCode_vals[] = {
|
||||
|
|
@ -3713,7 +3708,7 @@ static const value_string ansi_map_TDMATerminalCapability_prot_ver_vals[] = {
|
|||
|
||||
/* 6.5.2.aa BaseStationManufacturerCode N.S0007-0 v 1.0 */
|
||||
/* The BaseStationManufacturerCode (BSMC) parameter specifies the manufacturer of the
|
||||
base station that is currently serving the MS (see IS-136 for enumeration of values).*/
|
||||
base station that is currently serving the MS (see IS-136 for enumeration of values).*/
|
||||
|
||||
/* 6.5.2.ab BSMCStatus */
|
||||
|
||||
|
|
@ -3779,7 +3774,7 @@ static const value_string ansi_map_SOCStatus_vals[] = {
|
|||
|
||||
/* 6.5.2.aj SystemOperatorCode N.S0007-0 v 1.0*/
|
||||
/* The SystemOperatorCode (SOC) parameter specifies the system operator that is currently
|
||||
providing service to a MS (see IS-136 for enumeration of values) */
|
||||
providing service to a MS (see IS-136 for enumeration of values) */
|
||||
|
||||
/* 6.5.2.al UserGroup N.S0007-0 v 1.0*/
|
||||
|
||||
|
|
@ -3810,7 +3805,7 @@ static const value_string ansi_map_TDMABandwidth_vals[] = {
|
|||
|
||||
/* 6.5.2.az TDMADataFeaturesIndicator N.S0008-0 v 1.0 */
|
||||
/* TDMADataFeaturesIndicator
|
||||
ansi_map_FeatureActivity_vals
|
||||
ansi_map_FeatureActivity_vals
|
||||
|
||||
ADS FeatureActivity ADS-FA ( octet 1 bit A and B )
|
||||
G3 Fax FeatureActivity G3FAX-FA ( octet 1 bit C and D )
|
||||
|
|
@ -3828,7 +3823,7 @@ ansi_map_FeatureActivity_vals
|
|||
{ 3, "Authorized and activated"},
|
||||
{ 0, NULL }
|
||||
|
||||
};
|
||||
};
|
||||
*/
|
||||
|
||||
/* 6.5.2.ba TDMADataMode N.S0008-0 v 1.0*/
|
||||
|
|
@ -3845,16 +3840,16 @@ ansi_map_FeatureActivity_vals
|
|||
/* 6.5.2.ad CDMAState N.S0008-0 v 1.0 */
|
||||
/* Service Option State Octet 1 */
|
||||
/* a. This field carries the CDMA Service Option State information. The CDMA
|
||||
Service Option State is defined in the current CDMA Service Options standard.
|
||||
If CDMA Service Option State is not explicitly defined within a section of the
|
||||
relevant CDMA Service Option standard, the CDMA Service Option State shall
|
||||
carry the value of the ORD_Q octet of all current Service Option Control Orders
|
||||
(see IS-95), or the contents of all current CDMA Service Option Control
|
||||
Messages (see TSB74) type specific field for this connection reference. */
|
||||
Service Option State is defined in the current CDMA Service Options standard.
|
||||
If CDMA Service Option State is not explicitly defined within a section of the
|
||||
relevant CDMA Service Option standard, the CDMA Service Option State shall
|
||||
carry the value of the ORD_Q octet of all current Service Option Control Orders
|
||||
(see IS-95), or the contents of all current CDMA Service Option Control
|
||||
Messages (see TSB74) type specific field for this connection reference. */
|
||||
|
||||
/* 6.5.2.aj SecondInterMSCCircuitID */
|
||||
/* -- XXX Same code as ISLPinformation???
|
||||
dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
|
||||
dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
|
||||
|
||||
int offset = 0;
|
||||
|
||||
|
|
@ -3867,7 +3862,7 @@ dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, prot
|
|||
offset++;
|
||||
/ Trunk Member Number (M) Octet2 /
|
||||
proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
|
||||
}
|
||||
}
|
||||
*/
|
||||
/* 6.5.2.as ChangeServiceAttributes N.S0008-0 v 1.0 */
|
||||
/* Change Facilities Flag (CHGFAC)(octet 1, bits A - B) */
|
||||
|
|
@ -3975,11 +3970,11 @@ dissect_ansi_map_callingpartyname(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
|
|||
/* a. Refer to ANSI T1.610 for field encoding. */
|
||||
|
||||
/* 6.5.2.bz ServiceID
|
||||
Service Identifier (octets 1 to n)
|
||||
0 Not used.
|
||||
1 Calling Name Presentation - No RND.
|
||||
2 Calling Name Presentation with RND.
|
||||
*/
|
||||
Service Identifier (octets 1 to n)
|
||||
0 Not used.
|
||||
1 Calling Name Presentation - No RND.
|
||||
2 Calling Name Presentation with RND.
|
||||
*/
|
||||
|
||||
/* 6.5.2.co GlobalTitle N.S0013-0 v 1.0
|
||||
* Refer to Section 3 of ANSI T1.112 for the encoding of this field.
|
||||
|
|
@ -4223,9 +4218,9 @@ static const value_string ansi_map_Priority_vals[] = {
|
|||
|
||||
/* 6.5.2.gl CallingPartyCategory N.S0027*/
|
||||
/* a. Refer to ITU-T Q.763 (Signalling System No. 7 ISDN user part formats and
|
||||
codes) for encoding of this parameter.
|
||||
b. Refer to national ISDN user part specifications for definitions and encoding of the
|
||||
reserved for national use values.
|
||||
codes) for encoding of this parameter.
|
||||
b. Refer to national ISDN user part specifications for definitions and encoding of the
|
||||
reserved for national use values.
|
||||
*/
|
||||
/* 6.5.2.gm CDMA2000HandoffInvokeIOSData N.S0029-0 v1.0*/
|
||||
/* IOS A1 Element Handoff Invoke Information */
|
||||
|
|
@ -4246,7 +4241,7 @@ reserved for national use values.
|
|||
|
||||
/* Position Request Type (octet 1, bits A-H) */
|
||||
/*
|
||||
static const value_string ansi_map_Position_Request_Type_vals[] = {
|
||||
static const value_string ansi_map_Position_Request_Type_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Initial Position"},
|
||||
{ 2, "Return the updated position"},
|
||||
|
|
@ -4257,31 +4252,31 @@ static const value_string ansi_map_Position_Request_Type_vals[] = {
|
|||
{ 7, "Return the updated position based on the serving cell identity"},
|
||||
*/
|
||||
/*
|
||||
values through 95 Reserved. Treat the same as value 1, Initial position.
|
||||
96 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the
|
||||
same as value 1, Initial position.
|
||||
*
|
||||
values through 95 Reserved. Treat the same as value 1, Initial position.
|
||||
96 through 255 Reserved for TIA/EIA-41 protocol extension. If unknown, treat the
|
||||
same as value 1, Initial position.
|
||||
*
|
||||
{ 0, NULL }
|
||||
};
|
||||
};
|
||||
|
||||
*/
|
||||
|
||||
/* LCS Client Type (CTYP) (octet 2, bit A) *
|
||||
0 Emergency services LCS Client.
|
||||
1 Non-emergency services LCS Client.
|
||||
Call-Related Indicator (CALL) (octet 2, bit B)
|
||||
Decimal Value Meaning
|
||||
0 Call-related LCS Client request.
|
||||
1 Non call-related LCS Client request.
|
||||
0 Emergency services LCS Client.
|
||||
1 Non-emergency services LCS Client.
|
||||
Call-Related Indicator (CALL) (octet 2, bit B)
|
||||
Decimal Value Meaning
|
||||
0 Call-related LCS Client request.
|
||||
1 Non call-related LCS Client request.
|
||||
|
||||
Current Serving Cell Information for Coarse Position Determination (CELL) (octet 2, bit C)
|
||||
Decimal Value Meaning
|
||||
0 No specific request.
|
||||
1 Current serving cell information. Current serving cell information for
|
||||
Target MS requested. Radio contact with Target MS is required.
|
||||
Current Serving Cell Information for Coarse Position Determination (CELL) (octet 2, bit C)
|
||||
Decimal Value Meaning
|
||||
0 No specific request.
|
||||
1 Current serving cell information. Current serving cell information for
|
||||
Target MS requested. Radio contact with Target MS is required.
|
||||
*/
|
||||
/* 6.5.2.ft PositionResult *
|
||||
static const value_string ansi_map_PositionResult_vals[] = {
|
||||
static const value_string ansi_map_PositionResult_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Initial position returned"},
|
||||
{ 2, "Updated position returned"},
|
||||
|
|
@ -4312,7 +4307,7 @@ static const value_string ansi_map_PositionResult_vals[] = {
|
|||
{ 27, "Emergency services call precedence"},
|
||||
{ 28, "Request acknowledged"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
};
|
||||
*/
|
||||
/* 6.5.2.bp-1 ServiceRedirectionCause value */
|
||||
static const value_string ansi_map_ServiceRedirectionCause_vals[] = {
|
||||
|
|
@ -4341,7 +4336,7 @@ static const value_string ansi_map_ReauthenticationReport_vals[] = {
|
|||
|
||||
/* 6.5.2.lB AKeyProtocolVersion
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_AKeyProtocolVersion_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "A-key Generation not supported"},
|
||||
|
|
@ -4352,7 +4347,7 @@ static const value_string ansi_map_AKeyProtocolVersion_vals[] = {
|
|||
};
|
||||
/* 6.5.2.sB OTASP_ResultCode
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_OTASP_ResultCode_vals[] = {
|
||||
{ 0, "Accepted - Successful"},
|
||||
{ 1, "Rejected - Unknown cause."},
|
||||
|
|
@ -4366,7 +4361,7 @@ static const value_string ansi_map_OTASP_ResultCode_vals[] = {
|
|||
|
||||
/*6.5.2.wB ServiceIndicator
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_ServiceIndicator_vals[] = {
|
||||
{ 0, "Undefined Service"},
|
||||
{ 1, "CDMA OTASP Service"},
|
||||
|
|
@ -4380,7 +4375,7 @@ static const value_string ansi_map_ServiceIndicator_vals[] = {
|
|||
|
||||
/* 6.5.2.xB SignalingMessageEncryptionReport
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_SMEReport_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Signaling Message Encryption enabling not attempted"},
|
||||
|
|
@ -4392,7 +4387,7 @@ static const value_string ansi_map_SMEReport_vals[] = {
|
|||
|
||||
/* 6.5.2.zB VoicePrivacyReport
|
||||
N.S0011-0 v 1.0
|
||||
*/
|
||||
*/
|
||||
static const value_string ansi_map_VoicePrivacyReport_vals[] = {
|
||||
{ 0, "Not used"},
|
||||
{ 1, "Voice Privacy not attempted"},
|
||||
|
|
@ -15166,7 +15161,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
|
||||
/*--- End of included file: packet-ansi_map-fn.c ---*/
|
||||
#line 3636 "packet-ansi_map-template.c"
|
||||
#line 3631 "packet-ansi_map-template.c"
|
||||
|
||||
/*
|
||||
* 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301
|
||||
|
|
@ -15559,7 +15554,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
|
||||
return offset;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) {
|
||||
|
||||
|
|
@ -15793,7 +15788,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
|
||||
return offset;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
find_saved_invokedata(asn1_ctx_t *actx){
|
||||
|
|
@ -18913,7 +18908,7 @@ void proto_register_ansi_map(void) {
|
|||
"ansi_map.StatusRequestRes", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-ansi_map-hfarr.c ---*/
|
||||
#line 5230 "packet-ansi_map-template.c"
|
||||
#line 5225 "packet-ansi_map-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
|
@ -19167,7 +19162,7 @@ void proto_register_ansi_map(void) {
|
|||
&ett_ansi_map_ReturnData,
|
||||
|
||||
/*--- End of included file: packet-ansi_map-ettarr.c ---*/
|
||||
#line 5263 "packet-ansi_map-template.c"
|
||||
#line 5258 "packet-ansi_map-template.c"
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -234,12 +234,8 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
|
|||
struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata = value;
|
||||
gchar *TransactionId_str = key;
|
||||
|
||||
if ( TransactionId_str ){
|
||||
g_free(TransactionId_str);
|
||||
}
|
||||
if (ansi_tcap_saved_invokedata){
|
||||
g_free(ansi_tcap_saved_invokedata);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1306,7 +1302,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
|
||||
/*--- End of included file: packet-ansi_tcap-fn.c ---*/
|
||||
#line 317 "packet-ansi_tcap-template.c"
|
||||
#line 313 "packet-ansi_tcap-template.c"
|
||||
|
||||
|
||||
|
||||
|
|
@ -1637,7 +1633,7 @@ proto_register_ansi_tcap(void)
|
|||
"ansi_tcap.T_paramSet", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-ansi_tcap-hfarr.c ---*/
|
||||
#line 439 "packet-ansi_tcap-template.c"
|
||||
#line 435 "packet-ansi_tcap-template.c"
|
||||
};
|
||||
|
||||
/* Setup protocol subtree array */
|
||||
|
|
@ -1674,7 +1670,7 @@ proto_register_ansi_tcap(void)
|
|||
&ett_ansi_tcap_T_paramSet,
|
||||
|
||||
/*--- End of included file: packet-ansi_tcap-ettarr.c ---*/
|
||||
#line 449 "packet-ansi_tcap-template.c"
|
||||
#line 445 "packet-ansi_tcap-template.c"
|
||||
};
|
||||
|
||||
/*static enum_val_t tcap_options[] = {
|
||||
|
|
@ -1697,14 +1693,3 @@ proto_register_ansi_tcap(void)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue