obnox/wireshark/wip.git
7 years agoI'm not sure -Q/WIRESHARK_QUIT_AFTER_CAPTURE is actually useful in batch
guy [Mon, 29 Aug 2011 23:25:29 +0000 (23:25 +0000)]
I'm not sure -Q/WIRESHARK_QUIT_AFTER_CAPTURE is actually useful in batch
mode; in batch mode, you probably want to use TShark or dumpcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38787 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago-Q → WIRESHARK_QUIT_AFTER_CAPTURE.
gerald [Mon, 29 Aug 2011 23:16:57 +0000 (23:16 +0000)]
-Q → WIRESHARK_QUIT_AFTER_CAPTURE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38786 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAttempt to fix coverity id 1212: MISSING_BREAK by inserting "FALLTHROUGH"
sfisher [Mon, 29 Aug 2011 21:36:48 +0000 (21:36 +0000)]
Attempt to fix coverity id 1212: MISSING_BREAK by inserting "FALLTHROUGH"
comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38785 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoReplace "-Q" with "WIRESHARK_QUIT_AFTER_CAPTURE" as discussed in bug 6256.
gerald [Mon, 29 Aug 2011 21:16:29 +0000 (21:16 +0000)]
Replace "-Q" with "WIRESHARK_QUIT_AFTER_CAPTURE" as discussed in bug 6256.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38784 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Juliusz Chroboczek via bug #6273:
sfisher [Mon, 29 Aug 2011 19:56:11 +0000 (19:56 +0000)]
From Juliusz Chroboczek via bug #6273:

IANA has reallocated the Babel port; it is now 6696.  The attached patch makes
wireshark grok both the old and new ports.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38783 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix compilation when compiling without libpcap (configure script parameter
sfisher [Mon, 29 Aug 2011 19:47:50 +0000 (19:47 +0000)]
Fix compilation when compiling without libpcap (configure script parameter
"--without-pcap")

Note: Generates run-time warnings still:

(wireshark:66065): Gtk-WARNING **: CaptureFilters: missing action /Capture/CaptureFilters

(wireshark:66065): Gtk-WARNING **: Interfaces: missing action /Capture/Interfaces

(wireshark:66065): Gtk-WARNING **: Options: missing action /Capture/Options

(wireshark:66065): Gtk-WARNING **: Start: missing action /Capture/Start

(wireshark:66065): Gtk-WARNING **: Stop: missing action /Capture/Stop

(wireshark:66065): Gtk-WARNING **: Restart: missing action /Capture/Restart

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38782 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd "--windowsonly" and "--cygwinonly" options to win-setup.sh
gerald [Mon, 29 Aug 2011 19:22:42 +0000 (19:22 +0000)]
Add "--windowsonly" and "--cygwinonly" options to win-setup.sh
--appverify.  Make sure "mt" is only found in a normaly Windows path and
"find" is only found in a Cygwin path.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38781 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoOnly build rawshark and dumpcap if we have libpcap
jmayer [Mon, 29 Aug 2011 19:18:28 +0000 (19:18 +0000)]
Only build rawshark and dumpcap if we have libpcap

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38780 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a comment
jmayer [Mon, 29 Aug 2011 19:10:54 +0000 (19:10 +0000)]
Fix a comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38779 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInstall the new menu files.
jmayer [Mon, 29 Aug 2011 18:20:43 +0000 (18:20 +0000)]
Install the new menu files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38778 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a comment about using IFileOpenDialog and IFileSaveDialog on newer
gerald [Mon, 29 Aug 2011 16:45:48 +0000 (16:45 +0000)]
Add a comment about using IFileOpenDialog and IFileSaveDialog on newer
versions of Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38777 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Fredrik Kuivinen:
etxrab [Mon, 29 Aug 2011 14:47:20 +0000 (14:47 +0000)]
From Fredrik Kuivinen:
Fix a problem with dissection of HandoverRequest.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38776 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake loading the menu code from file a compile option: NEW_MENU_CODE
jmayer [Mon, 29 Aug 2011 14:39:22 +0000 (14:39 +0000)]
Make loading the menu code from file a compile option: NEW_MENU_CODE
Will not work right now unless the xml files have been installed into
the run time directory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38775 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agortp-player now compiles with gtk3
jmayer [Mon, 29 Aug 2011 13:43:23 +0000 (13:43 +0000)]
rtp-player now compiles with gtk3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38774 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRegister all icons regardless of HAVE_LIBPCAP.
etxrab [Mon, 29 Aug 2011 13:05:17 +0000 (13:05 +0000)]
Register all icons regardless of HAVE_LIBPCAP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38773 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove #ifdef's from UIDescription.
etxrab [Mon, 29 Aug 2011 11:54:36 +0000 (11:54 +0000)]
Remove #ifdef's from UIDescription.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38772 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd an expert info warning for integers encoded with too many octets.
stig [Mon, 29 Aug 2011 10:01:36 +0000 (10:01 +0000)]
Add an expert info warning for integers encoded with too many octets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38771 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDissect some op codes.
stig [Mon, 29 Aug 2011 07:35:53 +0000 (07:35 +0000)]
Dissect some op codes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38770 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoImproved heuristics.
stig [Mon, 29 Aug 2011 07:35:44 +0000 (07:35 +0000)]
Improved heuristics.

Corrected check for absurdly large values in for-loops,
as remaining data may be 0.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38769 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a tpyo, remove trailing whitespace while at it.
jmayer [Mon, 29 Aug 2011 07:08:55 +0000 (07:08 +0000)]
Fix a tpyo, remove trailing whitespace while at it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38768 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Martin Kaiser:
etxrab [Mon, 29 Aug 2011 05:35:51 +0000 (05:35 +0000)]
From Martin Kaiser:
correct the filter names
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6239

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38767 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Martin Kaiser:
etxrab [Mon, 29 Aug 2011 05:32:21 +0000 (05:32 +0000)]
From Martin Kaiser:
DVB-CI dissector: reassembly on the transport layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6221

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38766 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Lei Chen:
etxrab [Mon, 29 Aug 2011 05:24:10 +0000 (05:24 +0000)]
From Lei Chen:
Support E-UTRAN neighbor cells in Enhanced Measurement Report.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6275

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38765 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoI guess this is the right thing to do with the "ui" directory to put it
guy [Sun, 28 Aug 2011 19:28:17 +0000 (19:28 +0000)]
I guess this is the right thing to do with the "ui" directory to put it
into the U3 package.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38764 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoEscape the newlines in the definition of ui_DATA.
guy [Sun, 28 Aug 2011 19:26:03 +0000 (19:26 +0000)]
Escape the newlines in the definition of ui_DATA.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38763 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the main menubar UI description.
etxrab [Sun, 28 Aug 2011 18:34:52 +0000 (18:34 +0000)]
Add the main menubar UI description.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38762 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUnify windows and non windows menu_bar a bit.
etxrab [Sun, 28 Aug 2011 18:28:29 +0000 (18:28 +0000)]
Unify windows and non windows menu_bar a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38761 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the treeView popup UI description.
etxrab [Sun, 28 Aug 2011 16:18:58 +0000 (16:18 +0000)]
Add the treeView popup UI description.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38760 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-08-28]
gerald [Sun, 28 Aug 2011 15:34:37 +0000 (15:34 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-08-28]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38757 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInstall the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
etxrab [Sun, 28 Aug 2011 15:08:31 +0000 (15:08 +0000)]
Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd directory for xml UI descriptions and a UI description for the byte View popup.
etxrab [Sun, 28 Aug 2011 15:00:02 +0000 (15:00 +0000)]
Add directory for xml UI descriptions and a UI description for the byte View popup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38755 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoStengthen the heuristics a bit (aka don't misclassify some of
jmayer [Sat, 27 Aug 2011 11:06:50 +0000 (11:06 +0000)]
Stengthen the heuristics a bit (aka don't misclassify some of
my capture data as rpcap). Someone with more knowledge of the
format might want to look at this (I added FIXMEs).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38754 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemoved unused argument to new_packet_list_copy_summary_cb().
stig [Sat, 27 Aug 2011 09:43:27 +0000 (09:43 +0000)]
Removed unused argument to new_packet_list_copy_summary_cb().
Mark unused argument to help_menu_cont_cb().
Whitespace cleanup in colorize_conversation_cb() calls.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38753 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix all occurrences of the color2 bug 6269.
stig [Sat, 27 Aug 2011 09:34:18 +0000 (09:34 +0000)]
Fix all occurrences of the color2 bug 6269.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38752 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoColorize conversation color 2 not working from right-click menu
etxrab [Sat, 27 Aug 2011 09:29:44 +0000 (09:29 +0000)]
Colorize conversation color 2 not working from right-click menu

Typo in packet_list_menu_color_conv_tcp_color2_cb()
While at it change the signature of callbacks.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38751 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUnify my address entry
jmayer [Sat, 27 Aug 2011 09:23:12 +0000 (09:23 +0000)]
Unify my address entry

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38750 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoEnable and disable toolbar buttons when having packets.
stig [Sat, 27 Aug 2011 09:22:22 +0000 (09:22 +0000)]
Enable and disable toolbar buttons when having packets.
Set correct sensitivity for Go -> Go to Packet.

This fixes bug 6268.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38749 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove some useless/wrong comments
jmayer [Sat, 27 Aug 2011 09:21:04 +0000 (09:21 +0000)]
Remove some useless/wrong comments

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38748 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoNo semicolons after #endif, please.
guy [Fri, 26 Aug 2011 19:07:40 +0000 (19:07 +0000)]
No semicolons after #endif, please.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38747 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoReplace TRUE/FALSE with the new ENCAP stuff where appropriate
jmayer [Fri, 26 Aug 2011 17:02:33 +0000 (17:02 +0000)]
Replace TRUE/FALSE with the new ENCAP stuff where appropriate

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38746 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCSN_LEFT_ALIGNED_VAR_BMP didn't handle more than 8 bits.
etxrab [Fri, 26 Aug 2011 15:25:14 +0000 (15:25 +0000)]
CSN_LEFT_ALIGNED_VAR_BMP didn't handle more than 8 bits.

(CSN Ack/Nack Description wrongly handled in gsm_rlcmac_dl dissector )
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6101

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38745 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMissing ; in the < GTK 2.22 branch
etxrab [Fri, 26 Aug 2011 15:15:20 +0000 (15:15 +0000)]
Missing ; in the < GTK 2.22 branch

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38744 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse cairo_surface_t
etxrab [Fri, 26 Aug 2011 14:28:46 +0000 (14:28 +0000)]
Use cairo_surface_t

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38743 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix LUA labels in the UI_MANAGER case.
etxrab [Fri, 26 Aug 2011 08:25:38 +0000 (08:25 +0000)]
Fix LUA labels in the  UI_MANAGER case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38740 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake dissection of AVP: 3GPP-User-Location-Info(22) l=15 f=V-- vnd=TGPP val=303231...
etxrab [Fri, 26 Aug 2011 06:22:20 +0000 (06:22 +0000)]
Make dissection of AVP: 3GPP-User-Location-Info(22) l=15 f=V-- vnd=TGPP val=303231 more robust.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38739 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse ENC_BIG_ENDIAN.
etxrab [Fri, 26 Aug 2011 05:54:00 +0000 (05:54 +0000)]
Use ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38738 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDo case insensitive search for lua scripts to load.
stig [Thu, 25 Aug 2011 19:01:05 +0000 (19:01 +0000)]
Do case insensitive search for lua scripts to load.
Skip files starting with . also on windows, as the home directory
may be mounted from a server with a proper filesystem.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38737 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a method to fetch protocol description.
stig [Thu, 25 Aug 2011 18:52:54 +0000 (18:52 +0000)]
Add a method to fetch protocol description.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38736 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut LUA back in the menu_bar.
etxrab [Thu, 25 Aug 2011 18:35:22 +0000 (18:35 +0000)]
Put LUA back in the menu_bar.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38735 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTrivial formatting differences (removed tabs, added newline between functions).
martinm [Thu, 25 Aug 2011 14:15:20 +0000 (14:15 +0000)]
Trivial formatting differences (removed tabs, added newline between functions).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38734 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCorrect action names.
etxrab [Thu, 25 Aug 2011 13:23:20 +0000 (13:23 +0000)]
Correct action names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38733 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- Remove expert Warning not relevant to all GTP variants.
etxrab [Thu, 25 Aug 2011 10:26:35 +0000 (10:26 +0000)]
- Remove expert Warning not relevant to all GTP variants.
- use proto_add_item() in a couple of places.
- Fix a hf length.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38732 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTypo
etxrab [Thu, 25 Aug 2011 08:11:29 +0000 (08:11 +0000)]
Typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38731 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 make the tcp_graph work.
etxrab [Thu, 25 Aug 2011 08:05:40 +0000 (08:05 +0000)]
GTK3 make the tcp_graph work.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38730 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSimplify the ciode a bit.
etxrab [Thu, 25 Aug 2011 07:45:32 +0000 (07:45 +0000)]
Simplify the ciode a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38729 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago"Bytes left to read" is an unsigned quantity. Changed FT_INT64 to FT_UINT64 as sugge...
cmaynard [Thu, 25 Aug 2011 00:50:39 +0000 (00:50 +0000)]
"Bytes left to read" is an unsigned quantity.  Changed FT_INT64 to FT_UINT64 as suggested by Rui Loura via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6262.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38728 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
alagoutte [Wed, 24 Aug 2011 22:18:24 +0000 (22:18 +0000)]
From Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
BGP add-path (Additional Paths) support for IPv4 unicast

From me:
Fix some whitespace/tab...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38727 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe guide.macports.org page points you to the other page, so just cite
guy [Wed, 24 Aug 2011 22:10:04 +0000 (22:10 +0000)]
The guide.macports.org page points you to the other page, so just cite
it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38726 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate the information about getting Xcode, and note that
guy [Wed, 24 Aug 2011 22:08:50 +0000 (22:08 +0000)]
Update the information about getting Xcode, and note that
PKG_CONFIG_PATH must include /usr/X11/lib/pkgconfig (the man page for
pkg-config 0.26 seems to indicate that pkg-config searches the
directories in PKG_CONFIG_PATH *in addition to* the standard
directories, so it *might* be sufficient to set PKG_CONFIG_PATH to
/usr/X11/lib/pkgconfig).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38725 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
alagoutte [Wed, 24 Aug 2011 21:58:14 +0000 (21:58 +0000)]
From Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
BGP add-path (Additional Paths) support for IPv4 unicast

From me:
Fix some whitespace/tab...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38724 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom astramax57 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6188
alagoutte [Wed, 24 Aug 2011 21:37:37 +0000 (21:37 +0000)]
From astramax57 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6188
In some BGP captures the AS_PATH attribute was decode wrong, if the asn length determines automatically

From me:
Fix some whitespace...
Fix error: ‘for’ loop initial declarations are only allowed in C99 mode
Replace unsigned by guint

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38723 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMark another widget argument as unused.
guy [Wed, 24 Aug 2011 20:58:10 +0000 (20:58 +0000)]
Mark another widget argument as unused.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38722 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCorrected position of filter autocompletion window when using GTK3.
stig [Wed, 24 Aug 2011 20:53:25 +0000 (20:53 +0000)]
Corrected position of filter autocompletion window when using GTK3.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38721 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut back the experimental GTK3 code. To be tested tomorrow :-)
etxrab [Wed, 24 Aug 2011 19:45:33 +0000 (19:45 +0000)]
Put back the experimental GTK3 code. To be tested tomorrow :-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38720 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoArgh, forgot the _U_:s
etxrab [Wed, 24 Aug 2011 19:34:27 +0000 (19:34 +0000)]
Argh, forgot the _U_:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38719 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse user data rather than setting object data.
etxrab [Wed, 24 Aug 2011 19:26:07 +0000 (19:26 +0000)]
Use user data rather than setting object data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38718 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoBack out the previous commits, the graph blows up - at least in the GTK2 version.
etxrab [Wed, 24 Aug 2011 19:05:06 +0000 (19:05 +0000)]
Back out the previous commits, the graph blows up - at least in the GTK2 version.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38717 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMark widget parameter as unused a number of times
sfisher [Wed, 24 Aug 2011 18:57:10 +0000 (18:57 +0000)]
Mark widget parameter as unused a number of times

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38716 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 18:19:25 +0000 (18:19 +0000)]
GTK3 expose_event -> draw

Not compiled/tested

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38715 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMark length parameter as unused
sfisher [Wed, 24 Aug 2011 15:35:32 +0000 (15:35 +0000)]
Mark length parameter as unused

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38714 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse elm_len for the length.
etxrab [Wed, 24 Aug 2011 15:22:29 +0000 (15:22 +0000)]
Use elm_len for the length.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38713 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoXcode 4 isn't available on DVD, but is available for download from
guy [Wed, 24 Aug 2011 10:18:25 +0000 (10:18 +0000)]
Xcode 4 isn't available on DVD, but is available for download from
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.

While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38712 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCall gdk_cairo_create() for earlier versions of gtk.
martinm [Wed, 24 Aug 2011 09:41:17 +0000 (09:41 +0000)]
Call gdk_cairo_create() for earlier versions of gtk.
Is this correct?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38711 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCode clean up as draw_arc works with cairo now.
etxrab [Wed, 24 Aug 2011 08:48:19 +0000 (08:48 +0000)]
Code clean up as draw_arc works with cairo now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38710 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPaths changed for UI_MANAGER
etxrab [Wed, 24 Aug 2011 08:32:14 +0000 (08:32 +0000)]
Paths changed for UI_MANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38709 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSimplified some GTK_CHECK_VERSION to improve readability.
stig [Wed, 24 Aug 2011 08:28:39 +0000 (08:28 +0000)]
Simplified some GTK_CHECK_VERSION to improve readability.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38708 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 Remove gtk_window_set_has_resize_grip() as it creates
etxrab [Wed, 24 Aug 2011 08:12:08 +0000 (08:12 +0000)]
GTK3 Remove gtk_window_set_has_resize_grip() as it creates
warning "invalid cast from GtkStatusbar to GtkWindow".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38707 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 Remove gtk_window_set_has_resize_grip() as it creates
etxrab [Wed, 24 Aug 2011 08:02:37 +0000 (08:02 +0000)]
GTK3 Remove gtk_window_set_has_resize_grip() as it creates
warning "invalid cast from GtkStatusbar to GtkWindow".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38706 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSeveral Time Shift menu improvements:
stig [Wed, 24 Aug 2011 07:26:20 +0000 (07:26 +0000)]
Several Time Shift menu improvements:
- Added shortcut Shift-Control-T
- Set inactive when no loaded packets
- Add stock time icon
- Moved below time reference functions

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38705 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 07:26:11 +0000 (07:26 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38704 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoYet another cast.
stig [Wed, 24 Aug 2011 06:57:14 +0000 (06:57 +0000)]
Yet another cast.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38703 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a warning by changing a pointer type.
stig [Wed, 24 Aug 2011 06:42:40 +0000 (06:42 +0000)]
Fix a warning by changing a pointer type.

text2pcap.c: In function ‘parse_token’:
text2pcap.c:1076: warning: cast from pointer to integer of different size
text2pcap.c:1076: warning: cast from pointer to integer of different size

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38702 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 typo fixes:
jmayer [Wed, 24 Aug 2011 05:48:26 +0000 (05:48 +0000)]
GTK3 typo fixes:
Change iso->surface -> ios->surface
Rename draw_area_draw -> on_draw_area_draw_event
Change callback on_draw -> on_draw_area_draw_event
Remove trailing whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38701 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3:
jmayer [Wed, 24 Aug 2011 05:37:51 +0000 (05:37 +0000)]
GTK3:
Rename the function parameter from usr_data -> data.
Use allocation instead of allocationarea in one place.
Remove trailing whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38700 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a typo.
etxrab [Wed, 24 Aug 2011 05:25:04 +0000 (05:25 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38699 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 05:04:30 +0000 (05:04 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38698 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 04:53:50 +0000 (04:53 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38697 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix prematurely-terminated comment.
guy [Wed, 24 Aug 2011 02:37:36 +0000 (02:37 +0000)]
Fix prematurely-terminated comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38696 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a comment; this includes describing an additional way in which we
guy [Wed, 24 Aug 2011 02:25:08 +0000 (02:25 +0000)]
Fix a comment; this includes describing an additional way in which we
could fail to open the capture file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38695 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHopefully fix
tuexen [Tue, 23 Aug 2011 23:10:50 +0000 (23:10 +0000)]
Hopefully fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6256.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38694 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Akos Lukovics:
stig [Tue, 23 Aug 2011 20:40:34 +0000 (20:40 +0000)]
From Akos Lukovics:
Bugfix moving averages.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38693 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake the byte highlighting work in GTK3
etxrab [Tue, 23 Aug 2011 16:39:40 +0000 (16:39 +0000)]
Make the byte highlighting work in GTK3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38692 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoStatus update.
jmayer [Tue, 23 Aug 2011 14:53:18 +0000 (14:53 +0000)]
Status update.

The lua menu items do work in the ItemFactory code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38691 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMissed backing out one line...
etxrab [Tue, 23 Aug 2011 14:48:05 +0000 (14:48 +0000)]
Missed backing out one line...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38690 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake colors work on GTK3 take 2
etxrab [Tue, 23 Aug 2011 14:17:30 +0000 (14:17 +0000)]
Make colors work on GTK3 take 2
Revert tcp_graph commit by mistake, typo etc

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38689 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix build in the non gtk3 case: Add gpointer data to the
jmayer [Tue, 23 Aug 2011 14:13:34 +0000 (14:13 +0000)]
Fix build in the non gtk3 case: Add gpointer data to the
  parameter list.
Remove some trailing spaces.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38688 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake colors work on GTK3
etxrab [Tue, 23 Aug 2011 13:49:37 +0000 (13:49 +0000)]
Make colors work on GTK3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38687 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Gisle Vanem:
stig [Tue, 23 Aug 2011 13:16:44 +0000 (13:16 +0000)]
From Gisle Vanem:
Rename header guard.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38686 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake the IO-grph work in GTK3.
etxrab [Tue, 23 Aug 2011 11:18:35 +0000 (11:18 +0000)]
Make the IO-grph work in GTK3.
The "expose-event" needs to be changed to "draw" in all files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38685 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGTK3 only builds if portaudio is disabled (rtp player is not
jmayer [Tue, 23 Aug 2011 09:31:25 +0000 (09:31 +0000)]
GTK3 only  builds if portaudio is disabled (rtp player is not
yet gtk3 ready).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38684 f5534014-38df-0310-8fa8-9805f1628bb7