metze/wireshark/wip.git
7 years agoMake it possible to edit capture comments
Anders Broman [Sun, 26 Feb 2012 17:04:28 +0000 (17:04 -0000)]
Make it possible to edit capture comments

svn path=/trunk/; revision=41193

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

svn path=/trunk/; revision=41190

7 years agoFrom Robin Seggelmann: Add support for RFC 6520.
Michael Tüxen [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.

svn path=/trunk/; revision=41189

7 years agoFor LANalyzer files, make the "File type name" be the file comment.
Guy Harris [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.

svn path=/trunk/; revision=41188

7 years agoSuppress invalid or non-meaningful statistics - for example, without
Guy Harris [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?).

svn path=/trunk/; revision=41187

7 years agoDon't show time stamp-based information if we don't have it (now that we
Guy Harris [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).

svn path=/trunk/; revision=41186

7 years agoAdd a presence flag field to the packet information structure filled in
Guy Harris [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.

svn path=/trunk/; revision=41185

7 years agoFrom Jose Pedro Oliveira: pcapio is writing the if_speed value in the IDB_TSRESOL...
Anders Broman [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

svn path=/trunk/; revision=41184

7 years agoAs suggested by multipleinterfaces in http://ask.wireshark.org/questions/9194/can...
Jeff 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.

svn path=/trunk/; revision=41183

7 years agoRevisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
Jeff 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...

svn path=/trunk/; revision=41182

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

svn path=/trunk/; revision=41181

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

svn path=/trunk/; revision=41180

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

svn path=/trunk/; revision=41179

7 years agoFix a typo.
Anders Broman [Fri, 24 Feb 2012 15:53:00 +0000 (15:53 -0000)]
Fix a typo.

svn path=/trunk/; revision=41178

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

svn path=/trunk/; revision=41177

7 years agoFrom Irene Ruengeler: Always show snaplen.
Michael Tüxen [Fri, 24 Feb 2012 13:13:21 +0000 (13:13 -0000)]
From Irene Ruengeler: Always show snaplen.

svn path=/trunk/; revision=41176

7 years agoFrom Irene Ruengeler: Fix a bug where the interface
Michael Tüxen [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.

svn path=/trunk/; revision=41175

7 years agoFrom Irene Ruengeler: Whitespace changes.
Michael Tüxen [Fri, 24 Feb 2012 12:54:15 +0000 (12:54 -0000)]
From Irene Ruengeler: Whitespace changes.

svn path=/trunk/; revision=41174

7 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
Alexis La Goutte [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.

svn path=/trunk/; revision=41173

7 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6838
Alexis La Goutte [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.

svn path=/trunk/; revision=41172

7 years agoFrom Robert Shade: Mobile IP NVSE (RFC3115) Decoding https://bugs.wireshark.org/bugzi...
Anders Broman [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

svn path=/trunk/; revision=41171

7 years agoFrom Mark Cottrell: Attempting to view an RTP stream analysis graph causes program...
Anders Broman [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

svn path=/trunk/; revision=41170

7 years agoFrom Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...
Anders Broman [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

svn path=/trunk/; revision=41169

7 years agoRevert SVN #40866 (which used g_fprintf() in place of fprintf()).
Bill Meier [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.

svn path=/trunk/; revision=41168

7 years agoAdd SHB info to Summary
Anders Broman [Thu, 23 Feb 2012 21:29:13 +0000 (21:29 -0000)]
Add SHB info to Summary

svn path=/trunk/; revision=41167

7 years agoFrom Pascal Quantin [NAS EPS] Update Configuration Protocol description in PCO IE...
Anders Broman [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

svn path=/trunk/; revision=41166

7 years agoNo debug output, please.
Michael Tüxen [Thu, 23 Feb 2012 19:14:58 +0000 (19:14 -0000)]
No debug output, please.

svn path=/trunk/; revision=41165

7 years agoFix the handling of snaplen.
Michael Tüxen [Thu, 23 Feb 2012 19:14:14 +0000 (19:14 -0000)]
Fix the handling of snaplen.
While there fix some whitespace issues.

svn path=/trunk/; revision=41164

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

svn path=/trunk/; revision=41163

7 years agoFrom Dirk Leinenbach:
Anders Broman [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

svn path=/trunk/; revision=41162

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

svn path=/trunk/; revision=41161

7 years agoAs discussed with Anders: Only write a single ISB at the end. Proivde
Michael Tüxen [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.

svn path=/trunk/; revision=41160

7 years agointerface id is 32-bit, not 64-bit.
Michael Tüxen [Thu, 23 Feb 2012 11:55:24 +0000 (11:55 -0000)]
interface id is 32-bit, not 64-bit.

svn path=/trunk/; revision=41159

7 years agoFrom Kundok Park:
Anders Broman [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

svn path=/trunk/; revision=41158

7 years agoFrom Steve Magnani:
Anders Broman [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

svn path=/trunk/; revision=41157

7 years agoFrom Tyson Key:
Anders Broman [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

svn path=/trunk/; revision=41156

7 years agoMove 'static' qualifier before 'const' in a couple of places. I didn't
Martin Mathieson [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.

svn path=/trunk/; revision=41155

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

svn path=/trunk/; revision=41154

7 years agoDo a check of the block total length in pcapng_read_unknown_block().
Guy Harris [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.

svn path=/trunk/; revision=41152

7 years agoFrom Tyson Key:
Anders Broman [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

svn path=/trunk/; revision=41151

7 years agoFrom Yaniv Kaul:
Anders Broman [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

svn path=/trunk/; revision=41150

7 years agoFrom Lei Chen:
Anders Broman [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

svn path=/trunk/; revision=41149

7 years agoFrom Jeff Morriss:
Anders Broman [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

svn path=/trunk/; revision=41148

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

svn path=/trunk/; revision=41146

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

svn path=/trunk/; revision=41145

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

svn path=/trunk/; revision=41144

7 years agoAdd sanity checks to make sure the claimed block size is big enough to:
Guy Harris [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).

svn path=/trunk/; revision=41143

7 years agoFrom Josip Medved:
Anders Broman [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

svn path=/trunk/; revision=41141

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

svn path=/trunk/; revision=41140

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

svn path=/trunk/; revision=41139

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

svn path=/trunk/; revision=41138

7 years ago- Write ISB(s) at start and end of capture.
Anders Broman [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.

svn path=/trunk/; revision=41137

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

svn path=/trunk/; revision=41136

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

svn path=/trunk/; revision=41135

7 years agoFrom Lars Ruoff:
Anders Broman [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

svn path=/trunk/; revision=41134

7 years agoMore debugging information - in at least one of the failures, neither of
Guy Harris [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.

svn path=/trunk/; revision=41133

7 years agoHandle the case where there are no IDBs before the first non-SHB/non-IDB
Guy Harris [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.)

svn path=/trunk/; revision=41132

7 years agoWe need to build libui even if we're only building TShark. Fixes bug
Guy Harris [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.

svn path=/trunk/; revision=41131

7 years agoSmall fix.
Michael Tüxen [Tue, 21 Feb 2012 21:50:08 +0000 (21:50 -0000)]
Small fix.

svn path=/trunk/; revision=41129

7 years agoFrom Irene Ruengeler: Describe what we currently have in trunk/
Michael Tüxen [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.

svn path=/trunk/; revision=41128

7 years agoFrom Irene Ruengeler: Updated screenshots.
Michael Tüxen [Tue, 21 Feb 2012 21:27:02 +0000 (21:27 -0000)]
From Irene Ruengeler: Updated screenshots.

svn path=/trunk/; revision=41127

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

svn path=/trunk/; revision=41126

7 years agoCorrectly write os string...
Michael Tüxen [Tue, 21 Feb 2012 18:01:44 +0000 (18:01 -0000)]
Correctly write os string...

svn path=/trunk/; revision=41125

7 years agoWhitespace changes.
Michael Tüxen [Tue, 21 Feb 2012 18:01:01 +0000 (18:01 -0000)]
Whitespace changes.

svn path=/trunk/; revision=41124

7 years agoUse wtap_dump_open_ng() in tshark.
Michael Tüxen [Tue, 21 Feb 2012 17:19:45 +0000 (17:19 -0000)]
Use wtap_dump_open_ng() in tshark.

svn path=/trunk/; revision=41123

7 years agoThis should fix the buildbots...
Michael Tüxen [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()...

svn path=/trunk/; revision=41122

7 years agoWhen saving a file and the are no IDBs, create a default one.
Michael Tüxen [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...

svn path=/trunk/; revision=41121

7 years agoFrom Lori Tribble:
Anders Broman [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

svn path=/trunk/; revision=41120

7 years agoDisable debug output...
Michael Tüxen [Tue, 21 Feb 2012 16:33:33 +0000 (16:33 -0000)]
Disable debug output...

svn path=/trunk/; revision=41119

7 years agoWhen writing an option in an IDB, also write an endofoption option.
Michael Tüxen [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.

svn path=/trunk/; revision=41118

7 years agoWhitespace changes.
Michael Tüxen [Tue, 21 Feb 2012 16:30:22 +0000 (16:30 -0000)]
Whitespace changes.

svn path=/trunk/; revision=41117

7 years agoWhitespace changes.
Michael Tüxen [Tue, 21 Feb 2012 16:29:29 +0000 (16:29 -0000)]
Whitespace changes.

svn path=/trunk/; revision=41116

7 years agoWhitespace changes.
Michael Tüxen [Tue, 21 Feb 2012 16:28:42 +0000 (16:28 -0000)]
Whitespace changes.

svn path=/trunk/; revision=41115

7 years agoFrom Jose Pedro Oliveira:
Anders Broman [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.

svn path=/trunk/; revision=41114

7 years agoWhitespace changes.
Michael Tüxen [Tue, 21 Feb 2012 15:38:30 +0000 (15:38 -0000)]
Whitespace changes.

svn path=/trunk/; revision=41113

7 years agoImprove the error handling.
Michael Tüxen [Tue, 21 Feb 2012 15:36:08 +0000 (15:36 -0000)]
Improve the error handling.

svn path=/trunk/; revision=41112

7 years agoDon't dereference idb_inf in wtap_dump_open_ng() when
Michael Tüxen [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.

svn path=/trunk/; revision=41111

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

svn path=/trunk/; revision=41110

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

svn path=/trunk/; revision=41109

7 years agoExtend libpcap_write_interface_description_block() wiyh more options
Anders Broman [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.

svn path=/trunk/; revision=41108

7 years agoFix compilation (hopefully).
Michael Tüxen [Tue, 21 Feb 2012 12:56:52 +0000 (12:56 -0000)]
Fix compilation (hopefully).

svn path=/trunk/; revision=41107

7 years agoImprove peeking for IDBs.
Michael Tüxen [Tue, 21 Feb 2012 12:24:42 +0000 (12:24 -0000)]
Improve peeking for IDBs.
While there, cleanup some whitespaces.

svn path=/trunk/; revision=41106

7 years agoFrom Irene Ruengeler:
Michael Tüxen [Tue, 21 Feb 2012 11:59:41 +0000 (11:59 -0000)]
From Irene Ruengeler:
* Add support in the GUI for pipes.
* Allow the local interfaces to be rescanned via the GUI.
* Allow remote interfaces to be added and deleted.
The GUI can be extended to support other ways of capturing.

svn path=/trunk/; revision=41105

7 years agoFrom David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).
Anders Broman [Tue, 21 Feb 2012 09:25:41 +0000 (09:25 -0000)]
From David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).

svn path=/trunk/; revision=41104

7 years agoAdd VENDOR_ERICSSON_PKT_CORE
Anders Broman [Tue, 21 Feb 2012 08:58:05 +0000 (08:58 -0000)]
Add VENDOR_ERICSSON_PKT_CORE

svn path=/trunk/; revision=41103

7 years agoOnce we've read a valid SHB, we've concluded the file is a pcap-NG file,
Guy Harris [Tue, 21 Feb 2012 08:27:41 +0000 (08:27 -0000)]
Once we've read a valid SHB, we've concluded the file is a pcap-NG file,
so if we later get a short read, we have to return -1 and set *err to
WTAP_ERR_SHORT_READ.  Otherwise, we'll try other file types and, if none
of them match, we'll try to close the wtap structure, which crashes.

svn path=/trunk/; revision=41102

7 years agoDeclare opt_cont_buf_len
Anders Broman [Tue, 21 Feb 2012 07:25:22 +0000 (07:25 -0000)]
Declare opt_cont_buf_len

svn path=/trunk/; revision=41101

7 years agoFree the buffer
Anders Broman [Tue, 21 Feb 2012 06:57:14 +0000 (06:57 -0000)]
Free the buffer

svn path=/trunk/; revision=41099

7 years agoChange comment to Loop ower all IDB:s that appear before any packets sugested by...
Anders Broman [Tue, 21 Feb 2012 05:58:40 +0000 (05:58 -0000)]
Change comment to Loop ower all IDB:s that appear before any packets sugested by Guy, there can be more IDBs in a cpture file

svn path=/trunk/; revision=41096

7 years agoFrom Jose Pedro Oliveira shb_os value: get_os_version_info() instead of get_runtime_v...
Anders Broman [Tue, 21 Feb 2012 05:52:50 +0000 (05:52 -0000)]
From Jose Pedro Oliveira shb_os value: get_os_version_info() instead of get_runtime_version_info()

svn path=/trunk/; revision=41095

7 years agoAlways test tvb_reported_length_remaining() return val for '> 0' instead of '!=0'
Bill Meier [Tue, 21 Feb 2012 02:02:11 +0000 (02:02 -0000)]
Always test tvb_reported_length_remaining() return val for '> 0' instead of '!=0'
Also: Whitespace cleanup.

svn path=/trunk/; revision=41094

7 years agoIndentation & whitespace cleanup....
Bill Meier [Mon, 20 Feb 2012 23:28:23 +0000 (23:28 -0000)]
Indentation & whitespace cleanup....

svn path=/trunk/; revision=41093

7 years ago(Trivial) Fix a typo in a comment; Do some whitespace changes.
Bill Meier [Mon, 20 Feb 2012 22:46:24 +0000 (22:46 -0000)]
(Trivial) Fix a typo in a comment; Do some whitespace changes.

svn path=/trunk/; revision=41092

7 years agoFrom Jose Pedro Oliveira fix a typo
Anders Broman [Mon, 20 Feb 2012 22:40:17 +0000 (22:40 -0000)]
From Jose Pedro Oliveira  fix a typo

svn path=/trunk/; revision=41091

7 years agoUse tvb_reported_length_remaining() iso tvb_length_remaining().
Bill Meier [Mon, 20 Feb 2012 22:22:48 +0000 (22:22 -0000)]
Use tvb_reported_length_remaining() iso tvb_length_remaining().

svn path=/trunk/; revision=41090

7 years agoFix 'variable set but then unused'; Do some whitespace cleanup.
Bill Meier [Mon, 20 Feb 2012 22:20:30 +0000 (22:20 -0000)]
Fix 'variable set but then unused'; Do some whitespace cleanup.

svn path=/trunk/; revision=41089

7 years agoproto_reg_handoff...() doesn't need 'if(!Initialized)';
Bill Meier [Mon, 20 Feb 2012 22:00:50 +0000 (22:00 -0000)]
proto_reg_handoff...() doesn't need 'if(!Initialized)';
Also: Do some whitespace cleanup.

svn path=/trunk/; revision=41088

7 years ago(Trivial) Whitespace changes
Bill Meier [Mon, 20 Feb 2012 21:39:19 +0000 (21:39 -0000)]
(Trivial) Whitespace changes

svn path=/trunk/; revision=41087

7 years agoJose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os
Anders Broman [Mon, 20 Feb 2012 21:17:43 +0000 (21:17 -0000)]
Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os

svn path=/trunk/; revision=41086

7 years agoFrom e.yimjia Add LPP decoding support in ULP protocol dissector \n https://bugs...
Anders Broman [Mon, 20 Feb 2012 20:32:53 +0000 (20:32 -0000)]
From e.yimjia Add LPP decoding support in ULP protocol dissector \n https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6851

svn path=/trunk/; revision=41085