wmeier [Sun, 19 Jun 2011 18:47:35 +0000 (18:47 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37716
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 19 Jun 2011 17:34:22 +0000 (17:34 +0000)]
Update for current reality, and give some more details.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37714
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 19 Jun 2011 16:05:29 +0000 (16:05 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Use 2-space indenting
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37712
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 19 Jun 2011 16:04:57 +0000 (16:04 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37711
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 19 Jun 2011 15:28:32 +0000 (15:28 +0000)]
Try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6029
Wireshark crashes when entering anything in capture filter textbox
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37709
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 19 Jun 2011 15:03:54 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-06-19]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37708
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Sun, 19 Jun 2011 13:53:42 +0000 (13:53 +0000)]
UI_MANAGER: #if 0 out add_menu_item as it is not used yet(?).
Move menu.c back to the list of clean files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37707
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 19 Jun 2011 10:15:58 +0000 (10:15 +0000)]
Revert r37702 in favour of r37705 for bug 6035.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37706
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 19 Jun 2011 10:15:05 +0000 (10:15 +0000)]
Handle BASE_NONE as BASE_DEC for filter expression in custom columns.
This fixes bug 6035.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37705
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 19 Jun 2011 09:33:18 +0000 (09:33 +0000)]
Mark parameters as unused when MAIN_MENU_USE_UIMANAGER.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37704
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 19 Jun 2011 09:26:13 +0000 (09:26 +0000)]
Add missing part of menu.c checkin for UI manager code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37703
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 18 Jun 2011 22:52:00 +0000 (22:52 +0000)]
Use BASE_DEC for expert.group and expert.severity.
This fixes bug 6035.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37702
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 17 Jun 2011 22:57:02 +0000 (22:57 +0000)]
Add configure options to make change the default file format
from pcap-ng to pcap.
Add a comment that GTK3 doesn't build yet.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37701
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 21:17:06 +0000 (21:17 +0000)]
Added 'make osx-package' for building binary package for OSX.
Corrected text describing 'make svr4-package'.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37700
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 21:02:45 +0000 (21:02 +0000)]
Added a note about Windows 2000.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37699
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 20:57:05 +0000 (20:57 +0000)]
Wireshark now builds and runs on Windows 7, but not on Windows 2000.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37698
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 18:40:07 +0000 (18:40 +0000)]
Set PCAP_NG_DEFAULT correct in config.h on win32.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37697
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 17 Jun 2011 17:52:31 +0000 (17:52 +0000)]
Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap. Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).
Update the documentation and release notes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37696
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 17 Jun 2011 16:06:27 +0000 (16:06 +0000)]
pflog: use BSD_AF_ defines from <epan/aftypes.h>.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37695
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 13:39:56 +0000 (13:39 +0000)]
Added some casts from spotlight_ntoh64 to guint.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37694
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 17 Jun 2011 13:19:44 +0000 (13:19 +0000)]
Add the correct casts to make it compile on some old ERHL box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37693
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Fri, 17 Jun 2011 12:28:21 +0000 (12:28 +0000)]
From Gregor Beck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6004
dissect_nt_v2_ace: doesn't support ace type > 8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37692
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 11:56:56 +0000 (11:56 +0000)]
Added a cast from ieee802154_long_addr.addr (guint64) to guint.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37691
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Fri, 17 Jun 2011 11:54:51 +0000 (11:54 +0000)]
Update IKEv2 to last IANA Parameters (2011-05-09)
Add Notify Message Types of :
* A Quick Crash Detection Method for IKE (RFC-ietf-ipsecme-failure-detection-08.txt)
* Protocol Support for High Availability of IKEv2/IPsec (RFC-ietf-ipsecme-ipsecha-protocol-06.txt)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37690
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 11:09:35 +0000 (11:09 +0000)]
Added cast to int for nstime_t.nsecs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37689
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 08:04:10 +0000 (08:04 +0000)]
Reordered some svn:ignore targets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37688
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 17 Jun 2011 08:03:18 +0000 (08:03 +0000)]
Preferences for x411 moved to p1.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37687
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 17 Jun 2011 01:56:35 +0000 (01:56 +0000)]
From Roland Knall:
openSAFETY: Making the UDP ports configurable; Modbus/TCP support
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5999
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37686
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 18:34:17 +0000 (18:34 +0000)]
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37685
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 17:17:55 +0000 (17:17 +0000)]
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37684
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 16 Jun 2011 08:04:31 +0000 (08:04 +0000)]
From Kevin Kayes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6026
Enhance Snoop file reader to include 10Gbit datalink value
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37683
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 16 Jun 2011 07:55:55 +0000 (07:55 +0000)]
Enhance Cisco CCX1 CKIP Information Element (133)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37682
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 16 Jun 2011 07:33:24 +0000 (07:33 +0000)]
Really print the rpcap username when logging, not
the rpcap password.
This only affects remote capturing.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37681
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 07:27:48 +0000 (07:27 +0000)]
Constify a return value, to squelch a compiler warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37680
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 07:02:23 +0000 (07:02 +0000)]
Attempt to squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37679
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 06:55:11 +0000 (06:55 +0000)]
Attempt to squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37678
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 16 Jun 2011 03:56:08 +0000 (03:56 +0000)]
Attempt to squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37677
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 21:22:30 +0000 (21:22 +0000)]
Sigh. Cast away a warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37676
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 20:21:45 +0000 (20:21 +0000)]
Constify some arguments.
Technically, %p must be given a void * as an argument (although the
representation of pointers on all platforms we deal with is the same for
all pointed-to types).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37675
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 20:13:42 +0000 (20:13 +0000)]
Constify some arguments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37674
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 19:48:27 +0000 (19:48 +0000)]
Try to squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37673
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 19:36:43 +0000 (19:36 +0000)]
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37672
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 19:34:54 +0000 (19:34 +0000)]
Strings are not writable, and the compiler warns that assigning a
pointer to a string to a non-const pointer discards qualifiers; make the
err_info member of the wtap_reader structure a const pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37671
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 19:27:01 +0000 (19:27 +0000)]
See if this squelches some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37670
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 15 Jun 2011 19:23:58 +0000 (19:23 +0000)]
See if this squelches some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37669
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 15 Jun 2011 09:01:04 +0000 (09:01 +0000)]
From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6022
802.11 Disassociation Packet's "Reason Code" field is imprecisely decoded/described
From me :
* Display Reason code in decimal (not Hexa)
* Update list from last standard (802.11-2007 & 802.11n-2009)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37668
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 15 Jun 2011 08:55:01 +0000 (08:55 +0000)]
Make checkAPIs Happy
Error: the blurb for field "Status" ("icmpv6.6lowpannd.da.status") has leading space in epan/dissectors/packet-icmpv6.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37667
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 15 Jun 2011 08:52:38 +0000 (08:52 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Add latest 6lowpan-nd Support
From me :
* Add Description in Header Field
* Use FT_EUI64 for EUI64 Field
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37666
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 15 Jun 2011 08:32:10 +0000 (08:32 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Fix some error in ICMPv6 dissector...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37665
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 14 Jun 2011 20:37:53 +0000 (20:37 +0000)]
Please don't use prohibited APIs in new code:
sprintf -> g_snprintf
Fixes coverity 1197 & 1198.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37664
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Mon, 13 Jun 2011 20:29:51 +0000 (20:29 +0000)]
Fix for bug 6009:
Information transfer rate is a 7 bit field.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37663
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 13 Jun 2011 15:28:37 +0000 (15:28 +0000)]
Remove not used cap_pipe_err_str.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37662
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 13 Jun 2011 15:13:39 +0000 (15:13 +0000)]
Handle deprecated GtkTooltips.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37661
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 13 Jun 2011 14:54:33 +0000 (14:54 +0000)]
Handle deprecated GtkTooltips.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37660
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 12 Jun 2011 15:03:37 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-06-12]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37656
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sun, 12 Jun 2011 10:35:55 +0000 (10:35 +0000)]
cfilter can be NULL. Handle this correctly.
This should fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6016
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37655
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 21:49:24 +0000 (21:49 +0000)]
Use spaces uniformly in AC_WIRESHARK_PYTHON_CHECK.
If we don't find python-config, set want_python to no, so the
end-of-configuration message says we're not using the Python
interpreter. Also fix some cases where we were setting want_zlib rather
than want_python (cut-and-pasteo).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37654
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 20:24:24 +0000 (20:24 +0000)]
Just as with autoconf, we need to include the Python cflags when
building libwireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37653
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 19:05:17 +0000 (19:05 +0000)]
Do the Python embedding similarly to other "default = yes, if available"
items.
Add some quoting to the zlib tests, just in case the argument contains
white space.
Clean up capitalization of Lua and Python.
Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37652
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 17:20:44 +0000 (17:20 +0000)]
Include <Python.h> to get the Python version number.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37651
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 11 Jun 2011 02:35:58 +0000 (02:35 +0000)]
The "shared by every program in the Wireshark suite, including dumpcap"
version information doesn't include Python version information (only
programs using libwireshark have that) or GeoIP version information
(ditto). Don't include headers required only for that information;
hopefully this will keep dumpcap from requiring the Python library on
Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37650
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 10 Jun 2011 17:25:55 +0000 (17:25 +0000)]
Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37649
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 10 Jun 2011 17:16:09 +0000 (17:16 +0000)]
Add some more error checking.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37648
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 16:27:53 +0000 (16:27 +0000)]
Make capture dialog compile with GTK3+
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37647
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 11:01:43 +0000 (11:01 +0000)]
Seemingly this is needed to...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37646
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 08:31:14 +0000 (08:31 +0000)]
Add casts to make it compile on some old ERHL box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37645
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 10 Jun 2011 08:30:17 +0000 (08:30 +0000)]
From Pascal Quantin:
allowing Length Indicator 0x7ffb for RLC AM PDUs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37644
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 10 Jun 2011 07:16:10 +0000 (07:16 +0000)]
Fix capinfo: ** ERROR **: Unknown capture file type 61
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37643
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 10 Jun 2011 02:10:44 +0000 (02:10 +0000)]
Add a hack to prevent a gcc warning "ignoring return value of 'strtoul'..."
for some gcc configurations (see _FORTIFY_SOURCE).
This hack is used instead of storing the result returned by strtoul() in a
dummy variable so as to prevent a gcc 4.6 with -Wextra warning:
"set but not used ...".
TBD: will this hack pass muster with other validators
such as Coverity, CLang, & etc ?
For much gory detail: see the message thread starting at:
http://www.wireshark.org/lists/wireshark-dev/201106/msg00088.html
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37642
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 23:14:57 +0000 (23:14 +0000)]
Add another cast.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37641
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 9 Jun 2011 22:46:00 +0000 (22:46 +0000)]
The only place where we care about zlib is file_wrappers.c; include
<zlib.h> there, rather than wtap-int.h. That obviates the need to
include config.h earlier in ascend_scanner.l; revert the previous
change, so we don't require a version of Flex that supports %top.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37640
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 22:42:44 +0000 (22:42 +0000)]
Add a couple of casts to make Visual C++ happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37639
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 22:01:57 +0000 (22:01 +0000)]
Fix possible compilation errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37638
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 21:37:19 +0000 (21:37 +0000)]
- Add something to columns when using mime-encap
- Replace decoders in wiretap/CMakeLists.txt
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37637
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 9 Jun 2011 21:21:06 +0000 (21:21 +0000)]
- Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
- Add new dissector packet-mime-encap which understands mime_file fragmentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37636
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 21:13:40 +0000 (21:13 +0000)]
Move the copyright notice and the config.h include to the top of the
file so that we have the proper definitions in place for large file
support on Solaris (bug 6102).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37635
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 18:31:39 +0000 (18:31 +0000)]
Make sure we don't write invalid record lengths.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37634
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 9 Jun 2011 18:27:11 +0000 (18:27 +0000)]
Simplify timestamp checking: only check the packet's timestamp if
check_startstop is set.
Refuse to write packets that do not fit in the file type we're writing. This
allows fuzz testing to be done on JPEGs without generating bogus files (with
packets bigger than the maximum packet size). This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6010 .
Note that this is only a problem with editcap is run with -T to force the
encapsulation type.
Maybe this needs a more generic solution (e.g., should this check be done in
the wiretap routines?), but at least for now it'll pacify the buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37633
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 9 Jun 2011 18:02:13 +0000 (18:02 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980
Add draft-ietf-6man-rpl-routing-header-03 Support (RH4 RPL Routing Header)
From me :
* Display Bytes of Address and Full Address (Generated)
* Fix some Whitespace and minor enhance...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37632
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 9 Jun 2011 17:30:13 +0000 (17:30 +0000)]
Only count an ACK if it's part of an existing conversation, otherwise we
get a lot of false positives.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37631
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 12:54:44 +0000 (12:54 +0000)]
Add ws-coding-style.cfg to dist.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37630
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 08:51:30 +0000 (08:51 +0000)]
Add casts to make it compile on some old ERHL box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37629
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 08:28:04 +0000 (08:28 +0000)]
From Francesco Fondelli:
Add crustyfy .cfg file
I found it useful on some inetnal dissector where the indentation
was relay messed up so I think it's a usfel tool to have in the toolbox.
I don't think we should run it on every file.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37628
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 9 Jun 2011 06:36:40 +0000 (06:36 +0000)]
From Madhusudhan M:
Cisco and Vodafone Diameter AVP:s
I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37627
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 21:33:38 +0000 (21:33 +0000)]
As pointed out by Jakub Zawadzki:
While updating to the current cmake version of FindZLIB I missed
a Wireshark specific addition. Add it back.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37626
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 8 Jun 2011 20:58:44 +0000 (20:58 +0000)]
Limit the lengths of some of our patterns. Fixes an infinite loop found
when trying to read a TPNCP data file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37625
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Wed, 8 Jun 2011 18:26:50 +0000 (18:26 +0000)]
* Add Keep Going bit flag in insert command
* Replace tab by space
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37624
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 18:10:03 +0000 (18:10 +0000)]
Add GTK3 cmake options. It doesn't build, just like its configure pendant.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37623
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 8 Jun 2011 17:10:40 +0000 (17:10 +0000)]
Fix a typo (spotted by Pascal Quantin).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37622
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 8 Jun 2011 17:08:27 +0000 (17:08 +0000)]
The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37621
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 17:07:06 +0000 (17:07 +0000)]
Last patch removed $Id$ head line
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37620
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 8 Jun 2011 16:24:36 +0000 (16:24 +0000)]
Copy over changes from cmake git HEAD.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37619
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Wed, 8 Jun 2011 14:12:47 +0000 (14:12 +0000)]
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6008
Clear the list of interfaces before adding new interfaces.
Also fix an endless loop which would occur in case of an error
when getting remote interfaces.
From Irene Ruengeler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37618
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 13:11:51 +0000 (13:11 +0000)]
Try to fix the Ubuntu buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37617
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 12:05:49 +0000 (12:05 +0000)]
Assign to a dummy variable to squelch the warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37616
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 12:02:38 +0000 (12:02 +0000)]
Move the warning "...SercosIII heuristic dissector cannot be registered.." to the handoff routine as sercosIII most probably will
not have registered it's name when opensafty's register routine is executed e.g the warning will always be printed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37615
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 8 Jun 2011 07:03:53 +0000 (07:03 +0000)]
From Roland Knall via bug 6007:
Remove plugins/interlink from CMake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37614
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:27:39 +0000 (05:27 +0000)]
Remove the interlinki plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37612
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:23:17 +0000 (05:23 +0000)]
Remove theinterlinki plugin dir as it's now a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37611
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 8 Jun 2011 05:20:43 +0000 (05:20 +0000)]
From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37610
f5534014-38df-0310-8fa8-
9805f1628bb7