Commit Graph

58 Commits

Author SHA1 Message Date
Jeff Morriss f86b14d820 Replace 2 switch()es with duplicated values (but missing most of the case statements--leading the Sun compiler to complain about most of the statements not being reached) with a value_string and a couple of val_to_str() calls. Also some minor reformatting of the function in question.
svn path=/trunk/; revision=35386
2011-01-05 22:17:33 +00:00
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
Stig Bjørlykke df48a37c2e Use correct abbrev for fragment entries.
svn path=/trunk/; revision=34547
2010-10-17 18:33:50 +00:00
Bill Meier 93b94a23ca Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h not req'd.
svn path=/trunk/; revision=34464
2010-10-10 23:28:40 +00:00
Jeff Morriss e62b60be7c Rework SMS reassembly:
- Take out the if(tree) because for reassembly to work we need to do the
  reassembly on the first pass.
- Remove the (confusing) "try_dissect_message_fragment" preference (which
  caused us to dissect the message fragments) and replace it with a "reassembly"
  preference.  Dissect the message fragments regardless of whether reassembly is
  enabled or not (it's just SMS).  This solves the user confusion reported in
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4232 .
- Add the text of the SMS using proto_tree_add_string*() so that we an filter on
  the text.

svn path=/trunk/; revision=32812
2010-05-14 19:27:11 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Anders Broman 2f9306d05a GSM SMS PDU TPVPF wrong interpretation.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4524

svn path=/trunk/; revision=31985
2010-02-24 12:41:01 +00:00
Stig Bjørlykke 539b558f8c Renamed some reassembled data texts.
Removed some check_col().

svn path=/trunk/; revision=31809
2010-02-06 18:20:21 +00:00
Stig Bjørlykke 88b72356ad Introduce "Reassembled length" filter element for all protocols doing
reassembly.

svn path=/trunk/; revision=31767
2010-02-02 16:01:52 +00:00
Anders Broman 440c3f9261 From Didier Gautheron:
check_col.diff
Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31519
2010-01-13 20:32:01 +00:00
Guy Harris 68cf37f81b Replace gsm_sms_char_ascii_decode() with gsm_sms_chars_to_utf8(), which
returns an ep_allocated string (and whose name reflects that what you
get out is UTF-8, not just ASCII).

svn path=/trunk/; revision=31376
2009-12-28 21:58:43 +00:00
Stig Bjørlykke 30b31a46bb Initialize variables which may be used uninitialized.
svn path=/trunk/; revision=30536
2009-10-12 14:29:48 +00:00
Kovarththanan Rajaratnam 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Bill Meier 6c545e0d79 Save some memory: Don't statically allocate ett[] arrays used "dynamically".
svn path=/trunk/; revision=29929
2009-09-15 17:37:54 +00:00
Kovarththanan Rajaratnam 17c9803cac Sanitize epan includes
svn path=/trunk/; revision=29499
2009-08-21 20:25:24 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Anders Broman 8611ec5f5e More size_t casts.
svn path=/trunk/; revision=27879
2009-03-29 12:07:30 +00:00
Stig Bjørlykke 62f60df6b4 From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.

svn path=/trunk/; revision=27718
2009-03-13 22:06:48 +00:00
Stig Bjørlykke 1a5114edf9 Removed an unused variable 'str'.
Removed some unused hf_ variables.

svn path=/trunk/; revision=26957
2008-12-10 08:44:13 +00:00
Anders Broman 573bdfa36a From Abhik Sarkar:
More HF support for TPDU parameters in the GSM SMS dissector.

svn path=/trunk/; revision=26956
2008-12-10 07:52:27 +00:00
Stig Bjørlykke bd08ae7ee6 Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26647
2008-10-31 15:11:57 +00:00
Anders Broman 95f8f924ca From Abhik Sarkar:
GSM SMS dissector doesn't support filtering based on TPDU parameters.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3012

svn path=/trunk/; revision=26628
2008-10-30 19:50:32 +00:00
Guy Harris 246fce7b04 Clean up indentation.
Fix typoes.

Get rid of C++/C99-style comment.

svn path=/trunk/; revision=26613
2008-10-28 22:15:42 +00:00
Stig Bjørlykke 209c8de4e5 Make it compile.
svn path=/trunk/; revision=26611
2008-10-28 20:55:59 +00:00
Anders Broman de8c90d0fe packet-gsm_sms.c:1643: warning: unused variable 'str' ...etc
svn path=/trunk/; revision=26608
2008-10-28 20:21:52 +00:00
Anders Broman c29d949834 From Shmulik Bezale:
gsm sms -> reassemble + wap support
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3004

svn path=/trunk/; revision=26607
2008-10-28 19:48:55 +00:00
Bill Meier 432f7be1e0 Minor proto_reg_handoff cleanup
svn path=/trunk/; revision=26265
2008-09-25 02:21:04 +00:00
Bill Meier 77b81b391b #include <prefs.h> not req'd
svn path=/trunk/; revision=26089
2008-08-25 22:06:20 +00:00
Gerald Combs d630c26a29 Fully implement Guy's suggested fix. Rename ADDRBUF_MAX_MESSAGE_SIZE to
MAX_ADDR_SIZE, to be more in line with a suggestion by Abhik Sarkar.

svn path=/trunk/; revision=25466
2008-06-17 19:05:48 +00:00
Gerald Combs a40cf08dda Fix an off-by-one bug reported by David Ceccanti, as suggested by Guy at
http://www.wireshark.org/lists/wireshark-users/200806/msg00077.html.
Add a comment about the usage of gsm_sms_char_7bit_unpack().

svn path=/trunk/; revision=25462
2008-06-16 21:55:37 +00:00
Guy Harris 1ad79116ed Get rid of old GLib 1.2[.x] stuff, as we now require GLib 2.x.
svn path=/trunk/; revision=25192
2008-04-29 08:44:57 +00:00
Stig Bjørlykke 28ae535b00 Removed even more "statement not reached" warnings.
svn path=/trunk/; revision=24286
2008-02-07 15:44:45 +00:00
Jeff Morriss b128029ac4 Oops, glib's iconv stuff is in glib >= 2, not just glib > 2
svn path=/trunk/; revision=24099
2008-01-15 19:24:27 +00:00
Jeff Morriss 5ebba98529 The glib iconv routines are new to glib-2 so #ifdef around them to get glib-1 builds going again. I started to merge in using the regular iconv routines (if we don't have glib-2 but we HAVE_CONV) but the code rapidly got ugly with all the #ifdef's; it could be done but it's probably not worth the effort/ugliness.
svn path=/trunk/; revision=24098
2008-01-15 18:37:48 +00:00
Anders Broman 48d17b4c2f From Shmulik Bezalel:
Add support for ucs2 on ussd string.
(Changing the font from Lucida console to Arial dissplaed all chars correctly).

svn path=/trunk/; revision=24029
2008-01-08 05:18:36 +00:00
Jaap Keuter c84621caba From Abhik Sarkar:
In packet-gsm_sms.c, in function dis_field_ud_iei, it is assumed that the UDHL
must be greater than 2 (because it is expected that IEIa and IEIDLa will be 
one byte each and the rest will be IEIDa). 
However, there are some cases in which UDHL can be 2. For example, in 3GPP 23.048.

svn path=/trunk/; revision=23945
2007-12-24 11:16:06 +00:00
Anders Broman 607b0b1048 Add call to the sms dissector for MO-ForwardSM-Arg and MT-ForwardSM-Arg.
Use a separate valuestring for forwardSM and sendRoutingInfoForSM.

svn path=/trunk/; revision=22146
2007-06-20 21:54:40 +00:00
Guy Harris 8a3af12c87 Define "char_def_alphabet_ext_decode()" with a return type - and define
it as static as it's not used outside this file.

svn path=/trunk/; revision=18955
2006-08-19 02:58:48 +00:00
Anders Broman e2c1051a56 From Willem Dekker:
The attached patch fixes this and converts the sms content (7 bit encoded, gms 03.38 alphabet)  into utf8.

svn path=/trunk/; revision=18660
2006-07-05 05:05: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
Guy Harris 654d0bd25d Make "oct" in "dis_field_ud()" a guint8, as we never stuff anything
bigger than an 8-bit value in it, and guint is too big as we pass
something based on it to a routine expecting a guint16.

svn path=/trunk/; revision=18152
2006-05-15 02:49:42 +00:00
Gerald Combs 1a4719ef8d Fix Coverity run 12, CID 104: Don't overflow a guint8, and don't read past
the end of an array.

Update the release notes.

svn path=/trunk/; revision=17506
2006-03-07 19:53:57 +00:00
Anders Broman a8a4c251f0 TP-PI (TP-Parameter-Indicator) is optional.
svn path=/trunk/; revision=15360
2005-08-15 19:35:09 +00:00
Ronnie Sahlberg efa1f43005 convert some tvb_fake_unicode() to tvb_get_ephemeral_faked_unicode()
svn path=/trunk/; revision=15272
2005-08-10 14:17:27 +00:00
Anders Broman 49284d02cb Fix "tvb_fake_unicode takes the lengt in number of guint16's not guint8's" fix up indentation.
svn path=/trunk/; revision=15199
2005-08-02 21:16:56 +00:00
Jörg Mayer 5602f5bb83 Make some funtions static. More char -> const char warning fixes
svn path=/trunk/; revision=15146
2005-07-30 01:01:02 +00:00
Guy Harris ab797734dd Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.

svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
Anders Broman 0232c81b91 From Viorel Suman:
Enable a proper deconding of an alphanumeric 7-bit encoded SMS TP-Originating-Address.

svn path=/trunk/; revision=14349
2005-05-11 21:59:44 +00:00