Commit Graph

52 Commits

Author SHA1 Message Date
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 e7e9a81155 Fix to BUG GSM CAMEL-3 GPRS InvokeInitialDPGPRS.APN decoded incorrectly
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1543

svn path=/trunk/; revision=21471
2007-04-18 21:52:11 +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 0e706015c2 From Florent Drouin:
Update the Camel dissector to have the same structure as the gsm map dissector.
Now the dissector correctly handles the Tcap return error component.
Some improvement have been made for ApplyChargingReport too.

svn path=/trunk/; revision=20835
2007-02-17 20:04:10 +00:00
Anders Broman 039a3278a0 From Florent Drouin:
Update the Camel ASN1 definition to version 3GPP TS
29.078 7.3.0 Release 7.
Some definitions for element SIZE have been replaced to use the capSpecificBound variables, and some decoding problemes, like for Establish temporary connection have been solved.
I did notice that the CalledPartyBCDNumber (ISDN-AddressString (1..9) ) is not inline with the last definition (1..41), but I did not update it.

svn path=/trunk/; revision=20153
2006-12-19 22:07:08 +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 2aed0d4f40 Fix more Ubuntu warnings.
svn path=/trunk/; revision=19711
2006-10-26 21:31:48 +00:00
Anders Broman b68d723b81 Remove some unused asn1 code(not in spec) to get rid of some Ubuntu warnings.
svn path=/trunk/; revision=19688
2006-10-25 22:09:48 +00:00
Anders Broman 12819c3b19 Finally got it to complie.
svn path=/trunk/; revision=19427
2006-10-04 16:02:59 +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
Anders Broman 8faa5f837c From Florent Drouin:
patch to implement the decoding of the GPRS reference. The specific oid for the CAP-GPRS-ReferenceNumber is attached to a decoding function in the camel module.

svn path=/trunk/; revision=19108
2006-09-01 16:17:48 +00:00
Anders Broman 4e72c1ca2f From Florent Drouin:
This patch introduce the decoding of the RP-Cause element in the Release SMS message for Camel.

svn path=/trunk/; revision=18986
2006-08-21 21:58:30 +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 437baee301 Fix Bug 913 DateAndTime dissection error in CAMEL CallInfoReportArg
svn path=/trunk/; revision=18079
2006-05-02 20:26:49 +00:00
Anders Broman f22abb2933 Fix a typo
svn path=/trunk/; revision=17135
2006-01-31 18:35:36 +00:00
Anders Broman c6527de2aa Fix a typo.
svn path=/trunk/; revision=17131
2006-01-31 05:42:55 +00:00
Anders Broman 1c5874e2e3 Dissect CellGlobalIdOrServiceAreaIdOrLAI and RAIdentity
svn path=/trunk/; revision=17075
2006-01-22 21:16:33 +00:00
Anders Broman f194c9eddb Dissect:
- PDPcontext
 - GSN-Address
 - QoS

svn path=/trunk/; revision=17063
2006-01-20 19:41:31 +00:00
Anders Broman 4ecd261cfb Change some OPCODE decodes from respons to Invoke (bug fix), let gsm_a decode som IE:s.
svn path=/trunk/; revision=17050
2006-01-17 21:52:30 +00:00
Anders Broman c0d17b8845 Use col_set_fence(), not to owerwrite colinfo if more than one Camel pdu is in one TCAP message.
svn path=/trunk/; revision=16980
2006-01-09 21:12:22 +00:00
Anders Broman 44784a9fe4 From Olivier Jacques,
Here is a patch that:
- Replaces the arrow labels by the beginning of the COLINFO column if available (usually containing message names/types).
- Change the comment area to be "protocol: colinfo_content"
From Anders
Added ID tag

Camel
Use col_set_str to remove TCAP info in col_info
 


svn path=/trunk/; revision=16975
2006-01-07 11:10:50 +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 6f23144e46 From Jaap Keuter:
- Editcap 
Mikko Tiihonen filed bug 379 including a patch for editcap. This wasn't picked up so far. I've ported the patch to svn 16820 and included a documentation patch.

-packet-ieee80211.c
Radek Vokal of RedHat filed a bug found by Vladimir Kondratiev of Intel in the 802.11 dissector. Radek provided a sample capture and Vladimir a oneliner patch. I've ported the patch to svn 16820 and tested it against the provided capture. Works well.


-From Kan Sasaki
A patch for packet-ospf.c is attached:
 - Fix the handling of the DN-bit of options field.
 - Add a new function dissect_ospf_bitfield() to dissect a bitfield
   such as options, flags. The following functions are merged by
   using this function.
     - dissect_ospf_lls_extended_options()
     - dissect_ospf_dbd()


     - dissect_ospf_options()
     - dissect_ospf_v3_prefix_options()
 - dissect the flags and prefix-options bitfield.

- lldp Bugfix Bug 596  LLDP TIA Network Policy Decode is not correct 

- Camel make it possible to dissect based on OID.

svn path=/trunk/; revision=16822
2005-12-16 16:37:03 +00:00
Anders Broman ef6bc891fa Fix Bug 628 Bugzilla 2.18.3
CAMEL - Connect decoding error 
- Calledparty number included first two octets

svn path=/trunk/; revision=16804
2005-12-14 21:46:56 +00:00
Anders Broman 1426dbb8fb Dissect Cause and use %(DEFAULT_BODY)s use import for IMSI.
svn path=/trunk/; revision=16701
2005-12-06 17:53:28 +00:00
Anders Broman f082fe8ecf ISUP - Export functions used by INAP and Camel
Gsmmap - Export asn1 structs used by Camel
Camel - Use functions from GSMMAp and ISUP
INAP - Rewrite of the asn1 code to correspond more to CS1 data types
          Let ISUP and Q931 dissect apropriate stuff.

svn path=/trunk/; revision=16624
2005-11-29 17:23:50 +00:00
Anders Broman b8d097b28b Update the Camel asn1 spec to 3GPP TS 29.078 version 6.4.0 and export needed stuff from gsmmap
svn path=/trunk/; revision=16587
2005-11-25 20:18:36 +00:00
Anders Broman 6eb18470f8 From Tim
A small patch for camel and inap, where the linkedid doesn't get dissected correctly in camel or inap
and some tidy up in the camel asn.1 which now compiles with no warnings.

also fix the copy_file target (/y)

svn path=/trunk/; revision=16376
2005-11-02 07:51:55 +00:00
Guy Harris c5b0fc27d7 Fix a bunch of places where we were calling "dissect_ber_octet_string()"
with a non-null pointer-to-pointer-to-tvbuff and not checking whether
the returned tvbuff pointer was non-null.

svn path=/trunk/; revision=15948
2005-09-22 00:51:11 +00:00
Gerald Combs e0331bbb1c Fix more problems found by Steve Grubb, along with other changes:
Camel: Fix an off-by-one error.  Don't alloc and free where it's not
needed.  Remove an unused variable.

PPP and K12: Fix memory leaks.

svn path=/trunk/; revision=15725
2005-09-08 15:01:16 +00:00
Guy Harris 50a0cfd477 Give it an RCS ID.
svn path=/trunk/; revision=15641
2005-08-31 19:51:53 +00:00
Ronnie Sahlberg 927b1668d8 another value_string that was not terminated
fix a bug from the previous checking as well.

svn path=/trunk/; revision=15577
2005-08-28 01:51:50 +00:00
Ulf Lamping 925489be0b removed MSVC warnings:
packet-camel.c(6829) : warning C4101: 'version_str' : unreferenced local variable
packet-quakeworld.c(172) : warning C4090: 'return' : different 'const' qualifiers
packet-smb.c(10859) : warning C4101: 'target_name_len' : unreferenced local variable
packet-smb.c(10860) : warning C4101: 'fn_len' : unreferenced local variable
packet-smb.c(10858) : warning C4101: 'fn' : unreferenced local variable

svn path=/trunk/; revision=15474
2005-08-20 15:58:42 +00:00
Ronnie Sahlberg 2046fd75b8 from Tomas Kukosa, remove a redundant g_strdup()
svn path=/trunk/; revision=15379
2005-08-17 08:31:54 +00:00
Ulf Lamping 0dc9fb3d4a various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants

svn path=/trunk/; revision=15264
2005-08-08 18:50:39 +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
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
Gerald Combs 12b7466381 From Steve Grubb: Fix a memory leak.
Don't pass a null to atoi().

Fixes part of bug 217.

svn path=/trunk/; revision=14495
2005-05-30 20:55:16 +00:00
Lars Roland 20901fcedf only lower-case ASCII letters, numbers,
underscores, and dots are allowed in the
preference name. 

Fix it the camel dissector.

svn path=/trunk/; revision=14333
2005-05-09 00:11:03 +00:00
Anders Broman fd075dadf0 From Javier Acuna:
Added some code to dissect DateAndTime.

svn path=/trunk/; revision=14328
2005-05-08 20:35:44 +00:00
Anders Broman 5a2d87c586 Add dissection of q850 cause.
svn path=/trunk/; revision=14273
2005-05-02 18:32:00 +00:00
Anders Broman dca524507c From Olivier Jacques:
- Adds callingPartyNumber and CalledPartyNumber parameter dissection uing ISUP dissector
- Adds IMSI and ISDN-AddressString parameter dissection
- A lot of changes in the .asn file to sort it, handle more parameters and error codes - contributed by Javier Acuna [javier.acuna@sixbell.cl]

svn path=/trunk/; revision=14088
2005-04-15 08:18:48 +00:00
Guy Harris e611516763 Get rid of an unused variable.
Include "packet-gsm_map.h", not "packet-gsm_map.c".

Check in the regenerated CAMEL dissector.

svn path=/trunk/; revision=13995
2005-04-01 09:20:39 +00:00