Commit Graph

39583 Commits

Author SHA1 Message Date
Michael Tüxen cf952db147 From Irene Ruengeler: Add check for reading strings from the
preferences to make sure it is printable. This avoids a crash
when reading a corrupted preferences file.

svn path=/trunk/; revision=41613
2012-03-16 15:09:54 +00:00
Bill Meier abf79b900b Fix some of the incorrect hf[] FT_BOOLEAN 'display' and 'bitmask' fields;
(Additional instances requiring feedback from the dissector author have
 been marked with XXX).
For 'hf_om2k_aop' use a bitmask in the hf[] entry rather than shifting & etc
 in the proto_tree_add_uint() call.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6792  Comment #8.

svn path=/trunk/; revision=41612
2012-03-16 14:16:20 +00:00
Jeff Morriss 1108df5539 Make it possible to run capinfos and editcap from this script.
svn path=/trunk/; revision=41611
2012-03-16 14:12:01 +00:00
Jeff Morriss fb46cda196 When we're in a for(i=0,[...]) loop, don't reuse (and thus reset) 'i' in another for(i=0,[...]) loop. This fixes the capinfos double-free crashes that the fuzz bot has been experiencing.
svn path=/trunk/; revision=41610
2012-03-16 14:07:22 +00:00
Anders Broman 96e944c8ef Show instance_id.
svn path=/trunk/; revision=41609
2012-03-16 14:03:47 +00:00
Jeff Morriss ae27b278ab From Martin Kaiser: remove a set-but-unused variable
svn path=/trunk/; revision=41608
2012-03-16 13:33:09 +00:00
Jeff Morriss 78f7795a54 Make a function static
svn path=/trunk/; revision=41607
2012-03-16 13:31:36 +00:00
Jeff Morriss 0c8b0a9f3d Make several functions static; remove trailing commas and white space.
svn path=/trunk/; revision=41606
2012-03-16 13:30:12 +00:00
Jeff Morriss 255c803c61 Make most of the functions in here static
svn path=/trunk/; revision=41605
2012-03-16 13:24:15 +00:00
Jeff Morriss 53c44185bf Terminate a value_string. Remove a couple of trailing commas.
svn path=/trunk/; revision=41604
2012-03-16 13:19:16 +00:00
Anders Broman 45785bc056 Fix typo.
svn path=/trunk/; revision=41603
2012-03-16 12:46:54 +00:00
Anders Broman 21e9cc64d6 Fix a typo
svn path=/trunk/; revision=41602
2012-03-16 12:43:44 +00:00
Anders Broman a4e856ba9b Error: the name for field "Initial Resource Locator Type " ("eiss.aid.irl.type") has trailing space in packet-eiss.c
Error: the name for field "Initial Resource Locator Length " ("eiss.aid.irl.length") has trailing space in packet-eiss.c
Error: the name for field "Initial Resource Locator String " ("eiss.aid.irl.string") has trailing space in packet-eiss.c

svn path=/trunk/; revision=41601
2012-03-16 12:43:12 +00:00
Anders Broman affd39940f From Guy Martin:
Add packet-mpeg-pmt, packet-mpeg-ca and mpeg-descriptors.

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

svn path=/trunk/; revision=41600
2012-03-16 12:25:06 +00:00
Anders Broman 0422304fbc From Weston Schmidt:
Add EISS dissector support.

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

svn path=/trunk/; revision=41599
2012-03-16 12:02:56 +00:00
Anders Broman dcaddfba2c Upadte a value string.
svn path=/trunk/; revision=41598
2012-03-16 11:51:32 +00:00
Anders Broman e4403efbdb From Guy Martin:
Fix a few bugs in packet-mp2t

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

svn path=/trunk/; revision=41597
2012-03-16 11:51:00 +00:00
Guy Harris 931acaff3e Fix some comments and some indentation.
svn path=/trunk/; revision=41596
2012-03-16 08:02:35 +00:00
Guy Harris f31c9b8967 Add some more -D flags to CPPFLAGS rather than CFLAGS, and add some
flags that aren't -D or -I flags to CXXFLAGS as well as CFLAGS.

svn path=/trunk/; revision=41595
2012-03-16 08:02:04 +00:00
Guy Harris fe37c0ccb8 Add @configure_input@ to a bunch of .in files that didn't have it.
Add $Id$ to those of said files that didn't have it, and fix one $Id to
be $Id$.

svn path=/trunk/; revision=41594
2012-03-16 03:39:51 +00:00
Guy Harris 04acb74936 Put -D and -I flags into CPPFLAGS rather than into CFLAGS; that should
make them apply to C++ as well as C.  That seems to be what the autoconf
documentation suggests:

- Variable: CFLAGS
  Debugging and optimization options for the C compiler. If it is not set
  in the environment when configure runs, the default value is set when
  you call AC_PROG_CC (or empty if you don't). configure uses this
  variable when compiling or linking programs to test for C features.

  If a compiler option affects only the behavior of the preprocessor
  (e.g., -Dname), it should be put into CPPFLAGS instead. If it affects
  only the linker (e.g., -Ldirectory), it should be put into LDFLAGS
  instead. If it affects only the compiler proper, CFLAGS is the natural
  home for it. If an option affects multiple phases of the compiler,
  though, matters get tricky. One approach to put such options directly
  into CC, e.g., CC='gcc -m64'. Another is to put them into both CPPFLAGS
  and LDFLAGS, but not into CFLAGS.

	...

- Variable: CPPFLAGS
  Preprocessor options for the C, C++, Objective C, and Objective C++
  preprocessors and compilers. If it is not set in the environment when
  configure runs, the default value is empty. configure uses this variable
  when preprocessing or compiling programs to test for C, C++, Objective
  C, and Objective C++ features.

  This variable's contents should contain options like -I, -D, and -U that
  affect only the behavior of the preprocessor. Please see the explanation
  of CFLAGS for what you can do if an option affects other phases of the
  compiler as well.

svn path=/trunk/; revision=41593
2012-03-16 03:27:45 +00:00
Jeff Morriss 08953cee3a Actually, the Lua-menu-items aren't necessary anyway; remove them.
svn path=/trunk/; revision=41592
2012-03-16 02:47:16 +00:00
Jeff Morriss 80a7287360 Get the Lua menus working again: when adding UI menus, it appears that our
description of existing menus must be accurate: if a name and action are
both specified then the to-be-added-XML must include both the name and the
action.

It appears that the formats given in stat_group_name()'s value_string were
designed to take this into account, but there was no code to separate the menu
name from its action.  Adding that separation is complicated by the fact that
menus are separated by /'s and actions may also contain that character.  To
deal with that, "escape" the /'s in actions by replacing them with #'s.
make_menu_xml() then un-escapes them back into /'s.

There has to be an easier way to do all of this...

svn path=/trunk/; revision=41591
2012-03-16 02:36:32 +00:00
Bill Meier fe9aac8af0 FT_BOOLEAN hf[] entry with a 0 'bitmask' should have 'display' = BASE_NONE;
svn path=/trunk/; revision=41590
2012-03-16 02:31:42 +00:00
Bill Meier 43402e0119 FT_BOOLEAN hf[] entry with a 0 'bitmask' should have 'display' = BASE_NONE;
Reformat long lines;
Use consistent indentation;
Do some general whitespace changes.

svn path=/trunk/; revision=41589
2012-03-16 02:24:57 +00:00
Jeff Morriss a2c94ef9bf Fix menu path typos: Stataistics->Statistics, LUA->Lua
svn path=/trunk/; revision=41588
2012-03-16 02:24:56 +00:00
Bill Meier 198c9ba55f FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
In some cases:
 Use val_to_str_const() instead of val_to_str();
 Reformat long lines;
 Do some general whitespace changes.


svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
Guy Harris b53e379447 Have AC_WIRESHARK_GCC_CFLAGS_CHECK take an optional second flag to
indicate whether the flag is C-only, C++-only, or for both compilers;
pass the appropriate value for C-only flags.  Have the "Checking for..."
message indicate whether we're adding to CFLAGS, CXXFLAGS, or both.

(Yes, the macro should probably be renamed.  "GCC" refers to the GNU
Compiler Collection, which includes a C++ compiler, although that's also
used for compilers that are more-or-less compatible with the ones from
the GNU Compiler Collection, such as the clang compilers.)

We set -Wformat-security whether or not --enable-extra-gcc-checks was
specified, so we don't need to do it again if it was specified.

svn path=/trunk/; revision=41586
2012-03-16 00:49:01 +00:00
Bill Meier 74f884820e FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
Reformat long lines;
Do some general whitespace changes.

svn path=/trunk/; revision=41585
2012-03-16 00:05:36 +00:00
Bill Meier 542fac85c8 FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
svn path=/trunk/; revision=41584
2012-03-16 00:01:50 +00:00
Bill Meier b2102cc092 FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
svn path=/trunk/; revision=41582
2012-03-15 23:26:40 +00:00
Chris Maynard 023545da82 Update the link to the specification.
svn path=/trunk/; revision=41581
2012-03-15 23:21:05 +00:00
Bill Meier bc30c6d5aa FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
Convert "4 space tabs" to "4 spaces";
General whitespace & formatting changes.

svn path=/trunk/; revision=41580
2012-03-15 23:19:28 +00:00
Bill Meier c4cc3264fd proto_tree_add_bits_item() associated hf[] entry 'bitmask' must be 0;
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
General whitespace & formatting changes.

svn path=/trunk/; revision=41579
2012-03-15 23:16:46 +00:00
Bill Meier 5feace57e3 Use 'display'=BASE_NONE for all FT_BOOLEAN hf[] entries with a 0 bitmask;
Do some general whitespace & long-line changes.

svn path=/trunk/; revision=41577
2012-03-15 21:56:52 +00:00
Guy Harris 8af620acd7 Initialize the new num_stat_entries and interface_statistics members of
a wtapng_if_descr_t, so that we don't crash on a close (as is happening
in the buildbot).

Fix up some 4-space tabs.

svn path=/trunk/; revision=41575
2012-03-15 21:44:54 +00:00
Jörg Mayer 6b8234e001 Document which warnings are c++ only.
svn path=/trunk/; revision=41574
2012-03-15 21:27:04 +00:00
Jörg Mayer 4d25efa4ad i18 -> i18n
svn path=/trunk/; revision=41573
2012-03-15 21:26:16 +00:00
Jeff Morriss db0f554064 Handle .pcap and .pcapng files: set their mime-types appropriately.
svn path=/trunk/; revision=41572
2012-03-15 21:04:47 +00:00
Jeff Morriss 944254a5b5 Don't set svn:keywords on PCAP files
svn path=/trunk/; revision=41571
2012-03-15 21:03:15 +00:00
Jeff Morriss d555eb9122 Set mime-type to application/vnd.tcpdump.pcap
svn path=/trunk/; revision=41570
2012-03-15 21:01:28 +00:00
Bill Meier bd7a332b88 Calls to col_add_fstr() & etc should not be under 'if (tree)';
hf[] FT_BOOLEAN entry with 0 bitmask should have BASE_NONE as 'display' (benign);
Enforce modelines (Convert '4 space tabs' to spaces);
Do general formatting and whitespace cleanup.

svn path=/trunk/; revision=41569
2012-03-15 20:48:40 +00:00
Chris Maynard 09f001a9b1 Sort the options.
svn path=/trunk/; revision=41567
2012-03-15 15:15:18 +00:00
Chris Maynard 2b302230de Sort the options.
svn path=/trunk/; revision=41566
2012-03-15 15:03:08 +00:00
Chris Maynard 9dd8ba6ce5 Sort the options.
svn path=/trunk/; revision=41565
2012-03-15 14:56:06 +00:00
Chris Maynard 3fc4c9cafb Correct the sorting of the options in the synopsis.
svn path=/trunk/; revision=41564
2012-03-15 14:52:49 +00:00
Chris Maynard 9c7b936e79 Sort the options. Delete all the line-terminating "g's" added in 40820.
svn path=/trunk/; revision=41563
2012-03-15 14:50:07 +00:00
Chris Maynard 2ef7d8fe83 Sort the options.
svn path=/trunk/; revision=41562
2012-03-15 14:35:36 +00:00
Anders Broman fb0fec7c1c If we have one ISB, display the droped count from it.
svn path=/trunk/; revision=41561
2012-03-15 14:33:04 +00:00
Chris Maynard a88ab3eccf Sort the -z options.
svn path=/trunk/; revision=41560
2012-03-15 14:29:44 +00:00