Commit Graph

52 Commits

Author SHA1 Message Date
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
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-12-20 05:35:29 +00:00
Jeff Morriss 2efec6f8c5 tcaphash_context_t.oid is of size LENGTH_OID+1, not LENGTH_OID. Just use 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-06-04 19:28:39 +00:00
Bill Meier f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Stig Bjørlykke 6d1dae6f28 Make all proto_* values static.
svn path=/trunk/; revision=30516
2009-10-11 16:24:29 +00:00
Kovarththanan Rajaratnam c19f7978db Sanitize epan includes
svn path=/trunk/; revision=29500
2009-08-21 20:32:50 +00:00
Kovarththanan Rajaratnam 6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Stig Bjørlykke e3ef20f3ea From Kovarththanan Rajaratnam:
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-06-23 06:02:12 +00:00
Bill Meier ee908a7abd #include <epan/conversation.h> not req'd ...
svn path=/trunk/; revision=27392
2009-02-07 16:01:26 +00:00
Bill Meier 35e5fa9bc1 #include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...
svn path=/trunk/; revision=27390
2009-02-07 14:33:47 +00:00
Bill Meier 0817daf0c7 Do find_dissector_table("ber.oid") during startup
in proto_reg_handoff instead of during dissection.

svn path=/trunk/; revision=27008
2008-12-15 20:52:40 +00:00
Anders Broman 14f76023b3 Remove the rest of the ANSI TCAP stuff.
svn path=/trunk/; revision=26191
2008-09-14 14:33:01 +00:00
Anders Broman eb9dc794b2 Start to get rid of the "old" ANSI TCAP stuff.
svn path=/trunk/; revision=26189
2008-09-13 16:38:21 +00:00
Jeff Morriss 10a67c2028 sccp_ssn_table is not used so remove it. The handoff function does not need to be called after preference changes so stop doing that. Found this on the hunt for bug 2053's cause but it shouldn't (AFAICS) be related.
svn path=/trunk/; revision=25080
2008-04-16 14:28:22 +00:00
Stig Bjørlykke b091b8d26c Rewrote to use g_strlcpy and g_strlcat.
svn path=/trunk/; revision=24525
2008-03-01 17:23:39 +00:00
Jeff Morriss 1fb716d4ff Display TCAP parameter lengths in decimal (like packet-ber does). Fix hex-pane byte highlighting for primitive parameters with tags or lengths longer than 1 octet (contructed ones are OK). Finally, fix up the indenting in this function.
svn path=/trunk/; revision=23154
2007-10-11 22:49:52 +00:00
Anders Broman c4daf58278 Use the new ANSI TCAP dissector.
svn path=/trunk/; revision=22854
2007-09-12 16:45:53 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Anders Broman 1518d1b07a Preparations to split the TCAP dissector into ANSI and ITU parts.
svn path=/trunk/; revision=22501
2007-08-14 22:05:36 +00:00
Jeff Morriss 7c4cca3e63 From Florent Drouin:
Correct bug in TCAP statistics when read filter is used.
Rename the TCAP decoding functions to show which are ITU vs. ANSI.
Don't unregister an ITU SSN if it's used by an ANSI subdissector.

svn path=/trunk/; revision=22421
2007-07-30 17:10:20 +00:00
Jeff Morriss 29facf8ff9 From Florent Drouin:
- add support of session management for tcap ANSI.
   (In fact, this support already exist for ANSI MAP subdissector, but as our
   simulators can reuse the tcap transaction Id, the decoding of the response
   may be wrong)
- move the code related to asn1 in tcap.cnf, and update tcap.cnf
- move the code related to the session management in tcap-persistentdata
- add a compilation option to free the entry in the hashtable for a closed
  transaction. This is used only for tshark statistics generation, with huge file.
- cleanup and add some comments

Add Id tags to epan/tcap-persistentdata.{c,h}

svn path=/trunk/; revision=22415
2007-07-27 19:24:40 +00:00
Anders Broman dca634c4de Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Anders Broman d07a92f8bc TCAP: Fix up indentation a bit.
GSM MAP: Add returnResultNotLast from TCAP to the included ROS stuff.

svn path=/trunk/; revision=21537
2007-04-23 20:20:46 +00:00
Jeff Morriss 20a3a52951 Mark all the items for TCAP statistics as generated
svn path=/trunk/; revision=21524
2007-04-23 10:45:00 +00:00
Anders Broman 117eaaf948 and the missing files ...
svn path=/trunk/; revision=21522
2007-04-23 06:50:07 +00:00
Anders Broman 4960e68578 EXPORT DialoguePDU UniDialoguePDU and make them callable by OID.
svn path=/trunk/; revision=21487
2007-04-21 20:53:35 +00:00
Luis Ontanon 9709011a9b Implement a proposal from Elefterios Gabriel for SCCP:
Add a table of DPCs and SSNs that allow to override the protocol that would be choosen
so that the same SSN can use two different protocols in two different DPCs.

I did not believe it someone could have done it, then I saw the captures...


svn path=/trunk/; revision=21321
2007-04-03 19:08:00 +00:00
Anders Broman 771d0fc34a Revert some dissector_handle_t to static changes to make it compile again.
svn path=/trunk/; revision=20064
2006-12-07 20:53:32 +00:00
Anders Broman d61e373bb4 As ponted out by Stig Bjørlykke change a whole bunch of dissector_handle_t to static.
svn path=/trunk/; revision=20062
2006-12-07 20:34:08 +00:00
Anders Broman 699c5c66b6 From Florent.Drouin@alcatel.fr:
I did improve the OID management in the tcap dissector.
Now, when a tcap message is reveived, without upper layer, the ACN is saved in the TCAP context, and can be used for the next messages of the dialogue. It is used only when the upper layer session is opened with Tcap only messages.

svn path=/trunk/; revision=19414
2006-10-03 19:24:22 +00:00
Anders Broman ad9a9a6a9d From Florent Drouin:
Here are some patches and a new module to introduce the notion of Tcap context for a Tcap transaction. For each Tcap transaction, several parameters, like session identifier, start time or OID, will be saved in a hash table, to keep these informations available for the next messages. This context is then given to the upper layer, and can be used, for example, to generate transaction-associated statistics.

Moreover, the Upper protocol, detected in the Begin of the TCAP transaction ( according to the OID ), is saved in the context, and will be reused for the next messages of the transaction. This help the decoding of SS7 messages, without any SSN configuration in the "wireshark preferences".

You will have too, the possibility to apply a filter to see only the messages related to a TCAP transaction. (tcap.srt.session_id=XXX)

To enable the use of the Tcap context, you have 2 new parameters in the preferences,
- SRT, enable search for a Tcap context for any TCAP messages
- persistentSRT, keep the Tcap context, even after the transaction has been closed. This is mandatory with Wireshark, to have a clean display of the stats.

There is 2 new timers  in the preferences for the statistics, to tune the retransmission timeout, and messages lost timeout.

svn path=/trunk/; revision=19341
2006-09-27 20:06:06 +00:00
Tomas Kukosa 56d7db0c08 remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them

svn path=/trunk/; revision=18595
2006-06-28 14:19:08 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Anders Broman 42bf48fa74 Export dissector_handle_t get_itu_tcap_subdissector()
svn path=/trunk/; revision=17136
2006-01-31 19:39:55 +00:00
Guy Harris 004eb8b1c1 If we're going to use a handle for the data handle, we need to get a
handle for that dissector.  This fixes bug 637.

svn path=/trunk/; revision=16842
2005-12-18 11:19:25 +00:00
Luis Ontanon bc84ba5de6 Have tcap subdissectors registering using functions provided by tcap and tcap manage ssn registration.
In packet-sccp.c avoid not having a binding.


svn path=/trunk/; revision=16834
2005-12-17 16:55:45 +00:00
Anders Broman 8d05164bec Get rid of duplicted dissector tables for MTP3 Service indicator and SCCP ssn:s
svn path=/trunk/; revision=16815
2005-12-16 07:05:50 +00:00
Luis Ontanon 3728b83d2b Avoid the default sccp.ssn range to overwrite sccp.ssns of other dissectors.
svn path=/trunk/; revision=16782
2005-12-13 22:04:02 +00:00
Guy Harris 3784eec708 Get rid of unused global variables.
svn path=/trunk/; revision=16601
2005-11-26 03:09:40 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Anders Broman 1e1df99990 From Tim Endean:
Small patch to ber.c

The tcap dissector has been updated to use this length. I have not tested other asn.1 dissectors to ensure that they correctly use the indefinite encoding flag instead of the length value returning zero. 

There may also be some problems when re-assembly is needed, but the ability to deal with indefinite length is much more useful.

For developers the get_ber_length now returns the length of the pdu including the EOC, where you have dissectors that use packet-ber.c the eoc may need to be dealt with separately.

The tcap dissector has had numerous changes to make it less cluttered, and the useful feature of the previous version where a dialogue could be filtered out by selecting either the source or destination transaction ID has been incorporated into this version.

svn path=/trunk/; revision=15414
2005-08-18 21:36:59 +00:00
Guy Harris 2fcce4b6c4 Fix some more signed vs. unsigned warnings.
svn path=/trunk/; revision=14903
2005-07-12 01:01:19 +00:00
Anders Broman 104bc44dbd From Valery Vybornov:
add register_dissector to packet-tcap.c

svn path=/trunk/; revision=14737
2005-06-23 22:15:47 +00:00
Ronnie Sahlberg 5f334f7f7b move two functions that are not used by tcap and only used by gsm_a and gsm_ss into gsm_ss.
remove the include <epan.asn1.h> from tcap since it no longer needs that file.

only 9 dissectors remain that use asn1.h



svn path=/trunk/; revision=14710
2005-06-20 07:18:10 +00:00
Guy Harris ddbee0ffd0 Clean up white space.
Register "standard" and "lock_info_col" as obsolete preferences, so
they're silently ignored rather than triggering warnings.

Propagate changes to check for "dissect_ber_octet_string()" supplying a
null tvbuff pointer from the checkins to the generated dissector ("Do
not modify this file" means "Do not modify this file"!) to the tcap.cnf
file, so that they're not lost if the dissector is regenerated.  (Don't
propagate the checks for "tvb_new_subset()" returning null - it never
returns null.)

Pass -1 to "tvb_new_subset()" when appropriate.

When looping over packet data, check against the reported length, not
the captured length, so we indicate a short frame if we get stopped by
the snapshot length.

Get rid of unused variables.

svn path=/trunk/; revision=14658
2005-06-16 07:46:03 +00:00
Anders Broman e92c34b0f9 From Olivier Jacques,
- beautify TCAP decoding without upper dissector associated.
With a couple of if (parameter_tvb) trown in to hopfully fix a Buildbot crash output

svn path=/trunk/; revision=14591
2005-06-08 18:53:11 +00:00
Anders Broman 05f62aae78 Cahnge ssn range
svn path=/trunk/; revision=14586
2005-06-08 05:06:30 +00:00
Anders Broman bdf3f907e9 From Tim Endean:
- I have had to make some changes to packet-ber to allow for PRIVATE and APPLICATION tags.
- Both ANSI and ITU variants supported without configuration.
- Asn.1 dissectors can now register using an OID value as well as an SSN, the oid it tried first.

svn path=/trunk/; revision=14574
2005-06-07 05:50:28 +00:00