Commit Graph

64 Commits

Author SHA1 Message Date
Jeff Morriss ba3f1eaa5a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2848 :
Decode SUA GT digits.  This removes the (undecoded, raw BCD) FT_BYTES field
sua.global_title_signals and adds an FT_STRING field sua.global_title_digits
(like in SCCP).

svn path=/trunk/; revision=26262
2008-09-24 13:41:47 +00:00
Jeff Morriss ad10542235 Correct the field lengths for the segmentation parameter (fixes the highlighting in the byte pane).
svn path=/trunk/; revision=26229
2008-09-19 12:17:32 +00:00
Jeff Morriss f426f3363f If ANSI and national==0, decode the PC as ITU (not China). This fixes bug 2861.
svn path=/trunk/; revision=26210
2008-09-15 20:17:47 +00:00
Bill Meier ceebccced4 Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25607
2008-06-26 00:16:58 +00:00
Anders Broman e623809550 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25264
2008-05-09 13:59:10 +00:00
Anders Broman 63c5c71cf8 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24859
2008-04-09 05:36:08 +00:00
Gerald Combs 216168c922 Fix compilation under Windows.
svn path=/trunk/; revision=24743
2008-03-28 05:56:02 +00:00
Gerald Combs 1747ccc7c7 Make sure we reset a pointer to ephemeral memory when we're done processing
our packet, otherwise someone might try to use it later on.

svn path=/trunk/; revision=24740
2008-03-27 23:09:22 +00:00
Stig Bjørlykke fdc980e79d Added an option to uat_new() to set if configuration shall be saved in the
selected profile.

Don't save SMI Paths and SMI Modules in the profiles because reloading
currently doesn't work (bug 2309).

svn path=/trunk/; revision=24580
2008-03-06 22:13:24 +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
Guy Harris 6dd81aa615 The type field of an mtp3_addr_pc_t is a "which SS7 standard is this?"
type, not a "how do I format addresses?" type; declare it as such, and
remove the comment that pointed out that the type field had the wrong
(C) type.

svn path=/trunk/; revision=24297
2008-02-10 21:38:52 +00:00
Bill Meier bad9f18d33 Fix (Sun) compiler warnings as reported by David Kirkby: Part 1
svn path=/trunk/; revision=24295
2008-02-09 23:35:28 +00:00
Jeff Morriss ed88c589b0 Add support for DLT_SCCP (SCCP without MTP2, MTP3, or any pseudo-header).
svn path=/trunk/; revision=24119
2008-01-17 17:55:38 +00:00
Jeff Morriss 52fcbb6ed8 Display the Country Code information in a subtree of the digits (to make it obvious that it's a subfield). Add #defines for the NAI and NP values and use them rather than hex values. Initial the 'np' variable to clean up a warning.
svn path=/trunk/; revision=24049
2008-01-09 22:01:57 +00:00
Anders Broman 1b73351c8d From Shmulik Bezalel:
Present the country code description gsmmap and SCCP.
Added small ASN1 bugfix - missing EXPORTS used by gsmmap.asn(Handle older ver).

svn path=/trunk/; revision=24048
2008-01-09 21:14:01 +00:00
Anders Broman 88b269d724 Fix indentation somewhat.
svn path=/trunk/; revision=23976
2007-12-30 00:02:25 +00:00
Jeff Morriss aabf0f25d1 Fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2059 : reassemble XUDTS, too
svn path=/trunk/; revision=23705
2007-12-03 18:12:25 +00:00
Guy Harris 9c89cdaaa3 strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est.  Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).

In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.

We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot.  This causes strings that should
match not to match.

This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.

svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
Jeff Morriss 29cb0d329b Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2011 : check SSN in both Called and Calling addresses even when we know the direction of the messages
svn path=/trunk/; revision=23564
2007-11-24 15:43:39 +00:00
Jeff Morriss 8058db81b9 Fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2006 : use 0xffffff (reserved value) for unset xLRs
svn path=/trunk/; revision=23563
2007-11-24 15:38:19 +00:00
Jeff Morriss 53085e0828 Minor indentation changes
svn path=/trunk/; revision=23282
2007-10-26 22:17:45 +00:00
Jeff Morriss ced84236fe checkhf.pl found a couple bugs: hf_sccp_calling_itu_global_title_indicator and hf_sccp_ansi_isni_counter were never used (the former due to a typo, the latter due to oversight).
svn path=/trunk/; revision=22510
2007-08-15 21:07:01 +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 37a954260a Stop using switch statements on the GTI when decoding GT's: the values are
not unique between ANSI and ITU so we end up with incorrect behavior.  In
particular:
  - In non-ANSI if GTI==0x1, don't try to decode TT, NP, and ES.
  - In ANSI don't decode the O/E indicator on GTI==0x1.
  - In non-ANSI don't decode NAI on GTI==0x1 or 0x4.

svn path=/trunk/; revision=22090
2007-06-13 13:39:05 +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
Guy Harris 08ab8d8734 mtp3_addr_to_str_buf() and mtp3_pc_hash() expect to be passed a pointer
to a mtp3_addr_pc_t; declare them as such, and pass the argument as
such.

svn path=/trunk/; revision=21595
2007-04-26 07:57:44 +00:00
Guy Harris 1bc049906a Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.

If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.

Constify a bunch of stuff, and make some other changes, to get rid of
warnings.

Clean up some indentation.

svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
Jeff Morriss 3f68c1395b Fix a couple warnings
svn path=/trunk/; revision=21446
2007-04-16 08:37:39 +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
Stephen Fisher 82b2c83149 Fix some more warnings
svn path=/trunk/; revision=21273
2007-03-29 18:09:13 +00:00
Luis Ontanon 455bb07b1f remove debugging printf() calls left in the code.
svn path=/trunk/; revision=21270
2007-03-29 12:24:04 +00:00
Luis Ontanon 9dbe9adf50 Another iteration over sctp calls (RANAP/BSSAP) a step towards TCAP/(MAP/IMAP/CAMEL)
- Fix SUA calls (I would need some more traces to test this)


svn path=/trunk/; revision=21235
2007-03-27 23:00:55 +00:00
Jeff Morriss 109388d263 Clean up some more warnings: unused variables, unitialized variables, wrong format (%ld instead of %d) in packet-sccp.c
svn path=/trunk/; revision=21167
2007-03-24 13:46:41 +00:00
Luis Ontanon 7f3e4fea48 Mine:
* add SUA to the "VoIP Calls" tap.
* propagate changes to packet-sccp.h to other dissectors

From Neil Piercy:
* add SLR, DLR and CAUSE to COL_INFO

svn path=/trunk/; revision=21126
2007-03-22 22:59:20 +00:00
Luis Ontanon 5fa8e75149 packet_info.c and packet.c
add sccp_info to struct _packet_info (Sorry but the way private_data works and the fact that TCAP uses it and BSSAP/RANAP can be tunnelled on GSMMAP over TCAP makes it impossible to avoid)

SCCP
- Have SCCP to have a TAP,
- Fix associations so that every message belongs to the association.
- Export message type values so that they can be used by a tap listener

RANAP
 - Have RANAP information attached to the sccp_info 

BSSAP + GSM_A
- Have DTAP, BSSMAP and BSSAP info attached to the sccp_info

svn path=/trunk/; revision=21076
2007-03-21 00:48:46 +00:00
Jörg Mayer fb820f0a07 GCC warning fixes
epan/dissectors/
packet-bctp.c:
	no newline at end of file
packet-epl.c:
	C++ style comments are not allowed in ISO C90
packet-sccp.c:
	missing initializer
packet-sccp.h:
	comma at end of enumerator list
packet-sctp.c:
	suggest parentheses around assignment used as truth value
packet-vnc.c:
	control reaches end of non-void function
	pointer targets in passing argument 1 of 'g_strtod' differ in
		signedness
	pointer targets in passing argument 3 of 'vnc_client_to_server'
		differ in signedness
gtk/
main.c:
	C++ style comments are not allowed in ISO C90
u3.h:
	function declaration isn't a prototype

Other (trivial) stuff
packet-sccp.h:
	Add svn properties


svn path=/trunk/; revision=21011
2007-03-09 13:14:09 +00:00
Luis Ontanon 61c8b55913 prepare for in-tree call tracing of bssap and ranap.
svn path=/trunk/; revision=20978
2007-03-05 23:50:08 +00:00
Luis Ontanon 628d990885 Add an optional generated id to each association and have a tree with links to all messages of the association bellow it.
svn path=/trunk/; revision=20967
2007-03-03 23:38:35 +00:00
Jeff Morriss 1a9420702e Fix the SCCP dissector so it doesn't show non-segmented DT1 messages as
having been reassembled.

Fix the comments in reassembly.c and reassembly.h regarding what the reassembly
routines actually return in the 802.11 and no-sequence-number cases when they
are given the first and last packet (that is, a non-segmented packet): in
particular the routines return a pointer to a list containing just the one
fragment.

svn path=/trunk/; revision=20505
2007-01-19 23:27:24 +00:00
Jeff Morriss cb8d14bd5e Reindent pretty heavily. It's still not 100% consistent but at least all the
code in each function is consistent (previously there were some sections of
code indented, oh, about 10 indentations too far).  At the same time, remove
trailing white space and change spaces to tabs.

Remove one duplicated call to sccp_assoc() and s/isup_apm/sccp/g in the hf[]
array (apparently when the XUDT reassembly was put in it was copied from ISUP
but the filter names weren't changed).


svn path=/trunk/; revision=20502
2007-01-19 17:25:13 +00:00
Jeff Morriss 37d4a40254 If p2p_dir isn't set (no message direction is configured) or no association is found, try to find a subdissector on both the called and calling SSNs instead of just trying the called SSN. Also clean up some indenting and fix the capitalization when showing what dissector the TCAP SSN is linked to.
svn path=/trunk/; revision=20220
2006-12-26 22:27:46 +00:00
Jörg Mayer 2a5d217358 Jeff Morriss:
Fix for bug 1036

I looked at this today and found that in fact the PC stuff is pretty
hosed up in the SS7 dissectors.  For example, MTP3 *looks* OK here (DPC is
4-5-6):

    Routing label
        DPC (4-5-6) (394500)

but 394500 == 0x60504 == 6-5-4.  Something's not right.

I made a common PC dissector function for all the SS7 dissectors so as to
concentrate all this code in one place (something I've been wanting to do for a
while anyway) and fixed the reported problem as well as the above problem in
the attached patch.

svn path=/trunk/; revision=19231
2006-09-14 10:51:44 +00:00
Ronnie Sahlberg 8ce8e719e0 rename some structures and defines from the se_tree to the emem_tree prefix
svn path=/trunk/; revision=18894
2006-08-14 08:29:29 +00:00
Anders Broman c72d4e8f2e From Albert Chin:
Fix some C++ comments in C source files and fixes some non-constant initializations.

svn path=/trunk/; revision=18521
2006-06-20 05:57:29 +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 5683612f36 Fix bug 851
svn path=/trunk/; revision=17837
2006-04-06 20:50:48 +00:00
Anders Broman ba35e5d4d9 Frof Jeff Morriss:
The attached patch adds support for the Japan SS7 variants (TTC/NTT) to 
the MTP3, MTP3MG, SCCP, and SCCPMG dissectors.  It's not as thoroughly 
implemented nor tested as I'd like, but it does a good job of at least 
the basic dissection and I'm out of time for now.

It also fixes bug I found in the SCCP dissector where it would show an 
End of Optional parameter even when the Optional pointer was 0.

svn path=/trunk/; revision=17815
2006-04-05 16:03:36 +00:00
Anders Broman 9c5ac889e7 sccp - fix a typo
gre - fix a length error, and change the way to display 3GPP atributes.

svn path=/trunk/; revision=17757
2006-03-29 17:00:16 +00:00
Luis Ontanon 19f81800ba use se_trees instead of GHashTables,
rename binding into assoc(iation) which is the AOC name.
move the definition of sccp_assoc_t to packet-sccp.h so that information regarding sccp associations it can be used by user protocols



svn path=/trunk/; revision=17590
2006-03-11 15:30:52 +00:00
Anders Broman 31424b15fb Desegment DT1 messages.
svn path=/trunk/; revision=17372
2006-02-22 16:25:29 +00:00