osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
50,455 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

50455 Commits

Author SHA1 Message Date
Anders Broman 089e4d999f Try to fix [-Wmissing-prototypes] 
svn path=/trunk/; revision=53741
 2013-12-03 06:20:18 +00:00
Anders Broman a21898cf69 - copy paste error in parlay 
- Add pragmas to remove warnings, this should go into the generation script.

svn path=/trunk/; revision=53740
 2013-12-03 05:22:47 +00:00
Guy Harris 203ecca6da Space between STANAG and the standard number. 
svn path=/trunk/; revision=53739
 2013-12-02 23:09:08 +00:00
Jakub Zawadzki a4c78939b2 Fix encap_table_base[] array. 
svn path=/trunk/; revision=53738
 2013-12-02 22:38:00 +00:00
Chris Maynard 231e52a9ea Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53737
 2013-12-02 21:52:46 +00:00
Guy Harris a441a51918 Link with -lcodecs on UN*X as well. Link with -lwsutil after 
-lwireshark, -lwiretap, and -lcodecs, just in case the linker requires
that, if library A uses something from library B, library B be read
after library A.

svn path=/trunk/; revision=53736
 2013-12-02 21:46:06 +00:00
Chris Maynard ae2e12d1f7 Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53735
 2013-12-02 21:34:23 +00:00
Guy Harris ce7b83123c No C++/C99 comments, as not all compilers handle them. Use #if 0/#endif 
instead.

svn path=/trunk/; revision=53734
 2013-12-02 21:18:25 +00:00
Chris Maynard b5e3775535 eject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53733
 2013-12-02 21:13:29 +00:00
Chris Maynard 99d9c3d0f5 Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53732
 2013-12-02 21:05:11 +00:00
Anders Broman ba0e04ed1b Character conversion error. 
svn path=/trunk/; revision=53731
 2013-12-02 20:31:42 +00:00
Anders Broman c0407d6bc5 Add pragmas to remove warnings, this should go into the generation script. 
svn path=/trunk/; revision=53730
 2013-12-02 20:18:48 +00:00
Guy Harris fb289aedf6 Explicitly convert an int to an enum. 
svn path=/trunk/; revision=53729
 2013-12-02 19:20:35 +00:00
Chris Maynard 93f15d640c Specify SI units for the max filesize autostop condition. For now, keep the capture buffer size in IEC units, but document it as such. 
#BACKPORT(1.10, 1.8(?))

svn path=/trunk/; revision=53728
 2013-12-02 19:17:12 +00:00
Guy Harris 5e7b58ab94 Make the declaration of stats_tree_format_node_as_str() match the 
definition.

svn path=/trunk/; revision=53727
 2013-12-02 19:15:14 +00:00
Guy Harris 28a1c45bfa Use g_strlcpy() and g_strlcat() to squelch API checker warnings. 
svn path=/trunk/; revision=53726
 2013-12-02 19:12:59 +00:00
Guy Harris e313b15f03 Use ws_fopen() so we properly handle UTF-8 file names on Windows. 
svn path=/trunk/; revision=53725
 2013-12-02 18:58:40 +00:00
Jörg Mayer 72065e7d69 stats_tree_stat.c currently procudes warnings - move to dirty 
svn path=/trunk/; revision=53724
 2013-12-02 15:55:36 +00:00
Alexis La Goutte 3f8128d521 Fix (-W)documentation error found by Clang 
parameter 'sai' not found in the function declaration [-Werror,-Wdocumentation]

svn path=/trunk/; revision=53723
 2013-12-02 13:46:39 +00:00
Alexis La Goutte 5d53a72f79 Fix (-W)documentation error found by Clang 
error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation]

svn path=/trunk/; revision=53722
 2013-12-02 13:46:30 +00:00
Alexis La Goutte bd5f16acf4 Fix (-W)documentation error found by Clang 
../../epan/strutil.h:95:11: error: parameter 'line' not found in the function declaration [-Werror,-Wdocumentation]
 * @param line A pointer to the input string
          ^~~~
../../epan/strutil.h:95:11: note: did you mean 'string'?
 * @param line A pointer to the input string
          ^~~~
          string

svn path=/trunk/; revision=53721
 2013-12-02 13:46:20 +00:00
Alexis La Goutte 1f3261d99a Fix (-W)documentation error found by Clang 
error: parameter 'addr*[in]' not found in the function declaration [-Werror,-Wdocumentation]

svn path=/trunk/; revision=53720
 2013-12-02 13:46:10 +00:00
Alexis La Goutte 67c04188ce Fix (-W)documentation error found by Clang 
error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation]

svn path=/trunk/; revision=53719
 2013-12-02 13:45:59 +00:00
Jörg Mayer acccbc79c5 nmake: Allow setting the wireshark base dir via env variable 
svn path=/trunk/; revision=53718
 2013-12-02 13:00:06 +00:00
Jörg Mayer 20799bdeb4 Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of 
the QT5_BASE_DIR value.

svn path=/trunk/; revision=53717
 2013-12-02 09:50:30 +00:00
Guy Harris 55544b5c39 Get rid of a stray semicolon, as it upsets Sun^WOracle Studio's C 
compiler.

Clean up escape_xml_chars() a bit, so that there's no extra unreached
"return s;", and so that it's clearer that it runs until it hits a NUL. 
(XXX - are there GLib routines that will do this?)

svn path=/trunk/; revision=53716
 2013-12-02 09:30:31 +00:00
Guy Harris 111ee4cc3a Don't include wslua headers if we don't have Lua. 
svn path=/trunk/; revision=53715
 2013-12-02 09:10:29 +00:00
Guy Harris c3de2cb2fe Don't assume we have Lua just because we have plugin support. 
svn path=/trunk/; revision=53714
 2013-12-02 09:10:13 +00:00
Guy Harris 7c10c3d617 We need to link with the codecs library. 
svn path=/trunk/; revision=53713
 2013-12-02 09:06:00 +00:00
Guy Harris c123b131ae Make the declaration of stats_tree_format_as_str() match the definition. 
svn path=/trunk/; revision=53712
 2013-12-02 08:55:38 +00:00
Guy Harris 40b60cbf55 Do something less catastrophic than crashing if the same name is used in 
two codec registrations.

svn path=/trunk/; revision=53711
 2013-12-02 08:51:46 +00:00
Guy Harris 0cc1545d05 Move most of the plugin code from epan to wsutil and remove all 
knowledge of particular types of plugins.  Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.

In particular applications, only process the relevant plugin types.

Add a Makefile.common to the codecs directory.

svn path=/trunk/; revision=53710
 2013-12-02 08:30:29 +00:00
Chris Maynard baf569188a Reject the packet if data is NULL. 
svn path=/trunk/; revision=53709
 2013-12-02 02:31:33 +00:00
Chris Maynard 9b38829b34 Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53708
 2013-12-02 02:31:04 +00:00
Chris Maynard acc5fd78e4 Reject the packet if data is NULL. 
svn path=/trunk/; revision=53707
 2013-12-02 02:18:21 +00:00
Chris Maynard 42a64c3557 If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly. 
svn path=/trunk/; revision=53706
 2013-12-02 02:07:42 +00:00
Chris Maynard a9900375b4 Fix Coverity CID 1134045: Printf format string issue. (As documented in the printf man page for the ' option, "Note that many versions of gcc(1) cannot parse this option and will issue a warning." (r47940 reverted a similar change, so this keeps things consistent.) 
svn path=/trunk/; revision=53705
 2013-12-02 01:53:13 +00:00
Chris Maynard 87d36305f9 Fix Coverity CID 1134046: Structurally dead code. 
svn path=/trunk/; revision=53704
 2013-12-02 00:45:44 +00:00
Jörg Mayer 70f4223c2a The changes to work around the msbuild deficiencies broke 
dependeny tracking (replaced the list of dissectors by the file
containing the dissectors). Fix that.

svn path=/trunk/; revision=53703
 2013-12-01 22:24:59 +00:00
Jörg Mayer 40c6d9abcb Copy over rev 53700 to cmake 
svn path=/trunk/; revision=53702
 2013-12-01 21:56:40 +00:00
Jörg Mayer 6a34c8c924 Small style changes. 
svn path=/trunk/; revision=53701
 2013-12-01 21:55:21 +00:00
Anders Broman 9baa93519c Update to V11.7.1 (2013-09) 
svn path=/trunk/; revision=53700
 2013-12-01 20:34:21 +00:00
Bill Meier eb8b50625a If we're including "config.h" when compiling a codec, then /I.. must be part of CFLAGS. 
svn path=/trunk/; revision=53699
 2013-12-01 16:50:05 +00:00
Michael Mann 0c9aa51ec5 Patch to include YAML export. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452) 
From Deon van der Westhuysen
From me: use switch statements instead of if-else

svn path=/trunk/; revision=53698
 2013-12-01 15:44:22 +00:00
Gerald Combs 98c8454dd6 [Automatic manuf, services and enterprise-numbers update for 2013-12-01] 
svn path=/trunk/; revision=53695
 2013-12-01 15:03:49 +00:00
Michael Mann 7ee8d48670 Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) 
From Peter Paluch

svn path=/trunk/; revision=53694
 2013-12-01 13:47:11 +00:00
Jörg Mayer c0f974f9d1 Too litte modify in copy - modify - paste cycle 
svn path=/trunk/; revision=53693
 2013-12-01 10:58:17 +00:00
Jörg Mayer 38b8e4ecb9 Graham Bloice 
- Using gtk[23] is a hack. Implement a clean solution.

Me
- In the current setup, building Qt ONLY is not supported as
  lots of required support libraries are only found in gtk2 and
  gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)

svn path=/trunk/; revision=53692
 2013-12-01 10:34:01 +00:00
Jörg Mayer 402df00544 Looks like the problem with redefined symbols is not new, it 
just got a few new ones.
Add HAVE_STRING_H and HAVE_STDLIB_H to the list.

svn path=/trunk/; revision=53691
 2013-12-01 10:10:24 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying 
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
 2013-12-01 10:05:16 +00:00