metze/wireshark/wip.git
11 years agoAdd two missing NULL checks, fixes most of
Evan Huus [Sun, 10 Mar 2013 13:40:50 +0000 (13:40 -0000)]
Add two missing NULL checks, fixes most of

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

svn path=/trunk/; revision=48224

11 years agoMake the memory limit (in bytes or packets) used for storing packets
Michael Tüxen [Sun, 10 Mar 2013 11:57:40 +0000 (11:57 -0000)]
Make the memory limit (in bytes or packets) used for storing packets
configurable via command line options and print specific drop numbers
at the end. This allows to tune the buffering when using multiple
threads.
This also fixes a logic arrow in enforcing the limits.
The patch for the enhanced counters is from Anders Broman.

svn path=/trunk/; revision=48223

11 years agoOnly cast the variable after checking it.
Michael Tüxen [Sun, 10 Mar 2013 11:51:25 +0000 (11:51 -0000)]
Only cast the variable after checking it.

svn path=/trunk/; revision=48222

11 years agoAdd -t to synopsis.
Michael Tüxen [Sun, 10 Mar 2013 11:40:46 +0000 (11:40 -0000)]
Add -t to synopsis.

svn path=/trunk/; revision=48221

11 years agoAdd the appropriate new WS_DLL_* declarations to the wmem API.
Evan Huus [Sat, 9 Mar 2013 20:25:44 +0000 (20:25 -0000)]
Add the appropriate new WS_DLL_* declarations to the wmem API.

svn path=/trunk/; revision=48220

11 years agoRemove the wmem slab. It was an optimization mimicking the emem slab
Evan Huus [Sat, 9 Mar 2013 20:16:33 +0000 (20:16 -0000)]
Remove the wmem slab. It was an optimization mimicking the emem slab
(removed in r48218) which did nothing particularly useful. Also lets us remove
another debugging environment variable.

svn path=/trunk/; revision=48219

11 years agoRemove the emem slab feature (sl_* functions) completely, replacing it with
Evan Huus [Sat, 9 Mar 2013 20:02:19 +0000 (20:02 -0000)]
Remove the emem slab feature (sl_* functions) completely, replacing it with
glib memory slices.

- We weren't doing anything with the emem slab that couldn't be done with glib
  slices.
- Removes a fair bit of code as well as one debugging environment variable.
- Glib slices are much cache-friendlier and are multi-threading friendly (if
  we ever go there).
- Allows glib to actually return slices to the OS on occasion. The emem slab
  would hold onto its memory forever which resulted in a great deal of wasted
  memory after closing a large file.

svn path=/trunk/; revision=48218

11 years agoUse explicit casts.
Anders Broman [Sat, 9 Mar 2013 17:33:15 +0000 (17:33 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48217

11 years ago[NPL] Misc fixes
Jakub Zawadzki [Sat, 9 Mar 2013 15:53:30 +0000 (15:53 -0000)]
[NPL] Misc fixes

svn path=/trunk/; revision=48216

11 years agoFrom Thomas Wiens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8455
Evan Huus [Sat, 9 Mar 2013 13:47:08 +0000 (13:47 -0000)]
From Thomas Wiens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8455

Don't add an extra 16 to offset, we've been updating it as we go. Fixes cases
where valid AMS packets were marked as malformed.

svn path=/trunk/; revision=48215

11 years agoTwo instances of s/delete/delete_id/ to satisfy C++ that were missed in
Evan Huus [Sat, 9 Mar 2013 12:21:00 +0000 (12:21 -0000)]
Two instances of s/delete/delete_id/ to satisfy C++ that were missed in
r48212 and were causing build failures.

svn path=/trunk/; revision=48214

11 years agoUpdate lex and yacc
Anders Broman [Sat, 9 Mar 2013 10:10:32 +0000 (10:10 -0000)]
Update lex and yacc

svn path=/trunk/; revision=48213

11 years agoUse explicit casts.
Anders Broman [Sat, 9 Mar 2013 10:09:58 +0000 (10:09 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48212

11 years agoMake checkAPIs Happy
Alexis La Goutte [Sat, 9 Mar 2013 09:45:28 +0000 (09:45 -0000)]
Make checkAPIs Happy

svn path=/trunk/; revision=48211

11 years agoFrom Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATU...
Alexis La Goutte [Sat, 9 Mar 2013 08:44:14 +0000 (08:44 -0000)]
From Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATURE IMPLEMENTED: SMB2 SUPPORT FOR EXPORT->OBJECTS->SMB

Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.

Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2

svn path=/trunk/; revision=48210

11 years agoPut items in the tree we just created, mark an unused param as _U_.
Evan Huus [Sat, 9 Mar 2013 03:31:27 +0000 (03:31 -0000)]
Put items in the tree we just created, mark an unused param as _U_.

Fixes GCC build.

svn path=/trunk/; revision=48209

11 years agoUpdate URLs to specs.
Jeff Morriss [Sat, 9 Mar 2013 01:35:58 +0000 (01:35 -0000)]
Update URLs to specs.

svn path=/trunk/; revision=48208

11 years agoSwitch to WinPcap 4.1.3.
Gerald Combs [Sat, 9 Mar 2013 01:20:09 +0000 (01:20 -0000)]
Switch to WinPcap 4.1.3.

svn path=/trunk/; revision=48207

11 years agoRTPS Cleanup, Part 2
Michael Mann [Sat, 9 Mar 2013 00:21:56 +0000 (00:21 -0000)]
RTPS Cleanup, Part 2

1. Convert more proto_tree_add_text to proto_tree_add_<something else>/expert_info.  checkAPIs.pl is happy (for packet-rtps.c), but the raw number is a bit deceiving because of macros and wrappers.
2. Fixed the offending "uses snprintf + strlen to assemble strings" in packet-rtps.c.  The exact same code is used in packet-rtps2.c, so just proper refactoring will fix it.  There is still too much unnecessary use of g_snprintf/g_strlcpy/strlen, but that's for a later date.
3. Removed most of the "useless" wrapper functions.  Again, the number of proto_tree_add_text is deceiving, so the number of hfs that really need to be created is much larger.
4. Whitespace cleanup.   Removed a lot of whitespace so I could see more code on the screen, to help determine duplication between packet-rtps.c and packet-rtps2.c  Comments/descriptions of fields remain untouched.

The more I trim, the more I think this should all be in a single dissector file, which will be the goal of the next update.  Trying to patch this in somewhat manageable chunks.

Also need to submit sample traces generated for (fuzz)testing.

svn path=/trunk/; revision=48206

11 years agoFrom Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Evan Huus [Sat, 9 Mar 2013 00:10:14 +0000 (00:10 -0000)]
From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414

Fix minor cut-and-paste error in USB-Video dissector caught by cppcheck.

svn path=/trunk/; revision=48205

11 years agofreekdesktop.org says all themes must fall back to 'hicolor' if they don't find
Jeff Morriss [Fri, 8 Mar 2013 23:40:37 +0000 (23:40 -0000)]
freekdesktop.org says all themes must fall back to 'hicolor' if they don't find
a theme-specific icon (and as such hicolor is where applications should
install their icons).  So: don't install some of our icons in the gnome area,
install them all in hicolor.

While we're at it, go ahead and install all the icon sizes we have.

If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.

Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .

svn path=/trunk/; revision=48204

11 years agoThe Icon is not supposed to have an extension; remove it.
Jeff Morriss [Fri, 8 Mar 2013 23:04:52 +0000 (23:04 -0000)]
The Icon is not supposed to have an extension; remove it.

svn path=/trunk/; revision=48203

11 years agoUse explicit casts.
Anders Broman [Fri, 8 Mar 2013 22:10:06 +0000 (22:10 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48202

11 years agoDissect the DCCP header by stepping through it a field at a time and
Guy Harris [Fri, 8 Mar 2013 19:56:41 +0000 (19:56 -0000)]
Dissect the DCCP header by stepping through it a field at a time and
adding the fields to the protocol tree as we fetch them, rather than
fetching a bunch of them up front.  That way, if the packet was cut
short by a snapshot length, we'll dissect what we have.

Create the top-level tree item at the beginning, with an unknown length,
and set the length when we're done.  If we're putting details into that
item, update the item as we process each field; also update the Info
column as we process each field.

Don't use tvb_bytes_exist() to do our own tvbuff bounds-checking; let
the tvbuffs themselves do that.  Do not use it to do header-length
checking; check the actual header length value instead.

Do not fail if the *captured* data in the tvbuff is too short; we're
selected by an IP protocol number, which we can expect to definitively
identify us, not by a transport-layer port number, which is often an
unreliable identifier.

Do header length checks as we go along, and bail as soon as we identify
the header length as wrong.  (We do the first check once we get the X
bit, so we know whether the generic header is 12 or 16 bytes long.)
Treat a too-*large* header as a protocol violation, not a malformed
packet indication.

Use tvb_get_ntoh24() and tvb_get_ntoh48() to fetch the sequence number,
rather than fetching it in pieces and putting them together ourselves.

Correctly pluralize "byte".

Don't use tvb_length_remaining() to check whether we have a payload, use
tvb_reported_length_remaining(), so we base it on whether the packet
actually had the data, not on whether we actually captured it.

svn path=/trunk/; revision=48201

11 years agoAdd a debug function (ifdef'ed out by default) and fix another two bugs found by
Evan Huus [Fri, 8 Mar 2013 18:50:34 +0000 (18:50 -0000)]
Add a debug function (ifdef'ed out by default) and fix another two bugs found by
reading it's output.

svn path=/trunk/; revision=48198

11 years agoAdd another pair of assertions.
Evan Huus [Fri, 8 Mar 2013 18:27:29 +0000 (18:27 -0000)]
Add another pair of assertions.

svn path=/trunk/; revision=48197

11 years agoAdd /SD defaults to every MessageBox call (even if they're commented
Gerald Combs [Fri, 8 Mar 2013 18:23:58 +0000 (18:23 -0000)]
Add /SD defaults to every MessageBox call (even if they're commented
out). Fixes bug 8451.

Don't yell at the user so much.

svn path=/trunk/; revision=48196

11 years agoUpdate to V11.5.0 (2012-12).
Anders Broman [Fri, 8 Mar 2013 17:55:53 +0000 (17:55 -0000)]
Update to V11.5.0 (2012-12).

svn path=/trunk/; revision=48195

11 years agoUse only simple allocators until I can work out the kinks with the block
Evan Huus [Fri, 8 Mar 2013 17:52:13 +0000 (17:52 -0000)]
Use only simple allocators until I can work out the kinks with the block
allocator.

svn path=/trunk/; revision=48194

11 years agoShould fix assertion failure seen by Anders on -dev.
Evan Huus [Fri, 8 Mar 2013 17:51:45 +0000 (17:51 -0000)]
Should fix assertion failure seen by Anders on -dev.

https://www.wireshark.org/lists/wireshark-dev/201303/msg00081.html

svn path=/trunk/; revision=48193

11 years agoAdd new SIP headers.
Anders Broman [Fri, 8 Mar 2013 16:53:14 +0000 (16:53 -0000)]
Add new SIP headers.

svn path=/trunk/; revision=48192

11 years agoSwitch to c-ares 1.9.1.
Gerald Combs [Fri, 8 Mar 2013 16:51:21 +0000 (16:51 -0000)]
Switch to c-ares 1.9.1.

svn path=/trunk/; revision=48191

11 years agoFrom Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Evan Huus [Fri, 8 Mar 2013 14:25:55 +0000 (14:25 -0000)]
From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414

Dissector for USBVIDEO.

svn path=/trunk/; revision=48190

11 years agoDon't try to show an IP address if none is present.
Irene Rüngeler [Fri, 8 Mar 2013 09:00:48 +0000 (09:00 -0000)]
Don't try to show an IP address if none is present.

svn path=/trunk/; revision=48189

11 years agoPrettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer
Pascal Quantin [Fri, 8 Mar 2013 08:19:26 +0000 (08:19 -0000)]
Prettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer

svn path=/trunk/; revision=48188

11 years agoUse explicit casts.
Anders Broman [Fri, 8 Mar 2013 07:09:39 +0000 (07:09 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48187

11 years agoUse explicit casts.
Anders Broman [Fri, 8 Mar 2013 06:07:26 +0000 (06:07 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48186

11 years agoFrom beroset:
Anders Broman [Fri, 8 Mar 2013 06:06:56 +0000 (06:06 -0000)]
From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48185

11 years agoFrom Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Evan Huus [Thu, 7 Mar 2013 23:57:43 +0000 (23:57 -0000)]
From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431

Add a few member variables to the USB conversation structure, necessary
for a USB PTP dissector.

svn path=/trunk/; revision=48184

11 years agoUse explicit casts.
Anders Broman [Thu, 7 Mar 2013 22:57:36 +0000 (22:57 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48183

11 years agoMake the prefernce settings work.
Anders Broman [Thu, 7 Mar 2013 22:57:11 +0000 (22:57 -0000)]
Make the prefernce settings work.

svn path=/trunk/; revision=48182

11 years agocorrectly mark the payload for unknown extension tags
Martin Kaiser [Thu, 7 Mar 2013 22:06:18 +0000 (22:06 -0000)]
correctly mark the payload for unknown extension tags
(fixes a bug introduced by my previous commit)

svn path=/trunk/; revision=48181

11 years agoProperly pluralize "octet" for the Extended Capabilities tag.
Guy Harris [Thu, 7 Mar 2013 21:42:01 +0000 (21:42 -0000)]
Properly pluralize "octet" for the Extended Capabilities tag.

If we don't decode a tag, just say "Undecoded" on the top-level item;
the tag name or number is already on that item, and the length is
underneath it.

svn path=/trunk/; revision=48180

11 years agoUse explicit casts.
Anders Broman [Thu, 7 Mar 2013 19:52:33 +0000 (19:52 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48179

11 years ago[NPL] Simplify parser for EXPRESSION_FIELD (Expression, ".", ID)
Jakub Zawadzki [Thu, 7 Mar 2013 19:38:35 +0000 (19:38 -0000)]
[NPL] Simplify parser for EXPRESSION_FIELD (Expression, ".", ID)

svn path=/trunk/; revision=48178

11 years agoFix proto stats window size allocation so it works with GTK3.
Bill Meier [Thu, 7 Mar 2013 19:25:36 +0000 (19:25 -0000)]
Fix proto stats window size allocation so it works with GTK3.
(adapted from a suggested patch by Peter Hatina in Bug #8315)
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315)

From me:
 Widen the default width to show all the columns when the window is opened.

svn path=/trunk/; revision=48177

11 years agodissect Supplementary Audio Descriptor as defined in EN300468
Martin Kaiser [Thu, 7 Mar 2013 19:14:11 +0000 (19:14 -0000)]
dissect Supplementary Audio Descriptor as defined in EN300468

svn path=/trunk/; revision=48176

11 years agouse defines for extension tags
Martin Kaiser [Thu, 7 Mar 2013 19:05:45 +0000 (19:05 -0000)]
use defines for extension tags

svn path=/trunk/; revision=48175

11 years agoFrom Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Pascal Quantin [Thu, 7 Mar 2013 18:37:58 +0000 (18:37 -0000)]
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from ssl and ssh files

svn path=/trunk/; revision=48174

11 years agoFrom Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Pascal Quantin [Thu, 7 Mar 2013 18:25:25 +0000 (18:25 -0000)]
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from capture.c

svn path=/trunk/; revision=48173

11 years agoFrom Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Pascal Quantin [Thu, 7 Mar 2013 18:09:23 +0000 (18:09 -0000)]
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-nfs.c

svn path=/trunk/; revision=48172

11 years agoRevert part of r48021: those hunks are no more needed with r48170
Pascal Quantin [Thu, 7 Mar 2013 17:39:20 +0000 (17:39 -0000)]
Revert part of r48021: those hunks are no more needed with r48170

svn path=/trunk/; revision=48171

11 years agoFrom Balint:
Gerald Combs [Thu, 7 Mar 2013 17:20:12 +0000 (17:20 -0000)]
From Balint:

[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.

This reverts commit r48158.

[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly

From me:

Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.

svn path=/trunk/; revision=48170

11 years agoTweak the handling of resizing the window.
Bill Meier [Thu, 7 Mar 2013 15:27:24 +0000 (15:27 -0000)]
Tweak the handling of resizing the window.

svn path=/trunk/; revision=48169

11 years agoUse if_string instead og if_string->name.
Irene Rüngeler [Thu, 7 Mar 2013 14:11:45 +0000 (14:11 -0000)]
Use if_string instead og if_string->name.

svn path=/trunk/; revision=48168

11 years agoUse ifdefs for buffer size.
Irene Rüngeler [Thu, 7 Mar 2013 13:16:48 +0000 (13:16 -0000)]
Use ifdefs for buffer size.

svn path=/trunk/; revision=48167

11 years agoUse ifdefs for buffer size.
Irene Rüngeler [Thu, 7 Mar 2013 13:15:55 +0000 (13:15 -0000)]
Use ifdefs for buffer size.

svn path=/trunk/; revision=48166

11 years agoMore ifdefs. Maybe this makes the mac buildbots happy.
Michael Tüxen [Thu, 7 Mar 2013 12:55:22 +0000 (12:55 -0000)]
More ifdefs. Maybe this makes the mac buildbots happy.

svn path=/trunk/; revision=48165

11 years agoTry to fix the buildbots.
Michael Tüxen [Thu, 7 Mar 2013 12:06:55 +0000 (12:06 -0000)]
Try to fix the buildbots.
The patch for capture_dlg.c is from Anders...

svn path=/trunk/; revision=48164

11 years agoAdd buffersize and snap length to the preferences.
Irene Rüngeler [Thu, 7 Mar 2013 09:16:55 +0000 (09:16 -0000)]
Add buffersize and snap length to the preferences.

svn path=/trunk/; revision=48163

11 years agoUse explicit casts.
Anders Broman [Thu, 7 Mar 2013 07:48:33 +0000 (07:48 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48162

11 years agoUse explicit casts.
Anders Broman [Thu, 7 Mar 2013 07:05:45 +0000 (07:05 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48161

11 years agoList more (obvious) build dependencies.
Jeff Morriss [Thu, 7 Mar 2013 03:50:28 +0000 (03:50 -0000)]
List more (obvious) build dependencies.

The problem with listing these package names (which I think is convenient)
is that different distros have different names for some packages.  So:
update to work on OpenSuSE.

svn path=/trunk/; revision=48160

11 years agoAvoid a potential divide-by-zero condition.
Chris Maynard [Thu, 7 Mar 2013 02:04:41 +0000 (02:04 -0000)]
Avoid a potential divide-by-zero condition.
#BACKPORT(1.8)

svn path=/trunk/; revision=48159

11 years agoTry to fix the "LNK4217: locally defined symbol" warnings.
Gerald Combs [Thu, 7 Mar 2013 00:16:32 +0000 (00:16 -0000)]
Try to fix the "LNK4217: locally defined symbol" warnings.

svn path=/trunk/; revision=48158

11 years agoUpdate the changelog.
Gerald Combs [Wed, 6 Mar 2013 23:06:09 +0000 (23:06 -0000)]
Update the changelog.

svn path=/trunk/; revision=48151

11 years agoEnable c-ares support by default to match the Windows and Debian
Gerald Combs [Wed, 6 Mar 2013 23:04:43 +0000 (23:04 -0000)]
Enable c-ares support by default to match the Windows and Debian
packages (and to make things less painful if the user enables name
resolution). Untested.

svn path=/trunk/; revision=48150

11 years agoAlways build with GDK_PIXBUF_DISABLE_DEPRECATED, GDK_DISABLE_DEPRECATED, GTK_DISABLE_...
Bill Meier [Wed, 6 Mar 2013 22:17:25 +0000 (22:17 -0000)]
Always build with GDK_PIXBUF_DISABLE_DEPRECATED, GDK_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also: # Enable GSEAL when building with GTK > 2.20

svn path=/trunk/; revision=48149

11 years agoUpdate to the latest config.guess and config.sub (I needed these so configure
Jeff Morriss [Wed, 6 Mar 2013 22:14:49 +0000 (22:14 -0000)]
Update to the latest config.guess and config.sub (I needed these so configure
would recognize OpenSuSE 12.1).

Note: these are now GPLv3 but there's an exception which allows us to
distribute these files under our distribution terms.

svn path=/trunk/; revision=48148

11 years agoAdd support for software updates. Remove qtshark.rc and use
Gerald Combs [Wed, 6 Mar 2013 22:04:17 +0000 (22:04 -0000)]
Add support for software updates. Remove qtshark.rc and use
image/wireshark.rc (which contains resources needed by WinSparkle)
instead.

svn path=/trunk/; revision=48147

11 years agolook for /usr/include/lua5.x directories to determine the lua version
Martin Kaiser [Wed, 6 Mar 2013 21:48:30 +0000 (21:48 -0000)]
look for /usr/include/lua5.x directories to determine the lua version

(Debian squeeze installs lua includes in /usr/include/lua5.1 and libs
 under /usr/lib, there's no --with-lua=<dir> setting for this
 configuration)

see also https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8438

svn path=/trunk/; revision=48146

11 years agoAlways build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_...
Bill Meier [Wed, 6 Mar 2013 20:56:04 +0000 (20:56 -0000)]
Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED

Also: remove "experimental" comment from Win32 GTK3 build config;

(I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental).

svn path=/trunk/; revision=48145

11 years agoUse explicit casts.
Anders Broman [Wed, 6 Mar 2013 20:33:32 +0000 (20:33 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48144

11 years agoGet rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
Anders Broman [Wed, 6 Mar 2013 18:23:22 +0000 (18:23 -0000)]
Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.

svn path=/trunk/; revision=48141

11 years agoGet rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
Anders Broman [Wed, 6 Mar 2013 18:17:42 +0000 (18:17 -0000)]
Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.

svn path=/trunk/; revision=48140

11 years agoUse explicit casts.
Anders Broman [Wed, 6 Mar 2013 17:35:11 +0000 (17:35 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48137

11 years agoAdd asn2deb.pod and idl2deb.pod to the source distribution.
Jeff Morriss [Wed, 6 Mar 2013 17:16:16 +0000 (17:16 -0000)]
Add asn2deb.pod and idl2deb.pod to the source distribution.

svn path=/trunk/; revision=48136

11 years agoDon't use (GNU-specific) pattern rules: use old-fashioned suffix rules instead.
Jeff Morriss [Wed, 6 Mar 2013 16:33:01 +0000 (16:33 -0000)]
Don't use (GNU-specific) pattern rules: use old-fashioned suffix rules instead.

Since there's now a suffix rule for the .1 man pages, don't create explicit
rules for them.  (Leave a comment explaining why the .html and .4 rules need
to stay.)

Simplify CLEANFILES: there's no need to list each man page, just remove them
all.

svn path=/trunk/; revision=48135

11 years agoFix distcheck in autotools based builds
Balint Reczey [Wed, 6 Mar 2013 14:46:15 +0000 (14:46 -0000)]
Fix distcheck in autotools based builds

svn path=/trunk/; revision=48134

11 years agoMerge asn2deb and idl2deb from official Debian package
Balint Reczey [Wed, 6 Mar 2013 13:31:08 +0000 (13:31 -0000)]
Merge asn2deb and idl2deb from official Debian package

svn path=/trunk/; revision=48133

11 years agogtk_alignment_new() args are gfloat; use constants of form 0.0F.
Bill Meier [Wed, 6 Mar 2013 04:43:12 +0000 (04:43 -0000)]
gtk_alignment_new() args are gfloat; use constants of form 0.0F.

(A floating point constant without a suffix (e.g., 0.0) is a 'double'.

svn path=/trunk/; revision=48129

11 years agoActually add IPv6 addresses to the display.
Jeff Morriss [Wed, 6 Mar 2013 02:18:23 +0000 (02:18 -0000)]
Actually add IPv6 addresses to the display.

svn path=/trunk/; revision=48128

11 years agoFix the plurality of the length of a data source if it has only 1 byte (I'm
Jeff Morriss [Wed, 6 Mar 2013 01:53:03 +0000 (01:53 -0000)]
Fix the plurality of the length of a data source if it has only 1 byte (I'm
looking at a "Bitstring tvb" that is only 1 byte long).

svn path=/trunk/; revision=48127

11 years agoFollowup to r48011, answering my own XXX comment:
Evan Huus [Wed, 6 Mar 2013 00:39:35 +0000 (00:39 -0000)]
Followup to r48011, answering my own XXX comment:

No, ReportedBoundsError is not the right thing to throw, ReassemblyError is.
That's why I added it in the first place!

svn path=/trunk/; revision=48123

11 years agoFrom Peter Hatina: Fix for: Gtk3 widgets are not properly expanded.
Bill Meier [Wed, 6 Mar 2013 00:33:58 +0000 (00:33 -0000)]
From Peter Hatina: Fix for:  Gtk3 widgets are not properly expanded.
(Part of suggested patch for WIreshark 1.8 applied to trunk instead)

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

From me: Add an XXX xomment about how, on Windows, closing the top_level
Wireshark window while the capture_interfaces dialog window is open
will leave the associated dumpcap process running.

svn path=/trunk/; revision=48122

11 years agoMake the GTP and GTP' dissectors new-style dissectors, so that they can
Guy Harris [Wed, 6 Mar 2013 00:02:18 +0000 (00:02 -0000)]
Make the GTP and GTP' dissectors new-style dissectors, so that they can
reject packets that don't look enough like GTP/GTP' packets.  This fixes
bug 1706, and fixes some other cases where non-GTP/GTP' packets are
being dissected as GTP/GTP'.

svn path=/trunk/; revision=48118

11 years agoDon't say "Warn!", say "Warning!"
Jeff Morriss [Tue, 5 Mar 2013 22:26:03 +0000 (22:26 -0000)]
Don't say "Warn!", say "Warning!"

svn path=/trunk/; revision=48110

11 years agoUpdate the information on building RPMs based on recent work. Include the informatio...
Jeff Morriss [Tue, 5 Mar 2013 22:20:16 +0000 (22:20 -0000)]
Update the information on building RPMs based on recent work.  Include the information that the Qt development package needs to be installed.

svn path=/trunk/; revision=48109

11 years agoUse explicit casts.
Anders Broman [Tue, 5 Mar 2013 22:15:20 +0000 (22:15 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48108

11 years agoRemove a comment left over from the "old days".
Bill Meier [Tue, 5 Mar 2013 22:12:09 +0000 (22:12 -0000)]
Remove a comment left over from the "old days".

Also: Add an XXX comment re one effect of the
      fact that, on Windows, dlg_window_new() does *not*
      set the newly created dialog window as 'transient for'
      the Wireshark top_level window.

svn path=/trunk/; revision=48106

11 years agoDon't have a separate srpm-package target: we already build the SRPM while building...
Jeff Morriss [Tue, 5 Mar 2013 21:35:48 +0000 (21:35 -0000)]
Don't have a separate srpm-package target: we already build the SRPM while building the RPM (since r47574).

svn path=/trunk/; revision=48105

11 years agoMove the install_desktop_files target so it's not in the middle of the various packag...
Jeff Morriss [Tue, 5 Mar 2013 21:31:44 +0000 (21:31 -0000)]
Move the install_desktop_files target so it's not in the middle of the various package-making targets.

svn path=/trunk/; revision=48103

11 years agoUse XDLC_IS_INFORMATION() to determine whether there's a payload to hand
Guy Harris [Tue, 5 Mar 2013 20:50:25 +0000 (20:50 -0000)]
Use XDLC_IS_INFORMATION() to determine whether there's a payload to hand
to the X.25 dissector or not.

svn path=/trunk/; revision=48097

11 years agoit seems that g_free() needs a gpointer
Martin Kaiser [Tue, 5 Mar 2013 20:25:32 +0000 (20:25 -0000)]
it seems that g_free() needs a gpointer

using a gconstpointer creates a warning
capture_sync.c: In function ‘sync_pipe_open_command’:
capture_sync.c:823:13: error: passing argument 1 of ‘g_free’ discards ‘const’ qualifier from pointer target type [-Werror]

svn path=/trunk/; revision=48096

11 years agofix
Martin Kaiser [Tue, 5 Mar 2013 20:17:29 +0000 (20:17 -0000)]
fix
packet-bssgp.c: In function 'de_bssgp_unconfim_send_state_var':
packet-bssgp.c:3318:13: error: variable 'state_var' set but not used [-Werror=unused-but-set-variable]

svn path=/trunk/; revision=48095

11 years agoFix some variable names to better indicate what they do.
Guy Harris [Tue, 5 Mar 2013 19:31:13 +0000 (19:31 -0000)]
Fix some variable names to better indicate what they do.

Fix indentation.

Fix a proto_tree_add_uint_format_value() call not to include the name of
the field - proto_tree_add_uint_format_value() will add that for you.

Have dte_address_util() take the offset of the address as an argument;
it's not always at the same offset from the beginning of the facility.

Have it return the pointer to the generated string directly, rather than
through a pointer argument.

Create only one subtree for each facility, and give it a text description
of the facility code rather than the numerical value of the facility
code.  Make the top-level item for the facility cover all the bytes of
the facility, including code, length if present, and parameters.

Dissect the end-to-end transit delay and priorities facilities
completely.  Also, fix an incorrect use of "transmit delay" to say
"transit delay".

Get rid of the last of the spaces preceding colons in "Field: value"
descriptions and in a "default:" case label.

Do the data vs. non-data packet thing ith

if (PACKET_IS_DATA(pkt_type)) {
...
} else {
...
}

rather than, in effect, doing the "else" with a break; that makes the
code a bit clearer.

Put the logical channel number into the protocol tree in common code for
the default case, rather than doing it separately for data and non-data
packets.  Clean up the dissection of non-data packets to add entries
before updating the columns, so that we don't throw an exception
updating the columns before we get to add items that wouldn't throw
exceptions.  Clear the Info column early in the dissection, in case we
throw an exception before getting to set it and thus leave behind the
column information for the protocol atop which we're running.

svn path=/trunk/; revision=48093

11 years ago"HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark...
Gerald Combs [Tue, 5 Mar 2013 18:46:50 +0000 (18:46 -0000)]
"HKEY_CURRENT_USER\Software\The Wireshark developer community, wireshark.org/\Wireshark\WinSparkle" isn't the prettiest registry path.

svn path=/trunk/; revision=48089

11 years agoUse explicit casts.
Anders Broman [Tue, 5 Mar 2013 17:39:20 +0000 (17:39 -0000)]
Use explicit casts.

svn path=/trunk/; revision=48088

11 years agoFrom Joseph Chai:
Anders Broman [Tue, 5 Mar 2013 17:38:44 +0000 (17:38 -0000)]
From Joseph Chai:
Add aditional IE dissection.
From me patch cleanup and add set fence for multiple DTAP messages in one frame.

svn path=/trunk/; revision=48087

11 years agoUse consistent indentation (4 spaces);
Bill Meier [Tue, 5 Mar 2013 15:28:10 +0000 (15:28 -0000)]
Use consistent indentation (4 spaces);
Reformat  long single line comments for readability;
Add editor modelines.

svn path=/trunk/; revision=48086