Commit Graph

36058 Commits

Author SHA1 Message Date
Guy Harris 317cb92f9c 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.

svn path=/trunk/; revision=37650
2011-06-11 02:35:58 +00:00
Gerald Combs 79a0fbdca0 Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.

svn path=/trunk/; revision=37649
2011-06-10 17:25:55 +00:00
Guy Harris 6584ad9781 Add some more error checking.
svn path=/trunk/; revision=37648
2011-06-10 17:16:09 +00:00
Anders Broman 59dc5adbc4 Make capture dialog compile with GTK3+
svn path=/trunk/; revision=37647
2011-06-10 16:27:53 +00:00
Anders Broman c0d4b8a152 Seemingly this is needed to...
svn path=/trunk/; revision=37646
2011-06-10 11:01:43 +00:00
Anders Broman 22ceac7035 Add casts to make it compile on some old ERHL box.
svn path=/trunk/; revision=37645
2011-06-10 08:31:14 +00:00
Anders Broman 735f48f551 From Pascal Quantin:
allowing Length Indicator 0x7ffb for RLC AM PDUs.

svn path=/trunk/; revision=37644
2011-06-10 08:30:17 +00:00
Jakub Zawadzki c54afc05e7 Fix capinfo: ** ERROR **: Unknown capture file type 61
svn path=/trunk/; revision=37643
2011-06-10 07:16:10 +00:00
Bill Meier d2629a5335 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


svn path=/trunk/; revision=37642
2011-06-10 02:10:44 +00:00
Gerald Combs 61eacf0d54 Add another cast.
svn path=/trunk/; revision=37641
2011-06-09 23:14:57 +00:00
Guy Harris 06256dfe5b 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.

svn path=/trunk/; revision=37640
2011-06-09 22:46:00 +00:00
Gerald Combs ae4c6d08ca Add a couple of casts to make Visual C++ happy.
svn path=/trunk/; revision=37639
2011-06-09 22:42:44 +00:00
Jakub Zawadzki 110f2c4ef7 Fix possible compilation errors.
svn path=/trunk/; revision=37638
2011-06-09 22:01:57 +00:00
Jakub Zawadzki 178def67b7 - Add something to columns when using mime-encap
- Replace decoders in wiretap/CMakeLists.txt

svn path=/trunk/; revision=37637
2011-06-09 21:37:19 +00:00
Jakub Zawadzki a723874490 - Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
- Add new dissector packet-mime-encap which understands mime_file fragmentation.

svn path=/trunk/; revision=37636
2011-06-09 21:21:06 +00:00
Gerald Combs a47485acd9 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).

svn path=/trunk/; revision=37635
2011-06-09 21:13:40 +00:00
Gerald Combs 04f147f4fa Make sure we don't write invalid record lengths.
svn path=/trunk/; revision=37634
2011-06-09 18:31:39 +00:00
Jeff Morriss 90e539b55f 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.

svn path=/trunk/; revision=37633
2011-06-09 18:27:11 +00:00
Alexis La Goutte 08dcc37848 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...




svn path=/trunk/; revision=37632
2011-06-09 18:02:13 +00:00
Gerald Combs 0abba34b6a Only count an ACK if it's part of an existing conversation, otherwise we
get a lot of false positives.

svn path=/trunk/; revision=37631
2011-06-09 17:30:13 +00:00
Anders Broman a1afae94eb Add ws-coding-style.cfg to dist.
svn path=/trunk/; revision=37630
2011-06-09 12:54:44 +00:00
Anders Broman 5659d18813 Add casts to make it compile on some old ERHL box.
svn path=/trunk/; revision=37629
2011-06-09 08:51:30 +00:00
Anders Broman ea74ffe9a8 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

svn path=/trunk/; revision=37628
2011-06-09 08:28:04 +00:00
Anders Broman 85195d1e02 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

svn path=/trunk/; revision=37627
2011-06-09 06:36:40 +00:00
Jörg Mayer 8aada8637d As pointed out by Jakub Zawadzki:
While updating to the current cmake version of FindZLIB I missed
a Wireshark specific addition. Add it back.

svn path=/trunk/; revision=37626
2011-06-08 21:33:38 +00:00
Gerald Combs 2eff7bab66 Limit the lengths of some of our patterns. Fixes an infinite loop found
when trying to read a TPNCP data file.

svn path=/trunk/; revision=37625
2011-06-08 20:58:44 +00:00
Alexis La Goutte 5bcc2dc2f7 * Add Keep Going bit flag in insert command
* Replace tab by space

svn path=/trunk/; revision=37624
2011-06-08 18:26:50 +00:00
Jörg Mayer 48904e0a71 Add GTK3 cmake options. It doesn't build, just like its configure pendant.
svn path=/trunk/; revision=37623
2011-06-08 18:10:03 +00:00
Martin Mathieson 5d78458e4b Fix a typo (spotted by Pascal Quantin).
svn path=/trunk/; revision=37622
2011-06-08 17:10:40 +00:00
Martin Mathieson 651e93c93a The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.
svn path=/trunk/; revision=37621
2011-06-08 17:08:27 +00:00
Jörg Mayer fc59537249 Last patch removed $Id$ head line
svn path=/trunk/; revision=37620
2011-06-08 17:07:06 +00:00
Jörg Mayer a0116ff94f Copy over changes from cmake git HEAD.
svn path=/trunk/; revision=37619
2011-06-08 16:24:36 +00:00
Michael Tüxen e0b054f2e2 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.

svn path=/trunk/; revision=37618
2011-06-08 14:12:47 +00:00
Anders Broman 2cc50fa41c Try to fix the Ubuntu buildbot.
svn path=/trunk/; revision=37617
2011-06-08 13:11:51 +00:00
Anders Broman 1a81c428d9 Assign to a dummy variable to squelch the warning.
svn path=/trunk/; revision=37616
2011-06-08 12:05:49 +00:00
Anders Broman 30a3988111 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.

svn path=/trunk/; revision=37615
2011-06-08 12:02:38 +00:00
Stig Bjørlykke 65b2467999 From Roland Knall via bug 6007:
Remove plugins/interlink from CMake.

svn path=/trunk/; revision=37614
2011-06-08 07:03:53 +00:00
Anders Broman 344d215dfc Remove the interlinki plugin dir as it's now a builtin dissector.
svn path=/trunk/; revision=37612
2011-06-08 05:27:39 +00:00
Anders Broman f2c3e81b4a Remove theinterlinki plugin dir as it's now a builtin dissector.
svn path=/trunk/; revision=37611
2011-06-08 05:23:17 +00:00
Anders Broman afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Anders Broman b5b4195bb9 Remove the sercosiii plugin dir as it's now a builtin dissector.
svn path=/trunk/; revision=37609
2011-06-08 05:06:02 +00:00
Anders Broman 6ad93d0bd9 Remove the sercosiii plugin dir as it's now a builtin dissector.
svn path=/trunk/; revision=37608
2011-06-08 04:55:29 +00:00
Guy Harris 712d0fa20d Didn't need to introduce that variable.
svn path=/trunk/; revision=37607
2011-06-08 04:49:35 +00:00
Guy Harris a3714500fd Try to squelch the warning about not using the return value of strtoul()
- we really *are* using it just for its side-effects if it fails; its
return value is not the best way to check for failure, as the failure
return values are also valid return values on success.

While we're at it, check for it setting errno, which is one of the
better ways to check for failure.

svn path=/trunk/; revision=37606
2011-06-08 04:07:15 +00:00
Guy Harris e25095dfe5 The SERCOS III dissector is now built-in.
svn path=/trunk/; revision=37605
2011-06-08 01:37:18 +00:00
Bill Meier 2841028cf2 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
svn path=/trunk/; revision=37604
2011-06-07 23:05:53 +00:00
Bill Meier aaa723e538 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.

svn path=/trunk/; revision=37603
2011-06-07 23:03:12 +00:00
Bill Meier 54105fbc42 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.

svn path=/trunk/; revision=37602
2011-06-07 22:59:19 +00:00
Bill Meier d75988bacc Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup in some cases.

svn path=/trunk/; revision=37601
2011-06-07 22:50:49 +00:00
Bill Meier 4f420ef6cd Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
svn path=/trunk/; revision=37600
2011-06-07 22:28:55 +00:00