metze/wireshark/svnmirror.git
35 min agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8700 : trunk
mmann [Tue, 21 May 2013 13:27:48 +0000]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8700 :
Highlight correct bytes in some SDP trees.

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

62 min agoApply the filter string if all interfaces are selected.
ruengeler [Tue, 21 May 2013 13:00:03 +0000]
Apply the filter string if all interfaces are selected.

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

67 min agoadd a few filterable fields/expert info
mmann [Tue, 21 May 2013 12:55:55 +0000]
add a few filterable fields/expert info

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

68 min agouse ep_ allocated memory instead of g_ allocated.
mmann [Tue, 21 May 2013 12:54:08 +0000]
use ep_ allocated memory instead of g_ allocated.

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

90 min agoOn MacOSX en1 is not necessarily wireless.
ruengeler [Tue, 21 May 2013 12:32:44 +0000]
On MacOSX en1 is not necessarily wireless.

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

4 hours agoFix compilation with GTK version older than 2.24
pascal [Tue, 21 May 2013 09:13:43 +0000]
Fix compilation with GTK version older than 2.24

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

8 hours ago- Move the export_pdu tap outside of if(tree)
etxrab [Tue, 21 May 2013 05:47:20 +0000]
- Move the export_pdu tap outside of if(tree)
- Have the diameter tap request a tree.

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

8 hours agoAdd missing element NSAP to IE Evolved Allocation/Retention Priority II.
etxrab [Tue, 21 May 2013 05:08:50 +0000]
Add missing element NSAP to IE Evolved Allocation/Retention Priority II.

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

10 hours agoDHCPv6 option 56, RFC 5908
mmann [Tue, 21 May 2013 03:24:55 +0000]
DHCPv6 option 56, RFC 5908
Bug 8421 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8421)

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

11 hours agoUse col_set_fence() functionality to remove an unnecessary global variable.
mmann [Tue, 21 May 2013 02:08:40 +0000]
Use col_set_fence() functionality to remove an unnecessary global variable.

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

11 hours agoMinor cleanup. Removal of unnecessary packet_info* global variable
mmann [Tue, 21 May 2013 02:04:41 +0000]
Minor cleanup.  Removal of unnecessary packet_info* global variable

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

13 hours agoFix format string typo.
eapache [Tue, 21 May 2013 00:11:10 +0000]
Fix format string typo.

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

14 hours agoadd a few more filterable items.
mmann [Mon, 20 May 2013 23:56:47 +0000]
add a few more filterable items.

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

14 hours agoFix:
morriss [Mon, 20 May 2013 23:23:34 +0000]
Fix:

Error: the blurb for hf_048_030_WE ("asterix.048_030_WE") matches the field name in epan/dissectors/packet-asterix.c

Also remove a few blurbs which aren't exact matches but are basically the same.

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

15 hours agoMake sure we apply POD_CSS_URL everywhere. Capitalize a couple of titles.
gerald [Mon, 20 May 2013 22:51:33 +0000]
Make sure we apply POD_CSS_URL everywhere. Capitalize a couple of titles.

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

16 hours agoRemove some of the extra noise added while trying to figure out why
eapache [Mon, 20 May 2013 22:00:39 +0000]
Remove some of the extra noise added while trying to figure out why
the build-bot's valgrind pass wasn't running with/without tree. It's still
broken, but the debug output wasn't giving us any useful information.

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

17 hours agoMore compiler warning fixes...
eapache [Mon, 20 May 2013 20:45:52 +0000]
More compiler warning fixes...

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

17 hours agoThird time lucky, hopefully fix the last of the compiler warnings...
eapache [Mon, 20 May 2013 20:30:23 +0000]
Third time lucky, hopefully fix the last of the compiler warnings...

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

17 hours agoUse doubles and FT_DOUBLE for better precision and to avoid a large
eapache [Mon, 20 May 2013 20:16:03 +0000]
Use doubles and FT_DOUBLE for better precision and to avoid a large
number of compiler warnings for systems where floats are 32 bits, but
floating-point literals default to 64-bit doubles.

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

18 hours agoFix some compile warnings, and spread a struct definition over multiple
eapache [Mon, 20 May 2013 19:56:04 +0000]
Fix some compile warnings, and spread a struct definition over multiple
lines to make it obvious where the 32-bit cast is needed, since it's not
at all obvious to me...

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

18 hours agoFrom Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8579
eapache [Mon, 20 May 2013 19:23:41 +0000]
From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8579

Dissector for ASTERIX (a radar data and air traffic controller protocol).

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

18 hours agoFix trimming the maximum number if display filter entries.
gerald [Mon, 20 May 2013 19:04:19 +0000]
Fix trimming the maximum number if display filter entries.

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

19 hours agoFix Typo about filename
alagoutte [Mon, 20 May 2013 18:56:56 +0000]
Fix Typo about filename

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

19 hours agoFrom Richard Turner via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8630...
alagoutte [Mon, 20 May 2013 18:56:47 +0000]
From Richard Turner via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8630 QtShark doesn't quit properly after closing the main window during initialization

When trying to close the QtShark application during its initialization process
(by hitting the "close" button), the processes "qtshark.exe" and "dumpcap.exe" don't terminate properly

The patch contains fix to:

1. QtShark doesn't quit properly after closing the main window during initialization

2. User is not prompted to save the capture to file when user chooses to exit
the program during capturing.

3. Bug exists in function MainWindow::testCaptureFileClose(bool from_quit, QString &before_what),
which prevent it from behaving correctly when from_quit == true.

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

19 hours agoFrom report of mot990-8omk7tp8mio8ro via https://bugs.wireshark.org/bugzilla/show_bug...
alagoutte [Mon, 20 May 2013 18:56:33 +0000]
From report of mot990-8omk7tp8mio8ro via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8469 QtShark (wireshark-qt) doesn't use the saved preferences

Detail about this issue :
Bug is reproduced when accessing Preferences Dialog before QtShark start-up is finished,
specifically before preferences loading is completed which comes very late in the initialization process.

Fix from Richard Turner :
Patch to fix problems arising from users interacting with main interface before initialization is complete

Introduced a new slot function in main window for the locking of features before
init complete and for the unlocking of features after all systems good to go.

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

19 hours agoThe printf format may require 2 arguments passed and if it does, the second argument...
mmann [Mon, 20 May 2013 18:50:50 +0000]
The printf format may require 2 arguments passed and if it does, the second argument could be garbage, so make sure printf has 2 arguments.  Fixes bug 8066 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8066)

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

19 hours agoFrom Tom Bottom:
etxrab [Mon, 20 May 2013 18:41:46 +0000]
From Tom Bottom:
Addition of STREAM_VLAN_ID field to GET_STREAM_INFO and SET_STREAM_INFO pdu in packet-ieee17221.c

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

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

19 hours agoRemove #if 0:ed code.
etxrab [Mon, 20 May 2013 18:38:34 +0000]
Remove #if 0:ed code.

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

19 hours agoAdd export_pdu_tap to packet-diameter.c
etxrab [Mon, 20 May 2013 18:30:32 +0000]
Add export_pdu_tap to packet-diameter.c

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

20 hours agoMake preparation to select which level tap is to be used.
etxrab [Mon, 20 May 2013 17:48:09 +0000]
Make preparation to select which level tap is to be used.

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

20 hours agoFrom me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8631
alagoutte [Mon, 20 May 2013 17:33:44 +0000]
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8631

Fix to honour the Response Bit/Opcode implementation,
as e.g. a map response opcode is not 129 as per 1000 0001 but should be
Response bit =1 / Opcode =1.

* Rename opcode variable to ropcode (and pcp_ropcode_vals)
* Use pcp_opcode for hf_pcp_opcode
* Add hf for R item (and add tfs)
* Fix bitmask for opcode

Also fix warning found by encoding-args tool.

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

20 hours agoMake the minimum supported GLib version 2.16.
gerald [Mon, 20 May 2013 17:27:05 +0000]
Make the minimum supported GLib version 2.16.

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

20 hours agoSet svn properties.
cmaynard [Mon, 20 May 2013 17:24:28 +0000]
Set svn properties.

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

20 hours agoFix typo s/ENCNA/ENC_NA/
eapache [Mon, 20 May 2013 17:06:07 +0000]
Fix typo s/ENCNA/ENC_NA/

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

21 hours agoNo always : after URL in svn info
alagoutte [Mon, 20 May 2013 16:32:11 +0000]
No always : after URL in svn info

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

21 hours agoAdd Modelines Info and remove a tab
alagoutte [Mon, 20 May 2013 16:32:03 +0000]
Add Modelines Info and remove a tab

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

21 hours agoAdd Modelines Info and fix warning from fix-encoding-args tools
alagoutte [Mon, 20 May 2013 16:31:54 +0000]
Add Modelines Info and fix warning from fix-encoding-args tools

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

21 hours agoFrom david19801118 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8680 Add...
alagoutte [Mon, 20 May 2013 16:31:44 +0000]
From david19801118 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8680 Add decryption for WPA eapol 4-way handshake

Wireshark can't decode eapol packet which using WPA properly.
(decode eapol packaet which using WPA2 is work well.)

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

23 hours agoFix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
eapache [Mon, 20 May 2013 14:56:18 +0000]
Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."

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

32 hours agoFrom chaitanya:
etxrab [Mon, 20 May 2013 05:45:32 +0000]
From chaitanya:
Find Window: The cursor is not set when we seleted String/hex/Display Filter (again)

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

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

32 hours agoFrom Cal Turney:
etxrab [Mon, 20 May 2013 05:33:18 +0000]
From Cal Turney:
When another profile is selected, its column.hidden preference is ignored.

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

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

35 hours agoIf tcpdump doesn't exist, why refer to it? Omit this confusing phrase.
cmaynard [Mon, 20 May 2013 02:21:07 +0000]
If tcpdump doesn't exist, why refer to it?  Omit this confusing phrase.

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

36 hours agoAdd some newlines at the end of the file so the authors are printer properly.
cmaynard [Mon, 20 May 2013 01:53:26 +0000]
Add some newlines at the end of the file so the authors are printer properly.

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

36 hours agoManually update the manuf and services files - the automatic updates
eapache [Mon, 20 May 2013 01:51:10 +0000]
Manually update the manuf and services files - the automatic updates
don't seem to have been running since April 28th...

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

36 hours agoClean up some documentation a bit, removing non-ASCII characters, formatting like...
cmaynard [Mon, 20 May 2013 01:41:52 +0000]
Clean up some documentation a bit, removing non-ASCII characters, formatting like other pages, alphabetizing options, describing options under their own headingadding missing newline at end of file, fixing typos and some minor rewording.

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

36 hours agoTrivial: remove extraneous word, 'is'.
cmaynard [Mon, 20 May 2013 01:35:17 +0000]
Trivial: remove extraneous word, 'is'.

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

42 hours agoAt the suggestion of Stuart Kendrick via https://bugs.wireshark.org/bugzilla/show_bug...
eapache [Sun, 19 May 2013 19:49:36 +0000]
At the suggestion of Stuart Kendrick via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8647

Improve documentation for tshark's -z io,stat somewhat so that it's clear(er)
that filters for the statistics must be associated with the -z flag and not
applied via -Y.

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

44 hours agoAdd filter capabillities.
etxrab [Sun, 19 May 2013 17:14:33 +0000]
Add filter capabillities.

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

46 hours agoDon't access nbap_dch_chnl_info if the index is > maxNrOfDCHs
etxrab [Sun, 19 May 2013 15:21:33 +0000]
Don't access nbap_dch_chnl_info if the index is > maxNrOfDCHs

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

46 hours agoTrivial change so all longnames are aligned.
cmaynard [Sun, 19 May 2013 15:12:01 +0000]
Trivial change so all longnames are aligned.

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

47 hours agotest-fuzzed-cap.sh is now test-captures.sh
morriss [Sun, 19 May 2013 15:00:32 +0000]
test-fuzzed-cap.sh is now test-captures.sh

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

47 hours agoSCSI: Add support for report-one-command structure for REPORT SUPPORTED OPCODES
sahlberg [Sun, 19 May 2013 14:45:12 +0000]
SCSI: Add support for report-one-command structure for REPORT SUPPORTED OPCODES

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

47 hours agoSCSI: REPORT SUPPORTED OPCODES print the reporing options in human readable
sahlberg [Sun, 19 May 2013 14:24:31 +0000]
SCSI: REPORT SUPPORTED OPCODES  print the reporing options in human readable
text.

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

2 days agoFix a memory leak by using seasonal memory for building all parts of one of
eapache [Sun, 19 May 2013 13:00:06 +0000]
Fix a memory leak by using seasonal memory for building all parts of one of
the address resolution tables.

Showed up with https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8670
although I doubt it's the cause of the crash.

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

2 days agoUpdate test-fuzzed-cap.sh:
eapache [Sun, 19 May 2013 12:51:35 +0000]
Update test-fuzzed-cap.sh:
- support testing multiple files at once
- use tools/test-common.sh to make sure we have the most up-to-date environment
  variables set (the old version was missing the WMEM_ one for example)
- rename to test-captures.sh since it works just fine on non-fuzzed files

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

2 days agoRegenerate t124 dissector
pascal [Sat, 18 May 2013 17:50:10 +0000]
Regenerate t124 dissector

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

2 days agoRevert r49406: it's not ready for prime time yet
pascal [Sat, 18 May 2013 17:48:50 +0000]
Revert r49406: it's not ready for prime time yet

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

2 days agodistinguish between length and reported length when dissecting a packet
martink [Sat, 18 May 2013 17:08:46 +0000]
distinguish between length and reported length when dissecting a packet
with DLT_USERxy

with this fix, the user-encap dissector hands over truncated packets to
the defined sub-dissector

(the previous version would assume length==reported length and throw an
execption for truncated packets)

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

2 days agoSCSI: Add dissection of REPORT SUPPORTED OPCODES
sahlberg [Sat, 18 May 2013 16:26:26 +0000]
SCSI: Add dissection of REPORT SUPPORTED OPCODES

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

3 days agoDo not display payload twice when using uncompressed profile
pascal [Sat, 18 May 2013 11:41:44 +0000]
Do not display payload twice when using uncompressed profile

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

3 days agoMove kerberos back from broken list to normal list
jmayer [Sat, 18 May 2013 09:25:45 +0000]
Move kerberos back from broken list to normal list

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

3 days agoFix "set but not used" compile warning turning error
jmayer [Sat, 18 May 2013 08:13:51 +0000]
Fix "set but not used" compile warning turning error

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

3 days agoFill in the struct wtap_pkthdr in the seek-read routine.
guy [Sat, 18 May 2013 03:42:06 +0000]
Fill in the struct wtap_pkthdr in the seek-read routine.

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

3 days agoIn libpcap_process_header(), fill in what phdr points to, not wth->phdr.
guy [Sat, 18 May 2013 03:15:06 +0000]
In libpcap_process_header(), fill in what phdr points to, not wth->phdr.

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

3 days agoFill in the struct wtap_pkthdr in the seek-read routine.
guy [Sat, 18 May 2013 03:02:04 +0000]
Fill in the struct wtap_pkthdr in the seek-read routine.

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

3 days agoIn the pcapng seek-read routine, *don't* fill in wth->phdr; seek-read
guy [Sat, 18 May 2013 02:36:00 +0000]
In the pcapng seek-read routine, *don't* fill in wth->phdr; seek-read
routines are passed a separate struct wtap_pkthdr to be filled in.

Get rid of the pseudo_header member of the wblock structure - the
pseudo-header is part of the struct wtap_pkthdr.

Get rid of the union wtap_pseudo_header * argument to
pcap_process_pseudo_header() - it's passed a pointer to a struct
pcap_pkthdr, and that structure contains the union in question.

Have libpcap_read_header() take a FILE_T argument, rather than using
only the "sequential" handle of the wtap it's handed.  Have the libpcap
read routine return the offset of the beginning of the pcap record, and
have the seek-read routine read the header and fill in the struct
wtap_pkthdr handed to it.

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

3 days agoAdd some casts for C++ compatibility.
guy [Sat, 18 May 2013 01:42:20 +0000]
Add some casts for C++ compatibility.

Make conv_get_fid() return a "const char *", as it can return a string
constant, and they are usually *not* writable.

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

3 days agoA "pointer to something" is a "void *", not a "char *". Using "void *"
guy [Sat, 18 May 2013 00:45:20 +0000]
A "pointer to something" is a "void *", not a "char *".  Using "void *"
avoids some alignment warnings from clang.

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

3 days agoUse g_array_index() to get at elements of the encapsulation table array;
guy [Sat, 18 May 2013 00:41:30 +0000]
Use g_array_index() to get at elements of the encapsulation table array;
this avoids some compiler warnings from clang about alignment.

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

3 days agoPut the code to read trace record headers into a common routine used by
guy [Sat, 18 May 2013 00:08:43 +0000]
Put the code to read trace record headers into a common routine used by
both the read and the seek-read routines.  Have the read routine return
the offset of the record header as the record's offset, so that the
seek-read routine can read that header.

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

3 days agoDon't pass globals as arguments to k12text_set_headers(), just use the
guy [Fri, 17 May 2013 23:53:44 +0000]
Don't pass globals as arguments to k12text_set_headers(), just use the
globals directly.  If we ever manage to make them *not* globals (which
might only be possible with newer versions of Flex), then we can do
better.

Get rid of an unused variable.

Squelch a 64-bit-to-32-bit conversion warning.

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

3 days agoRename k12text_set_pseudo_header() to k12text_set_headers() and have it
guy [Fri, 17 May 2013 21:55:33 +0000]
Rename k12text_set_pseudo_header() to k12text_set_headers() and have it
fill in the entire struct wtap_pkthdr.

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

3 days agoFrom Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8643
eapache [Fri, 17 May 2013 21:50:27 +0000]
From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8643

When a TCP segment contains the end of two or more SSL PDUs, the TCP reassembly
code passes that segment up to the SSL dissector multiple times--one for each
SSL PDU. The SSL dissector queues the packet for SSL tap listeners each time it
is invoked. Therefore a single packet can be processed by SSL tap listeners
multiple times. But the tap data that the SSL dissector sends to its tap
listeners is a linked list of all PDUs in the packet.

The SSL tap listener responsible for populating the Follow SSL Stream dialog
did not account for the possibility of seeing a packet multiple times. As a
result, it would process the entire linked list of PDUs each time it received a
packet, and that would result in some SSL PDUs showing up two or more times in
the dialog.

This patch fixes the described bug. It also implements a few slight
improvements in closely related code. See bugzilla for details.

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

3 days agoFrom Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8695 :
pascal [Fri, 17 May 2013 21:24:20 +0000]
From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8695 :
packet-synphasor.c: use 'new_' versions of dissector registration and initialization

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

3 days agoMore compilation fixes when having HAVE_KERBEROS
pascal [Fri, 17 May 2013 19:31:44 +0000]
More compilation fixes when having HAVE_KERBEROS

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

3 days agoset col fence, in case there are more Diameter PDU:s in a transport message.
etxrab [Fri, 17 May 2013 16:24:46 +0000]
set col fence, in case there are more Diameter PDU:s in a transport message.

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

3 days agoAs suggested by Jakub: don't ep_alloc buffers for TVBs, use g_malloc()'d
morriss [Fri, 17 May 2013 14:38:36 +0000]
As suggested by Jakub: don't ep_alloc buffers for TVBs, use g_malloc()'d
memory with tvb-free-callback.

Fixes one of the "read after free" warnings from Valgrind reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 and the one reported
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8653

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

4 days agoPrevent "'len' may be used uninitialized in this function" error when compiling with...
pascal [Fri, 17 May 2013 13:37:36 +0000]
Prevent "'len' may be used uninitialized in this function" error when compiling with gcc 4.3.2

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

4 days agoPull some functions that fill in a struct wtap_pkthdr into common code,
guy [Fri, 17 May 2013 10:13:12 +0000]
Pull some functions that fill in a struct wtap_pkthdr into common code,
and use it in both the read and seek-read routines.

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

4 days agoHave iseries_parse_packet() fill in a struct wtap_pkthdr; that means it
guy [Fri, 17 May 2013 09:48:19 +0000]
Have iseries_parse_packet() fill in a struct wtap_pkthdr; that means it
doesn't need to return the number of bytes of captured packet data (it
can just stuff that into the struct wtap_pkthdr), so have it return a
Boolean success/failure indication.

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

4 days agoIf iseries_seek_next_packet() hits the EOF, *err will be set to 0; just
guy [Fri, 17 May 2013 09:37:02 +0000]
If iseries_seek_next_packet() hits the EOF, *err will be set to 0; just
have it return -1 for errors or EOF, and have iseries_read() check for a
negative return value and return FALSE.  That simplifies it a bit, and
handles the "no more records in the file" case
(iseries_seek_next_packet() will hit EOF and return -1 with *err set to
0, which is what the callers of a read routine expect at EOF).

Get rid of duplicate (and incorrect before the change) comment.

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

4 days agoGet rid of duplicate code.
guy [Fri, 17 May 2013 08:56:43 +0000]
Get rid of duplicate code.

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

4 days agoPull the reading of record data and ATM post-processing into another
guy [Fri, 17 May 2013 08:53:04 +0000]
Pull the reading of record data and ATM post-processing into another
common routine.

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

4 days agoAdd iptrace_process_rec_header_ routines to read record headers and fill
guy [Fri, 17 May 2013 08:19:51 +0000]
Add iptrace_process_rec_header_ routines to read record headers and fill
in a wtap_pkthdr, as well as skipping FDDI padding, etc..

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

4 days agoFix some more warnings that show up on platforms with 32-bit time_t.
guy [Fri, 17 May 2013 08:09:39 +0000]
Fix some more warnings that show up on platforms with 32-bit time_t.

Get rid of double semicolons.

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

4 days agoIPFIX records have a time stamp (and, according to RFC 5101, it's UNIX
guy [Fri, 17 May 2013 07:45:36 +0000]
IPFIX records have a time stamp (and, according to RFC 5101, it's UNIX
time, i.e. seconds since January 1, 1970, 00:00:00 UTC).

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

4 days agoWe need ipfix_read_message_header() for the open routine; have
guy [Fri, 17 May 2013 07:28:34 +0000]
We need ipfix_read_message_header() for the open routine; have
ipfix_read_and_process_message_header() call it and then fill in the
wtap_pkthdr structure, and use the latter routine in the read and
seek-read routines.

Expand a comment, and fix indentation.

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

4 days agoPull the code that fills in a wtap_pkthdr structure into
guy [Fri, 17 May 2013 06:41:20 +0000]
Pull the code that fills in a wtap_pkthdr structure into
ipfix_read_message_header() and rename it
ipfix_process_message_header().  Use it in the read and seek-read
routines.

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

4 days agoPull the record header processing code into i4b_read_rec_header(),
guy [Fri, 17 May 2013 06:08:40 +0000]
Pull the record header processing code into i4b_read_rec_header(),
renaming it to i4b_process_rec_header(), so that it's used in the read
and the seek-read routines.

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

4 days agoSquelch more warnings about empty structures.
etxrab [Fri, 17 May 2013 05:33:53 +0000]
Squelch more warnings about empty structures.

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

4 days agoPull code to fill in a wtap_pkthdr into a hcidump_process_header()
guy [Fri, 17 May 2013 05:31:21 +0000]
Pull code to fill in a wtap_pkthdr into a hcidump_process_header()
routine, and use it in both the read and seek-read routines.

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

4 days agoSquelch warnings about empty structures and chopping off 64-bit values
guy [Fri, 17 May 2013 05:25:11 +0000]
Squelch warnings about empty structures and chopping off 64-bit values
at 32 bits.

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

4 days agoFrom Dominique Martinet via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8589 :
morriss [Fri, 17 May 2013 02:00:05 +0000]
From Dominique Martinet via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8589 :

Theses patches add alot of new message types for the 9P protocol and its
extensions (most specifically 9P2000.L), while staying compatible with the
legacy protocol (hence the hashtable with conversation information, since
version is only known at handshake)

It is still missing alot of 9P2000.u specifics, but I don't have any server
to test it with. I'm also missing some dump to test legacy, but I'm pretty
confident I didn't break much there as it is mostly compatible, most
differences are handled using different messages, the only one that was
changed would be RERROR.

second diff also adds deeper interpretation of the protocol, by following
the conversation stream and keeping a bigger hashtable associating fid (file
handles) and file names, for easier debugging.

From me: roll the contents of the (new) packet-9p.h back into the C file.

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

4 days agoUse proto_tree_add_int64 for 64-bit values.
eapache [Fri, 17 May 2013 00:56:54 +0000]
Use proto_tree_add_int64 for 64-bit values.

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

4 days agoFrom Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :
morriss [Fri, 17 May 2013 00:42:45 +0000]
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :

Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.

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

4 days agoFill in the wtap_pkthdr in dct3trace_get_packet().
guy [Fri, 17 May 2013 00:21:16 +0000]
Fill in the wtap_pkthdr in dct3trace_get_packet().

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

4 days agoSet *data_offset early in the read process, to emphasize that it's the
guy [Fri, 17 May 2013 00:15:58 +0000]
Set *data_offset early in the read process, to emphasize that it's the
offset of the entire packet, not the offset of the data.

Pull the setting of the FCS length into a common routine.

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

4 days agoPass parse_dbs_etherwatch_packet() a pointer to a struct wtap_pkthdr,
guy [Fri, 17 May 2013 00:07:42 +0000]
Pass parse_dbs_etherwatch_packet() a pointer to a struct wtap_pkthdr,
not a wtap *, and have it fill in the specified struct wtap_pkthdr.
That makes the seek-read routine do the right thing.

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

4 days agoFrom Florian Forster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8472
eapache [Fri, 17 May 2013 00:06:26 +0000]
From Florian Forster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8472

Starting with collectd 5.0, the representation of time has changed. The new
fields "TIME_HR" and "INTERVAL_HR" contain the seconds since the epoch in steps
of 2^{-30} seconds (roughly nanosecond precision). This patch adds support for
both time formats.

From me:
Permit using 64-bit integers with value-strings, as this protocol actually
seems to needs it. We'll misbehave for named values > 2^32 but there aren't any
of those despite the field being 64 bits.

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

4 days agoMove the header-processing code into a common daintree_sna_scan_header()
guy [Fri, 17 May 2013 00:00:13 +0000]
Move the header-processing code into a common daintree_sna_scan_header()
routine.

Rename daintree_sna_hex_char() to daintree_sna_process_hex_data() (to
more clearly indicate what it does - it doesn't process a single
character, it processes a whole bunch of them), and have it do some
error checking and fill in the length field in the wtap_pkthdr.

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