osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix "no previous declaration" warnings 

Remove trailing ^M (cr) from some files

svn path=/trunk/; revision=15175
This commit is contained in:
Jörg Mayer 2005-08-02 05:09:41 +00:00
parent b73a3f2773
commit da9b7a9db9
4 changed files with 151 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
asn1/MAP_Dialogue/MAP_DialoguePDU.asn
View File

@ -1,143 +1,143 @@
MAP-DialogueInformation { MAP-DialogueInformation {
itu-t identified-organization (4) etsi (0) mobileDomain (0) itu-t identified-organization (4) etsi (0) mobileDomain (0)
gsm-Network (1) modules (3) map-DialogueInformation (3) version9 (9)} gsm-Network (1) modules (3) map-DialogueInformation (3) version9 (9)}
DEFINITIONS DEFINITIONS
IMPLICIT TAGS IMPLICIT TAGS
::= ::=
BEGIN BEGIN
EXPORTS EXPORTS
map-DialogueAS, map-DialogueAS,
MAP-DialoguePDU, MAP-DialoguePDU,
map-ProtectedDialogueAS, map-ProtectedDialogueAS,
MAP-ProtectedDialoguePDU MAP-ProtectedDialoguePDU
; ;
IMPORTS IMPORTS
gsm-NetworkId, gsm-NetworkId,
as-Id as-Id
FROM MobileDomainDefinitions { FROM MobileDomainDefinitions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
mobileDomainDefinitions (0) version1 (1)} mobileDomainDefinitions (0) version1 (1)}
AddressString AddressString
FROM MAP-CommonDataTypes { FROM MAP-CommonDataTypes {
itu-t identified-organization (4) etsi (0) mobileDomain (0) itu-t identified-organization (4) etsi (0) mobileDomain (0)
gsm-Network(1) modules (3) map-CommonDataTypes (18) version9 (9)} gsm-Network(1) modules (3) map-CommonDataTypes (18) version9 (9)}
ExtensionContainer ExtensionContainer
FROM MAP-ExtensionDataTypes { FROM MAP-ExtensionDataTypes {
itu-t identified-organization (4) etsi (0) mobileDomain (0) itu-t identified-organization (4) etsi (0) mobileDomain (0)
gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)} gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}
SecurityHeader, SecurityHeader,
ProtectedPayload ProtectedPayload
FROM MAP-ST-DataTypes { FROM MAP-ST-DataTypes {
itu-t identified-organization (4) etsi (0) mobileDomain (0) itu-t identified-organization (4) etsi (0) mobileDomain (0)
gsm-Network (1) modules (3) map-ST-DataTypes (27) version9 (9)} gsm-Network (1) modules (3) map-ST-DataTypes (27) version9 (9)}
; ;
-- abstract syntax name for MAP-DialoguePDU -- abstract syntax name for MAP-DialoguePDU
map-DialogueAS OBJECT IDENTIFIER ::= map-DialogueAS OBJECT IDENTIFIER ::=
{gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)} {gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)}
; ;
MAP-DialoguePDU ::= CHOICE { MAP-DialoguePDU ::= CHOICE {
map-open [0] IMPLICIT MAP-OpenInfo, map-open [0] IMPLICIT MAP-OpenInfo,
map-accept [1] IMPLICIT MAP-AcceptInfo, map-accept [1] IMPLICIT MAP-AcceptInfo,
map-close [2] IMPLICIT MAP-CloseInfo, map-close [2] IMPLICIT MAP-CloseInfo,
map-refuse [3] IMPLICIT MAP-RefuseInfo, map-refuse [3] IMPLICIT MAP-RefuseInfo,
map-userAbort [4] IMPLICIT MAP-UserAbortInfo, map-userAbort [4] IMPLICIT MAP-UserAbortInfo,
map-providerAbort [5] IMPLICIT MAP-ProviderAbortInfo} map-providerAbort [5] IMPLICIT MAP-ProviderAbortInfo}
MAP-OpenInfo ::= SEQUENCE { MAP-OpenInfo ::= SEQUENCE {
destinationReference [0] IMPLICIT AddressString OPTIONAL, destinationReference [0] IMPLICIT AddressString OPTIONAL,
originationReference [1] IMPLICIT AddressString OPTIONAL, originationReference [1] IMPLICIT AddressString OPTIONAL,
..., ...,
extensionContainer ExtensionContainer OPTIONAL extensionContainer ExtensionContainer OPTIONAL
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
} }
MAP-AcceptInfo ::= SEQUENCE { MAP-AcceptInfo ::= SEQUENCE {
..., ...,
extensionContainer ExtensionContainer OPTIONAL extensionContainer ExtensionContainer OPTIONAL
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
} }
MAP-CloseInfo ::= SEQUENCE { MAP-CloseInfo ::= SEQUENCE {
..., ...,
extensionContainer ExtensionContainer OPTIONAL extensionContainer ExtensionContainer OPTIONAL
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
} }
MAP-RefuseInfo ::= SEQUENCE { MAP-RefuseInfo ::= SEQUENCE {
reason Reason, reason Reason,
..., ...,
extensionContainer ExtensionContainer OPTIONAL, extensionContainer ExtensionContainer OPTIONAL,
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
alternativeApplicationContext OBJECT IDENTIFIER OPTIONAL alternativeApplicationContext OBJECT IDENTIFIER OPTIONAL
-- alternativeApplicationContext must not be used in version 2 -- alternativeApplicationContext must not be used in version 2
} }
Reason ::= ENUMERATED { Reason ::= ENUMERATED {
noReasonGiven (0), noReasonGiven (0),
invalidDestinationReference (1), invalidDestinationReference (1),
invalidOriginatingReference (2), invalidOriginatingReference (2),
encapsulatedAC-NotSupported (3) , encapsulatedAC-NotSupported (3) ,
transportProtectionNotAdequate (4)} transportProtectionNotAdequate (4)}
-- encapsulatedAC-NotSupported and transportProtectionNotAdequate must not be used in -- encapsulatedAC-NotSupported and transportProtectionNotAdequate must not be used in
-- dialogues with an AC different from secureTransportHandling -- dialogues with an AC different from secureTransportHandling
MAP-UserAbortInfo ::= SEQUENCE { MAP-UserAbortInfo ::= SEQUENCE {
map-UserAbortChoice MAP-UserAbortChoice, map-UserAbortChoice MAP-UserAbortChoice,
..., ...,
extensionContainer ExtensionContainer OPTIONAL extensionContainer ExtensionContainer OPTIONAL
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
} }
MAP-UserAbortChoice ::= CHOICE { MAP-UserAbortChoice ::= CHOICE {
userSpecificReason [0] IMPLICIT NULL, userSpecificReason [0] IMPLICIT NULL,
userResourceLimitation [1] IMPLICIT NULL, userResourceLimitation [1] IMPLICIT NULL,
resourceUnavailable [2] IMPLICIT ResourceUnavailableReason, resourceUnavailable [2] IMPLICIT ResourceUnavailableReason,
applicationProcedureCancellation [3] IMPLICIT ProcedureCancellationReason} applicationProcedureCancellation [3] IMPLICIT ProcedureCancellationReason}
ResourceUnavailableReason ::= ENUMERATED { ResourceUnavailableReason ::= ENUMERATED {
shortTermResourceLimitation (0), shortTermResourceLimitation (0),
longTermResourceLimitation (1)} longTermResourceLimitation (1)}
ProcedureCancellationReason ::= ENUMERATED { ProcedureCancellationReason ::= ENUMERATED {
handoverCancellation (0), handoverCancellation (0),
radioChannelRelease (1), radioChannelRelease (1),
networkPathRelease (2), networkPathRelease (2),
callRelease (3), callRelease (3),
associatedProcedureFailure (4), associatedProcedureFailure (4),
tandemDialogueRelease (5), tandemDialogueRelease (5),
remoteOperationsFailure (6)} remoteOperationsFailure (6)}
MAP-ProviderAbortInfo ::= SEQUENCE { MAP-ProviderAbortInfo ::= SEQUENCE {
map-ProviderAbortReason MAP-ProviderAbortReason, map-ProviderAbortReason MAP-ProviderAbortReason,
..., ...,
extensionContainer ExtensionContainer OPTIONAL extensionContainer ExtensionContainer OPTIONAL
-- extensionContainer must not be used in version 2 -- extensionContainer must not be used in version 2
} }
MAP-ProviderAbortReason ::= ENUMERATED { MAP-ProviderAbortReason ::= ENUMERATED {
abnormalDialogue (0), abnormalDialogue (0),
invalidPDU (1)} invalidPDU (1)}
-- abstract syntax name for MAP-ProtectedDialoguePDU -- abstract syntax name for MAP-ProtectedDialoguePDU
map-ProtectedDialogueAS OBJECT IDENTIFIER ::= map-ProtectedDialogueAS OBJECT IDENTIFIER ::=
{gsm-NetworkId as-Id map-ProtectedDialoguePDU (3) version1 (1)} {gsm-NetworkId as-Id map-ProtectedDialoguePDU (3) version1 (1)}
MAP-ProtectedDialoguePDU ::= SEQUENCE { MAP-ProtectedDialoguePDU ::= SEQUENCE {
encapsulatedAC OBJECT IDENTIFIER, encapsulatedAC OBJECT IDENTIFIER,
securityHeader SecurityHeader OPTIONAL, securityHeader SecurityHeader OPTIONAL,
protectedPayload ProtectedPayload OPTIONAL, protectedPayload ProtectedPayload OPTIONAL,
...} ...}
-- The protectedPayload carries the result of applying the security function -- The protectedPayload carries the result of applying the security function
-- defined in 3GPP TS 33.200 to the encoding of the securely transported -- defined in 3GPP TS 33.200 to the encoding of the securely transported
-- MAP-DialoguePDU -- MAP-DialoguePDU
END END

10
asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
View File

@ -3,11 +3,11 @@
# $Id$ # $Id$
#.MODULE_IMPORT #.MODULE_IMPORT
MAP-CommonDataTypes gsm_map MAP-CommonDataTypes gsm_map
MAP-ExtensionDataTypes gsm_map MAP-ExtensionDataTypes gsm_map
MAP-ST-DataTypes gsm_map MAP-ST-DataTypes gsm_map
#.INCLUDE ../gsmmap/gsm_map-exp.cnf #.INCLUDE ../gsmmap/gsm_map-exp.cnf
#.EXPORTS #.EXPORTS

4
asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
View File

@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#include "packet-ber.h" #include "packet-ber.h"
#include "packet-gsm_map.h" #include "packet-gsm_map.h"
#define PNAME "MAP_DialoguePDU" #define PNAME "MAP_DialoguePDU"
#define PSNAME "MAP_DialoguePDU" #define PSNAME "MAP_DialoguePDU"
@ -49,7 +49,7 @@ int proto_MAP_DialoguePDU = -1;
#include "packet-MAP_DialoguePDU-fn.c" #include "packet-MAP_DialoguePDU-fn.c"
void static void
dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{ {
dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1); dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1);

2
epan/dissectors/packet-MAP_DialoguePDU.c
View File

@ -407,7 +407,7 @@ dissect_MAP_DialoguePDU_MAP_ProtectedDialoguePDU(gboolean implicit_tag _U_, tvbu
/*--- End of included file: packet-MAP_DialoguePDU-fn.c ---*/ /*--- End of included file: packet-MAP_DialoguePDU-fn.c ---*/
void static void
dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{ {
dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1); dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1);