obnox/wireshark/wip.git
12 years agoExport tvb_get_unicode_string().
guy [Thu, 30 Jun 2011 18:08:42 +0000 (18:08 +0000)]
Export tvb_get_unicode_string().

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

12 years agoTemporarily enable dumpcap debugging.
gerald [Thu, 30 Jun 2011 17:41:46 +0000 (17:41 +0000)]
Temporarily enable dumpcap debugging.

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

12 years agoRemove all interfaces when available.
tuexen [Thu, 30 Jun 2011 11:40:50 +0000 (11:40 +0000)]
Remove all interfaces when available.
Add a missing g_strdup.

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

12 years agoAvoid absurdly large values used in for-loops.
stig [Thu, 30 Jun 2011 09:31:11 +0000 (09:31 +0000)]
Avoid absurdly large values used in for-loops.

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

12 years agoFix memory leak.
darkjames [Thu, 30 Jun 2011 08:54:24 +0000 (08:54 +0000)]
Fix memory leak.

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

12 years agoCleanup.
tuexen [Thu, 30 Jun 2011 06:31:52 +0000 (06:31 +0000)]
Cleanup.

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

12 years agoUndo r37833 in favor of Sake's changes to be committed at some future date.
cmaynard [Thu, 30 Jun 2011 01:05:49 +0000 (01:05 +0000)]
Undo r37833 in favor of Sake's changes to be committed at some future date.

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

12 years agoRemove tracing.
gerald [Thu, 30 Jun 2011 00:24:05 +0000 (00:24 +0000)]
Remove tracing.

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

12 years agoTemporarily enable tracing for the stdin capture step.
gerald [Wed, 29 Jun 2011 23:10:49 +0000 (23:10 +0000)]
Temporarily enable tracing for the stdin capture step.

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

12 years agoDon't colorize TCP window updates as "Bad TCP". This change was made in response...
cmaynard [Wed, 29 Jun 2011 18:45:14 +0000 (18:45 +0000)]
Don't colorize TCP window updates as "Bad TCP".  This change was made in response to a user request at Sharkfest '11.

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

12 years agoAlthough technically not needed, for clarity, explicity catch invalid Ethernet frames...
cmaynard [Wed, 29 Jun 2011 17:22:18 +0000 (17:22 +0000)]
Although technically not needed, for clarity, explicity catch invalid Ethernet frames, increment the "other" count and return.  Previously, code execution would have fallen through to the ETHERNET_II case and capture_ethertype() would have incremented the "other" count.

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

12 years agoIndicate TCP fast retransmissions as an expert info note, rather than a warning,just...
cmaynard [Wed, 29 Jun 2011 16:59:37 +0000 (16:59 +0000)]
Indicate TCP fast retransmissions as an expert info note, rather than a warning,just as TCP retransmissions are.  This was a user request from Sharkfest '11.

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

12 years agoBased on user feedback from Sharkfest '11, make the default choice when saving or...
cmaynard [Wed, 29 Jun 2011 16:31:44 +0000 (16:31 +0000)]
Based on user feedback from Sharkfest '11, make the default choice when saving or printing packets apply to only displayed packets and not all packets.

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

12 years agoBased on Guy's suggestion from the user mailing list, dissect Ethernet frames with...
cmaynard [Wed, 29 Jun 2011 16:05:56 +0000 (16:05 +0000)]
Based on Guy's suggestion from the user mailing list, dissect Ethernet frames with a type/len field in the range of 1501-1535 as invalid, and add an expert info to make it that much easier to find such invalid frames.

Also did some whitespace cleanup, converting tabs to spaces since most of the file was spaced, not tabbed, and swapped the order that the lg and ig bits get added to the tree because I think it looks better reading bits left-to-right.

TODO: I'm not entirely sure what to do in capture_eth() if that invalid range is encountered, so for now I just added some #if 0'd code as a placeholder.

Ref: http://www.wireshark.org/lists/wireshark-users/201106/msg00127.html

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

12 years agoUpdate my email address.
darkjames [Wed, 29 Jun 2011 11:03:41 +0000 (11:03 +0000)]
Update my email address.

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

12 years agoAdded a preference to turn of capture filter syntax check.
stig [Wed, 29 Jun 2011 10:42:29 +0000 (10:42 +0000)]
Added a preference to turn of capture filter syntax check.
This can be used to disable the effect in bug 5356.

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

12 years agoShow locale in version info (if !win32).
stig [Wed, 29 Jun 2011 08:05:53 +0000 (08:05 +0000)]
Show locale in version info (if !win32).
This may help us identifying bugs related to locale.

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

12 years agoStrengthen heuristics for Packets.
stig [Wed, 29 Jun 2011 07:02:04 +0000 (07:02 +0000)]
Strengthen heuristics for Packets.

This fixes bug 6073.

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

12 years agoCleanup whitespaces/indentation.
tuexen [Wed, 29 Jun 2011 06:33:54 +0000 (06:33 +0000)]
Cleanup whitespaces/indentation.

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

12 years agoDon't return an offset that you won't later use.
guy [Wed, 29 Jun 2011 05:21:10 +0000 (05:21 +0000)]
Don't return an offset that you won't later use.

The length fields in a pcap_pkthdr are unsigned, so presumably the
equivalent fields in the rpcap protocol are also unsigned.

Make sure the captured data length isn't bigger than the remaining data
in the packet before attempting to construct a tvbuff for the packet
data.  If it is, report that as an error, and don't even try to
construct the tvbuff; that'll fail.  This fixes bug 6073.

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

12 years agoAdd more error output to try to see what's causing the current test failure
gerald [Tue, 28 Jun 2011 23:08:05 +0000 (23:08 +0000)]
Add more error output to try to see what's causing the current test failure
on the XP buildbot. Use "capture_test_output_print" instead of "cat".

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

12 years agoDocument the handling of command line parameters with respect to
tuexen [Tue, 28 Jun 2011 22:02:43 +0000 (22:02 +0000)]
Document the handling of command line parameters with respect to
the capturing on multiple interfaces.

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

12 years agoCode cleanup.
tuexen [Tue, 28 Jun 2011 16:57:42 +0000 (16:57 +0000)]
Code cleanup.

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

12 years agoAdd $(GENERATED_H_FILES) to libui_a_SOURCES.
stig [Tue, 28 Jun 2011 16:57:10 +0000 (16:57 +0000)]
Add $(GENERATED_H_FILES) to libui_a_SOURCES.

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

12 years agoAdd a missing dependency for text_import_scanner_lex.h
stig [Tue, 28 Jun 2011 15:30:28 +0000 (15:30 +0000)]
Add a missing dependency for text_import_scanner_lex.h

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

12 years agoFrom Jose Pedro Oliveira via bug 5803:
stig [Tue, 28 Jun 2011 15:18:21 +0000 (15:18 +0000)]
From Jose Pedro Oliveira via bug 5803:
#ifdef HAVE_LIBGCRYPT block includes a line too many.
"Fixes 2nd instance of the problem"

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

12 years agoUse the generated header file from Guy's Flex front-end script from
stig [Tue, 28 Jun 2011 15:04:24 +0000 (15:04 +0000)]
Use the generated header file from Guy's Flex front-end script from
revision 22446 for text_import_scanner.

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

12 years agoExport all tfs from tfs.h
darkjames [Tue, 28 Jun 2011 09:58:26 +0000 (09:58 +0000)]
Export all tfs from tfs.h

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

12 years agoFrom bug 6057:
stig [Tue, 28 Jun 2011 09:11:18 +0000 (09:11 +0000)]
From bug 6057:
Improved set_color_filter_slot documentation.

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

12 years agoReplace all strerror() with g_strerror().
stig [Tue, 28 Jun 2011 09:00:11 +0000 (09:00 +0000)]
Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

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

12 years agoUse the filter argument as the capture filter for all interfaces.
tuexen [Tue, 28 Jun 2011 08:00:14 +0000 (08:00 +0000)]
Use the filter argument as the capture filter for all interfaces.
Signal an error if another capture filter is provided using the
-f option.

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

12 years agoUse the latest libsmi package. Note that we now support OID resolution
gerald [Mon, 27 Jun 2011 20:48:26 +0000 (20:48 +0000)]
Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.

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

12 years agoPut variable under the correct #ifdef.
tuexen [Mon, 27 Jun 2011 20:00:30 +0000 (20:00 +0000)]
Put variable under the correct #ifdef.

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

12 years agoFix the bug reported by Guy. Now
tuexen [Mon, 27 Jun 2011 19:07:36 +0000 (19:07 +0000)]
Fix the bug reported by Guy. Now
tshark -i en0 icmpp
returns a correct error message.

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

12 years agoUpdate suite-clopts.sh to match dumpcap's error output. Add a comment
gerald [Mon, 27 Jun 2011 16:09:49 +0000 (16:09 +0000)]
Update suite-clopts.sh to match dumpcap's error output. Add a comment
to dumpcap.c about keeping the errors synced.

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

12 years agoReport the correct interface when there is a problem with a capture filter.
tuexen [Mon, 27 Jun 2011 12:13:15 +0000 (12:13 +0000)]
Report the correct interface when there is a problem with a capture filter.
This patch is from Irene Ruengeler.

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

12 years agoEnable the cap_history again. It was temporary disabled a couple of hours ago.
tuexen [Mon, 27 Jun 2011 11:45:27 +0000 (11:45 +0000)]
Enable the cap_history again. It was temporary disabled a couple of hours ago.

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

12 years agoImprove the report of illegal capture filters. Also show the interface description.
tuexen [Mon, 27 Jun 2011 11:30:39 +0000 (11:30 +0000)]
Improve the report of illegal capture filters. Also show the interface description.

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

12 years agoFrom bug 6057:
stig [Mon, 27 Jun 2011 11:07:31 +0000 (11:07 +0000)]
From bug 6057:
Lua API: add support to temporary color filters (10 color slots)

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

12 years agoList cygwin 'zip' as a needed tool to build the U3 package.
stig [Mon, 27 Jun 2011 10:39:50 +0000 (10:39 +0000)]
List cygwin 'zip' as a needed tool to build the U3 package.

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

12 years agoUse the interface description instead of the interface name when
tuexen [Mon, 27 Jun 2011 10:11:15 +0000 (10:11 +0000)]
Use the interface description instead of the interface name when
reporting an error.

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

12 years agoRemove .cvsignore from svn:ignore.
stig [Mon, 27 Jun 2011 09:18:37 +0000 (09:18 +0000)]
Remove .cvsignore from svn:ignore.

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

12 years agoRemove compile and ylwrap when 'make maintainer-clean'.
stig [Mon, 27 Jun 2011 08:38:37 +0000 (08:38 +0000)]
Remove compile and ylwrap when 'make maintainer-clean'.

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

12 years agoRemove Makefile.in when 'make maintainer-clean'.
stig [Mon, 27 Jun 2011 08:02:46 +0000 (08:02 +0000)]
Remove Makefile.in when 'make maintainer-clean'.

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

12 years agoFix a bug when starting the capture without specifying an interface.
tuexen [Mon, 27 Jun 2011 01:32:22 +0000 (01:32 +0000)]
Fix a bug when starting the capture without specifying an interface.
The capability history needs to be fixed.

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

12 years agoGet rid of old non-interface specific settings which are now interface
tuexen [Mon, 27 Jun 2011 00:09:03 +0000 (00:09 +0000)]
Get rid of old non-interface specific settings which are now interface
specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

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

12 years agoChanged adding a new coloring rule to put the new rule at the top of the list.
stig [Sun, 26 Jun 2011 18:25:03 +0000 (18:25 +0000)]
Changed adding a new coloring rule to put the new rule at the top of the list.
This because the user most likely wants to use the new rule right away, and do
not want to think about which filters it should be above.

This was requested in bug 5669.

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

12 years ago[Automatic manuf, services and enterprise-numbers update for 2011-06-26]
gerald [Sun, 26 Jun 2011 15:03:44 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-06-26]

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

12 years agoFrom Tony Trinh via bug 6018:
stig [Sat, 25 Jun 2011 20:47:13 +0000 (20:47 +0000)]
From Tony Trinh via bug 6018:
Add NULL checks and fix typos in Lua error print-outs

From me:
Use the error message "GUI not available" when using GUI functions in tshark.

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

12 years agoAdded check for invalid chars in abbrev in ProtoField functions.
stig [Sat, 25 Jun 2011 19:39:16 +0000 (19:39 +0000)]
Added check for invalid chars in abbrev in ProtoField functions.

This fixes bug 5569.

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

12 years agoRemove "range" from Lua's Pref.range(), as this value shall be fetched from
stig [Sat, 25 Jun 2011 15:42:41 +0000 (15:42 +0000)]
Remove "range" from Lua's Pref.range(), as this value shall be fetched from
the "default".

This fixes bug 5896.

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

12 years agoFrom Tony Trinh via bug 5894:
stig [Sat, 25 Jun 2011 15:24:55 +0000 (15:24 +0000)]
From Tony Trinh via bug 5894:
Added argument validation to Pref.range.

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

12 years agoFrom Tony Trinh via bug 5895:
stig [Sat, 25 Jun 2011 15:21:17 +0000 (15:21 +0000)]
From Tony Trinh via bug 5895:
Add sanity checks in range.c

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

12 years agoMake guy's fix in revision 37236 actually work:
stig [Sat, 25 Jun 2011 14:58:06 +0000 (14:58 +0000)]
Make guy's fix in revision 37236 actually work:
"You cannot just make the "len" field of a GByteArray larger, if there's
no data to back that length; you can only make it smaller."

Two equal values are always equal!

This fixes bug 5941.

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

12 years agoUpdate the dissector_add call to use the current API.
jake [Fri, 24 Jun 2011 19:57:14 +0000 (19:57 +0000)]
Update the dissector_add call to use the current API.

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

12 years agoFrom Peter Nahas:
jake [Fri, 24 Jun 2011 06:49:20 +0000 (06:49 +0000)]
From Peter Nahas:
This patch adds support for the two-way Sythetic Loss Measurement
opcodes (SLM & SLR) defined in the latest ITU-T Y.1731.

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

12 years agoPrint the filter string, if one was specified, just like Wireshark does.
cmaynard [Fri, 24 Jun 2011 02:45:23 +0000 (02:45 +0000)]
Print the filter string, if one was specified, just like Wireshark does.

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

12 years agoMake Wireshark portable to all locales by calling setlocale(). This, along with...
cmaynard [Fri, 24 Jun 2011 02:35:46 +0000 (02:35 +0000)]
Make Wireshark portable to all locales by calling setlocale().  This, along with my previous commits in revisions 36160 and 36166 ought to fix the problem that Bartosz Kiziukiewicz first reported on the wireshark-users mailing list here:

    http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html

(I successfully generated Wireshark compare statistics after applying this change and also changing my locale to Polish.)

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

12 years agoRemove old PCRE references from the Windows build environment. We're not
gerald [Thu, 23 Jun 2011 23:04:03 +0000 (23:04 +0000)]
Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

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

12 years agoFrom Dejan Bucar:
jake [Thu, 23 Jun 2011 21:52:58 +0000 (21:52 +0000)]
From Dejan Bucar:
Added support new multicore header in the LINX Ethernet protocol.
Added linx/tcp.

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

12 years agoFrom Andrey Kulikov:
jake [Thu, 23 Jun 2011 21:33:29 +0000 (21:33 +0000)]
From Andrey Kulikov:
Patch to show GOST certificate types in CertificateRequest message.

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

12 years agoFrom Andrey Kulikov:
jake [Thu, 23 Jun 2011 21:17:42 +0000 (21:17 +0000)]
From Andrey Kulikov:
Patch to TLS dissector to show GOST ciphesuites names.

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

12 years agoAdd a check for TShark's return status.
gerald [Thu, 23 Jun 2011 19:22:21 +0000 (19:22 +0000)]
Add a check for TShark's return status.

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

12 years agoAdd pcap_options to the pcap_queue elements. This lets us keep interface
gerald [Thu, 23 Jun 2011 18:54:07 +0000 (18:54 +0000)]
Add pcap_options to the pcap_queue elements. This lets us keep interface
IDs in one place and fixes a bug which resulted in only writing
interface ID 0 to NG enhanced packet blocks.

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

12 years agoWhitespace cleanup ...
wmeier [Thu, 23 Jun 2011 18:06:13 +0000 (18:06 +0000)]
Whitespace cleanup ...

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

12 years agoFrom Ivan Lawrow: GTS Descriptor count is a 3 bit field;
wmeier [Thu, 23 Jun 2011 15:40:34 +0000 (15:40 +0000)]
From Ivan Lawrow: GTS Descriptor count is a 3 bit field;

The IEEE 802.15.4 GTS descriptor count is a 3-bit field (see page 144
of attached spec).

The mask for this field is incorrectly defined as a 2-bit field in
epan/dissectors/packet-ieee802154.h line 74:

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

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

12 years agoCode from Jakub:
stig [Thu, 23 Jun 2011 13:55:20 +0000 (13:55 +0000)]
Code from Jakub:
Put the "Filter" back in statistics dialogs, which was removed in r37559.

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

12 years agoUse ws_open/ws_read to avoid prohibited APIs.
stig [Thu, 23 Jun 2011 13:51:26 +0000 (13:51 +0000)]
Use ws_open/ws_read to avoid prohibited APIs.
Close file handle after usage.

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

12 years agoProhibited APIs: strncpy -> g_strlcpy.
stig [Thu, 23 Jun 2011 13:50:07 +0000 (13:50 +0000)]
Prohibited APIs: strncpy -> g_strlcpy.

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

12 years agoAdded missing $Id$
stig [Thu, 23 Jun 2011 13:48:38 +0000 (13:48 +0000)]
Added missing $Id$

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

12 years agoFix some of the GTK deprecated functions.
etxrab [Thu, 23 Jun 2011 13:36:25 +0000 (13:36 +0000)]
Fix some of the GTK deprecated functions.

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

12 years agoAdd GDK deprecated functions.
etxrab [Thu, 23 Jun 2011 13:04:19 +0000 (13:04 +0000)]
Add GDK deprecated functions.

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

12 years agoAdd a protocol decode.
etxrab [Thu, 23 Jun 2011 13:03:37 +0000 (13:03 +0000)]
Add a protocol decode.

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

12 years agoFrom Tony Trinh via bug 5960:
stig [Thu, 23 Jun 2011 11:06:34 +0000 (11:06 +0000)]
From Tony Trinh via bug 5960:
Fix TvbRange:string() so that it returns a string that contains all bytes
of the range, including zeroes (instead of being truncated at first zero).

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

12 years agoUse guint32 internally to store mask.
stig [Thu, 23 Jun 2011 10:52:40 +0000 (10:52 +0000)]
Use guint32 internally to store mask.

This may fix bug 5734.

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

12 years agoRename Tvb_new_real to ByteArray_tvb, as it's a ByteArray function.
stig [Thu, 23 Jun 2011 10:43:49 +0000 (10:43 +0000)]
Rename Tvb_new_real to ByteArray_tvb, as it's a ByteArray function.
Documentation is generated from code.

This fixes bug 5199.

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

12 years agoRename Tvb_tvb to TvbRange_tvb, as it's a TvbRange function.
stig [Thu, 23 Jun 2011 10:28:53 +0000 (10:28 +0000)]
Rename Tvb_tvb to TvbRange_tvb, as it's a TvbRange function.
Documentation is generated from code.

This fixes bug 5006.

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

12 years agoRemove not needed forward declaration.
darkjames [Thu, 23 Jun 2011 08:23:39 +0000 (08:23 +0000)]
Remove not needed forward declaration.

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

12 years agoFix some gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Wed, 22 Jun 2011 23:03:56 +0000 (23:03 +0000)]
Fix some gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: misc minor cleanup: unneeded #include; whitespace, tvb_length-->tvb_reported_length

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

12 years agoDon't assert on invalid custom columns, just set as invalid/unknown.
stig [Wed, 22 Jun 2011 20:15:34 +0000 (20:15 +0000)]
Don't assert on invalid custom columns, just set as invalid/unknown.

This fixes bug 6028.

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

12 years agoFrom Xiao Xiangquan: A new dissector for Vuze DHT;
wmeier [Wed, 22 Jun 2011 19:52:13 +0000 (19:52 +0000)]
From Xiao Xiangquan: A new dissector for Vuze DHT;

 Vuze, called Azureus before, is a great BT client and has a lot of users,
 while its DHT implementation is different from the official one.

From me: New-style dissectors are supposed to to always return
         "bytes dissected" (not just when tree != NULL);

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

12 years agotvb_format_text → tvb_format_stringzpad.
gerald [Wed, 22 Jun 2011 16:02:26 +0000 (16:02 +0000)]
tvb_format_text → tvb_format_stringzpad.

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

12 years agoUse ENC_BIG_ENDIAN.
etxrab [Wed, 22 Jun 2011 15:46:24 +0000 (15:46 +0000)]
Use ENC_BIG_ENDIAN.

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

12 years agoProtect the columns from beeing overwritten.
etxrab [Wed, 22 Jun 2011 14:49:26 +0000 (14:49 +0000)]
Protect the columns from beeing overwritten.

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

12 years agoAdd a dissector table for CDR:s
etxrab [Wed, 22 Jun 2011 13:58:04 +0000 (13:58 +0000)]
Add a dissector table for CDR:s

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

12 years agoFix a checkhf Warning
alagoutte [Wed, 22 Jun 2011 12:30:07 +0000 (12:30 +0000)]
Fix a checkhf Warning
Unused entry: epan/dissectors/packet-skinny.c, hf_skinny_modifyConfRes

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

12 years agoMake it possible to copy stuff from the welcome header.
etxrab [Wed, 22 Jun 2011 08:54:17 +0000 (08:54 +0000)]
Make it possible to copy stuff from the welcome header.

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

12 years agoFrom mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6041
alagoutte [Wed, 22 Jun 2011 08:09:55 +0000 (08:09 +0000)]
From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6041
Added party numbers and party names in message CM5CallInfoMessage

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

12 years agoAdded missing packet-mime-encap.c
stig [Wed, 22 Jun 2011 07:41:35 +0000 (07:41 +0000)]
Added missing packet-mime-encap.c

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

12 years agoOops, forgot to revert a variable after a test build
jmayer [Wed, 22 Jun 2011 07:04:34 +0000 (07:04 +0000)]
Oops, forgot to revert a variable after a test build

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

12 years agorev 37741 added tap-rtspstat.c to Makefile.common.
jmayer [Wed, 22 Jun 2011 06:52:18 +0000 (06:52 +0000)]
rev 37741 added tap-rtspstat.c to Makefile.common.

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

12 years agotvb_reported_length_remaining() can return -1;
wmeier [Wed, 22 Jun 2011 04:20:46 +0000 (04:20 +0000)]
tvb_reported_length_remaining() can return -1;
Remove a few lines of not really req'd code;
Minor whitespace cleanup.

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

12 years agoFrom Martin Kaiser: Fix forBug #6048 (fuzztest crash)
wmeier [Wed, 22 Jun 2011 01:20:20 +0000 (01:20 +0000)]
From Martin Kaiser: Fix forBug #6048 (fuzztest crash)

"this is caused by my newly added DVB-CI MMI code

endless loop when dissect_dvbci_text() returns 0 because the text pseudo-apdu
is invalid"

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

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

12 years agoAdd the correct casts to make it compile on some old ERHL box.
etxrab [Tue, 21 Jun 2011 15:04:14 +0000 (15:04 +0000)]
Add the correct casts to make it compile on some old ERHL box.
(Will this finally be correct?)

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

12 years agoFrom Stéphane Gorse:
etxrab [Tue, 21 Jun 2011 12:45:37 +0000 (12:45 +0000)]
From Stéphane Gorse:

The menu gets a new item (Statistics -> RTSP -> Packet Counter).

Like HTTP, filter can be set and then the dialog windows shows the result of the RTSP analysis.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6042

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

12 years agoWe need to start reassembly on a segment boundary.
etxrab [Tue, 21 Jun 2011 11:53:33 +0000 (11:53 +0000)]
We need to start reassembly on a segment boundary.

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

12 years agoFrom Roland Knall:
etxrab [Tue, 21 Jun 2011 05:21:15 +0000 (05:21 +0000)]
From Roland Knall:
Two changes for openSAFETY over Modbus/TCP:

1. Changing the default preference for Big Endian encoding from TRUE to FALSE
2. Changing the position in the tree for the dissection to the top-level,
therefore, the openSAFETY entries no longer will show up as children of the
Modbus entry. This is the same behaviour as the other variants for openSAFETY
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6038

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

12 years agoFrom Martin Kaiser:
etxrab [Tue, 21 Jun 2011 05:16:23 +0000 (05:16 +0000)]
From Martin Kaiser:
adds dissection
of the Card Information Structure (CIS). It shows the CIS as a list of tuples
without going into the details of each tuple.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6036

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

12 years agoFrom Martin Kaiser:
etxrab [Tue, 21 Jun 2011 05:12:14 +0000 (05:12 +0000)]
From Martin Kaiser:
adds the MMI resource as defined in
the DVB-CI specification (EN50221), section 8.6 (low-level MMI is excluded as
it's not used in practice).

The patch allows dissection of all text boxes that a DVB-CI host displays on
behalf of the CI module.

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

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

12 years agoHave mergecap, tshark, and editcap write pcap-ng files by default. This
gerald [Mon, 20 Jun 2011 23:31:26 +0000 (23:31 +0000)]
Have mergecap, tshark, and editcap write pcap-ng files by default. This
is mainly an attempt to fix the currently-broken "test.sh" step on the
XP buildbot. If this causes too many problems we might want to have
suite-capture.sh:capture_step_snapshot pass "-P" to dumpcap instead.

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