Commit graph

85 commits

Author SHA1 Message Date
Jakub Zawadzki
d6b35d5c6b mp2t: return offset when dissecting AF (continuation of r54396)
svn path=/trunk/; revision=54476
2013-12-27 17:42:46 +00:00
Jakub Zawadzki
37ec8781bb mp2t: rework dissecting adaptation field
- move dissecting adaptation field length to dissect_mp2t_adaptation_field()
- return offset, not delta.

svn path=/trunk/; revision=54396
2013-12-23 18:07:28 +00:00
Jakub Zawadzki
8c870995f0 mp2t: avoid calling get_mp2t_conversation_data()
svn path=/trunk/; revision=54395
2013-12-23 18:06:33 +00:00
Anders Broman
e8b935ad6e Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54209
2013-12-18 06:51:09 +00:00
Jakub Zawadzki
5c79cbf152 Fix some trivial warnings.
svn path=/trunk/; revision=54085
2013-12-14 10:29:26 +00:00
Jakub Zawadzki
82e2675f45 Avoid including <wiretap/wtap.h> in dissectors.
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00
Michael Mann
9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Martin Kaiser
733713b4b1 if pointer==0, the section starts immediately
don't add an empty fragment to the list

this should fix the asserts reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9325
and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8352

svn path=/trunk/; revision=52969
2013-10-29 21:50:21 +00:00
Martin Kaiser
41182561dd separate function for dissecting the adaptation field
svn path=/trunk/; revision=52967
2013-10-29 21:40:09 +00:00
Martin Kaiser
6ef5eb635c TABs -> spaces
add editor modelines

svn path=/trunk/; revision=52934
2013-10-28 21:49:56 +00:00
Martin Kaiser
5587250676 make Pointer filterable
svn path=/trunk/; revision=52925
2013-10-28 17:16:43 +00:00
Martin Kaiser
8367a1acbd packed_analysis_data_t -> packet_analysis_data_t
svn path=/trunk/; revision=52924
2013-10-28 17:13:13 +00:00
Martin Kaiser
1a7a05ab55 correct typos
svn path=/trunk/; revision=52923
2013-10-28 17:10:09 +00:00
Martin Kaiser
8a2b9d87f3 remove unnecessary return; lines
svn path=/trunk/; revision=52922
2013-10-28 17:08:55 +00:00
Michael Mann
9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Alexis La Goutte
9c43ccd371 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51668
2013-09-02 23:13:12 +00:00
Evan Huus
14e6dddcdc Replace some emem with wmem.
svn path=/trunk/; revision=51512
2013-08-25 14:23:13 +00:00
Jakub Zawadzki
f4bcbeb9f2 Keep result of [new_]register_dissector in some dissectors. [2 of x]
(don't create new dissector handle if we can use already existing one)

svn path=/trunk/; revision=51159
2013-08-05 19:09:44 +00:00
Jakub Zawadzki
a18172147f Remove fragment_data, add fragment_head, fragment_item - for now alias it to the same structure.
This is begin of work to split fragment head and fragments items.

svn path=/trunk/; revision=50708
2013-07-17 21:12:24 +00:00
Chris Maynard
e37533ced7 Fix warnings: comma at end of enumerator list.
svn path=/trunk/; revision=50640
2013-07-15 21:37:55 +00:00
Jakub Zawadzki
2671b8a398 fix: packet-mp2t.c:489: warning: implicit declaration of function 'tvb_new_proxy'
svn path=/trunk/; revision=50581
2013-07-14 15:20:09 +00:00
Jakub Zawadzki
c766e78cfa Rewrite reassemble API to use TVBs instead of raw data.
(it seems to be working for TCP ^^)

svn path=/trunk/; revision=50580
2013-07-14 14:42:05 +00:00
Michael Mann
ea177a2575 Batch of filterable expert infos
svn path=/trunk/; revision=49596
2013-05-27 17:30:43 +00:00
Anders Broman
85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +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
b7617b32eb From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48383
2013-03-17 22:16:39 +00:00
Guy Harris
53fffe0414 Get rid of unnecessary includes of "packet-frame.h".
svn path=/trunk/; revision=47925
2013-02-27 23:02:18 +00:00
Bill Meier
96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier
1823aa007c it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47891
2013-02-26 01:06:19 +00:00
Bill Meier
959ae3d687 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).


svn path=/trunk/; revision=47391
2013-01-31 18:35:06 +00:00
Bill Meier
c929e42eb4 Fix various instances of unused hf[] entries found
by checkhf.

svn path=/trunk/; revision=47312
2013-01-26 22:43:34 +00:00
Guy Harris
b98d44d71f If there's no packet data, there's nothing to check to see whether this
is an MPEG-2 transport packet, so don't treat it as one.

svn path=/trunk/; revision=46733
2012-12-25 12:00:32 +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
Bill Meier
163ca72bab From Роман Донченко: "Adaptation" misspelled as "adaption"
In MPEG-related dissectors, "adaption" is used instead of "adaptation" several
times. See patch (it also fixes an unrelated typo that happens to be on the
same line).

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

svn path=/trunk/; revision=43539
2012-06-29 01:55:05 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Bill Meier
2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Anders Broman
e4403efbdb From Guy Martin:
Fix a few bugs in packet-mp2t

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

svn path=/trunk/; revision=41597
2012-03-16 11:51:00 +00:00
Bill Meier
87cf82e056 Use tvb_new_subset_remaining() rather than tvb_new_subset();
#include <styring.h> not req'd (in a few cases);
Minor reformating & whitespace cleanup.

svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
Guy Harris
1f971df298 Close parentheses in expert info.
svn path=/trunk/; revision=41002
2012-02-12 20:44:51 +00:00
Guy Harris
f36fec7381 Don't trust the pointer value in a packet; it could be invalid, and this
could cause an unsigned length value to be reduced by more than its
value, turning it into a very large value.

I couldn't exactly reproduce bug 6833, but it was due to an attempt to
allocate 4294967110 bytes, and this bug caused remaining_len to equal
4294967110, and it would try to create a reassembled packet tvbuff of
that size, so I'm guessing this fixes 6833.

svn path=/trunk/; revision=41001
2012-02-12 20:03:37 +00:00
Jeff Morriss
d51510c1a3 From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :
Remove some duplicate checks.

svn path=/trunk/; revision=40922
2012-02-07 19:14:45 +00:00
Jeff Morriss
76efc975bd Fix the fuzz failure reported in in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6799 :
Ensure that the payload length handed to the reassembly routines doesn't go
negative/very-large-positive.

svn path=/trunk/; revision=40919
2012-02-07 16:53:22 +00:00
Jörg Mayer
dca8952441 Fix "variable set but not used" warnings turned error. In at least
one case this looks like a logic bug and should be investigated.

svn path=/trunk/; revision=40914
2012-02-07 09:03:14 +00:00
Anders Broman
3f27726353 From Guy Martin:
Updated MP2T (MPEG2-TS) dissector

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

svn path=/trunk/; revision=40885
2012-02-06 19:21:11 +00:00
Chris Maynard
1153ff7b56 Fix incorrect "pos=0" pdml values. Resolves the issue reported in comment 4 of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2432 and closes the bug.
svn path=/trunk/; revision=40161
2011-12-12 18:35:49 +00:00
Bill Meier
2103e7f38a tvb_[reported_]length_remaining can return -1
svn path=/trunk/; revision=39870
2011-11-15 21:22:01 +00:00
Bill Meier
794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier
293049dfba Do some conversions of proto_tree_add_item() 'encoding' arg.
(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN


svn path=/trunk/; revision=39442
2011-10-16 23:38:49 +00:00