Commit graph

69 commits

Author SHA1 Message Date
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
Tomas Kukosa
e5922df225 - use #.FN_HDR where #.FN_BODY is not necessary
- modify subtypes for individual TCMessage/ansi... fields instead of switching based on hf_index inside common TransactionPDU type

svn path=/trunk/; revision=22411
2007-07-27 06:23:45 +00:00
Jeff Morriss
45ee7230cc Change a bunch of calls to col_append_*() to col_add_*() in places where we
_want_ what's currently in the INFO column (usually a more generic message
type from a lower level dissector) replaced (usually with a more
specific--higher level--message type from the currect dissector).  Add a
comment there not to change it back and to explain the use of col_set_fence()
in case someone finds data there that they _don't_ want replaced.

svn path=/trunk/; revision=22409
2007-07-26 20:05:54 +00:00
Jeff Morriss
10dcbaa760 From Florent Drouin: fix for bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1681 : initialize the variable containing the OID so the dialog portion gets decoded properly
svn path=/trunk/; revision=22298
2007-07-13 13:45:11 +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
4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Anders Broman
c0dc340d5d From Florent DROUIN:
I have made some changes to the final patch to have the operation code decoded
as ForwardSM. A change for TCAP is included too, to be sure that the
application context is not overwritten by the User Info OID (this was the case,
when a MAP open dialog was included in the request).
Fix bug:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1498

svn path=/trunk/; revision=21543
2007-04-23 21:26:27 +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
9344195101 Formating changes and align a bit to spec.
svn path=/trunk/; revision=21521
2007-04-23 06:24:39 +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
Anders Broman
eab3eb5c68 Put some missing TAG:s in the tree if internal BER fields shown.
svn path=/trunk/; revision=21486
2007-04-21 20:27:05 +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
Ronnie Sahlberg
8920a7e7f2 change the signature that asn2wrs generates for functions to marm all parameters as _U_
to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 


svn path=/trunk/; revision=21088
2007-03-21 10:22:22 +00:00
Anders Broman
9375e27794 Use TransactionId to match ansi map responses to requests and fix
some bugs in the asn2wrs generated ansi map dissector.

svn path=/trunk/; revision=20257
2007-01-01 22:03:01 +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
5cd8c719e6 ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb
svn path=/trunk/; revision=18921
2006-08-16 05:58:39 +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
Tomas Kukosa
604000a6b3 - remove some #.MODULE_IMPORT from .cng files
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs

svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
Ronnie Sahlberg
feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +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
0f4cc578a1 remove // comments
svn path=/trunk/; revision=16835
2005-12-17 21:17:58 +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
b45d2efe6d Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
2005-12-08 23:29:21 +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
Ronnie Sahlberg
0ca30abe65 change the symbol dissect_ber_CHOICE back into dissect_ber_choice
svn path=/trunk/; revision=14980
2005-07-21 21:12:09 +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
Ronnie Sahlberg
3a51ba4293 make dissect_ber_choice take a guint* that will return the
index of the branch taken or -1  to make prettifications easier to implement.


change the signature of dissect_ber_choice and rename it to dissect_ber_CHOICE to catch all
occurences of the use of this function

update asn2eth to use the new name/signature

update all occurences of this function to the new name and new signature.



svn path=/trunk/; revision=14758
2005-06-26 05:48:50 +00:00
Anders Broman
6f9d56ddd0 From Valery Vybornov:
add register_dissector to packet-tcap.c

svn path=/trunk/; revision=14738
2005-06-23 22:17:03 +00:00
Ronnie Sahlberg
33f4400f83 the maximum ASN OID length is 256 bytes and there is a define to control this.
fix bug251 and all other occurances where an oid string  passed to packet_ber_object_identifier()
is not defined as foo[MAX_OID_STR_LEN]

svn path=/trunk/; revision=14720
2005-06-21 09:38:59 +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
89ddd6077a From Tim Endean:
Check for tvb.

svn path=/trunk/; revision=14592
2005-06-09 04:28:13 +00:00
Anders Broman
d82116f2aa 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=14590
2005-06-08 18:52:34 +00:00
Anders Broman
1ce165a446 From Tim Endean:
Fix ssn range

svn path=/trunk/; revision=14585
2005-06-08 05:04:26 +00:00
Anders Broman
b3934176cb Some fixes from Tim Endean
svn path=/trunk/; revision=14578
2005-06-07 20:29:23 +00:00