summaryrefslogtreecommitdiff
path: root/asn1/gsm_map/packet-gsm_map-template.c
AgeCommit message (Collapse)AuthorFilesLines
2016-03-13Move /asn1 to /epan/dissectorsJoão Valverde1-3185/+0
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-06Remove unbalanced comment markerJoão Valverde1-1/+1
Change-Id: I21faa3f454974ee4a167ff8709a8f7ecead8a7cd Reviewed-on: https://code.wireshark.org/review/13785 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-04ASN1: fix misspelling (found by Lintian)Alexis La Goutte1-2/+2
Extention -> Extension Change-Id: I10278ce21da805b2b86cac6e2b14e921acf15544 Reviewed-on: https://code.wireshark.org/review/13052 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-29gsm_map: decode SRISM v1 and v2 resultLuke Mewburn1-1/+5
Fix decoding of sendRoutingInfoForSM (SRISM) application contexts version 1 and version 2. Use a (slightly modified) version of the ASN.1 from ETS 300 599: December 2000 (GSM 09.02 version 4.19.1), clause 14.7.6 which has LocationInfoWithLMSI that is incompatible with application context version 3 in 3GPP TS 29.002 version 3.20.0 Release 1999, clause 17.7.6. Bug: 9622 Ping-Bug: 9704 Change-Id: Icc9a0a1743a6eb4c907f4cab3fb2137db139ad74 Reviewed-on: https://code.wireshark.org/review/13572 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-28correctly decode GSM_MAP invoke SRISMv1Luke Mewburn1-1/+1
The decoding of application context version 1 SendRoutingInfoForSM (SRISM) invokes (added in bug 9704) had issues: - The ASN.1 for RoutingInfoForSM-ArgV1 in GSMMAP.asn lacked teleserviceCode and the extension marker. ETSI ETS 300 599 (GSM 09.02 version 4.19.1) clause 14.7.6 has teleserviceCode and the extension marker, but not cug-Interlock. Clause C.6.4 mentions that cug-Interlock has been deleted, but it's retained here for decoding backwards compat. - The test for which application_context_version to decode as didn't work when that value was 0 (i.e. missing). Ping-Bug: 9704 Change-Id: I8a8170d959347a47413cfd9876022e9182256452 Reviewed-on: https://code.wireshark.org/review/13571 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29Rename new_stat_tap_ui to stat_tap_table_ui.Guy Harris1-3/+3
A "new" statistics tap UI is a statistics tap UI where the statistics are maintained as tables and common code handles the tables; what matters is the tables, not that it's "new". Change-Id: I7a0e63cfac98c24cd5e7dce973b9a0cc5b6a03ba Reviewed-on: https://code.wireshark.org/review/12897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29There's no "old" stat_tap_table, so remove "new_" from the name.Guy Harris1-5/+5
Change-Id: I1a0349d5d9d47210a97ff7a99fb358e59fd70e72 Reviewed-on: https://code.wireshark.org/review/12896 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-29/+29
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09"new" dissector API -> dissector API for ASN.1 dissectors.Michael Mann1-2/+2
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25Require BER dissector (OID) registration to be "new style".Michael Mann1-83/+83
Both old and new style API existed, just remove the "old" one. Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013 Reviewed-on: https://code.wireshark.org/review/12107 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06[Dissector tables] DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE -> ↵AndersBroman1-3/+3
DISSECTOR_TABLE_ALLOW_DUPLICATE Change-Id: Id4d8d9a2d2befee7b82ac4e0e6f2f1b8f03b4532 Reviewed-on: https://code.wireshark.org/review/11603 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-3/+3
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-21GSM_map: Fix indent (use 2 spaces) and add modelinesAlexis La Goutte1-161/+174
Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b Reviewed-on: https://code.wireshark.org/review/10168 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b Reviewed-on: https://code.wireshark.org/review/10163 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-06Fixup stat_tap table freeing.Gerald Combs1-3/+15
As it turns out we *do* need to free table elements. We also need to free the tables themselves and clear the table array. Do so. Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 Reviewed-on: https://code.wireshark.org/review/9901 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Convert the GSM MAP stats to new "generic stat API".Gerald Combs1-2/+158
Convert both the MAP statistics and summary. As with the GSM A stats this are mostly untested. Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 Reviewed-on: https://code.wireshark.org/review/9883 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-29GSM_MAP: adding dissector for sendParameters (MAPv1)Luca Melette1-6/+5
The current ASN.1 description of MAP (3GPP 29.002) is missing this operation. I recovered the needed code from an old MAP description (ets_300599e01p) and integrated the missing parts into the asn tree and C template file (via asn2wrs). Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b Reviewed-on: https://code.wireshark.org/review/9594 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22GSM MAP: Fix decoding of IPv6 addressesVasil Velichckov1-0/+5
From 3GPP 23.003 The GSN Address is composed of the following elements: 1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the Address field. 2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field. 3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address. Address Type 0 and Address Length 4 are used when Address is an IPv4 address. Address Type 1 and Address Length 16 are used when Address is an IPv6 address. The IP v4 address structure is defined in RFC 791 [14]. The IP v6 address structure is defined in RFC 2373 [15]. Currently the Wireshark decodes IPv6 addresses as IPv4 This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44 Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444 Reviewed-on: https://code.wireshark.org/review/8984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-03GSM MAP: do not use a global variable to store OIDPascal Quantin1-1/+0
Fixes an ASAN failure reported by Alexis Change-Id: I63b07ec4b6eb0698c4abf27f8fb0b1f11a19396d Reviewed-on: https://code.wireshark.org/review/7510 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-30GSM MAP: display TBCD digits, USSD string and Location Number digits in a ↵Pascal Quantin1-0/+4
subtree Bug: 10900 Change-Id: I01277633a1314e68363ef433f3b99b4138657330 Reviewed-on: https://code.wireshark.org/review/6850 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-5/+2
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26Remove sccp_info member from packet_info structure.Michael Mann1-0/+41
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter. Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0 Reviewed-on: https://code.wireshark.org/review/5442 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10GSM MAP: fix detection of SMS direction when application context version is < 3Pascal Quantin1-3/+2
Bug: 10547 Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e Reviewed-on: https://code.wireshark.org/review/4579 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-01Use a common hf for international E164 numbers (MSISDN).AndersBroman1-9/+26
Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b Reviewed-on: https://code.wireshark.org/review/3863 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22Replace a couple of implementations of unpack_digits() with ↵Jeff Morriss1-37/+1
tvb_bcd_dig_to_wmem_packet_str(). Change-Id: Ic9e740345fb3a748f6df4f624441bb947bbd9429 Reviewed-on: https://code.wireshark.org/review/3797 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-21Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use itJeff Morriss1-1/+1
in the Diameter dissector. This new API adds a filter for the MSISDN as well as a subtree and filter for the Country Code. Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7 Reviewed-on: https://code.wireshark.org/review/3760 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-19Implement a common function to dissect IMSI and use it GSM MAP as a start.AndersBroman1-23/+3
- remove soft deprecated APIs and unused hf. Change-Id: Id00c3dd35f3fc65f543bc29df6d35515c45fe7e1 Reviewed-on: https://code.wireshark.org/review/3715 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann1-7/+17
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22convert to proto_tree_add_subtree[_format] for ASN.1 dissectorsMichael Mann1-126/+62
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19batch of manual tvb_length conversionsEvan Huus1-3/+3
Change-Id: Ifea45514bdba8be5f62b9dc560027077297f631e Reviewed-on: https://code.wireshark.org/review/2456 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin1-6/+6
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b. Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071 Reviewed-on: https://code.wireshark.org/review/2435 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update ASN.1 source files with the API changes done in g021e7afPascal Quantin1-6/+6
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15Remove unused const variables errors seen with recent Clang versionPascal Quantin1-0/+6
Fixes bug 9886 Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936 Reviewed-on: https://code.wireshark.org/review/657 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15Fix indent (use 2 spaces)Alexis La Goutte1-805/+804
Change-Id: If7872c510d20e9f04e44e3fdf09c023e5ac602d9 Reviewed-on: https://code.wireshark.org/review/648 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-13Bug 9704: GSM_MAP SendRoutingInfoForSM incomplete0xbismarck1-1/+5
Added the field information for Phase 1 for the Send Routing Info For Sm message per request of ticket 9704. Code per the suggestion of Anders Broman. Adding Phase 1 code to GSMMAP.asn. Did not have any data to verify that the change worked. Change-Id: Ic387e2e12e8893abb0f453f5010909ffbfd1808c Reviewed-on: https://code.wireshark.org/review/147 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSMPascal Quantin1-2/+3
Fixes bug 9829 Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8 Reviewed-on: https://code.wireshark.org/review/494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-2/+2
dissectors. Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss1-2/+0
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 Reviewed-on: https://code.wireshark.org/review/244 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-01-04Add the rest of the NOKIA extensions.Anders Broman1-8/+122
svn path=/trunk/; revision=54586
2014-01-03Add a few more of the NOKIA extensions.Anders Broman1-1/+130
svn path=/trunk/; revision=54580
2013-12-08- Forward declaration of register functions.Anders Broman1-2/+13
svn path=/trunk/; revision=53872
2013-12-03When including <epan/prefs.h> don't force inclusion of <epan/uat.h>Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53769
2013-11-26From Vineeth:Anders Broman1-1/+87
Support for Nokias GSM MAP Private Extensions svn path=/trunk/; revision=53600
2013-11-07From Vasil Velichkov via ↵Pascal Quantin1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9382 : Fix dissection of GSM MAPv3 ReportSM_DeliveryStatusRes svn path=/trunk/; revision=53148
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-2/+2
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-28Pass tcap_private into the dissectors that need it rather than use ↵Michael Mann1-12/+12
private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use. svn path=/trunk/; revision=52916
2013-10-02Replace the 3 dissector tables (with a single entry in each) by a direct ↵Pascal Quantin1-5/+2
call to the GSM SMS dissector svn path=/trunk/; revision=52336
2013-09-09Change some internal dissector table UI names so it's clear which protocol ↵Chris Maynard1-6/+6
they pertain to and it's easier to find in the list. svn path=/trunk/; revision=51904
2013-07-03expert_add_info_format_text + proto_tree_add_text = ↵Michael Mann1-11/+6
proto_tree_add_expert_format, where applicable. svn path=/trunk/; revision=50377
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 13:30:49 +0000