obnox/wireshark/wip.git
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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:

http://www.odva.org/Home/ODVATECHNOLOGIES/CIP/CIPTechnologyOverview/CIPSafety/CIPSafetyOverview/tabid/131/lng/en-US/Default.aspx

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

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

7 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).

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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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
anyway...

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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

#BACKPORT
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6861

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

7 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

7 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

7 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

7 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.

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

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

7 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.

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

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

7 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.

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

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

7 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

7 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

7 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

7 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

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

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

7 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.

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

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

7 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

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

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

7 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

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

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

7 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

7 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

7 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

7 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

7 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. -->

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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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
families.
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

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

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

7 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

7 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

7 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
6855.

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

7 years agoSmall fix.
tuexen [Tue, 21 Feb 2012 21:50:08 +0000 (21:50 +0000)]
Small fix.

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

7 years agoFrom Irene Ruengeler: Describe what we currently have in trunk/
tuexen [Tue, 21 Feb 2012 21:46:06 +0000 (21:46 +0000)]
From Irene Ruengeler: Describe what we currently have in trunk/
                      related to capturing from multiple
                      interfaces.

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

7 years agoFrom Irene Ruengeler: Updated screenshots.
tuexen [Tue, 21 Feb 2012 21:27:02 +0000 (21:27 +0000)]
From Irene Ruengeler: Updated screenshots.

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

7 years agoFix bugs which resulted in the buildbot errors.
tuexen [Tue, 21 Feb 2012 20:37:22 +0000 (20:37 +0000)]
Fix bugs which resulted in the buildbot errors.

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

7 years agoCorrectly write os string...
tuexen [Tue, 21 Feb 2012 18:01:44 +0000 (18:01 +0000)]
Correctly write os string...

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 18:01:01 +0000 (18:01 +0000)]
Whitespace changes.

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

7 years agoUse wtap_dump_open_ng() in tshark.
tuexen [Tue, 21 Feb 2012 17:19:45 +0000 (17:19 +0000)]
Use wtap_dump_open_ng() in tshark.

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

7 years agoThis should fix the buildbots...
tuexen [Tue, 21 Feb 2012 17:07:57 +0000 (17:07 +0000)]
This should fix the buildbots...

The problem was that when reading a .pcap file, we don't have any IDBs.
If reqested to write out an pcapng file, we (now) build a dummy IDB which
uses the file's encapsulation as the interface encapsulation. Therefore
it can't be per=packet.
We need to fix this by using wtap_dump_open_ng()...

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

7 years agoWhen saving a file and the are no IDBs, create a default one.
tuexen [Tue, 21 Feb 2012 16:51:23 +0000 (16:51 +0000)]
When saving a file and the are no IDBs, create a default one.
This seems right, but doesn't make the buildbots happy, because
a read pcap file is reported a per packet encaps...

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

7 years agoFrom Lori Tribble:
etxrab [Tue, 21 Feb 2012 16:43:20 +0000 (16:43 +0000)]
From Lori Tribble:
 BACnet: Allow vendor specified network layer messages.'

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

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

7 years agoDisable debug output...
tuexen [Tue, 21 Feb 2012 16:33:33 +0000 (16:33 +0000)]
Disable debug output...

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

7 years agoWhen writing an option in an IDB, also write an endofoption option.
tuexen [Tue, 21 Feb 2012 16:32:25 +0000 (16:32 +0000)]
When writing an option in an IDB, also write an endofoption option.
Use (consistently) 0 as the default for the interface speed.
While there, do some whitespace cleanups.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:30:22 +0000 (16:30 +0000)]
Whitespace changes.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:29:29 +0000 (16:29 +0000)]
Whitespace changes.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 16:28:42 +0000 (16:28 +0000)]
Whitespace changes.

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

7 years agoFrom Jose Pedro Oliveira:
etxrab [Tue, 21 Feb 2012 16:14:57 +0000 (16:14 +0000)]
From Jose Pedro Oliveira:
dumpcap: only free os_version_str after the
libpcap_write_interface_description_block() calls.

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

7 years agoWhitespace changes.
tuexen [Tue, 21 Feb 2012 15:38:30 +0000 (15:38 +0000)]
Whitespace changes.

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

7 years agoImprove the error handling.
tuexen [Tue, 21 Feb 2012 15:36:08 +0000 (15:36 +0000)]
Improve the error handling.

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

7 years agoDon't dereference idb_inf in wtap_dump_open_ng() when
tuexen [Tue, 21 Feb 2012 15:21:01 +0000 (15:21 +0000)]
Don't dereference idb_inf in wtap_dump_open_ng() when
you provide NULL when you call it via wtap_dump_open.

This does not make the buildbots happy, but at least
tshark doesn't crash anymore.

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

7 years agoUse tab indentation as elsewhere in the files.
tuexen [Tue, 21 Feb 2012 15:16:45 +0000 (15:16 +0000)]
Use tab indentation as elsewhere in the files.
Only whitespace changes.

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

7 years agoCheck if the string exists first.
etxrab [Tue, 21 Feb 2012 13:59:08 +0000 (13:59 +0000)]
Check if the string exists first.

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

7 years agoExtend libpcap_write_interface_description_block() wiyh more options
etxrab [Tue, 21 Feb 2012 13:35:04 +0000 (13:35 +0000)]
Extend libpcap_write_interface_description_block() wiyh more options
all exept os curently unused.

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