Commit Graph

39226 Commits

Author SHA1 Message Date
Gerald Combs e5a91c8632 [Automatic manuf, services and enterprise-numbers update for 2012-02-26]
svn path=/trunk/; revision=41190
2012-02-26 15:03:43 +00:00
Michael Tüxen e929fdfdee 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.

svn path=/trunk/; revision=41189
2012-02-26 13:50:52 +00:00
Guy Harris 83bf13e1e6 For LANalyzer files, make the "File type name" be the file comment.
Display the file comment in the Summary dialog.

svn path=/trunk/; revision=41188
2012-02-26 10:20:40 +00:00
Guy Harris 30b86b7817 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?).

svn path=/trunk/; revision=41187
2012-02-26 08:02:02 +00:00
Guy Harris 08d7ff268b 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).

svn path=/trunk/; revision=41186
2012-02-26 05:51:54 +00:00
Guy Harris b6ff142f60 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.

svn path=/trunk/; revision=41185
2012-02-25 23:24:34 +00:00
Anders Broman e994e78412 From Jose Pedro Oliveira: pcapio is writing the if_speed value in the IDB_TSRESOL optiones
svn path=/trunk/; revision=41184
2012-02-25 08:20:50 +00:00
Jeff Morriss 1cf31238ff As suggested by multipleinterfaces in http://ask.wireshark.org/questions/9194/can-i-recover-a-discarded-capture :
Add the location of the temporary file on Windows 7.

svn path=/trunk/; revision=41183
2012-02-24 21:43:48 +00:00
Jeff Morriss bc465f37fc 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...

svn path=/trunk/; revision=41182
2012-02-24 20:33:19 +00:00
Bill Meier d0e9923506 g_fprintf() & g_vfprintf() should not be used....
svn path=/trunk/; revision=41181
2012-02-24 19:02:28 +00:00
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Anders Broman cacbe31797 Fix a typo and revert previous.
svn path=/trunk/; revision=41179
2012-02-24 15:57:56 +00:00
Anders Broman c14dbfc465 Fix a typo.
svn path=/trunk/; revision=41178
2012-02-24 15:53:00 +00:00
Anders Broman 2b815454e7 From Martin Kaiser:
Get rid of an unused variable.

svn path=/trunk/; revision=41177
2012-02-24 14:40:31 +00:00
Michael Tüxen acdd01a1d9 From Irene Ruengeler: Always show snaplen.
svn path=/trunk/; revision=41176
2012-02-24 13:13:21 +00:00
Michael Tüxen 7194766584 From Irene Ruengeler: Fix a bug where the interface
names are not shown during capturing.

svn path=/trunk/; revision=41175
2012-02-24 13:05:33 +00:00
Michael Tüxen 64ba56a080 From Irene Ruengeler: Whitespace changes.
svn path=/trunk/; revision=41174
2012-02-24 12:54:15 +00:00
Alexis La Goutte c45a941597 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.

svn path=/trunk/; revision=41173
2012-02-24 08:18:30 +00:00
Alexis La Goutte fc88f5558a 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.

svn path=/trunk/; revision=41172
2012-02-24 07:57:48 +00:00
Anders Broman 1b6a35348b From Robert Shade: Mobile IP NVSE (RFC3115) Decoding https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6868
svn path=/trunk/; revision=41171
2012-02-24 05:50:47 +00:00
Anders Broman fc42284f1d From Mark Cottrell: Attempting to view an RTP stream analysis graph causes program exit. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6866
svn path=/trunk/; revision=41170
2012-02-24 05:42:40 +00:00
Anders Broman 0badfa1224 From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6867
svn path=/trunk/; revision=41169
2012-02-24 05:39:13 +00:00
Bill Meier 174d06e4c6 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.


svn path=/trunk/; revision=41168
2012-02-24 05:17:46 +00:00
Anders Broman b5a2ba98be Add SHB info to Summary
svn path=/trunk/; revision=41167
2012-02-23 21:29:13 +00:00
Anders Broman a062fb34bd From Pascal Quantin [NAS EPS] Update Configuration Protocol description in PCO IE https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6865
svn path=/trunk/; revision=41166
2012-02-23 20:24:40 +00:00
Michael Tüxen 525df25b7f No debug output, please.
svn path=/trunk/; revision=41165
2012-02-23 19:14:58 +00:00
Michael Tüxen dddfe189a1 Fix the handling of snaplen.
While there fix some whitespace issues.

svn path=/trunk/; revision=41164
2012-02-23 19:14:14 +00:00
Anders Broman 286f3425e7 Have the used interfaces show up if number of interfaces > 0.
(pcapng file).

svn path=/trunk/; revision=41163
2012-02-23 15:40:31 +00:00
Anders Broman 07c039ad17 From Dirk Leinenbach:
Follow TCP IPv6 - wrong hostname.

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

svn path=/trunk/; revision=41162
2012-02-23 13:24:54 +00:00
Anders Broman 59ce037134 Fix a 3GPP specification error.
svn path=/trunk/; revision=41161
2012-02-23 13:10:59 +00:00
Michael Tüxen 412c5a903c As discussed with Anders: Only write a single ISB at the end. Proivde
start/end time in the ISBs.

svn path=/trunk/; revision=41160
2012-02-23 12:57:17 +00:00
Michael Tüxen 2b3cd82cb1 interface id is 32-bit, not 64-bit.
svn path=/trunk/; revision=41159
2012-02-23 11:55:24 +00:00
Anders Broman 511d403ec2 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

svn path=/trunk/; revision=41158
2012-02-23 11:29:24 +00:00
Anders Broman 416117f63a From Steve Magnani:
USB: Add dissection for Interface Association descriptor.

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

svn path=/trunk/; revision=41157
2012-02-23 11:20:52 +00:00
Anders Broman 9d545467ef From Tyson Key:
Clean up redundant Data handlers in the CCID dissector.

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

svn path=/trunk/; revision=41156
2012-02-23 11:14:57 +00:00
Martin Mathieson 51c31cd7bd Move 'static' qualifier before 'const' in a couple of places. I didn't
know it mattered, but gcc warns.

svn path=/trunk/; revision=41155
2012-02-23 11:03:30 +00:00
Martin Mathieson 774be29de0 Mark some unused parameters. Still getting other warnings...
svn path=/trunk/; revision=41154
2012-02-23 10:55:57 +00:00
Guy Harris b6330fc765 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.

svn path=/trunk/; revision=41152
2012-02-23 10:03:16 +00:00
Anders Broman 1a42f455a5 From Tyson Key:
Support for switching USB CCID PC_to_RDR_XfrBlock payload dissectors

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

svn path=/trunk/; revision=41151
2012-02-23 09:12:30 +00:00
Anders Broman f77e059a2e From Yaniv Kaul:
Enhance the Spice dissector - small additional dissections.

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

svn path=/trunk/; revision=41150
2012-02-23 09:06:33 +00:00
Anders Broman dea5452b95 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

svn path=/trunk/; revision=41149
2012-02-23 08:57:40 +00:00
Anders Broman 2a35f59066 From Jeff Morriss:
H223: Buildbot crash output: fuzz-2012-01-25-22599.pcap

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

svn path=/trunk/; revision=41148
2012-02-23 08:40:23 +00:00
Anders Broman 228d0e37e7 From Josip Medved: Add 3GPP AVP 1506 and 1507
svn path=/trunk/; revision=41146
2012-02-23 05:29:28 +00:00
Guy Harris 4bf0c5bf5b Fix typo introduced by previous checkin.
svn path=/trunk/; revision=41145
2012-02-22 23:44:25 +00:00
Anders Broman b95b53cd19 Added aplications and one AVP from Josip Medved
svn path=/trunk/; revision=41144
2012-02-22 23:01:28 +00:00
Guy Harris 3b262a0621 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).

svn path=/trunk/; revision=41143
2012-02-22 18:32:43 +00:00
Anders Broman 0ebef9a0fa 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

svn path=/trunk/; revision=41141
2012-02-22 16:06:02 +00:00
Anders Broman ace4d65e47 Grr forgot debug flag - again.
svn path=/trunk/; revision=41140
2012-02-22 16:02:38 +00:00
Bill Meier 81d3b58f02 Whitespace cleanup: Convert 4 space tabs to spaces ...
svn path=/trunk/; revision=41139
2012-02-22 15:47:30 +00:00
Bill Meier 397d29e83b Rename some enumeration constants; Do some minor code simplification & reformatting.
svn path=/trunk/; revision=41138
2012-02-22 15:42:50 +00:00