Commit graph

170 commits

Author SHA1 Message Date
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
Evan Huus
d70fafb0db And packet-isup.c is the first to fall to r48415.
From Anders via
https://www.wireshark.org/lists/wireshark-dev/201303/msg00183.html

svn path=/trunk/; revision=48417
2013-03-19 15:38:14 +00:00
Anders Broman
2cc00294c7 Use explicit casts.
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Anders Broman
5257351bfb Dissect Contractor Number digits.
svn path=/trunk/; revision=48253
2013-03-11 19:30:59 +00:00
Anders Broman
e8af5b4e67 Dissect japan ISUP Charging Info IE.
svn path=/trunk/; revision=47946
2013-02-28 17:56:02 +00:00
Anders Broman
e1c43d0095 Dissect Japan ISUP Charge rate transfer (flexible charging) .
svn path=/trunk/; revision=47919
2013-02-27 20:02:38 +00:00
Anders Broman
755ccf4162 {..., NULL} is required as the last XXX_string array entry: value_string q763_generic_notification_indicator_vals[]
svn path=/trunk/; revision=47635
2013-02-11 15:56:02 +00:00
Anders Broman
8f96a14263 Dissection of Q.763 ISUP Generic Notification.
based on bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8311

svn path=/trunk/; revision=47630
2013-02-11 14:50:50 +00:00
Anders Broman
fe29434e82 Export dissect_japan_isup_additonal_user_cat()
svn path=/trunk/; revision=47497
2013-02-05 15:12:54 +00:00
Anders Broman
264ac136ef Make it easier to make full extended value string if required.
svn path=/trunk/; revision=46437
2012-12-07 09:34:39 +00:00
Anders Broman
a85be64367 Found non-ASCII characters on line 7323 of packet-isup.c
svn path=/trunk/; revision=46407
2012-12-05 17:45:54 +00:00
Anders Broman
59af28f911 unused variable 'length'
svn path=/trunk/; revision=46406
2012-12-05 17:08:34 +00:00
Anders Broman
f06a499b83 Dissect more Japanese ISUP parameters.
svn path=/trunk/; revision=46405
2012-12-05 16:21:09 +00:00
Anders Broman
c9622178cf Add more dissection for Japan ISUP.
svn path=/trunk/; revision=46368
2012-12-04 16:22:00 +00:00
Anders Broman
362dd1dcb5 Add more Japan ISUP parameters to value sting, dissection remains to be done.
svn path=/trunk/; revision=46364
2012-12-04 09:15:21 +00:00
Pascal Quantin
51323635aa From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8035 :
Wrong packet bytes are selected for ISUP CUG binary code

svn path=/trunk/; revision=46334
2012-12-02 20:49:19 +00:00
Jeff Morriss
0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Anders Broman
6408671bad Add more parameters for Japanese ISUP.
svn path=/trunk/; revision=46220
2012-11-27 13:36:18 +00:00
Guy Harris
dda0e94161 hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464
2012-10-11 08:23:29 +00:00
Anders Broman
f6914a05af "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848

svn path=/trunk/; revision=45463
2012-10-11 08:12:41 +00:00
Anders Broman
2c181db864 Fix unused parameters.
svn path=/trunk/; revision=45387
2012-10-08 15:10:24 +00:00
Anders Broman
4856bcfd40 Let ISUP national settings be valid for BICC too.
Extend dissection of Japan ISUP.

svn path=/trunk/; revision=45386
2012-10-08 14:22:24 +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
Jakub Zawadzki
5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +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
Chris Maynard
3e976d69d1 tools/checkhf.pl reported 3 unused hf entries. Commented them out for now.
BTW:
tools/checkAPIs.pl reports 109 useless add_text()'s vs. 346 add_<something else>() calls (31.50%), under 50% threshhold, but not really that great.

tools/checkfiltername.pl reports 42 errors.

svn path=/trunk/; revision=44706
2012-08-30 20:36:53 +00:00
Jeff Morriss
3268b5b215 Remove trailing space in some hf names.
Add some hf names (some entries had only a space for a name).
Remove non-ASCII chars and C++/C99-style comments.

svn path=/trunk/; revision=44705
2012-08-30 20:22:09 +00:00
Anders Broman
e94d8a0b7e Add Japanese ISUP variant(not all IE's)
IE dissection code from Brian Mceniery.

svn path=/trunk/; revision=44703
2012-08-30 18:40:49 +00:00
Bill Meier
7641d97020 Cleanup: Whitespace and long lines;
Also: remove a few boilerplate comments.

svn path=/trunk/; revision=44637
2012-08-23 17:11:36 +00:00
Bill Meier
da57a45b8c value-string arrays - allow "direct" access: fix dup val & fill in a "gap".
svn path=/trunk/; revision=44636
2012-08-23 15:38:03 +00:00
Evan Huus
6960a27c75 From Bodo Petermann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7632
Fix dissection of ISUP message Generic Numbers with no digits.

svn path=/trunk/; revision=44487
2012-08-14 11:58:20 +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
dd6ca38fff updated more display filters per checkfiltername.pl
svn path=/trunk/; revision=44178
2012-08-01 01:57:18 +00:00
Chris Maynard
6590deb37f Fix Coverity CID 712526: Missing break in switch. Bug introduced with r44134.
svn path=/trunk/; revision=44157
2012-07-31 14:32:10 +00:00
Anders Broman
5a4c037e87 Add Russian national variant.
svn path=/trunk/; revision=44134
2012-07-30 13:22:38 +00:00
Anders Broman
71f4754f19 Extend a value string.
svn path=/trunk/; revision=44028
2012-07-26 08:16:07 +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
ae43364681 Only dissect as SDp if it's IPBCP (text encoded).
svn path=/trunk/; revision=43152
2012-06-08 11:50:52 +00:00
Jeff Morriss
d8c246d53d Fix CID 700200: the Israeli variant case can't happen in
dissect_application_isup() so comment it out for now.

svn path=/trunk/; revision=42554
2012-05-10 18:33:24 +00:00
Jeff Morriss
7afe87264d Decode the Israeli TCM and CAM messages.
svn path=/trunk/; revision=42465
2012-05-07 15:13:28 +00:00
Jeff Morriss
444187c5e8 Add support for Israeli national variant of (ITU) ISUP; Only the BCM
message is decoded for now.

Also clean up lots of white space and replace tabs (including 4-space tabs)
with spaces.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4231

svn path=/trunk/; revision=42435
2012-05-05 01:55:21 +00:00
pascal
a4232cc6bd Remove non-ASCII character
svn path=/trunk/; revision=42101
2012-04-16 18:13:34 +00:00
Chris Maynard
3f7146a937 Define ISUP_ITU_STANDARD_VARIANT before using it.
svn path=/trunk/; revision=42100
2012-04-16 17:17:18 +00:00
Anders Broman
b365941321 Introduce a preference to set Standard or National ITU ISUP variant.
svn path=/trunk/; revision=42099
2012-04-16 15:52:32 +00:00
Anders Broman
3f87ab8e85 Add dissection of French national messages.
svn path=/trunk/; revision=42098
2012-04-16 15:28:57 +00:00
Anders Broman
d7192a8bac Use content_type_parameter_str in dissect_application_isup()
to determine ISUP standard and ISUP variant(French).

Also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6258

svn path=/trunk/; revision=42095
2012-04-16 14:11:32 +00:00
Anders Broman
a43d44f907 Separate ANSI and ITU messages.
svn path=/trunk/; revision=42093
2012-04-16 13:28:41 +00:00
Chris Maynard
1574813764 Fix Coverity CID's 1439-1448 OVERRUN_STATIC introduced with r41468. Also fix one additional dead store.
svn path=/trunk/; revision=41702
2012-03-21 03:04:15 +00:00
Alexis La Goutte
63b9d7324e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41468
2012-03-10 17:49:17 +00:00
Jeff Morriss
183f0e934c Create a list of MTP Service Indicator macros and use them.
svn path=/trunk/; revision=40828
2012-02-03 18:26:37 +00:00