Commit graph

98 commits

Author SHA1 Message Date
Pascal Quantin
0975d03e8d Fix dissection of 3GPP2 SMS messages when the User Data Header field is present (for fragmented SMS)
svn path=/trunk/; revision=49910
2013-06-12 16:59:59 +00:00
Pascal Quantin
b0646c0756 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8756 :
Compute the number of septets needed for an alphanumeric address

svn path=/trunk/; revision=49698
2013-06-02 20:57:48 +00:00
Pascal Quantin
608fe54c05 Fix computation of TP-User-Data-Length when SMS is coded with GSM 7 bit default alphabet and TP-User-Data-Header field is present
svn path=/trunk/; revision=49546
2013-05-23 20:28:59 +00:00
Michael Mann
ce537f6b94 Remove static packet_info *gpinfo and just use the packet_info provided by the function.
svn path=/trunk/; revision=49145
2013-05-03 14:54:39 +00:00
Evan Huus
37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Guy Harris
a2414d8909 Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.

We do this by:

	adding "reassembly table" as a data structure;

	associating hash tables for both in-progress reassemblies and
	completed reassemblies with that data structure (currently, not
	all reassemblies use the latter; they might keep completed
	reassemblies in the first table);

	having functions to create and destroy keys in that table;

	offering standard routines for doing address-based and
	address-and-port-based flow processing, so that dissectors not
	needing their own specialized flow processing can just use them.

This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.

svn path=/trunk/; revision=48491
2013-03-22 23:59:54 +00:00
Anders Broman
6bde918078 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
Anders Broman
5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Pascal Quantin
6d99fb6a9f Add dissection of ENVELOPE 3GPP SMS-PP Download
svn path=/trunk/; revision=45768
2012-10-24 16:05:50 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jeff Morriss
aa5d9d78dd From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 :
The reassembled fragments tree in the Packet Details view is awesome, but it
lacks one thing: a field that exposes the reassembled data.

tcp.data already exists for exposing a single TCP segment's payload as a byte
array. It would be handy to have something similar for a single application
layer PDU when TCP segment reassembly is involved. I propose
tcp.reassembled.data, named and placed after the already existing field
tcp.reassembled.length.

My primary use case for this feature is outputting tcp.reassembled.data with
tshark for further processing with a script.

The attached patch implements this very feature. Because the reassembled
fragment tree code is general purpose, i.e. not specific to just TCP, any
dissector that relies upon it can add a similar field very cheaply. In that
vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which
expose reassembled fragment data as a single byte stream for IPv4 and IPv6,
respectively. All other protocols that use the reassembly code have been left
alone, other than inserting NULL into their initializer lists for the newly
introduced struct field reassemble.h:fragment_items.hf_reassembled_data.

svn path=/trunk/; revision=44802
2012-09-07 02:09:59 +00:00
Evan Huus
9c924315b6 Use parentheses to clarify ambiguous operator precedence.
svn path=/trunk/; revision=44743
2012-09-02 17:12:12 +00:00
Bill Meier
638d74d43f Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc

svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
Michael Mann
175851fb40 Updated GSM dissectors display filters per checkfiltername.pl
Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.

svn path=/trunk/; revision=44162
2012-07-31 18:54:11 +00:00
Jakub Zawadzki
b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Anders Broman
7364abf0bc Typo
svn path=/trunk/; revision=43365
2012-06-19 14:46:21 +00:00
Jakub Zawadzki
85aad38347 Add proto_tree_add_unicode_string() to add UTF-8 string to tree.
Convert some proto_tree_add_string_format_value(..., val, "%s", val); to use new function.

svn path=/trunk/; revision=43363
2012-06-19 14:32:24 +00:00
Jakub Zawadzki
7c59ac0280 Fix bug #7378: Wireshark 1.8.0rc1: gsm_a_dtap SMS 7-bit default alphabet regression w.r.t. 1.6.8
proto_item_add_string() can be only used with ASCII strings.

svn path=/trunk/; revision=43362
2012-06-19 14:25:50 +00:00
Anders Broman
a6deef666c Fix a typo
svn path=/trunk/; revision=42805
2012-05-23 06:26:46 +00:00
pascal
0ba1ab2909 Display Element ID in hexadecimal (like in 3GPP specs)
Display EPS bearer ID in decimal

svn path=/trunk/; revision=42755
2012-05-21 19:27:38 +00:00
Bill Meier
d12d5a606c AFAICT sys/types.h & netinet/in.h #includes are not needed for these files.
(Let's see if any of the buildbots give any errors).
Also: remove trailing whitespace on lines.

svn path=/trunk/; revision=42429
2012-05-04 21:29:00 +00:00
pascal
5df9055044 Fix a few clang warnings
svn path=/trunk/; revision=42343
2012-04-30 08:38:26 +00:00
Guy Harris
6163bcfa89 Just use a Boring Old ASCII Dash for hex ranges.
svn path=/trunk/; revision=42272
2012-04-26 16:58:30 +00:00
Anders Broman
0820e375b0 Prepare to use value_string or range_string.
svn path=/trunk/; revision=42267
2012-04-26 16:11:34 +00:00
pascal
81c1371d5d From Evan Huus:
Add missing break
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7201

svn path=/trunk/; revision=42265
2012-04-26 15:44:01 +00:00
pascal
4a530904f8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7131 :
Always store UDL/length in hash table and check pointer coming from lookup before using it

svn path=/trunk/; revision=42111
2012-04-17 13:17:39 +00:00
pascal
a01bf60abf Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6202 :
Stop applying a specific treatment when receiving a SMS-DELIVER packet with an unknown direction (no such treatment is done for SMS-SUBMIT).
Store SMS fragment length in hash table to avoid mangling the output when displaying the reassembled SMS.

svn path=/trunk/; revision=42064
2012-04-14 11:56:12 +00:00
Guy Harris
f2f11f4a2b GUINT_TO_POINTER() causes warnings when passed something *shorter* than
a guint; cast the argument to guint.

svn path=/trunk/; revision=42051
2012-04-13 19:40:57 +00:00
Guy Harris
01b2867f4e Clean up white space.
svn path=/trunk/; revision=42050
2012-04-13 19:36:44 +00:00
Jakub Zawadzki
25178510bd Try to fix OSX builds.
svn path=/trunk/; revision=42049
2012-04-13 18:27:51 +00:00
pascal
6f91bcc65a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6477:
Use T-User-Data-Length to define the string size decoded with the 7 bits alphabet

svn path=/trunk/; revision=42041
2012-04-13 10:01:38 +00:00
Jakub Zawadzki
80445e5a99 Fix off by one shift errors introduced in r39530 where it seemed proper[1]
[1] I'm unsure of packet-dtpt, so I haven't patch it.

svn path=/trunk/; revision=41873
2012-03-31 20:57:15 +00:00
Bill Meier
d7a1840204 Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.

svn path=/trunk/; revision=39530
2011-10-23 22:58:45 +00:00
Jaap Keuter
151acb8fa1 Fix for bug 6469:
Retrieve the fill bits in the correct amount and from the correct place.

svn path=/trunk/; revision=39494
2011-10-20 17:49:19 +00:00
Bill Meier
5eaad4ecd3 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38386
2011-08-07 14:36:19 +00:00
Jeff Morriss
7ad71a2d78 Treat TVBs as opaque: use the accessor functions instead of accessing the fields
directly.

svn path=/trunk/; revision=37420
2011-05-27 01:57:33 +00:00
Bill Meier
b9a1e3fb2a Do PROTO_ITEM_SET_GENERATED for two 'proto_item *': Fixes Coverity 914 & 915 [UNUSED]
svn path=/trunk/; revision=37245
2011-05-18 17:17:08 +00:00
Gerald Combs
8ae09e055c Mark a parameter unused.
svn path=/trunk/; revision=35845
2011-02-07 18:05:26 +00:00
Anders Broman
47cc39a0bb Use value_string_ext and ENC_BIG_ENDIAN.
svn path=/trunk/; revision=35844
2011-02-07 17:45:49 +00:00
Stig Bjørlykke
84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
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