Commit Graph

49661 Commits

Author SHA1 Message Date
Martin Kaiser 9f3740b414 simplify file_error()
svn path=/trunk/; revision=52944
2013-10-29 11:04:03 +00:00
Martin Kaiser 5ec452c288 allow err_info==NULL in file_error()
this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9309
reported by Peter Wu

svn path=/trunk/; revision=52943
2013-10-29 09:15:02 +00:00
Martin Kaiser a876a4306d From Peter Wu
write editcap debug infos to stderr
print some of those messages only in verbose mode 

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

svn path=/trunk/; revision=52942
2013-10-29 08:34:35 +00:00
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Jeff Morriss 58d01512b1 Make it so out-of-tree builds (autofoo and cmake) have access to the various
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.

Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).

The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one).  Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.

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

svn path=/trunk/; revision=52940
2013-10-29 02:28:16 +00:00
Guy Harris 766a32779a Support building and installing both Qt and GTK+.
When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of
autoconf do so for GCC-compatible compilers (clang is GCC-compatible in
that sense), but only do so when those variables aren't forced.

svn path=/trunk/; revision=52939
2013-10-29 01:49:59 +00:00
Michael Mann e15afadb11 Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter.
svn path=/trunk/; revision=52938
2013-10-29 00:25:57 +00:00
Gerald Combs 4e94bdcb85 Fix scroll bar ranges.
svn path=/trunk/; revision=52937
2013-10-28 23:57:57 +00:00
Gerald Combs 360c4fba21 Add c-ares. Untested, but it *should* work.
svn path=/trunk/; revision=52936
2013-10-28 22:38:23 +00:00
Gerald Combs 66558ef5a8 Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Martin Kaiser 6ef5eb635c TABs -> spaces
add editor modelines

svn path=/trunk/; revision=52934
2013-10-28 21:49:56 +00:00
Pascal Quantin 447d3938ed Add Tinkerforge to the list of new protocols
svn path=/trunk/; revision=52933
2013-10-28 21:19:21 +00:00
Bill Meier fbba4415a6 FIX compiler warning:
packet-gtp.c: In function 'dissect_gtp_common':
  packet-gtp.c:7838: warning: unused variable 'pd_save'

svn path=/trunk/; revision=52932
2013-10-28 20:37:58 +00:00
Bill Meier 11934cfb11 From Ishraq Ibne Ashraf: Tinkerforge protocol dissector
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9324

From me:

1. Move certain global vars to local storage in dissect_tfp_common()

2. Declare all remaining global vars as static;

3. Fix some bugs:
    - base58_encode() needed to be called before call to col_add_fstr()
    - display of UID string in tree was being truncated to 4 characters

4. Cleanup whitespace: use consistent indentation (tabs); remove trailing whitespace;

5. Add editor modelines




svn path=/trunk/; revision=52931
2013-10-28 20:07:58 +00:00
Michael Mann e68d15514b Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used.
svn path=/trunk/; revision=52930
2013-10-28 20:00:04 +00:00
Gerald Combs 31db0135f4 Add some verbosity.
svn path=/trunk/; revision=52929
2013-10-28 19:09:58 +00:00
Michael Tüxen 9a2f5a2db2 Fix the compilation.
I guess this is what is meant. Only compile tested...

svn path=/trunk/; revision=52928
2013-10-28 18:59:33 +00:00
Anders Broman 3f0e0d5cbf Add an if(tree) and tweek col_add_fstr().
svn path=/trunk/; revision=52927
2013-10-28 18:10:16 +00:00
Jeff Morriss d07f872c90 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :
SVN rev 50525 tried to fix out-of-source-tree builds, but did so by
writing the .rcc.cpp files to the source tree. This was noticed when
running `make distcheck`. This patch reverts that behavior, and creates
the image/ directory to fix out-of-tree builds.

In other words, fix things so "make distcheck" with Qt works in out-of-tree
builds too.

svn path=/trunk/; revision=52926
2013-10-28 18:01:09 +00:00
Martin Kaiser 5587250676 make Pointer filterable
svn path=/trunk/; revision=52925
2013-10-28 17:16:43 +00:00
Martin Kaiser 8367a1acbd packed_analysis_data_t -> packet_analysis_data_t
svn path=/trunk/; revision=52924
2013-10-28 17:13:13 +00:00
Martin Kaiser 1a7a05ab55 correct typos
svn path=/trunk/; revision=52923
2013-10-28 17:10:09 +00:00
Martin Kaiser 8a2b9d87f3 remove unnecessary return; lines
svn path=/trunk/; revision=52922
2013-10-28 17:08:55 +00:00
Martin Kaiser 8883b7a045 add tags file to .gitignore
svn path=/trunk/; revision=52921
2013-10-28 17:07:14 +00:00
Martin Kaiser c89b9a2cdc initialize tree variables
svn path=/trunk/; revision=52920
2013-10-28 16:59:57 +00:00
Michael Mann 5de5fe6cb1 Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=52919
2013-10-28 15:59:26 +00:00
Martin Mathieson 63407767cf Remove accidentally-added private dissectors from Makefile
svn path=/trunk/; revision=52918
2013-10-28 14:26:13 +00:00
Martin Mathieson bf004cced4 Comment changes only
svn path=/trunk/; revision=52917
2013-10-28 14:09:39 +00:00
Michael Mann 3b91b9586f Pass tcap_private into the dissectors that need it rather than use private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use.
svn path=/trunk/; revision=52916
2013-10-28 13:36:49 +00:00
Bill Meier 6697d30b72 Revert SVN #52914;
OSX-10.6-x64 buildbot still givs an error
(At least we now know which line of code gives the error).

svn path=/trunk/; revision=52915
2013-10-28 04:07:52 +00:00
Bill Meier 2c3ec284db From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280

(Revised patch: let's see if this version compiles w/o error
                on all the buildbots)


svn path=/trunk/; revision=52914
2013-10-28 03:16:31 +00:00
Gerald Combs 3b7c0fffe4 More size and position tweaks.
svn path=/trunk/; revision=52913
2013-10-28 01:39:20 +00:00
Evan Huus 20bbd49810 Use _add_item not _add_uint as pointed out by checkAPI
svn path=/trunk/; revision=52912
2013-10-28 00:43:18 +00:00
Jeff Morriss c5bc8e95ff Fix up some formatting.
svn path=/trunk/; revision=52911
2013-10-28 00:25:20 +00:00
Michael Mann 3ead3a994a Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well.
I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether.  Could also see renaming columns to DEPRECATED_[X].

svn path=/trunk/; revision=52910
2013-10-27 23:18:19 +00:00
Evan Huus 233c409184 Dissect Kafka "fetch" requests and responses.
svn path=/trunk/; revision=52909
2013-10-27 23:08:01 +00:00
Jeff Morriss 9259176f87 As pointed by Evan: don't leak memory when the string pointer is NULL.
svn path=/trunk/; revision=52908
2013-10-27 22:40:55 +00:00
Pascal Quantin 18b9db29b9 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
NFC: Add PN532 HCI dissector

svn path=/trunk/; revision=52907
2013-10-27 22:40:45 +00:00
Gerald Combs 5c65e00ca7 Try to improve the appearance of the sequence diagram.
Use integer coordinates for the arrows and text. Add smooth_font_size()
to qt_ui_utils which will hopefully adjust the size on Windows to
something more readable.

svn path=/trunk/; revision=52906
2013-10-27 22:23:27 +00:00
Jeff Morriss 8e2f00bf3d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :
Actually handle non-NULL-terminated FT_STRINGs properly.

svn path=/trunk/; revision=52905
2013-10-27 21:56:58 +00:00
Martin Mathieson b0aa70b807 Initialise a couple of variables to avoid bogus may-be-used-uninitialised warnings with my version of gcc
svn path=/trunk/; revision=52904
2013-10-27 21:52:35 +00:00
Pascal Quantin 289c2796ad From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: Decode HID interface subclasses and protocols

svn path=/trunk/; revision=52903
2013-10-27 21:32:32 +00:00
Pascal Quantin 13b39aa30d From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: CDC: Decode ACM, CM and Union Functional Descriptors

svn path=/trunk/; revision=52902
2013-10-27 21:14:22 +00:00
Pascal Quantin 3f26a0fc52 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: Decode CDC subclasses and protocols

svn path=/trunk/; revision=52901
2013-10-27 20:59:43 +00:00
Evan Huus 8ab858ef99 Mark unused parameters.
svn path=/trunk/; revision=52900
2013-10-27 20:58:00 +00:00
Michael Mann 8c64c5da89 Remove iplen and iphdrlen from struct _packet_info.
Dissectors should just use (reported) tvb length and taps have other ways to get the data.

svn path=/trunk/; revision=52899
2013-10-27 20:38:42 +00:00
Pascal Quantin 63ff652b8e Fix relative path now that u3 folder has been removed
svn path=/trunk/; revision=52898
2013-10-27 19:45:30 +00:00
Pascal Quantin d8bbe9bda2 Do not reset pinfo->curr_layer_num in packet-frame.c
Before this change, curr_layer_num could be off by 1 depending on whether we
generated items for Frame protocol or not, leading to a failure to get the
UDP heuristic dissector identified during first pass

svn path=/trunk/; revision=52897
2013-10-27 19:33:55 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Gerald Combs 858524047c Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.
svn path=/trunk/; revision=52895
2013-10-27 17:14:12 +00:00