Commit graph

39563 commits

Author SHA1 Message Date
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
Bill Meier
ad9f8fffad Update a comment as to the number of Wireshark protocols;
Minor whitespace and formatting changes.

svn path=/trunk/; revision=41559
2012-03-15 14:15:48 +00:00
Anders Broman
dc674a6043 - Store ISB data.
- free IDB and ISB data when closing.

svn path=/trunk/; revision=41558
2012-03-15 13:46:42 +00:00
Anders Broman
b1a9d50e03 From David Wei:
Fix a typo.

svn path=/trunk/; revision=41557
2012-03-15 08:32:49 +00:00
Michael Tüxen
34d5241775 Add support for SSH over SCTP.
svn path=/trunk/; revision=41556
2012-03-15 08:23:26 +00:00
Stig Bjørlykke
49009428ca Fixed error: "/*" within comment
svn path=/trunk/; revision=41555
2012-03-15 07:40:08 +00:00
Anders Broman
09b002ef2a Update MPLS return codes, https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6951
svn path=/trunk/; revision=41554
2012-03-15 06:23:01 +00:00
Jeff Morriss
9e8148eeef Should have been part of r41542: Don't free idb_inf in wtap_dump_open_ng(): free it in the callers.
svn path=/trunk/; revision=41553
2012-03-15 02:35:49 +00:00
Jeff Morriss
2d829b392f Line-wrap an extremely long comment. Remove trailing white space.
svn path=/trunk/; revision=41552
2012-03-15 02:33:52 +00:00
Michael Tüxen
5ccba8f2d3 Bump some version numbers.
svn path=/trunk/; revision=41551
2012-03-14 19:14:29 +00:00
Bill Meier
de43e2c55b hg_gsm_a_vamos_level --> hf_gsm_a_vamos_level
svn path=/trunk/; revision=41550
2012-03-14 18:57:17 +00:00
Jörg Mayer
19ea690e10 Fix:
work/wireshark/svn/trunk/ui/gtk/voip_calls.c:599:9: error: variable ‘voip_calls_graph_list’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=41548
2012-03-14 17:26:49 +00:00
Bill Meier
e0397b3811 Fix up a several REPORT_DISSECTOR_BUG messages to specify the correct function name;
Do general cleanup:
- Indentation & whitespace;
- Reformat long lines,
- & etc.

svn path=/trunk/; revision=41547
2012-03-14 17:11:39 +00:00
Michael Tüxen
4e58ec540f Update to glib 2.31.20.
One patch is not required anymore, since it has been included.

svn path=/trunk/; revision=41546
2012-03-14 16:56:20 +00:00
Anders Broman
1d4f630589 voip_calls.c Use the hastable instead, we should do away with the list.
graph_analysis.h Doxygen changes.

svn path=/trunk/; revision=41545
2012-03-14 16:46:59 +00:00
Anders Broman
4c801c8604 VoIP Calls Graph Analysis: Elements not sorted by Time.
Sort the list based on frame number.

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

svn path=/trunk/; revision=41544
2012-03-14 09:53:33 +00:00
Jeff Morriss
18f0ab61cb From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6946 :
Support for DCCP Simultaneous-Open for NAT Traversal, RFC 5596.  A new packet
format is supported.  I did a little code cleanup too.

svn path=/trunk/; revision=41543
2012-03-14 01:39:24 +00:00
Jeff Morriss
603b4d4348 Don't free idb_inf in wtap_dump_open_ng(): free it in the callers. This fixes the double-free editcap crashes that the buildbot's been seeing lately.
svn path=/trunk/; revision=41542
2012-03-14 01:08:09 +00:00
Gerald Combs
e60c1286b2 Add a "fileformats" suite (copied from the I/O suite) to check file
format conversion. So far we check nanosecond pcap, microsecond pcap-ng
and nanosecond pcap-ng against standard pcap.

Fix color output on OS X.

svn path=/trunk/; revision=41541
2012-03-13 19:58:19 +00:00
Bill Meier
f2590414a3 Use tvb_new_subset_remaining(...) instead of tvb_new_subset(..., -1, -1);
Use value_string_ext to reference a value_string;
Use global tfs_set_notset instead of a local version displaying the values incorrectly;
Slightly enhance display of the LWAPP Control Message.

svn path=/trunk/; revision=41540
2012-03-13 18:35:09 +00:00
Bill Meier
8caed06a76 Use tvb_new_subset_remaining(...) in place of tvb_new_subset(..., -1, -1);
Use value_string_ext to reference a few value_strings;
Use val_to_str_const() in place of val_to_str() in a few cases;
Use BASE_NONE for a few hf[] FT_BOOLEAN entries with 0x0 bitmask.

svn path=/trunk/; revision=41539
2012-03-13 17:21:46 +00:00