aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/tcap
AgeCommit message (Collapse)AuthorFilesLines
2015-01-19TCAP: support dialogue confirmationLuke Mewburn2-59/+57
TCAP permits the changing of the originating address on the first backwards continue (i.e. the establishment of the dialogue). See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue. In practice, a BEGIN replied to with an END can also exhibit this behaviour. For example, a BEGIN from GT A TID TA -> GT B, and the reply CONTINUE from GT B2 TID TB -> GT A TID TA. To support this, only support a single address hash in tcaphash_begin_info_key_t and tcaphash_end_info_key_t. The match of the first CONTINUE should find the appropriate tcaphash_begin and create the appropriate tcaphash_end entries. Also fix compile warning with DEBUG_TCAPSRT. Bug: 10841 Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd Reviewed-on: https://code.wireshark.org/review/6446 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-2/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13ASN1: Register PDU-dissectors as NEWStig Bjørlykke1-2/+2
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-09-14Consistent white space.Guy Harris1-756/+761
Change-Id: I7c19a16a671db7b68ef2f680813a9a190ed1e13d Reviewed-on: https://code.wireshark.org/review/4109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann1-1/+8
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-07-31Add more files to the distribution.Guy Harris1-3/+6
If it's checked into asn1 or a subdirectory thereof, put it into the distribution. (If it's not useful, why is it in Git?) Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc Reviewed-on: https://code.wireshark.org/review/3276 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-30Add some files under asn1 to the distribution.Guy Harris1-5/+5
Include CMakeLists.txt files and the gnm subdirectory, along with the top-level Makefile.inc and Makefile.preinc files. Don't explicitly include Custom.make, as automake does that automatically given that it's included by asn1/Makefile.am. Add some files to EXTRA_DIST lists. Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES, as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in EXTRA_DIST so that they're in the distribution. Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6 Reviewed-on: https://code.wireshark.org/review/3273 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22convert to proto_tree_add_subtree[_format] for ASN.1 dissectorsMichael Mann2-28/+13
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-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin1-2/+2
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-2/+2
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-17Convert tcap dissector to wmemEvan Huus1-14/+14
As far as I can tell these calls were just missed in the first initial pass, they're not in a weird scope. Close review from somebody else please to verify that! Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b Reviewed-on: https://code.wireshark.org/review/2266 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann2-4/+3
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-08TCAP: set a fence on info column after calling sub dissectorPascal Quantin1-1/+3
Bug: 10091 Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 Reviewed-on: https://code.wireshark.org/review/1555 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18Fix mix tab and spaceAlexis La Goutte1-6/+6
Change-Id: Ife12c5118dcd70ba6b2540d53697f7c9cc9207c9 Reviewed-on: https://code.wireshark.org/review/1196 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-14Fix warning found by -Wunused-const-variable (Clang 3.5)Alexis La Goutte1-0/+4
Change-Id: I246aa28be28194576b4bd58714b2e6ac36f7a29a Reviewed-on: https://code.wireshark.org/review/1121 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-06Convert ep_address_to_str -> address_to_str(wmem_packet_scope, ...) for all ↵Michael Mann1-20/+20
dissectors Change-Id: I7489e2fb3a1f2630ca17b0a5fe1aa873992f1061 Reviewed-on: https://code.wireshark.org/review/975 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-1/+1
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 Morriss9-18/+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-14Don't cast away constness.Guy Harris1-3/+3
svn path=/trunk/; revision=54800
2013-12-30Move tcap and camel "persistent data" functionality to the dissectors ↵Michael Mann2-6/+1973
themselves instead of being part of epan directory. svn path=/trunk/; revision=54499
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-10-28Pass tcap_private into the dissectors that need it rather than use ↵Michael Mann1-2/+2
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-05-11Now all disectors requiring asn2wrs can be generated usingJörg Mayer1-0/+31
cmake. svn path=/trunk/; revision=49254
2013-05-05Just whitespace changesJörg Mayer1-3/+4
svn path=/trunk/; revision=49167
2013-04-23Stub cmake support for generating the asn1 dissectors.Jörg Mayer1-0/+23
It doesn't do anything yet, it is just to make svn status readable again. svn path=/trunk/; revision=49007
2013-03-26Make the oid memeber a const.Anders Broman1-1/+1
svn path=/trunk/; revision=48558
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-2/+5
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-27Move show_exception() and show_reported_bounds_error() toGuy Harris2-6/+3
epan/show_exception.c, as it's used outside epan/dissectors/packet-frame.c. Update their callers to include <epan/show_exception.h> to get their declaration. Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if there's more stuff in the packet to dissect after the dissector call that threw the exception, doesn't mean you shouldn't go ahead and dissect that stuff. Use it in all those cases, including ones where BoundsError was inappropriately being caught (you want those passed up to the top level, so that the packet is reported as having been cut short in the capture process). Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that correspond to running past the end of the data for a tvbuff; use it rather than explicitly catching those exceptions individually, and rather than just catching all exceptions (the only place that DissectorError should be caught, for example, is at the top level, so dissector bugs show up in the protocol tree). Don't catch and then immediately rethrow exceptions without doing anything else; just let the exceptions go up to the final catcher. Use show_exception() to report non-fatal errors, rather than doing it yourself. If a dissector is called from Lua, catch all non-fatal errors and use show_exception() to report them rather than catching only ReportedBoundsError and adding a proto_malformed item. Don't catch exceptions when constructing a trailer tvbuff in packet-ieee8023.c - just construct it after the payload has been dissected, and let whatever exceptions that throws be handled at the top level. Avoid some TRY/CATCH/ENDTRY cases by using checks such as tvb_bytes_exist() before even looking in the tvbuff. svn path=/trunk/; revision=47924
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45015
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-06-28Update Free Software Foundation address.Jakub Zawadzki4-4/+4
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-16Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7372 :Pascal Quantin1-3/+7
tcap.otid and tcap.dtid can be used as display filters svn path=/trunk/; revision=43288
2011-11-20Get rid of Warnings.Anders Broman2-10/+10
svn path=/trunk/; revision=39954
2011-10-19Let subdissectors have a stab at the packet even if it's cut short.Anders Broman2-60/+70
svn path=/trunk/; revision=39472
2011-10-10Build the ASN.1 dissectors directly into epan/dissectors (rather than buildingJeff Morriss1-4/+0
them and then copying them over). The "all" target to builds these dissectors now (instead of "generate_files" and/or "copy_files"). asn2wrs's "-O" option now means "the dissector goes in this directory" (rather than "all output goes in this directory"); it also means that the "-s" (single output file) option is now required. Fix things up so that it's possible to build all of the ASN.1 dissectors in one shot. Fix building of conformance files when doing out-of-source-tree builds. Unfortunately "make all" in the asn1 directory always builds something--I think because of circular depedencies. svn path=/trunk/; revision=39333
2011-09-27Get rid of check_col, while at it set ENC.Anders Broman2-11/+7
svn path=/trunk/; revision=39164
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-9/+9
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-06-04tcaphash_context_t.oid is of size LENGTH_OID+1, not LENGTH_OID. Just use ↵Jeff Morriss1-8/+8
sizeof(tcaphash_context_t.oid) instead of LENGTH_OID so we can use that last byte. This allows us to retrieve the whole ACN when the ACN is LENGTH_OID bytes long. svn path=/trunk/; revision=33089
2010-04-06#include <stdio.h> not needed.Bill Meier1-1/+0
svn path=/trunk/; revision=32405
2009-10-11Make all proto_* values static.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=30516
2009-10-08Remove unused NEED_PACKET_PROTO_H variableKovarththanan Rajaratnam1-1/+0
svn path=/trunk/; revision=30409
2009-08-21Sanitize epan includesKovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29500
2009-08-09Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-4/+1
svn path=/trunk/; revision=29345
2009-06-23From Kovarththanan Rajaratnam:Stig Bjørlykke1-7/+7
Clean up header field info in asn1/*-template.c files. From me: Fixed a few typos in the patch. svn path=/trunk/; revision=28817
2009-03-23Removed some "statement not reached" warnings.Stig Bjørlykke1-4/+4
svn path=/trunk/; revision=27827
2009-03-09Corrected oid names.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=27673
2009-02-07#include <epan/conversation.h> not req'd ...Bill Meier1-1/+0
svn path=/trunk/; revision=27392
2009-02-07#include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...Bill Meier1-1/+0
svn path=/trunk/; revision=27390
2008-12-15Do find_dissector_table("ber.oid") during startupBill Meier1-3/+2
in proto_reg_handoff instead of during dissection. svn path=/trunk/; revision=27008
2008-09-14Use the unmodified DialoguePDUs ASN1 file.Anders Broman3-105/+16
svn path=/trunk/; revision=26192