diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-17 07:47:02 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-17 07:47:02 +0000 |
| commit | ae932282121e01ee468518579b9f52841ce63ef9 (patch) | |
| tree | 4b56255bad54b7b48603d58bcf9c9b258963aed2 /asn1 | |
| parent | 51baf7769acfe295b86bc7dc5ff39b922481b0e6 (diff) | |
| download | wireshark-ae932282121e01ee468518579b9f52841ce63ef9.tar.gz wireshark-ae932282121e01ee468518579b9f52841ce63ef9.tar.bz2 wireshark-ae932282121e01ee468518579b9f52841ce63ef9.zip | |
From Vasil Velichkov (bug 2471):
Add ASN definition of MAP BeginSubscriberActivity operation.
Add call to dissect function in packet template.
svn path=/trunk/; revision=25094
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/gsmmap/SS-DataTypes.asn | 8 | ||||
| -rw-r--r-- | asn1/gsmmap/SS-Operations.asn | 7 | ||||
| -rw-r--r-- | asn1/gsmmap/packet-gsmmap-template.c | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/asn1/gsmmap/SS-DataTypes.asn b/asn1/gsmmap/SS-DataTypes.asn index 6ff5b79ef9..03c8198dc0 100644 --- a/asn1/gsmmap/SS-DataTypes.asn +++ b/asn1/gsmmap/SS-DataTypes.asn @@ -38,6 +38,7 @@ maxSignalInfoLength, ISDN-AddressString, ISDN-SubaddressString, AlertingPattern, +IMSI, LCSClientExternalID, AddressString, LCSServiceTypeID, @@ -90,6 +91,13 @@ NotifySS-Arg ::= SEQUENCE{ alertingPattern [22] AlertingPattern OPTIONAL, multicall-Indicator [23] Multicall-Indicator OPTIONAL} + +BeginSubscriberActivityArg ::= SEQUENCE { + imsi IMSI, + originatingEntityNumber ISDN-AddressString, + msisdn [PRIVATE 28] AddressString OPTIONAL, + ... } + -- The nameIndicator is defined because of CNAP. Multicall-Indicator ::= ENUMERATED { diff --git a/asn1/gsmmap/SS-Operations.asn b/asn1/gsmmap/SS-Operations.asn index a7921c99f2..0150c2cdae 100644 --- a/asn1/gsmmap/SS-Operations.asn +++ b/asn1/gsmmap/SS-Operations.asn @@ -14,7 +14,7 @@ EXPORTS -- exports operations -- operations defined in this specification -processUnstructuredSS-Data, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService, +processUnstructuredSS-Data, beginSubscriberActivity, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService, lcs-LocationNotification, lcs-MOLR, lcs-AreaEventRequest, lcs-AreaEventReport, lcs-AreaEventCancellation, lcs-PeriodicLocationRequest, lcs-LocationUpdate, lcs-PeriodicLocationCancellation; IMPORTS @@ -32,6 +32,7 @@ Remote-Operations-Information-Objects { -- imports SS-data types NotifySS-Arg, +BeginSubscriberActivityArg, ForwardChargeAdviceArg, ForwardCUG-InfoArg, SS-UserData, @@ -87,6 +88,10 @@ processUnstructuredSS-Data OPERATION ::= { -- Timer T(PUSSD)= 15s to 30s unexpectedDataValue} CODE local:19 } +beginSubscriberActivity OPERATION ::= { + ARGUMENT BeginSubscriberActivityArg + CODE local:54 } + notifySS OPERATION ::= { ARGUMENT NotifySS-Arg CODE local:16 } diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index 985bef405f..781054e5cb 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -1201,7 +1201,9 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ break; /* reserved traceSubscriberActivity (52) */ /* undefined 53 */ - /* reserved beginSubscriberActivity (54) */ + case 54: /*beginSubscriberActivity*/ + offset=dissect_gsm_ss_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); + break; case 55: /*sendIdentification*/ offset=dissect_mc_message(tvb, offset, actx, tree, FALSE, dissect_gsm_map_TMSI, hf_gsm_map_tmsi, |