Commit Graph

45276 Commits

Author SHA1 Message Date
Anders Broman 85973068cc From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48038
2013-03-03 17:14:19 +00:00
Gerald Combs 7176e06a63 [Automatic manuf, services and enterprise-numbers update for 2013-03-03]
svn path=/trunk/; revision=48035
2013-03-03 15:03:27 +00:00
Evan Huus 1b4cffc527 Add modelines.
Fix issues caught by cppcheck:
- Remove unused variable.
- Make sure to fclose output file.

svn path=/trunk/; revision=48034
2013-03-03 14:03:00 +00:00
Jakub Zawadzki e0d19cb73a Publish initial version of mine npl (Network Parsing Language) generator sources.
Parser pass almost all npl files from Network Monitor Parsers 3.4.2774 package, 
but but not all data is stored in AST.
Work on wireshark code enerator has been started, but it need much more work.

Beware! It's ugly, putting it to wireshark repo, just to not lose sources :)
(feel free to improve/review it).

svn path=/trunk/; revision=48033
2013-03-03 11:59:14 +00:00
Michael Mann 78fe8ac7e9 Replace proto_tree_add_text "error messages" with expert_add_info_format
svn path=/trunk/; revision=48032
2013-03-03 07:29:28 +00:00
Evan Huus 14ab37223b Fix case where we were leaking frame_data if, during 2-pass analysis,
a frame did not pass the filter.

svn path=/trunk/; revision=48031
2013-03-03 03:29:40 +00:00
Evan Huus efaa8d71a5 Rewrite free_frame_data_sequence to use recursion instead of manually nested
loops.

This allows us to do the calculations to actually free all the frame data
instances correctly - the previous version was missing many of them,
leading to large memory leaks when given lots of frames that made use of
p_add_proto_data.

Fixes the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885

svn path=/trunk/; revision=48030
2013-03-03 03:26:09 +00:00
Guy Harris 607bb97056 The general convention for "interpreted" fields, where we display a more
human-friendly version of the value followed by the raw value, is to put
the human-friendly name first, with the raw value after it in
parentheses.  Follow that convention for the command code.

svn path=/trunk/; revision=48029
2013-03-03 01:31:49 +00:00
Guy Harris 4d978fd997 proto_tree_add_uint_format_value() puts the field name into the textual
representation for you; the format string should not include the field
name.

Add protocol items to the SliMP3 tree, not to the top-level tree.

If we're fetching a 16-bit value from the protocol tree and multiplying
it by 2, it won't necessarily fit in a guint16; make the variables used
for that guints.

The sequence field of the MP3 data ack packet isn't being fetched from
the packet, so just use proto_tree_add_item() for it (rather than using
a value fetched for a previous field).

Use %u to format unsigned values.

svn path=/trunk/; revision=48028
2013-03-03 01:17:26 +00:00
Pascal Quantin eb9e18a8be Fix copy-paste error introduced in r48021
svn path=/trunk/; revision=48027
2013-03-02 23:30:21 +00:00
Pascal Quantin 2eb92f7b86 Revert file committed by mistake in r48023
svn path=/trunk/; revision=48026
2013-03-02 23:22:19 +00:00
Pascal Quantin 95938370bd From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from tvbparse and tvbuff

svn path=/trunk/; revision=48025
2013-03-02 23:05:27 +00:00
Pascal Quantin 5a37615eeb Remove a useless pointer
svn path=/trunk/; revision=48024
2013-03-02 22:59:50 +00:00
Pascal Quantin 0a17799d61 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code

svn path=/trunk/; revision=48023
2013-03-02 22:54:39 +00:00
Balint Reczey 1eb5e1d739 Revert "Make Solaris Studio hide internal shared library symbols by default"
This reverts commit r48020.

svn path=/trunk/; revision=48022
2013-03-02 22:27:40 +00:00
Pascal Quantin fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +00:00
Balint Reczey 73aafe2bc4 Make Solaris Studio hide internal shared library symbols by default
svn path=/trunk/; revision=48020
2013-03-02 22:11:26 +00:00
Evan Huus 5c05c9e0e1 Export some wmem functions using the new scheme.
svn path=/trunk/; revision=48019
2013-03-02 21:29:05 +00:00
Evan Huus a668f359c8 Don't include wmem.h in packet_info.h, just use the struct name directly.
Otherwise wmem tweaks require rebuilding the entire tree for no particular
reason.

svn path=/trunk/; revision=48018
2013-03-02 21:28:29 +00:00
Evan Huus 16bda3caf4 Don't pass -v straight to valgrind, it's rarely useful. Just increasing
num-callers is usually enough.

svn path=/trunk/; revision=48017
2013-03-02 21:16:32 +00:00
Michael Mann 1658b20e44 Convert at least enough proto_tree_add_text to proto_tree_add_item/expert_info to passify checkAPIs.pl.
Removed check_col calls.

svn path=/trunk/; revision=48016
2013-03-02 21:05:32 +00:00
Guy Harris 47b4b15d80 Move the setting of pt to where it was before the changes, so it's
before the point at which it's added to the protocol tree.

Put the ATM channel in the ATM tree rather than the top-level tree.

Fix the name for the CPI field (copy-and-pasteo).

svn path=/trunk/; revision=48015
2013-03-02 21:01:08 +00:00
Anders Broman 41d6d12497 Rearrang the code to align with sqlite lemon and copy over a few more things.
svn path=/trunk/; revision=48014
2013-03-02 19:34:50 +00:00
Anders Broman 4f5d04e115 From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48013
2013-03-02 19:21:38 +00:00
Bill Meier 48527645c9 Minor tweaks to "ColorSelection" UI:
- For each choice (marked/ignored fg/bg) always show orig color as "prev color";
 - Improve spacing between widgets.

Also;
 - Add a few explanatory comments;
 - Add editor modelines;
 - Cleanup whitespace/long-lines/formatting.

svn path=/trunk/; revision=48012
2013-03-02 17:47:56 +00:00
Evan Huus b20db86a6f Define a new exception for reassembly errors, and throw it in several cases
instead of using DISSECTOR_ASSERT. When a dissector passes bad data to the
reassembly machine, that isn't necessarily the dissector's fault - the data may
come straight from the packet, and the dissector may not have enough information
to know it's bad without telling the reassembly machine in the first place.

Also fix a bug in the reassembly machine. If it were given a fragment and all of
the following conditions were met:
- the other associated fragments were already marked as done (reassembled)
- the fragment went beyond the end of the conceptual reassembled buffer
- the dissector had not set the PARTIAL_REASSEMBLY flag
then the reassembly machine would incorrectly think there was an overlap and
run past the end of the already-reassembled buffer.

Should fix the rest of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380

#BACKPORT
This is probably too big and intrusive to backport directly, and parts of it
will need adapting anyways since reassemble.c has changed. But the bug exists
and crashes in 1.6 and 1.8, so we'll have to do something.


svn path=/trunk/; revision=48011
2013-03-02 16:39:56 +00:00
Evan Huus 105dbc4027 Pass the same offset to tvb_ensure_bytes_exist and fragment_add.
One minor part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380

svn path=/trunk/; revision=48010
2013-03-02 16:23:21 +00:00
Michael Mann f473d9a3d7 General cleanup including:
1. Convert proto_tree_add_text to proto_tree_add_item/expert info
2. Change to "new style" dissector
3. Use standard malformed packet interface

Reviewed by Francesco Fondelli

svn path=/trunk/; revision=48009
2013-03-02 16:00:43 +00:00
Anders Broman 9991973c37 Use explicit casts.
svn path=/trunk/; revision=48008
2013-03-02 14:51:04 +00:00
Pascal Quantin 240af26981 Fix a copy/paste error and factorize dissection of extension header length and next extension header
svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
Anders Broman c5ee81098c From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48006
2013-03-02 12:10:56 +00:00
Anders Broman bd2b6b9964 Wite space changes.
svn path=/trunk/; revision=48005
2013-03-02 12:09:50 +00:00
Anders Broman 599d2e8a9c From Lakshmi Narayana Madala :
GTP dissector enhanced to support UDP Port extension header.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418

svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
Anders Broman b9cb9968f2 lemon.c:3176:8: error: attempt to free a non-heap object ‘buf’
svn path=/trunk/; revision=48003
2013-03-02 11:32:25 +00:00
Anders Broman 310b495ff3 Becport more code.
svn path=/trunk/; revision=48002
2013-03-02 10:56:17 +00:00
Anders Broman ad1ec109ed Missed one place.
svn path=/trunk/; revision=48001
2013-03-02 10:03:43 +00:00
Anders Broman da070427d9 lemon.c:78:14: note: expected ‘int (*)(const void *, const void *)’ but argument is of type ‘int (*)(const char *, const char *)’
svn path=/trunk/; revision=48000
2013-03-02 09:54:52 +00:00
Anders Broman 2eb5d3eb04 From beroset:
remove C++ incompatibilities from frame_data_sequence.c

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

svn path=/trunk/; revision=47999
2013-03-02 09:06:03 +00:00
Anders Broman 99d88bd54b More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47998
2013-03-02 09:04:52 +00:00
Anders Broman 7c3a122e37 lemon.c:4628:5: error: conflicting types for ‘Configcmp’
lemon.c:366:5: note: previous declaration of ‘Configcmp’ was here

svn path=/trunk/; revision=47997
2013-03-02 08:40:49 +00:00
Anders Broman 18c724b0ad More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47996
2013-03-02 08:19:31 +00:00
Balint Reczey 1b1716638a Move expert_group_vals expert_severity_vals constant definitions to expert.h
svn path=/trunk/; revision=47995
2013-03-02 01:00:20 +00:00
Balint Reczey 27320f87cb Remove asn1/dsp from autotools Makefile system since it lacks distclean target
svn path=/trunk/; revision=47994
2013-03-02 00:35:57 +00:00
Anders Broman a5c53e847e Backports from sqlite lemon.
svn path=/trunk/; revision=47993
2013-03-01 23:54:06 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Jeff Morriss 0b8d70bfb7 Fix a cut-n-pasteo and add a const cast to quiet a warning.
svn path=/trunk/; revision=47991
2013-03-01 22:58:23 +00:00
Evan Huus 0e67f0c7a1 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8338
Centralize logic related to per-interface conversations, and expose it for use
by class-specific dissectors.

Class-specific descriptor dissectors also need to know the interface in whose
context they are called to work.

This is a prerequisite for a USB Video Class dissector, which needs to decode
many class-specific descriptors.

svn path=/trunk/; revision=47990
2013-03-01 22:57:13 +00:00
Anders Broman ea76d02cb2 Backport const casts from sqlite lemon.
svn path=/trunk/; revision=47989
2013-03-01 21:37:48 +00:00
Anders Broman 8dbab6179d From beroset:
remove C++ incompatibilities from packet-xml.c

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

svn path=/trunk/; revision=47988
2013-03-01 20:36:59 +00:00
Anders Broman 44993045a2 try to remove C++ incompatibilities from lemon
svn path=/trunk/; revision=47987
2013-03-01 20:32:20 +00:00