Commit Graph

47857 Commits

Author SHA1 Message Date
Martin Kaiser 8905991b67 only one --capture-comment option may be given to dumpcap
svn path=/trunk/; revision=50946
2013-07-27 16:28:03 +00:00
Martin Kaiser 82ea635aa6 command line option --capture-comment for dumpcap
svn path=/trunk/; revision=50945
2013-07-27 16:25:08 +00:00
Martin Kaiser a585b45343 use capture_comment from the capture_options structure
when we write the SHB

svn path=/trunk/; revision=50944
2013-07-27 16:16:57 +00:00
Martin Kaiser e04a12af8c add capture_comment to the capture_options structure
svn path=/trunk/; revision=50943
2013-07-27 16:13:29 +00:00
Evan Huus 234cd8dac4 Add the proper license header and attribution to Balint's git-compare-abis script.
svn path=/trunk/; revision=50942
2013-07-27 13:50:52 +00:00
Evan Huus 5ede3bcde0 Follow-up to r50935: add support for 64-bit value strings in more places that
need it, I think this is all of them.

svn path=/trunk/; revision=50941
2013-07-26 23:51:00 +00:00
Evan Huus d22919194a Switch on field length for the length_min/max fields of IPFix. Like several
other nearby fields, they are different lengths in different versions of the
spec.

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

svn path=/trunk/; revision=50940
2013-07-26 23:16:16 +00:00
Evan Huus c0cac8611e Squelch MSVC warnings. It doesn't know that DISSECTOR_ASSERT_NOT_REACHED doesn't
return.

svn path=/trunk/; revision=50939
2013-07-26 22:52:34 +00:00
Evan Huus 6e3a30794e Add 64-bit value strings and the appropriate tooling (including yet another
overloaded use of the DISPLAY field). Thanks to Jakub for pointing out I'd done
this wrong the first time (months ago in r49357).

Fixes severity display for collectd protocol, originally filed at:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8472

svn path=/trunk/; revision=50935
2013-07-26 21:51:39 +00:00
Guy Harris 6580abbbc3 Give more detailed diagnostics for errors.
Actually *check* for errors when reading.

svn path=/trunk/; revision=50934
2013-07-26 21:49:42 +00:00
Guy Harris 9df4d49905 Send error messages to the standard error, and include the program name
in the error message.

svn path=/trunk/; revision=50928
2013-07-26 21:25:33 +00:00
Guy Harris 8d81fe9a0e The descriptive name for a field is the field full name; the name used
in packet-matching expressions and TShark's -e flag and... is the
field's abbreviated name.

svn path=/trunk/; revision=50927
2013-07-26 21:06:38 +00:00
Michael Mann 2675472389 Add support for common FT_ETHER cases.
Bugfix gauging where the "field text" argument when parsing the proto_tree_add_text call.

svn path=/trunk/; revision=50925
2013-07-26 18:30:10 +00:00
Michael Mann a7a2d51fae Add display filters courtesy of convert_proto_tree_add_text.pl
svn path=/trunk/; revision=50924
2013-07-26 18:27:38 +00:00
Jakub Zawadzki 2c85a33442 Fix bug #8980 - IO graph/advanced, max/min/summ error on frames with multiple Diameter messages
tap_iostat_packet() was fetching only first item for FT_RELATIVE_TIME.

svn path=/trunk/; revision=50923
2013-07-26 18:10:55 +00:00
Pascal Quantin 6b07d33130 Fix Frame Indicator analysis logic
svn path=/trunk/; revision=50920
2013-07-26 17:07:57 +00:00
Evan Huus c693d9c951 whitespace
svn path=/trunk/; revision=50919
2013-07-26 16:42:06 +00:00
Alexis La Goutte f15a20c9f0 Enhance BGP Update (Path Attribute)
Step 2 ! Make Path Attribute field filterable...

svn path=/trunk/; revision=50918
2013-07-26 16:26:29 +00:00
Alexis La Goutte 54fc4025e6 Enhance BGP Update
First step ! Remove ugly double switch(bgpa_type)... (use proto_item_append_text)

svn path=/trunk/; revision=50917
2013-07-26 16:26:21 +00:00
Alexis La Goutte aa27f065a1 From Thomas ERSFELD (GSoC13)
Automatic resize the content of UAT window dialog

svn path=/trunk/; revision=50916
2013-07-26 16:26:04 +00:00
Bill Meier e442680f48 gtk_widget_modify_font() has been renamed to gtk_widget_override_font() in GTK3
svn path=/trunk/; revision=50915
2013-07-26 16:19:00 +00:00
Anders Broman 22b3ead1c4 Add dissection of more IEs
svn path=/trunk/; revision=50912
2013-07-26 15:58:17 +00:00
Evan Huus 828eae73ce Document that pinfo-scoped memory is also needed for anything passed to
add_new_data_source().

svn path=/trunk/; revision=50911
2013-07-26 13:06:50 +00:00
Pascal Quantin 53ddabfe2e Align info column for AM/UM/TM PDUs
svn path=/trunk/; revision=50910
2013-07-26 10:39:23 +00:00
Pascal Quantin 373fde85bd Add Channel ID to MTCH PDUs
svn path=/trunk/; revision=50909
2013-07-26 10:21:05 +00:00
Alexis La Goutte 5988d137d8 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8972 ieee80211: Dissect QoS Mapping information
This patch adds support for dissecting QoS Map Configure frame and QoS Map Set element per Interworking functionality that was added in IEEE 802.11u

svn path=/trunk/; revision=50908
2013-07-26 08:51:59 +00:00
Alexis La Goutte 09dd131320 Oups... Revert my change (See revision 50905)
svn path=/trunk/; revision=50907
2013-07-26 07:02:12 +00:00
Alexis La Goutte 6e5d6b84b9 Fix compilation of qtshark
ui/qt/uat_dialog.cpp: In member function ‘void UatDialog::stringPrefTextChanged(const QString&)’:
ui/qt/uat_dialog.cpp:371:10: error: variable ‘enable_ok’ set but not used [-Werror=unused-but-set-variable]

And remove a tabs

svn path=/trunk/; revision=50906
2013-07-26 06:54:11 +00:00
Guy Harris bab7316bf2 Guess what the intent of the enable_ok Boolean was.
svn path=/trunk/; revision=50905
2013-07-26 06:51:59 +00:00
Gerald Combs ec23a1003c Call on_uatTreeWidget_itemActivated directly. Fixes compilation on
older versions of Qt.

svn path=/trunk/; revision=50904
2013-07-26 01:48:05 +00:00
Jeff Morriss 5c6e1d5d40 From Cal Turney and Jiří Engelthaler via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :

The fix for bug 5585 (r35583) is no longer necessary (thanks to r50516) and it
causes the screen to flicker when clicking on bytes in the bytes pane.

svn path=/trunk/; revision=50903
2013-07-26 01:45:48 +00:00
Jeff Morriss 588bc03a5b From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8977 :
In SSH, the protocol version message is terminated by CR LF. Wireshark, in the
info column, strips out the LF, but not the CR.

Attaching a patch to rectify that.

Also, as requested, update the contributor's email address in AUTHORS.

svn path=/trunk/; revision=50902
2013-07-26 01:35:44 +00:00
Jeff Morriss 26197c1693 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8952 :
Microsoft describes a feature called Bind Time Feature Negotiation used in
DCE/RPC Bind/BindAck PDUs. See http://msdn.microsoft.com/en-us/library/cc243715.aspx

In the Bind PDU they encode 2 bits into the Transfer Syntax UUID. In the
BindAck PDU they encode 2 bits into the result code. The attached patch
dissects these two special bits. For the UUID I've simply added 4 UUIDs each
with the same name; this works best with the DCE/RPC UUID lookup code. If
Microsoft would ever introduce more bits we could change this to a better
handling, since the current solution obviously doesn't scale.

Apart from adding new hf_ and ett_ variables and using them, I've also renamed
"Transport Syntax" to "Transfer Syntax", since the specifications only use
"Transfer".

svn path=/trunk/; revision=50901
2013-07-26 01:18:34 +00:00
Jeff Morriss 1b278a3db0 From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8951 :
Currently, the only attribute that is dissected is attribute 82 in page 1.

The approach for dissecting an attribute requires defining a function that
processes the attribute-specific fields. However, most attributes consists of
a single field, and the only difference between attributes is because of their
length and format (that is already defined for the header field). The current
code also assumes that the attribute length is always correct (e.g. the
attribute has 8 bytes if the field is registered as FT_UINT64).

As a proof of concept, this patch adds support for 3 attributes in the Current
Command attributes page (see OSD2r4 section 7.1.3.31) and prepares a framework
for dissecting additional attributes (dissection of additional attributes will
be delivered in a separate patch).


From me:

Move the new length checking up to the caller rather than repeating it in
every attribute dissector.

Use proto_tree_add_expert_format() instead of proto_tree_add_text() plus
expert_add_info().

Fix checkfiltername.pl error:

    scsi_osd.scsi_osd_attribute_length.invalid duplicates PROTOABBREV of scsi_osd

Remove trailing white space and fix up some indentation.

svn path=/trunk/; revision=50900
2013-07-26 01:09:41 +00:00
Jeff Morriss effa86350a From Chen Li via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8949 :
Fix the dissection of the port number in announce_peers request in BTDHT.

svn path=/trunk/; revision=50899
2013-07-26 00:24:54 +00:00
Evan Huus a934ff953f Add missing ui_uat_dialog.h dependency.
The fact that we're listing these manually is kind of ugly...

svn path=/trunk/; revision=50898
2013-07-26 00:23:09 +00:00
Evan Huus 8441fff193 Use the pinfo pool for adding data sources in the h245 dissector. The packet
pool is freed before the packet is displayed or otherwise processed, so adding
data sources from it leads to use-after-free errors.

Not sure why this wasn't showing up in the fuzz-bot valgrind step, there
are lots of h245 captures in the menagerie...

svn path=/trunk/; revision=50897
2013-07-25 23:58:49 +00:00
Gerald Combs a05f55bffc Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.

Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.

Update the Qt README.

svn path=/trunk/; revision=50896
2013-07-25 23:49:47 +00:00
Evan Huus 7d73903af6 Multiple improvements and bug-fixes for the fuzz-test script:
- fix a few pieces of bad indentation
- exit cleanly in all cases where we receive a SIGINT or other signal
- check for valgrind bugs and dissector errors with every set of arguments (-nr
  vs -nVxr etc) not just the last
- consider it an error if valgrind reports more than 500KB of leaked memory

For the last point, 500KB is hopefully a safe choice for now since we only leak
about 2KB "by default" and I have no idea what the state of most "non-default"
code is with respect to memory leaks. I would like to eventually work this
down to 0 of course :)

svn path=/trunk/; revision=50895
2013-07-25 23:28:38 +00:00
Evan Huus 7b1aa04181 Fix a bug in the Kafka dissector handling PRODUCE requests with a RequiredAcks
field of 0 - we don't expect a response to them.

svn path=/trunk/; revision=50894
2013-07-25 22:45:02 +00:00
Michael Mann c1e75c8ff3 Add a few filters to keep checkAPIs.pl happy.
svn path=/trunk/; revision=50893
2013-07-25 19:11:31 +00:00
Jeff Morriss d58c13c363 As pointed out in https://www.wireshark.org/lists/wireshark-dev/201307/msg00153.html :
The fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290 needs
to allow for giving a length of -1 for FT_STRINGZ's.

This is another fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8960
(in addition to r50836).  There's no point in reverting that revision, though,
since there was no need to use a length of -1 in that case.

svn path=/trunk/; revision=50892
2013-07-25 18:37:18 +00:00
Pascal Quantin a92ee76d3e Add a smarter UM analysis for MCCH/MTCH channels
svn path=/trunk/; revision=50891
2013-07-25 17:33:57 +00:00
Jakub Zawadzki 696a79707b Optimize proto_item_append_string()
- When old string empty just pass new one (like: frame.protocols)
- if not, use ep_strconcat()

svn path=/trunk/; revision=50890
2013-07-25 17:19:17 +00:00
Jeff Morriss 35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Guy Harris cb12fbb78c Fix some warnings that show up on OS X.
Clean up indentation (use 4-space indentation, and no tabs).

svn path=/trunk/; revision=50888
2013-07-25 10:05:41 +00:00
Guy Harris 629ee9ed81 Fix some more bugs that caused compiler warnings.
svn path=/trunk/; revision=50887
2013-07-25 09:53:28 +00:00
Guy Harris 166eb4f53d Get rid of an unused variable (set, but not used).
Get rid of extra arguments to expert_add_info_format_text() - as with
any other printf-like routine, if the format string has no % items, you
don't need to pass any additional arguments after that - you don't have
to tack on a BASE_NONE just for the lulz.

svn path=/trunk/; revision=50886
2013-07-25 09:03:02 +00:00
Anders Broman b2ba9d676e Commiting Jakub Zawadzkis memory_dlg even if he does not think it's ready yet so others can add to it if they like. Fixed it to work on Windows too. It can always be removed if nothing comes of it.
svn path=/trunk/; revision=50885
2013-07-25 04:40:37 +00:00
Michael Mann 3b3ff69af7 1. MASSIVE conversion of proto_tree_add_text to proto_tree_add_item with the help of (and a few passes of) convert_proto_tree_add_text.pl. Tried to keep display filter names in line with existing filters.
2. Cleaned up a bunch of proto_tree_add_xxx that could really be proto_tree_add_item so "useless" local variables could be removed.

3. Bugfixed a few bitmask (probably) copy/pasteos.

4. Better standardized whitespace and added modelines.

5. Still think some of the "object" filters (with BASE_NONE) could be removed in favor of a single filter (value_string) with object ID number (BASE_DEC), but I'll leave that to someone more familiar with the protocol.

svn path=/trunk/; revision=50884
2013-07-25 03:16:43 +00:00