Commit Graph

43692 Commits

Author SHA1 Message Date
Gerald Combs bd19dcd8bf Add an add_hosts_file routine that adds a "hosts" path to an array and
use it in tshark.c instead of read_hosts_file. This lets us use "-H"
multiple times. Make read_hosts_file static.

svn path=/trunk/; revision=46273
2012-11-29 00:32:39 +00:00
Bill Meier 40a2218110 Fix [-Wshadow] warning;
Also:
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46272
2012-11-28 23:53:25 +00:00
Guy Harris f208489b56 Slightly less hacky way to arrange that dictionary_load() be called
before hf_base[] is initialized.

svn path=/trunk/; revision=46271
2012-11-28 23:11:08 +00:00
Alexis La Goutte 6231bf0d36 Enhance README.qt documentation
svn path=/trunk/; revision=46268
2012-11-28 22:55:52 +00:00
Alexis La Goutte cf50d93510 Fix :
CMake Warning (dev) at CMakeLists.txt:476 (add_subdirectory):
  The source directory

    /home/wireshark/plugins/wimaxmacphy

  does not contain a CMakeLists.txt file.

  CMake does not support this case but it used to work accidentally and is
  being allowed for compatibility.

  Policy CMP0014 is not set: Input directories must have CMakeLists.txt.  Run
  "cmake --help-policy CMP0014" for policy details.  Use the cmake_policy
  command to set the policy and suppress this warning.
This warning is for project developers.  Use -Wno-dev to suppress it.

svn path=/trunk/; revision=46267
2012-11-28 22:50:33 +00:00
Jeff Morriss 3029a76dc3 Fix pretty-printing of the application ID in the protocol-details pane by
putting an "unused" variable (which was taken out in r24377) back in.  This
time add a (bogus) "use" of the variable and explain why we're doing what
we're doing.

Use VALS() (in one case anyway) and PINFO_FD_NUM.

svn path=/trunk/; revision=46266
2012-11-28 22:45:31 +00:00
Bill Meier a8112e6529 Fix [-Wshadow] warnings;
Also (for one or more of the files):
 - create/use one or more extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - convert apparent 4-space tabs to spaces;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46265
2012-11-28 22:41:07 +00:00
Guy Harris 84afa22969 It's not going to pass the
if (protocol_version_identifier >= 4 && version_1_length == 0
          && tvb_reported_length(tvb) >= 106) {

test if it doesn't pass the

    if (protocol_version_identifier >= 3 && version_1_length == 0 &&
        tvb_reported_length(tvb) >= 102) {

test.

svn path=/trunk/; revision=46258
2012-11-28 21:24:32 +00:00
Guy Harris 33b1d3abd9 Redo the MSTI stuff a bit, making a copy of total_msti_length at the
time we start processing the MSTI messages and decrementing the copy;
it's a bit clearer, and may make it easier to avoid the "uninitialized
variable" problem.

svn path=/trunk/; revision=46257
2012-11-28 21:08:28 +00:00
Guy Harris 1ce0f9234d "??" introduces a trigraph in C; escape "???" to avoid that.
svn path=/trunk/; revision=46256
2012-11-28 21:05:17 +00:00
Guy Harris fe9fe6b6e9 Squelch a "may be uninitialized" warning.
svn path=/trunk/; revision=46255
2012-11-28 20:31:13 +00:00
Guy Harris bab056d43c Clean up indentation.
svn path=/trunk/; revision=46254
2012-11-28 20:29:24 +00:00
Bill Meier c1b6433dcf Fix a [-Wshadow] warning;
Also:
 - create/use several extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46253
2012-11-28 20:03:10 +00:00
Anders Broman 70b35e6583 Remove an unused variable
svn path=/trunk/; revision=46252
2012-11-28 19:59:32 +00:00
Jeff Morriss c1c964db17 There's a macro for the Request bit. Use it instead of hard-coded 0x80.
svn path=/trunk/; revision=46249
2012-11-28 16:29:31 +00:00
Anders Broman ff85ba42ac From gyanesh:
BPDU dissector enhancement to recognize Shortest Path Bridging(SPB) BPDUs version 4 .

- Got rid of a couple of tvb_get_ptr().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7970

svn path=/trunk/; revision=46248
2012-11-28 15:59:53 +00:00
Jeff Morriss 87e64c2ab5 Add feature blurb for the fact that display filter fields can now be compared
in a display filter (r43069).

svn path=/trunk/; revision=46247
2012-11-28 15:34:58 +00:00
Jeff Morriss 7d0bb3bc0d Remove a now-unused variable.
svn path=/trunk/; revision=46246
2012-11-28 15:34:50 +00:00
Anders Broman 7d92266058 Add a copy button that copies to clipboard.
svn path=/trunk/; revision=46245
2012-11-28 14:34:20 +00:00
Michael Tüxen 99d406059f Add native SCTP encapsulation.
svn path=/trunk/; revision=46244
2012-11-28 12:16:12 +00:00
Martin Mathieson bd3b559725 - Allocate the correct number of elements to draw
- Draw data list then control list, so can spot blue of ACKs when zoomed
  right out
- Made the red crosses for NACKs smaller

svn path=/trunk/; revision=46243
2012-11-28 03:10:05 +00:00
Bill Meier 629f6d3291 Fix typo which cased compile error ...
svn path=/trunk/; revision=46242
2012-11-28 00:36:09 +00:00
Bill Meier 4297992b02 General cleanup:
- fix extensive use of expert...() under 'if(tree)'
- fix  a [-Wshadow] warning;
- create/use several extended variable strings;
- "localize" some variable definitions;
- remove some uneeded variable initializers;
- do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46240
2012-11-28 00:10:50 +00:00
Jeff Morriss 4da68e75e0 Warn about non-final parameters that aren't padded correctly. I'm not sure
that final parameters *with* padding is all that important (maybe it should
be there but not PI_ERROR?).

svn path=/trunk/; revision=46239
2012-11-27 23:13:56 +00:00
Jeff Morriss 38b58bd671 Delay the reading of the hosts file ("-H") until after cf_open() has been
called.  (cf_open() calls init_dissection() which, since r45511,
re-initializes the name resolution database.)

Complain if the user gives an invalid argument to "-W".

Specify the invalid argument if we don't like a "-z" argument.

svn path=/trunk/; revision=46238
2012-11-27 23:05:03 +00:00
Bill Meier 3a40f4d2a0 Fix [-Wuninitialized] warning.
svn path=/trunk/; revision=46237
2012-11-27 21:54:10 +00:00
Bill Meier 3617c83076 General cleanup:
- create/use extended variable string;
- #if 0 unused value_string arrays (instead of marking with _U_);
- "localize" some variable definitions;
- remove some uneeded variable initializers;
- reformat hf[] entries;
- do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46236
2012-11-27 21:48:15 +00:00
Anders Broman 20abe45694 Add more information about the capture.
svn path=/trunk/; revision=46224
2012-11-27 16:46:00 +00:00
Anders Broman 55a7c0f646 Get rid of now unused variable.
svn path=/trunk/; revision=46223
2012-11-27 14:42:28 +00:00
Bill Meier e5e3373e9d Fix several [-Wshadow] warnings;
Also:
 - Create/use several extended value strings;
 - Reformat hf[] array;
 - Do various whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46222
2012-11-27 14:34:27 +00:00
Anders Broman 79d397aae8 Add SKT as a vendor.
svn path=/trunk/; revision=46221
2012-11-27 13:36:58 +00:00
Anders Broman 6408671bad Add more parameters for Japanese ISUP.
svn path=/trunk/; revision=46220
2012-11-27 13:36:18 +00:00
Anders Broman 18d5f2dbfc Start including info from Statistics/Summary.
svn path=/trunk/; revision=46219
2012-11-27 13:35:33 +00:00
Alexis La Goutte 70a4056c1d From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
make[2]: *** No rule to make target `ui/qt/qtshark_fr.ts', needed by `ui/qt/qtshark_fr.qm'.  Stop.
make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
make: *** [all] Error 2

From me:
Add missing files (*.ts, *.qm) to ui/qt/Makefile.common

svn path=/trunk/; revision=46218
2012-11-27 13:14:37 +00:00
Alexis La Goutte 126c3f8b88 From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE):
  file Internal CMake error when trying to open file:
  /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading.
Call Stack (most recent call first):
  ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES)
...

From me:
Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common

svn path=/trunk/; revision=46217
2012-11-27 09:18:42 +00:00
Martin Mathieson 85e8ebaf19 Add %DL padding to LTE MAC stats.
svn path=/trunk/; revision=46215
2012-11-27 01:11:41 +00:00
Bill Meier c4e5b4745a Uh, it's BASE_EXT_STRING, not BASE_RANGE_STRING.
svn path=/trunk/; revision=46214
2012-11-27 00:11:43 +00:00
Bill Meier 56e910299a Fix several [-Wshadow] warnings;
Also:
 - Create/use several extended value strings;
 - Reformat hf[] array;
 - Do various whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46210
2012-11-26 21:19:44 +00:00
Bill Meier 0520b62b44 tvb_find_line_end() arg should be FALSE not ENC_BIG_ENDIAN.
svn path=/trunk/; revision=46209
2012-11-26 21:16:40 +00:00
Gerald Combs 1ffc96d153 From Dirk Jagdmann: Fix a comment in the DCERPC dissector header.
svn path=/trunk/; revision=46208
2012-11-26 21:16:09 +00:00
Anders Broman 45769c7975 Update MSG value string and add commented out info
svn path=/trunk/; revision=46207
2012-11-26 19:53:30 +00:00
Anders Broman 77dafd7b7c Add comment syúmmary to GUI and add Capture comment from SHB.
svn path=/trunk/; revision=46206
2012-11-26 18:52:29 +00:00
Bill Meier 044514edbd Fix several [-Wshadow] warnings;
Also:
- Create/use several extended value strings;
- Do various whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46205
2012-11-26 16:50:13 +00:00
Anders Broman beeabf86aa Rudimentary code to show comments summary.
svn path=/trunk/; revision=46204
2012-11-26 16:11:04 +00:00
Pascal Quantin 17781b66bf Add missing OPTIONAL keyword in RRCConnectionRequest message
svn path=/trunk/; revision=46202
2012-11-26 13:21:18 +00:00
Anders Broman 82e67826b4 Back out the SDP part of r46165 "Set up BFCP conversations".
svn path=/trunk/; revision=46201
2012-11-26 09:30:00 +00:00
Anders Broman 0f19bd385b From Jim Young:
Refactoring committed in Revision 460001 of tcp_graph.c introduced a copy&pasteo to wscale_make_elmtlist() such that compare_headers() would always return false.  Consequently no elements would get added to the list of elements to be plotted.

The attached patch corrects wscale_make_elmtlist() so that the Windows Scaling graph will plot elements.

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

svn path=/trunk/; revision=46200
2012-11-26 08:50:25 +00:00
Guy Harris 8b3de820ee Fix uninitialized-variable bug.
svn path=/trunk/; revision=46199
2012-11-26 03:45:55 +00:00
Guy Harris 83da3483cd If TSO support is enabled and, as a result, we assume an IP packet with
zero as the total length is the result of TSO, report that specially, so
that it's clearer why the we're reporting the length as non-zero when
it's zero in the packet data.

See

	http://ask.wireshark.org/questions/16279/why-are-the-bytes-00-00-but-wireshark-shows-an-ip-total-length-of-2016

svn path=/trunk/; revision=46198
2012-11-26 03:14:02 +00:00
Bill Meier 7c11289535 Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46197
2012-11-26 02:24:48 +00:00