10 years agosmb2-dissector: learn the "REPLAY_OPERATION" flag trunk
Michael Adam [Sat, 3 Mar 2012 01:12:56 +0000 (02:12 +0100)]
smb2-dissector: learn the "REPLAY_OPERATION" flag

10 years agosmb2-dissector: teach new ENCRYPT_DATA smb2 share flag
Michael Adam [Fri, 2 Mar 2012 18:44:16 +0000 (19:44 +0100)]
smb2-dissector: teach new ENCRYPT_DATA smb2 share flag

10 years agosmb2-dissector: add new share capabilites SCALEOUT and CLUSTER
Michael Adam [Fri, 2 Mar 2012 18:33:23 +0000 (19:33 +0100)]
smb2-dissector: add new share capabilites  SCALEOUT and CLUSTER

10 years agosmb2: fix the display of the persistent handles global capability
Michael Adam [Wed, 29 Feb 2012 02:45:42 +0000 (03:45 +0100)]
smb2: fix the display of the persistent handles global capability

10 years agosmb2: add support for the SMB2_GLOBAL_CAP_ENCRYPTION
Michael Adam [Wed, 29 Feb 2012 02:43:28 +0000 (03:43 +0100)]
smb2: add support for the SMB2_GLOBAL_CAP_ENCRYPTION

10 years agoFrom Mike Morrin: Fix for "The previous patch had an error and was returning too...
wmeier [Tue, 28 Feb 2012 20:32:42 +0000 (20:32 +0000)]
From Mike Morrin: Fix for "The previous patch had an error and was returning too many bits."


From me: Correct the indentation to match the rest of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41230 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoShow number of extensions in header root.
martinm [Tue, 28 Feb 2012 19:01:24 +0000 (19:01 +0000)]
Show number of extensions in header root.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41229 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoInitialize "value" in _tvb_get_bits64(). Clean up indentation.
guy [Tue, 28 Feb 2012 18:31:19 +0000 (18:31 +0000)]
Initialize "value" in _tvb_get_bits64().  Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41228 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix several messages of type:
jmayer [Tue, 28 Feb 2012 17:44:49 +0000 (17:44 +0000)]
Fix several messages of type:
epan/tvbuff.c: In function ‘tvb_get_bits16’:
epan/tvbuff.c:1736:82: error: unused parameter ‘encoding’ [-Werror=unused-parameter]

Compilation still fails with:
epan/tvbuff.c: In function ‘_tvb_get_bits64’:
epan/tvbuff.c:1829:19: error: ‘value’ may be used uninitialized in this function [-Werror=uninitialized

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41227 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Mike Morrin:
etxrab [Tue, 28 Feb 2012 16:29:07 +0000 (16:29 +0000)]
From Mike Morrin:
Overhaul of tvb_get_bitsxx() functions.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41226 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAnother try: we're in epan here so getting to libwsutil and wiretap requires going...
morriss [Tue, 28 Feb 2012 16:08:47 +0000 (16:08 +0000)]
Another try: we're in epan here so getting to libwsutil and wiretap requires going up a directory; getting to epan things does not require 'epan' in the path.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41225 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove an extraneous backslash
morriss [Tue, 28 Feb 2012 15:04:45 +0000 (15:04 +0000)]
Remove an extraneous backslash

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41224 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoOK, to heck with it - link reassemble_test with libwireshark. Trying to
guy [Tue, 28 Feb 2012 09:00:05 +0000 (09:00 +0000)]
OK, to heck with it - link reassemble_test with libwireshark.  Trying to
selectively pick up particular object files is just too much of a mess.

Alas, this requires that we add some additional symbols to the list
exported by libwireshark; the DCE RPC ones shouldn't be global, but
reassemble_test uses them, so....

Get rid of stubs in reassemble_test.c - they just stub out routines from
libwireshark, but that's not necessary any more.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41223 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemoved one variable to much.
etxrab [Tue, 28 Feb 2012 08:45:03 +0000 (08:45 +0000)]
Removed one variable to much.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41222 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Mijo Safradin:
etxrab [Tue, 28 Feb 2012 08:04:24 +0000 (08:04 +0000)]
From Mijo Safradin:
Add ECP VDP TLV dissector.

Fixed encoding arguments, removed unused variables checkapi errors

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41221 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Sean Bright:
etxrab [Tue, 28 Feb 2012 07:32:19 +0000 (07:32 +0000)]
From Sean Bright:
IAX2 trunk packets display misleading call information.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41220 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoreassemble_test now requires mark_frame_as_depended_upon(), so it
guy [Tue, 28 Feb 2012 07:06:59 +0000 (07:06 +0000)]
reassemble_test now requires mark_frame_as_depended_upon(), so it
requires packet.c.  (If it requires any more, we should just make it
link with libwireshark in its entirety.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41219 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPacket comments are working
etxrab [Tue, 28 Feb 2012 06:05:32 +0000 (06:05 +0000)]
Packet comments are working

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41218 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Josip Medved: EAP-SIM and EAP-AKA are missing some attributes. https://bugs...
etxrab [Tue, 28 Feb 2012 06:04:02 +0000 (06:04 +0000)]
From Josip Medved: EAP-SIM and EAP-AKA are missing some attributes. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6877

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41217 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -
morriss [Tue, 28 Feb 2012 03:19:49 +0000 (03:19 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -
make Save-As/Displayed/All-Packets save not only the displayed packets but
also any other packets needed (e.g., for reassembly) to fully dissect the
displayed packets.

This works only for the "All packets" case; choosing only the Selected packet,
the Marked packets, or a range of packets would require actually storing which
packets depend on which (too much memory) or going through the packet list many
times (too slow).  Also, this behavior is always the case: you can't save the
displayed packets without their dependencies (I don't see why this would be

So far this is done for SCTP and things using the reassembly routines (TCP has
been tested).

The Win32 dialog was modified but hasn't been tested yet.

One confusing aspect of the UI is that the Displayed count in the Save-As
dialog does not match the number of displayed packets.  (I tried renaming the
button "Displayed + Dependencies" but it looked too big.)  The tooltip tries
to explain this and the fact that this works only in the All-Packets case;
suggestions for improvement are welcome.

Implementation details:

Dissectors (or the reassembly code) can list frames which were needed to
build the current frame's tree.  If the current frame passes the display
filter then each listed frame is marked as "depended upon" (this takes up the
last free frame_data flag).

When performing a Save-As/Displayed/All-Packets then choose packets which
passed the dfilter _or_ are depended upon.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41216 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSome more details about REC_HEADER1 and REC_V2DESC; REC_HEADER1 doesn't
guy [Tue, 28 Feb 2012 01:11:11 +0000 (01:11 +0000)]
Some more details about REC_HEADER1 and REC_V2DESC; REC_HEADER1 doesn't
appear to contain anything of use to us - too random - but REC_V2DESC
might be worth converting into a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41215 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAnd more details.
guy [Mon, 27 Feb 2012 21:34:59 +0000 (21:34 +0000)]
And more details.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41214 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGive more details in comments.
guy [Mon, 27 Feb 2012 21:33:53 +0000 (21:33 +0000)]
Give more details in comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41213 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd documentation for the the tshark follow tcp/udp streams feature added
morriss [Mon, 27 Feb 2012 19:05:55 +0000 (19:05 +0000)]
Add documentation for the the tshark follow tcp/udp streams feature added
with https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6684

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41212 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 27 Feb 2012 16:50:27 +0000 (16:50 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41211 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6873
alagoutte [Mon, 27 Feb 2012 16:48:29 +0000 (16:48 +0000)]
From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6873
USB: SETUP information can be added to incorrect tree

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41210 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Alex Rodikov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6871
alagoutte [Mon, 27 Feb 2012 16:43:18 +0000 (16:43 +0000)]
From Alex Rodikov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6871
TPNCP (proprietary Audiocodes) protocol dessector - wrong guint8 value presentation

The presentation of unsigned 8-bit integer is wrong. The (signed) gint8 is used which is displayed as unsigned integer (by proto_tree_add_uint) afterwards.
That causes wrong presentation of valus which bigger than 127.
Solution: New guint8 is introduced to present unsigned 8 bit integer value.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41209 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMark the file as unsaved when updating packet comments.
etxrab [Mon, 27 Feb 2012 15:38:34 +0000 (15:38 +0000)]
Mark the file as unsaved when updating packet comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41208 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMore Warning fixes.
etxrab [Mon, 27 Feb 2012 12:48:08 +0000 (12:48 +0000)]
More Warning fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41207 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMore warning fixes.
etxrab [Mon, 27 Feb 2012 12:13:06 +0000 (12:13 +0000)]
More warning fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41206 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoTry to fix warning: comparison between signed and unsigned.
etxrab [Mon, 27 Feb 2012 11:48:38 +0000 (11:48 +0000)]
Try to fix warning: comparison between signed and unsigned.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41205 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix some unused parameter warnings etc.
etxrab [Mon, 27 Feb 2012 11:44:19 +0000 (11:44 +0000)]
Fix some unused parameter warnings etc.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41204 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoError: Found deprecated APIs in packet-ssl-utils.c: dissector_add
etxrab [Mon, 27 Feb 2012 10:05:22 +0000 (10:05 +0000)]
Error: Found deprecated APIs in packet-ssl-utils.c: dissector_add

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41203 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agopacket-applemidi.c:296:33: error: unused variable ‘p_conv_data’
etxrab [Mon, 27 Feb 2012 09:49:20 +0000 (09:49 +0000)]
packet-applemidi.c:296:33: error: unused variable ‘p_conv_data’

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41202 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Michael Mann:
etxrab [Mon, 27 Feb 2012 09:30:26 +0000 (09:30 +0000)]
From Michael Mann:
a dissector for the ODVA protocol: CIP Safety. More information
about the protocol can be found here:



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41201 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Tobias Erichsen:
etxrab [Mon, 27 Feb 2012 09:18:53 +0000 (09:18 +0000)]
From Tobias Erichsen:
RTP-MIDI - dissector for transmission of MIDI-commands via RTP (RFC 4695).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41200 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRe-apply r40728 and fix Coverity CID 1371 UNINIT again.
cmaynard [Mon, 27 Feb 2012 00:25:41 +0000 (00:25 +0000)]
Re-apply r40728 and fix Coverity CID 1371 UNINIT again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41199 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMark the gile as unsaved if comments are edited
etxrab [Sun, 26 Feb 2012 19:54:58 +0000 (19:54 +0000)]
Mark the gile as unsaved if comments are edited

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41198 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDissect SSH over SCTP when using the IANA assigned SCTP port 22.
tuexen [Sun, 26 Feb 2012 17:54:32 +0000 (17:54 +0000)]
Dissect SSH over SCTP when using the IANA assigned SCTP port 22.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41197 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMove the new files to the same places as in automake.
jmayer [Sun, 26 Feb 2012 17:51:40 +0000 (17:51 +0000)]
Move the new files to the same places as in automake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41196 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHarald Welte <laforge@gnumonks.org>
jmayer [Sun, 26 Feb 2012 17:30:38 +0000 (17:30 +0000)]
Harald Welte <laforge@gnumonks.org>
via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6792

This is a new dissector for the non-standard Ericsson OM2000 protocol, as it is
used for the OML on A-bis of Ericsson RBS 2xxx BTSs.

It also includes a dissector for a shim-layer protocol that Ericsson uses for
IP-based A-bis like the RBS 2409.  As the protocol is not publicly documented,
I have invented the name "EHDLC" (Ericsson HLDC) for it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41195 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd entry for TPDU in the tree
etxrab [Sun, 26 Feb 2012 17:10:40 +0000 (17:10 +0000)]
Add entry for TPDU in the tree

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41194 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake it possible to edit capture comments
etxrab [Sun, 26 Feb 2012 17:04:28 +0000 (17:04 +0000)]
Make it possible to edit capture comments

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41193 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago[Automatic manuf, services and enterprise-numbers update for 2012-02-26]
gerald [Sun, 26 Feb 2012 15:03:43 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-02-26]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41190 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Robin Seggelmann: Add support for RFC 6520.
tuexen [Sun, 26 Feb 2012 13:50:52 +0000 (13:50 +0000)]
From Robin Seggelmann: Add support for RFC 6520.
From me: Some cleanup
Initial work was done by Denis Jaeger and
Lukas Scharlau, but the code got rewritten by Robin.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41189 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFor LANalyzer files, make the "File type name" be the file comment.
guy [Sun, 26 Feb 2012 10:20:40 +0000 (10:20 +0000)]
For LANalyzer files, make the "File type name" be the file comment.

Display the file comment in the Summary dialog.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41188 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSuppress invalid or non-meaningful statistics - for example, without
guy [Sun, 26 Feb 2012 08:02:02 +0000 (08:02 +0000)]
Suppress invalid or non-meaningful statistics - for example, without
time stamps on all packets in a set, you can't determine the start and
end time of the packets in the set (even one timestampless packet throws
the determination off - was that packet before the first time-stamped or
after the last time-stamped packet, or between them?).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41187 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't show time stamp-based information if we don't have it (now that we
guy [Sun, 26 Feb 2012 05:51:54 +0000 (05:51 +0000)]
Don't show time stamp-based information if we don't have it (now that we
know whether packets - or "packets" - have time stamps).

Show the time stamp order as "Unknown" if we don't have enough
information to determine whether it's certainly in order or out of order
(XXX - we should do that if we have only one packet that has a time stamp).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41186 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd a presence flag field to the packet information structure filled in
guy [Sat, 25 Feb 2012 23:24:34 +0000 (23:24 +0000)]
Add a presence flag field to the packet information structure filled in
by Wiretap, to indicate whether certain fields in that structure
actually have data in them.

Use the "time stamp present" flag to omit showing time stamp information
for packets (and "packets") that don't have time stamps; don't bother
working very hard to "fake" a time stamp for data files.

Use the "interface ID present" flag to omit the interface ID for packets
that don't have an interface ID.

We don't use the "captured length, separate from packet length, present"
flag to omit the captured length; that flag might be present but equal
to the packet length, and if you want to know if a packet was cut short
by a snapshot length, comparing the values would be the way to do that.

More work is needed to have wiretap/pcapng.c properly report the flags,
e.g. reporting no time stamp being present for a Simple Packet Block.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41185 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Jose Pedro Oliveira: pcapio is writing the if_speed value in the IDB_TSRESOL...
etxrab [Sat, 25 Feb 2012 08:20:50 +0000 (08:20 +0000)]
From Jose Pedro Oliveira: pcapio is writing the if_speed value in the IDB_TSRESOL optiones

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41184 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAs suggested by multipleinterfaces in http://ask.wireshark.org/questions/9194/can...
morriss [Fri, 24 Feb 2012 21:43:48 +0000 (21:43 +0000)]
As suggested by multipleinterfaces in ask.wireshark.org/questions/9194/can-i-recover-a-discarded-capture :

Add the location of the temporary file on Windows 7.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41183 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
morriss [Fri, 24 Feb 2012 20:33:19 +0000 (20:33 +0000)]
Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
and r39501:

Setting _XOPEN_SOURCE to 600 is only allowed on Solaris 10 if the compiler is
set to C99 mode.  Conversely (and as reported in the bug), simply defining it
(but with no value) is not allowed if the compiler *is* compiling to C99.

So, don't define _XOPEN_SOURCE at all on Solaris.  Keep defining it as 600 on
other OS's as (also) requested in that bug.

Maybe there's a cleaner way to do this but all of this is a "trickery" mess

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41182 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agog_fprintf() & g_vfprintf() should not be used....
wmeier [Fri, 24 Feb 2012 19:02:28 +0000 (19:02 +0000)]
g_fprintf() & g_vfprintf() should not be used....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41181 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoCVARSDLL hasn't been used (is undefined) for a while....
wmeier [Fri, 24 Feb 2012 16:23:38 +0000 (16:23 +0000)]
CVARSDLL hasn't been used (is undefined) for a while....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41180 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a typo and revert previous.
etxrab [Fri, 24 Feb 2012 15:57:56 +0000 (15:57 +0000)]
Fix a typo and revert previous.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41179 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a typo.
etxrab [Fri, 24 Feb 2012 15:53:00 +0000 (15:53 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41178 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Martin Kaiser:
etxrab [Fri, 24 Feb 2012 14:40:31 +0000 (14:40 +0000)]
From Martin Kaiser:
Get rid of an unused variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41177 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Irene Ruengeler: Always show snaplen.
tuexen [Fri, 24 Feb 2012 13:13:21 +0000 (13:13 +0000)]
From Irene Ruengeler: Always show snaplen.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41176 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Irene Ruengeler: Fix a bug where the interface
tuexen [Fri, 24 Feb 2012 13:05:33 +0000 (13:05 +0000)]
From Irene Ruengeler: Fix a bug where the interface
names are not shown during capturing.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41175 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Irene Ruengeler: Whitespace changes.
tuexen [Fri, 24 Feb 2012 12:54:15 +0000 (12:54 +0000)]
From Irene Ruengeler: Whitespace changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41174 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
alagoutte [Fri, 24 Feb 2012 08:18:30 +0000 (08:18 +0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
Support HDCP version 1 over I2c

the attached patch adds support for HDCP version 1. This is the authentication that runs between your DVD/Bluray player and your TV when they're connected via an HDMI cable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41173 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
alagoutte [Fri, 24 Feb 2012 07:57:48 +0000 (07:57 +0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
Support HDCP version 1 over I2c

the attached patch adds support for HDCP version 1. This is the authentication that runs between your DVD/Bluray player and your TV when they're connected via an HDMI cable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41172 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Robert Shade: Mobile IP NVSE (RFC3115) Decoding https://bugs.wireshark.org/bugzi...
etxrab [Fri, 24 Feb 2012 05:50:47 +0000 (05:50 +0000)]
From Robert Shade: Mobile IP NVSE (RFC3115) Decoding https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6868

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41171 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Mark Cottrell: Attempting to view an RTP stream analysis graph causes program...
etxrab [Fri, 24 Feb 2012 05:42:40 +0000 (05:42 +0000)]
From Mark Cottrell: Attempting to view an RTP stream analysis graph causes program exit. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6866

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41170 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...
etxrab [Fri, 24 Feb 2012 05:39:13 +0000 (05:39 +0000)]
From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6867

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41169 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevert SVN #40866 (which used g_fprintf() in place of fprintf()).
wmeier [Fri, 24 Feb 2012 05:17:46 +0000 (05:17 +0000)]
Revert SVN #40866 (which used g_fprintf() in place of fprintf()).

Using g_fprintf() fails (crashes) on Windows because the Windows GLib DLL
is linked with (depends upon) MSVCRT while editcap is linked with
(depends upon) MSVCR90.

IOW: "You can't do that ... (on Windows)"

See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695 (Comment 2)
for some additional information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41168 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd SHB info to Summary
etxrab [Thu, 23 Feb 2012 21:29:13 +0000 (21:29 +0000)]
Add SHB info to Summary

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41167 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Pascal Quantin [NAS EPS] Update Configuration Protocol description in PCO IE...
etxrab [Thu, 23 Feb 2012 20:24:40 +0000 (20:24 +0000)]
From Pascal Quantin [NAS EPS] Update Configuration Protocol description in PCO IE https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6865

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41166 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoNo debug output, please.
tuexen [Thu, 23 Feb 2012 19:14:58 +0000 (19:14 +0000)]
No debug output, please.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41165 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix the handling of snaplen.
tuexen [Thu, 23 Feb 2012 19:14:14 +0000 (19:14 +0000)]
Fix the handling of snaplen.
While there fix some whitespace issues.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41164 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHave the used interfaces show up if number of interfaces > 0.
etxrab [Thu, 23 Feb 2012 15:40:31 +0000 (15:40 +0000)]
Have the used interfaces show up if number of interfaces > 0.
(pcapng file).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41163 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Dirk Leinenbach:
etxrab [Thu, 23 Feb 2012 13:24:54 +0000 (13:24 +0000)]
From Dirk Leinenbach:
Follow TCP IPv6 - wrong hostname.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41162 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a 3GPP specification error.
etxrab [Thu, 23 Feb 2012 13:10:59 +0000 (13:10 +0000)]
Fix a 3GPP specification error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41161 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAs discussed with Anders: Only write a single ISB at the end. Proivde
tuexen [Thu, 23 Feb 2012 12:57:17 +0000 (12:57 +0000)]
As discussed with Anders: Only write a single ISB at the end. Proivde
start/end time in the ISBs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41160 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agointerface id is 32-bit, not 64-bit.
tuexen [Thu, 23 Feb 2012 11:55:24 +0000 (11:55 +0000)]
interface id is 32-bit, not 64-bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41159 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Kundok Park:
etxrab [Thu, 23 Feb 2012 11:29:24 +0000 (11:29 +0000)]
From Kundok Park:
new_packet_list: crash in add_byte_views from decrypted zigbee data

The cause of the crash I saw was that the add_byte_views() function in
main_proto_draw.c relies on output from previous dissector run while the
function may eventually trigger dissector to run again which wipes out the
previous output.
The patch copies the output of the dissector before calling add_byte_tab() so
that even when add_byte_tab() updates the dissector output, the loop continues
with previous dissector output.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41158 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Steve Magnani:
etxrab [Thu, 23 Feb 2012 11:20:52 +0000 (11:20 +0000)]
From Steve Magnani:
USB: Add dissection for Interface Association descriptor.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41157 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Tyson Key:
etxrab [Thu, 23 Feb 2012 11:14:57 +0000 (11:14 +0000)]
From Tyson Key:
Clean up redundant Data handlers in the CCID dissector.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41156 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMove 'static' qualifier before 'const' in a couple of places. I didn't
martinm [Thu, 23 Feb 2012 11:03:30 +0000 (11:03 +0000)]
Move 'static' qualifier before 'const' in a couple of places. I didn't
know it mattered, but gcc warns.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41155 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMark some unused parameters. Still getting other warnings...
martinm [Thu, 23 Feb 2012 10:55:57 +0000 (10:55 +0000)]
Mark some unused parameters. Still getting other warnings...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41154 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDo a check of the block total length in pcapng_read_unknown_block().
guy [Thu, 23 Feb 2012 10:03:16 +0000 (10:03 +0000)]
Do a check of the block total length in pcapng_read_unknown_block().

That means we don't need to do the block length check in
pcapng_read_block(); each block type reader, including the one for
unknown block types, does a check that's as stringent as that block
length check or more stringent, which means any block whose length is
less than the minimum will fail with the same error in both cases.

Fix the message for a too-short NRB.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41152 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Tyson Key:
etxrab [Thu, 23 Feb 2012 09:12:30 +0000 (09:12 +0000)]
From Tyson Key:
Support for switching USB CCID PC_to_RDR_XfrBlock payload dissectors


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41151 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Yaniv Kaul:
etxrab [Thu, 23 Feb 2012 09:06:33 +0000 (09:06 +0000)]
From Yaniv Kaul:
Enhance the Spice dissector - small additional dissections.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41150 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Lei Chen:
etxrab [Thu, 23 Feb 2012 08:57:40 +0000 (08:57 +0000)]
From Lei Chen:
a patch to support decode FDD_CELL_INFORMATION of "UTRAN FDD Description" in packet-gsm_rlcmac.c


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41149 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Jeff Morriss:
etxrab [Thu, 23 Feb 2012 08:40:23 +0000 (08:40 +0000)]
From Jeff Morriss:
H223: Buildbot crash output: fuzz-2012-01-25-22599.pcap


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41148 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Josip Medved: Add 3GPP AVP 1506 and 1507
etxrab [Thu, 23 Feb 2012 05:29:28 +0000 (05:29 +0000)]
From Josip Medved: Add 3GPP AVP 1506 and 1507

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41146 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix typo introduced by previous checkin.
guy [Wed, 22 Feb 2012 23:44:25 +0000 (23:44 +0000)]
Fix typo introduced by previous checkin.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41145 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdded aplications and one AVP from Josip Medved
etxrab [Wed, 22 Feb 2012 23:01:28 +0000 (23:01 +0000)]
Added aplications and one AVP from Josip Medved

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41144 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd sanity checks to make sure the claimed block size is big enough to:
guy [Wed, 22 Feb 2012 18:32:43 +0000 (18:32 +0000)]
Add sanity checks to make sure the claimed block size is big enough to:

1) contain the block length fields and block type field;

2) contain that plus the fixed-length portion of the block;

3) for blocks that have a variable-length portion other than the
   options, contain that variable-length portion.

Fixes a crash we're seeing with a bad pcap-NG file in the Wireshark
menagerie (7799-lastPacketWithoutComment.pcapng - the last packet's
block length is 128, but it claims to have 98 bytes of packet data,
which requires a 132-byte block).

Clean up white space (use 8-space tabs).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41143 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Josip Medved:
etxrab [Wed, 22 Feb 2012 16:06:02 +0000 (16:06 +0000)]
From Josip Medved:
In line 4722 of dictionary.xml file there is comment:
<-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->

This is not a valid XML comment and that line should read:
<!-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41141 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGrr forgot debug flag - again.
etxrab [Wed, 22 Feb 2012 16:02:38 +0000 (16:02 +0000)]
Grr forgot debug flag  - again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41140 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoWhitespace cleanup: Convert 4 space tabs to spaces ...
wmeier [Wed, 22 Feb 2012 15:47:30 +0000 (15:47 +0000)]
Whitespace cleanup: Convert 4 space tabs to spaces ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41139 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRename some enumeration constants; Do some minor code simplification & reformatting.
wmeier [Wed, 22 Feb 2012 15:42:50 +0000 (15:42 +0000)]
Rename some enumeration constants; Do some minor code simplification & reformatting.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41138 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago- Write ISB(s) at start and end of capture.
etxrab [Wed, 22 Feb 2012 14:41:02 +0000 (14:41 +0000)]
- Write ISB(s) at start and end of capture.
- Read all options.
- Prepare to write ISB.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41137 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoExpand the API for ISB:s
etxrab [Wed, 22 Feb 2012 10:01:16 +0000 (10:01 +0000)]
Expand the API for ISB:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41136 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoReverse Revision 41134 (Need to fix error/warning before...)
alagoutte [Wed, 22 Feb 2012 09:18:30 +0000 (09:18 +0000)]
Reverse Revision 41134 (Need to fix error/warning before...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41135 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Lars Ruoff:
etxrab [Wed, 22 Feb 2012 08:37:46 +0000 (08:37 +0000)]
From Lars Ruoff:
Dissector for Alcatel-Lucent Enterprise Universal Alcatel- and NOE protocol
Meant as a replacement for existing UA-dissector in trunk because of better
feature set:
- latest protocol specifiaction
- more detailed dissection and filtering possibilities on subprotocols
- RTP stream setup
- NOE over SIP

Lars Ruoff
On behalf of Alcatel-Lucent Enterprise


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41134 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMore debugging information - in at least one of the failures, neither of
guy [Wed, 22 Feb 2012 03:13:38 +0000 (03:13 +0000)]
More debugging information - in at least one of the failures, neither of
the "Wrote xxx" messages was printed, although the compiler appeared to
have been run on the .c file that was never claimed to have been
written, but got an error because it couldn't find the .h file (also
never claimed to have been written), and in one of the successes on the
same buildbot, they were both printed for the same file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41133 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHandle the case where there are no IDBs before the first non-SHB/non-IDB
guy [Wed, 22 Feb 2012 03:03:34 +0000 (03:03 +0000)]
Handle the case where there are no IDBs before the first non-SHB/non-IDB
block, which could be the case even in a *valid* file (consider a file
with an SHB, an NRB, an IDB, and a packet block, in that order); even if
there's no IDB before the first packet block, that should be reported to
the user as "interface N not less than interface count M", to more
precisely indicate the problem.

(Yes, the loop should probably keep going until it finds a packet block,
not just a non-IDB block.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41132 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoWe need to build libui even if we're only building TShark. Fixes bug
guy [Wed, 22 Feb 2012 02:15:23 +0000 (02:15 +0000)]
We need to build libui even if we're only building TShark.  Fixes bug

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41131 f5534014-38df-0310-8fa8-9805f1628bb7