Commit Graph

45202 Commits

Author SHA1 Message Date
Jeff Morriss 663e6a6d6b Make it so that alternate-prefix RPM builds actually work.
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").

(Maybe this approach should also be used for the other options in the .spec
file.)

Only clean up if building the RPM was successful.

svn path=/trunk/; revision=47957
2013-02-28 23:02:38 +00:00
Michael Mann 7eac6729d8 Replace proto_tree_add_text with proto_tree_add_item/expert_info
svn path=/trunk/; revision=47956
2013-02-28 23:01:31 +00:00
Pascal Quantin 8ed55b8eef Fix dissection of feedback with large CID
svn path=/trunk/; revision=47955
2013-02-28 22:22:52 +00:00
Balint Reczey 4cf12b41be Revert "Fix MSVC build errors related to symbol visibility"
This reverts commit r47952.
The problem was different from what I originally thought, thus
the commit was obsolete.

svn path=/trunk/; revision=47954
2013-02-28 22:17:06 +00:00
Balint Reczey 383d73be05 Add -DWS_BUILD_DLL to wiretap Windows builds
It fixes symbol exporting from DLLs.

svn path=/trunk/; revision=47953
2013-02-28 21:42:23 +00:00
Balint Reczey ccc76ff07f Fix MSVC build errors related to symbol visibility
svn path=/trunk/; revision=47952
2013-02-28 21:11:32 +00:00
Pascal Quantin 969ec935fa Add SVN keywords
svn path=/trunk/; revision=47951
2013-02-28 21:05:27 +00:00
Michael Mann 4d1022a5ac Use proto_tree_add_item (or similar) instead of proto_item_add_text.
svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
Michael Mann 7cf5c59d6e Convert proto_item_add_text to proto_item_add_item.
General whitespace cleanup, add modelines.

svn path=/trunk/; revision=47949
2013-02-28 20:07:15 +00:00
Balint Reczey aa659985a5 Export libwiretap symbols using WS_DLL_PUBLIC define
TODO: hide flex-generated functions

svn path=/trunk/; revision=47948
2013-02-28 19:35:59 +00:00
Guy Harris 6c29b9edd6 Update a comment.
svn path=/trunk/; revision=47947
2013-02-28 18:13:41 +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 6bf8fcfad4 Avoid a packet rescan if we don't have an AirPcap adapter.
svn path=/trunk/; revision=47945
2013-02-28 17:55:07 +00:00
Jeff Morriss fe16b9835f Be a little quieter (and do a little more cleanup) when building RPMs.
svn path=/trunk/; revision=47944
2013-02-28 17:29:10 +00:00
Jeff Morriss d0992bf8cd Add a #define for the default capture buffer size and use it.
svn path=/trunk/; revision=47942
2013-02-28 15:27:56 +00:00
Balint Reczey 1826e2f219 Add ws_symbol_export.h WIRESHARK_COMMON_INCLUDES to fix failing distcheck
svn path=/trunk/; revision=47941
2013-02-28 15:27:15 +00:00
Jeff Morriss 98ea7d3a8d From Anders: revert r47934: it doesn't work everywhere.
See email discussion on -dev.

svn path=/trunk/; revision=47940
2013-02-28 15:16:46 +00:00
Jeff Morriss 4e2090bdc9 From Anders: more places to increase the default capture buffer size.
svn path=/trunk/; revision=47939
2013-02-28 14:36:41 +00:00
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
Jeff Morriss 018ba4ea65 Default capture buffer size is now 2MB.
svn path=/trunk/; revision=47937
2013-02-28 13:59:47 +00:00
Pascal Quantin 7adefca1bb From Hadriel Kaplan via https://www.wireshark.org/lists/wireshark-dev/201302/msg00216.html :
Fix dissection of method name in case of RAck header

svn path=/trunk/; revision=47936
2013-02-28 08:13:40 +00:00
Anders Broman 1a4fb17e13 Update the text of dumpcap -h, default buffer size should be 2 MB.
svn path=/trunk/; revision=47935
2013-02-28 06:37:41 +00:00
Gerald Combs 2f47e63a88 str_util.c: Although the glib documentation doesn't explicitly say so,
it looks like the thousands grouping (') modifier is supported so use it
in format_size.

capinfos.c: Set our locale.

svn path=/trunk/; revision=47934
2013-02-28 04:44:38 +00:00
Guy Harris fb8f5b815a Combine all the flags fields into one field, and get rid of the
commented-out/#if-ed-out "Data1" field, as it's the same field.

Give the flags in that field names including "flags".

Shuffle the fields around to put "Flags" (a/k/a Data1) where Data1 was,
and put the bits in that field after it.

Update the URL for the spec at IBM.

Reformat the entries in hf_netb[] to use the same style.

svn path=/trunk/; revision=47933
2013-02-28 04:29:43 +00:00
Chris Maynard 764cb1f99a Fix Coverity CID 719419: Dereference after null check.
svn path=/trunk/; revision=47932
2013-02-28 03:15:57 +00:00
Chris Maynard e91a73e2c0 Fix Coverity CID 280377: Dead default in switch.
svn path=/trunk/; revision=47931
2013-02-28 02:48:16 +00:00
Chris Maynard 97cc60f8fa Fix Coverity CID 280366: Dead default in switch.
svn path=/trunk/; revision=47930
2013-02-28 02:37:14 +00:00
Guy Harris c522bb09c2 The LDAP dissector uses register_frame_end_routine(), so it needs to
include packet-frame.h.

svn path=/trunk/; revision=47928
2013-02-28 00:09:26 +00:00
Pascal Quantin 7fdbff4822 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8378 :
A detailed diagnostic information contains either a SMS-SUBMIT-REPORT or a SMS-DELIVERY-REPORT. Set P2P direction accordingly.

svn path=/trunk/; revision=47927
2013-02-27 23:08:17 +00:00
Guy Harris 8c15ade43b Include <epan/show_exception.h>, as show_exception() is called.
svn path=/trunk/; revision=47926
2013-02-27 23:07:25 +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
Guy Harris 6b629c4d92 Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.
 
If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
Guy Harris 97a0ad8eab For subvectors, make a top-level item to cover the entire subvector, and
put the length, identifier, and value as visible sub-items underneath
it.  If the length is bad, add an expert info indication under the item
for the length, rather than using proto_malformed.  Add checks for the
lengths of each type of subvector.

Add some more subvector types from IEEE 802.5-1998, and use the names
from that spec.

svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
Guy Harris cb2d1c52a9 When decompressing, put an entry into the protocol tree that covers all
the compressed data, put the entries for particular parts of that data
under that entry, and, when we have a problem decompressing, add an
expert info item to that entry, rather than just adding text or using
proto_malformed.  Do so for *all* decompression problems; in particular,
check for decompressed_entry() returning NULL, which it can do.

tvb_new_child_real_data() won't throw an exception, so don't bother
checking for that.

If, after the first pass, we can't find the uncompressed data for a
frame, report it as a dissector bug.

Check whether we have room for a byte in the uncompressed data buffer
*before* copying it.

Other cleanups.

svn path=/trunk/; revision=47922
2013-02-27 22:04:40 +00:00
Pascal Quantin b5bbd0712e From J. Schoenwaelder via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8410 :
Fix dissection of flowDurationMicroseconds in Netflow dissector

svn path=/trunk/; revision=47921
2013-02-27 21:19:37 +00:00
Anders Broman 6cbcb0d94d Increase the default buffer size to 2MB.
svn path=/trunk/; revision=47920
2013-02-27 20:38:43 +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
Chris Maynard a4e2819e27 Use ENC_NA for single byte fields, as that appears to be the generally agreed upon convention. Add modelines.
#BACKPORT(1.8) + r47915


svn path=/trunk/; revision=47918
2013-02-27 16:18:16 +00:00
Bill Meier 6533174856 Use consistent indentation; Add editor modelines.
svn path=/trunk/; revision=47917
2013-02-27 16:15:18 +00:00
Jeff Morriss 98ce5836a4 Add a %prefix option for users who want to (easily) configure Wireshark to
install in a non-standard location.

Assume the desktop-integration stuff goes in /usr (regardless of our prefix).

This (with r47914) fixes RPM generation when someone uses a prefix other than
/usr .


Also: run desktop-file-validate on the wireshark.desktop file (just in case it
wasn't installed with desktop-file-install).

svn path=/trunk/; revision=47916
2013-02-27 16:12:19 +00:00
Michael Mann d48920d42a Protocol is ENC_BIG_ENDIAN, adjust accordingly.
Bug 8407 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8407)

svn path=/trunk/; revision=47915
2013-02-27 16:08:48 +00:00
Jeff Morriss f9324d29e7 Don't install the desktop-integration files in our (Wireshark's) data
directory (which is based on our installation prefix): there's no guarantee
that the desktop also uses the same prefix.

Add a note about how we might be able to find the desktop's data directory
should anyone actually run GNOME with a prefix other than /usr .

Also use 'desktop-file-install' to install the desktop file (if configure
found that command).

svn path=/trunk/; revision=47914
2013-02-27 16:08:16 +00:00
Anders Broman 7465ad1572 Fix
- warning: unused parameter 'item'.
- warning: format not a string literal and no format arguments.

svn path=/trunk/; revision=47912
2013-02-27 05:53:46 +00:00
Michael Mann e5aad204f8 Fix example Lua plugin that passes wrong argument in register_menu function
From Hadriel Kaplan, bug 8201 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8201)

svn path=/trunk/; revision=47911
2013-02-27 04:29:21 +00:00
Michael Mann f89cb20e2b Replace proto_tree_add_text with proto_tree_add_item + expert_info. Not enough to pacify checkAPIs.pl standards, but its a vast improvement.
svn path=/trunk/; revision=47910
2013-02-27 03:58:23 +00:00
Michael Mann 07a9b935de Increase use of proto_tree_add_item (mostly replacing proto_tree_add_text)
svn path=/trunk/; revision=47909
2013-02-27 03:37:45 +00:00
Michael Mann a38cf513de Replace proto_tree_add_text with proto_tree_add_item + expert_info
svn path=/trunk/; revision=47908
2013-02-27 03:35:04 +00:00
Jeff Morriss 6e79875c8d Look for desktop-file-install (to be used when installing wireshark.desktop).
svn path=/trunk/; revision=47907
2013-02-27 02:32:00 +00:00
Jeff Morriss 609c567a50 Put a trailing semicolon on the MimeType line (to satisfy desktop-file-validate).
svn path=/trunk/; revision=47906
2013-02-26 22:13:58 +00:00
Jakub Zawadzki b2c4ab3b2a Move pack_flags to better place.
Reduce sizeof(frame_data) from 136 to 128 (AMD64).

svn path=/trunk/; revision=47905
2013-02-26 21:32:11 +00:00