obnox/wireshark/wip.git
14 years agoFix comments.
guy [Wed, 19 May 2010 03:49:52 +0000 (03:49 +0000)]
Fix comments.

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

14 years agoIf the user asks for the Capture -> Interfaces dialog, and there are no
guy [Wed, 19 May 2010 03:05:40 +0000 (03:05 +0000)]
If the user asks for the Capture -> Interfaces dialog, and there are no
network interfaces, pop up a dialog saying that, rather than popping up
an empty Interfaces dialog.

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

14 years ago-S doesn't require an interface, either.
guy [Wed, 19 May 2010 02:55:05 +0000 (02:55 +0000)]
-S doesn't require an interface, either.

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

14 years agoRegularize indentation a bit.
guy [Wed, 19 May 2010 02:47:16 +0000 (02:47 +0000)]
Regularize indentation a bit.

Let pcap_statustostr()'s result suffice for most PCAP_ERROR_ errors.
Don't mention the capture device name multiple times in the error
message.  Treat positive returns from pcap_can_set_rfmon() other than 0
or 1 as weird returns, not error returns.

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

14 years agoiscsi also has a system port (860) registered in addition to the more common
sahlberg [Tue, 18 May 2010 22:00:17 +0000 (22:00 +0000)]
iscsi also has a system port (860) registered in addition to the more common
port (3260).

add knowledge about the registered system port for iscsi to the heuristics
so we automatically detect when iscsi is transported over this optional port.

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

14 years agoUse val_to_str() instead of match_strval() to ensure we get a non-NULL result to...
morriss [Tue, 18 May 2010 16:05:37 +0000 (16:05 +0000)]
Use val_to_str() instead of match_strval() to ensure we get a non-NULL result to pass to proto_tree_add*().

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

14 years agoAdd epan/dissectors/dcerpc/ and epan/dissectors/pidl/ to the source distribution
morriss [Tue, 18 May 2010 15:58:49 +0000 (15:58 +0000)]
Add epan/dissectors/dcerpc/ and epan/dissectors/pidl/ to the source distribution

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

14 years agoAvoid passing a NULL pointer to a string to proto_tree_add_uint_format()
morriss [Tue, 18 May 2010 14:17:11 +0000 (14:17 +0000)]
Avoid passing a NULL pointer to a string to proto_tree_add_uint_format()

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

14 years agoUse val_to_str() instead of match_strval() to ensure we get a non-NULL result.
morriss [Tue, 18 May 2010 14:04:31 +0000 (14:04 +0000)]
Use val_to_str() instead of match_strval() to ensure we get a non-NULL result.

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

14 years agoRestore blank line before "and by" removed in SVN #32864;
wmeier [Tue, 18 May 2010 14:01:59 +0000 (14:01 +0000)]
Restore blank line before "and by" removed in SVN #32864;
Also: Line up EMail address text for slava.

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

14 years agoAdd Slava as per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4741#c4
morriss [Tue, 18 May 2010 13:39:22 +0000 (13:39 +0000)]
Add Slava as per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4741#c4

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

14 years agoAdd FIXME
krj [Tue, 18 May 2010 11:44:32 +0000 (11:44 +0000)]
Add FIXME

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

14 years agoRemove NULL pointer guard in defragment_init()
krj [Tue, 18 May 2010 10:49:09 +0000 (10:49 +0000)]
Remove NULL pointer guard in defragment_init()

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

14 years agoRemove a couple of superfluous NULL assignments
krj [Tue, 18 May 2010 10:45:39 +0000 (10:45 +0000)]
Remove a couple of superfluous NULL assignments

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

14 years agoRemove a couple of check_col()
krj [Tue, 18 May 2010 10:43:36 +0000 (10:43 +0000)]
Remove a couple of check_col()

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

14 years agoParse everything as OBEX (for now).
krj [Tue, 18 May 2010 10:39:12 +0000 (10:39 +0000)]
Parse everything as OBEX (for now).

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

14 years agoAdd proper item for "User encapsulation not handled" to be able to
stig [Tue, 18 May 2010 09:01:08 +0000 (09:01 +0000)]
Add proper item for "User encapsulation not handled" to be able to
second-click the entry to edit preferences.

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

14 years agoRemove #if 0 code
krj [Tue, 18 May 2010 08:29:19 +0000 (08:29 +0000)]
Remove #if 0 code

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

14 years agoHandle fgets() error path
krj [Tue, 18 May 2010 08:22:42 +0000 (08:22 +0000)]
Handle fgets() error path

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

14 years agoMark defragment_init() as an init routine
krj [Tue, 18 May 2010 08:08:08 +0000 (08:08 +0000)]
Mark defragment_init() as an init routine

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

14 years agoFix several GCC build issues
krj [Tue, 18 May 2010 07:49:55 +0000 (07:49 +0000)]
Fix several GCC build issues

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

14 years agoAdd Allan M. Madsen
krj [Tue, 18 May 2010 07:37:37 +0000 (07:37 +0000)]
Add Allan M. Madsen

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

14 years agoInclude (local) packet-btl2cap.h properly
krj [Tue, 18 May 2010 07:35:31 +0000 (07:35 +0000)]
Include (local) packet-btl2cap.h properly

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

14 years agoFrom Allan M. Madsen:
krj [Tue, 18 May 2010 07:32:04 +0000 (07:32 +0000)]
From Allan M. Madsen:

Initial implementation of Bluetooth OBEX dissector. Work in progress.

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

14 years agoPrepare the docbooks for the 1.4 branch.
jake [Tue, 18 May 2010 06:16:03 +0000 (06:16 +0000)]
Prepare the docbooks for the 1.4 branch.

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

14 years agoExtract ogf from the opcode
krj [Tue, 18 May 2010 06:09:52 +0000 (06:09 +0000)]
Extract ogf from the opcode

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

14 years agoAdd CPackConfig.txt to the tarball.
jake [Tue, 18 May 2010 06:03:05 +0000 (06:03 +0000)]
Add CPackConfig.txt to the tarball.

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

14 years agoDissect Synchronous Connection correctly
krj [Tue, 18 May 2010 05:46:44 +0000 (05:46 +0000)]
Dissect Synchronous Connection correctly

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

14 years agoFix some errors. Use FormatMessageA(), as we need the string in ASCII.
guy [Tue, 18 May 2010 05:32:29 +0000 (05:32 +0000)]
Fix some errors.  Use FormatMessageA(), as we need the string in ASCII.

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

14 years agoSquelch an unused-variable warning.
guy [Tue, 18 May 2010 03:35:20 +0000 (03:35 +0000)]
Squelch an unused-variable warning.

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

14 years agoAdd a routine to convert Win32 error statuses into strings, and use it
guy [Tue, 18 May 2010 03:29:45 +0000 (03:29 +0000)]
Add a routine to convert Win32 error statuses into strings, and use it
when generating error messages.

The error code from CreatePipe() is gotten by calling GetLastError();
it's not in errno.

Clean up indentation a bit.

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

14 years agoMove some routines around, fix and shuffle comments.
guy [Tue, 18 May 2010 02:48:51 +0000 (02:48 +0000)]
Move some routines around, fix and shuffle comments.

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

14 years agoMove get_pcap_linktype() into dumpcap - it's not used elsewhere.
guy [Tue, 18 May 2010 02:36:02 +0000 (02:36 +0000)]
Move get_pcap_linktype() into dumpcap - it's not used elsewhere.

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

14 years agoOnly negative return values from pcap_activate() are errors; positive
guy [Tue, 18 May 2010 01:48:46 +0000 (01:48 +0000)]
Only negative return values from pcap_activate() are errors; positive
return values are success-with-a-warning.

Report those errors with a string.

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

14 years agoDon't write the SP_SUCCESS messages unless -Z was specified.
guy [Tue, 18 May 2010 00:20:30 +0000 (00:20 +0000)]
Don't write the SP_SUCCESS messages unless -Z was specified.

Add support for a machine-readable "-v" output, which prints only the
pcap version string.

Give a little more information about the machine-readable format, but
note that it's primarily intended for consumption by Wireshark and
TShark and is subject to change.

Properly hyphenate "pcap-ng".

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

14 years agoMake -Z always generate machine-readable output, and don't bother
guy [Mon, 17 May 2010 23:56:00 +0000 (23:56 +0000)]
Make -Z always generate machine-readable output, and don't bother
supplying -M along with -Z.  (We keep -M around for debugging use; it's
documented, unlike -Z.)

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

14 years agoIf dumpcap is run with -D, don't select a default interface; it's not
guy [Mon, 17 May 2010 23:13:24 +0000 (23:13 +0000)]
If dumpcap is run with -D, don't select a default interface; it's not
necessary.

If it's run with -D and -M, and we found no interfaces, don't treat that
as an error; let the code that reads our output just indicate it as "no
interfaces available", so *its* caller can decide whether to report an
error or not (in some cases in Wireshark, it's obvious that there are no
interfaces, e.g. there aren't any listed on the welcome screen, so
popping up a dialog is pointless).

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

14 years agoDon't pass a NULL pointer to what is supposed to be (according to the format) a strin...
morriss [Mon, 17 May 2010 21:49:09 +0000 (21:49 +0000)]
Don't pass a NULL pointer to what is supposed to be (according to the format) a string: some implementations of vsnprintf() will core on that.  (Unfortunately it seems that g_vsnprintf() doesn't protect us from this...)

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

14 years agoAdd a bunch of tools to the source distribution
morriss [Mon, 17 May 2010 20:38:46 +0000 (20:38 +0000)]
Add a bunch of tools to the source distribution

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

14 years agoAdded some new features.
stig [Mon, 17 May 2010 20:24:28 +0000 (20:24 +0000)]
Added some new features.

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

14 years agoFrom Lars Ruoff:
jake [Mon, 17 May 2010 18:48:44 +0000 (18:48 +0000)]
From Lars Ruoff:
Add some more robustness to Alcatel-Lucent vendor specific
DHCP options and add some new option values.

It now supports all currently implemented option values, i.e.:
{Option Opcode Length (bytes) Content}
AVA 58 (0x3A) 2 Vlanid
IP Touch TFTP1 64 (0x40) 4 IPv4 address
IP Touch TFTP2 65 (0x41) 4 IPv4 address
APPLICATION_TYPE 66 (0x42) 1 0 (noe) / 1 (sip)
SIP URL 67 (0x43) x bytes url string

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

14 years agoUpdate a comment.
guy [Mon, 17 May 2010 18:41:48 +0000 (18:41 +0000)]
Update a comment.

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

14 years agoWhen dumpcap is run to get an interface list, interface capabilities, or
guy [Mon, 17 May 2010 18:40:23 +0000 (18:40 +0000)]
When dumpcap is run to get an interface list, interface capabilities, or
interface statistics, have its error messages come out as sync-pipe
errors, have it send a sync-pipe "success" message on success, and have
the callers get that message and display it.

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

14 years agoUpdate Robert Hogan's entry to include TN5250
morriss [Mon, 17 May 2010 15:07:08 +0000 (15:07 +0000)]
Update Robert Hogan's entry to include TN5250

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

14 years agoFrom Torrey Atcitty: IEEE 1722(AVB Transport Protocol) Dissector
wmeier [Mon, 17 May 2010 04:08:08 +0000 (04:08 +0000)]
From Torrey Atcitty: IEEE 1722(AVB Transport Protocol) Dissector
See Bug #4764 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4764)

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

14 years agoMove most of the contents of the header file into the .c file.
morriss [Mon, 17 May 2010 03:01:03 +0000 (03:01 +0000)]
Move most of the contents of the header file into the .c file.

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

14 years agoRemove trailing white space
morriss [Mon, 17 May 2010 03:00:37 +0000 (03:00 +0000)]
Remove trailing white space

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

14 years agoFrom Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3922 :
morriss [Mon, 17 May 2010 02:55:51 +0000 (02:55 +0000)]
From Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3922 :

Add support for the IBM TN5250 data stream protocol.

http://wiki.wireshark.org/TN5250

From me:

Move most of the contents of the header file to the .c file.

Replace blurbs that match the hf name with NULL.
Replace empty-string blurbs with NULL.
Fix some abbreviations (hf_tn5220_xxx -> tn5220.xxx).
Make some functions static.
Cast some offset increments to unsigned to make sure we don't go backwards
(which could create a loop).  This includes making most of the subdissection
functions return an unsigned number.

Use find_or_create_conversation().

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

14 years agoAdd CMakeOptions.txt to the source distribution
morriss [Mon, 17 May 2010 02:43:15 +0000 (02:43 +0000)]
Add CMakeOptions.txt to the source distribution

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

14 years agoSome cleanup and adding one more new feature.
jake [Sun, 16 May 2010 16:58:04 +0000 (16:58 +0000)]
Some cleanup and adding one more new feature.

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

14 years agoEnsure we update default link-layer list when toggeling monitor mode.
stig [Sun, 16 May 2010 15:44:43 +0000 (15:44 +0000)]
Ensure we update default link-layer list when toggeling monitor mode.

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

14 years ago[Automatic manuf and enterprise-numbers update for 2010-05-16]
gerald [Sun, 16 May 2010 15:04:06 +0000 (15:04 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-05-16]

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

14 years agoFrom Chidambaram Arunachalam:
jake [Sun, 16 May 2010 10:58:50 +0000 (10:58 +0000)]
From Chidambaram Arunachalam:
Currently, H.264 dissector in Wireshark allows only one value for the "H264
dynamic payload type" preference value.
This patch allows users to specify a value range for this parameter (96-127)
so that both streams can be decoded for a video call with asymmetric rtp
payload types.

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

14 years agoFrom Robert Lickenbrock:
jake [Sun, 16 May 2010 10:28:14 +0000 (10:28 +0000)]
From Robert Lickenbrock:
Wireshark does not extract the vendor identifier (i.e. the 7th and 8th bytes)
from the header of YMSG packets. The current implementations skips over these
bytes during dissection, presumably because they were believed to be padding.

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

14 years agoIf we don't know whether a device supports monitor mode, turn off
guy [Sun, 16 May 2010 08:14:29 +0000 (08:14 +0000)]
If we don't know whether a device supports monitor mode, turn off
monitor mode in the checkbox before making the checkbox insensitive.

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

14 years agoAttempt to handle isochronous descriptors between the 64-byte header and
guy [Sun, 16 May 2010 03:19:40 +0000 (03:19 +0000)]
Attempt to handle isochronous descriptors between the 64-byte header and
the payload.  Should fix bug 4401.

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

14 years agoAlso set sensitive on monitor and linktype label, as it's not clear that
stig [Sat, 15 May 2010 23:25:53 +0000 (23:25 +0000)]
Also set sensitive on monitor and linktype label, as it's not clear that
the monitor mode is disabled when only the check box is disabled.

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

14 years agoSet the correct "monitor mode" button state.
stig [Sat, 15 May 2010 22:54:44 +0000 (22:54 +0000)]
Set the correct "monitor mode" button state.

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

14 years agotext2pcap_scanner.l does not compile without warnings
jmayer [Sat, 15 May 2010 21:40:25 +0000 (21:40 +0000)]
text2pcap_scanner.l does not compile without warnings
on my system - add it to the non-clean file list.

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

14 years agoBruno Matos <bruno.matos@gmail.com>
jmayer [Sat, 15 May 2010 21:38:36 +0000 (21:38 +0000)]
Bruno Matos <bruno.matos@gmail.com>

In version_info.c file, if we put the Python include in first place we
remove the warning/error "_POSIX_C_SOURCE redefined", as in this article:
http://bytes.com/topic/python/answers/30009-warning-_posix_c_source-redefined
.

I had problems with CMake build.

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

14 years ago- Move cmake options into their own file, making it easier to
jmayer [Sat, 15 May 2010 20:41:53 +0000 (20:41 +0000)]
- Move cmake options into their own file, making it easier to
  use a locally modified version of the stuff
- Some (still preliminary) CPack changes
- Add -fexcess-precision=fast (configure.in and CmakeLists.txt)
  to the compileflags (new gcc-4.5 feature to maintain backward
  compatibility with gcc-4.4 and IMO we don't need the slower but
  more exact implementation gcc 4.5 offers.

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

14 years agoUse binary search when scanning the SANC and ISPC lists; correct a couple of
dimeg [Sat, 15 May 2010 20:14:52 +0000 (20:14 +0000)]
Use binary search when scanning the SANC and ISPC lists; correct a couple of
double entries in the ISPC lists.

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

14 years agoExport prefs_capture_device_monitor_mode().
guy [Sat, 15 May 2010 20:00:09 +0000 (20:00 +0000)]
Export prefs_capture_device_monitor_mode().

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

14 years agoSupport monitor mode in the capture preferences.
guy [Sat, 15 May 2010 19:38:13 +0000 (19:38 +0000)]
Support monitor mode in the capture preferences.

Use prefs_is_capture_device_hidden() to find out whether a device should
be hidden - don't scan the list of hidden devices ourselves.

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

14 years agoUpdate to V9.2.0 (2010-03)
etxrab [Sat, 15 May 2010 10:27:45 +0000 (10:27 +0000)]
Update to V9.2.0 (2010-03)

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

14 years agoUpdate to V9.1.0 (2010-03).
etxrab [Sat, 15 May 2010 09:04:28 +0000 (09:04 +0000)]
Update to V9.1.0 (2010-03).

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

14 years agoUpdate to V9.2.0 (2010-03).
etxrab [Sat, 15 May 2010 08:49:39 +0000 (08:49 +0000)]
Update to V9.2.0 (2010-03).

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

14 years agoFrom Torrey Atcitty: IEEE 802.1Qat (Multiple Stream Reservation Protocol) dissector
wmeier [Fri, 14 May 2010 22:55:55 +0000 (22:55 +0000)]
From  Torrey Atcitty:  IEEE 802.1Qat (Multiple Stream Reservation Protocol) dissector
See: Bug #4757: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4757

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

14 years agoFrom David Aggeler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4762 :
morriss [Fri, 14 May 2010 21:54:48 +0000 (21:54 +0000)]
From David Aggeler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4762 :

- Fixed HF to separate signed & unsigned values and to have BASE_DEC all signed
- Fixed private sequences with undefined length in ILE
- Fixed some spellings in comments

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

14 years agoUpdate to V9.2.3 (2010-03)
etxrab [Fri, 14 May 2010 21:50:23 +0000 (21:50 +0000)]
Update to  V9.2.3 (2010-03)

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

14 years agoMNC, SANC and ISPC lists updated up to the latest OB, No 955
dimeg [Fri, 14 May 2010 21:12:48 +0000 (21:12 +0000)]
MNC, SANC and ISPC lists updated up to the latest OB, No 955

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

14 years agoRework SMS reassembly:
morriss [Fri, 14 May 2010 19:27:11 +0000 (19:27 +0000)]
Rework SMS reassembly:

- Take out the if(tree) because for reassembly to work we need to do the
  reassembly on the first pass.
- Remove the (confusing) "try_dissect_message_fragment" preference (which
  caused us to dissect the message fragments) and replace it with a "reassembly"
  preference.  Dissect the message fragments regardless of whether reassembly is
  enabled or not (it's just SMS).  This solves the user confusion reported in
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4232 .
- Add the text of the SMS using proto_tree_add_string*() so that we an filter on
  the text.

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

14 years agoFix a few usages of "" in the hfp] array 'blurb' field.
wmeier [Fri, 14 May 2010 18:56:28 +0000 (18:56 +0000)]
Fix a few usages of "" in the hfp] array 'blurb' field.

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

14 years agoFix the tooltip for the "monitor mode" checkbox.
guy [Fri, 14 May 2010 17:36:17 +0000 (17:36 +0000)]
Fix the tooltip for the "monitor mode" checkbox.

Speak of network adapters rather than network cards (most personal
computers these days have no network cards - the network adapters are on
the motherboard).

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

14 years agoSet SVN properties
morriss [Fri, 14 May 2010 17:05:50 +0000 (17:05 +0000)]
Set SVN properties

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

14 years agoSynchronize Makefiles even more.
jake [Fri, 14 May 2010 16:48:17 +0000 (16:48 +0000)]
Synchronize Makefiles even more.

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

14 years agoAdd Cmake stuff to the source distribution so more people can try it out.
morriss [Fri, 14 May 2010 16:27:03 +0000 (16:27 +0000)]
Add Cmake stuff to the source distribution so more people can try it out.

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

14 years agoFrom Tamas Regos:
etxrab [Fri, 14 May 2010 07:57:32 +0000 (07:57 +0000)]
From Tamas Regos:
diameter dictionary.xml update

AVP 1003:
- typo: Flow-Informatio <-> Flow-Information
- added: Monitoring-Key and AF-Signalling-Protocol
- whitespace corrections

AVP 1006:
- added code: 24-28 and 100
- whitespace correction

AVP 1001, 1007, 1013-1020: whitespace corrections
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4765

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

14 years agoFix compilation when we don't have pcap_create().
guy [Fri, 14 May 2010 07:48:50 +0000 (07:48 +0000)]
Fix compilation when we don't have pcap_create().

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

14 years agoSupport monitor mode from the GUI.
guy [Fri, 14 May 2010 05:15:40 +0000 (05:15 +0000)]
Support monitor mode from the GUI.

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

14 years agoIf something is only supposed to be included if we have libpcap, don't
guy [Fri, 14 May 2010 02:47:13 +0000 (02:47 +0000)]
If something is only supposed to be included if we have libpcap, don't
put #ifdef HAVE_LIBPCAP in it.

Add multiple-inclusion protection to capture_errs.h.

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

14 years agoDon't include capture-related headers if we don't support capturing
guy [Fri, 14 May 2010 01:39:02 +0000 (01:39 +0000)]
Don't include capture-related headers if we don't support capturing
network traffic.

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

14 years agoUm, no, the problem with the Leopard x86 build is that we first do a
guy [Fri, 14 May 2010 00:49:28 +0000 (00:49 +0000)]
Um, no, the problem with the Leopard x86 build is that we first do a
build without libpcap, to make sure that works, and then do a build with
libpcap, to put into a binary release.  It's the former that's failing;
I'll back out the previous change and then work on that.

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

14 years agoWe already have a link to the IBM version of the 3270 manual; just refer
guy [Fri, 14 May 2010 00:16:59 +0000 (00:16 +0000)]
We already have a link to the IBM version of the 3270 manual; just refer
to that.

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

14 years agoSee whether the Leopard x86 buildbot is upset because of the name
guy [Fri, 14 May 2010 00:10:15 +0000 (00:10 +0000)]
See whether the Leopard x86 buildbot is upset because of the name
if_capabilities_t - it doesn't fail on Snow Leopard, even if I undefine
HAVE_PCAP_CREATE, and doesn't fail on the Leopard PPC buildbot, either.

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

14 years agoHandle the Set Buffer Address command differently; this gets rid of the
guy [Thu, 13 May 2010 23:56:31 +0000 (23:56 +0000)]
Handle the Set Buffer Address command differently; this gets rid of the
macro with the "give credit" license, so back that out of COPYING.

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

14 years ago(Trivial) A little more whitespace cleanup.
wmeier [Thu, 13 May 2010 22:16:28 +0000 (22:16 +0000)]
(Trivial) A little more whitespace cleanup.

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

14 years agoFrom Torrey Atcitty: [Dissector Enhancement] Added new functionality to existing...
wmeier [Thu, 13 May 2010 21:47:38 +0000 (21:47 +0000)]
From  Torrey Atcitty:  [Dissector Enhancement] Added new functionality to existing 1588v2 dissector to also support IEEE802.1AS.

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

14 years agoFix up some indentation
morriss [Thu, 13 May 2010 20:39:56 +0000 (20:39 +0000)]
Fix up some indentation

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

14 years agoReindent a bit
morriss [Thu, 13 May 2010 20:31:53 +0000 (20:31 +0000)]
Reindent a bit

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

14 years agoUse find_or_create_conversation() in the example
morriss [Thu, 13 May 2010 18:59:35 +0000 (18:59 +0000)]
Use find_or_create_conversation() in the example

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

14 years agoDocument find_or_create_conversation()
morriss [Thu, 13 May 2010 18:57:41 +0000 (18:57 +0000)]
Document find_or_create_conversation()

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

14 years agoUse find_or_create_conversation() in some ASN.1 dissectors
morriss [Thu, 13 May 2010 18:55:31 +0000 (18:55 +0000)]
Use find_or_create_conversation() in some ASN.1 dissectors

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

14 years agoAs suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html
morriss [Thu, 13 May 2010 18:28:34 +0000 (18:28 +0000)]
As suggested in wireshark.org/lists/wireshark-dev/200809/msg00075.html
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 :

Write a new convenience routine for finding a conversation and, if it is not
found, create it.  The frame number and addresses are taken from pinfo (as is
the common case).

Use this function in a bunch of dissectors.

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

14 years agoFetch an indication of whether the interface supports capturing in
guy [Thu, 13 May 2010 17:37:39 +0000 (17:37 +0000)]
Fetch an indication of whether the interface supports capturing in
monitor mode at the same time that we fetch its list of link-layer
types.  Support fetching that list in monitor mode, as the list may be
different in regular and monitor mode.  If the interface supports
monitor mode, when printing the list of link-layer types, indicate
whether they're fetched in monitor mode or not, as tcpdump 4.1.x does.

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

14 years agoFrom Hadar Shohami:
jake [Thu, 13 May 2010 17:22:53 +0000 (17:22 +0000)]
From Hadar Shohami:
Add support to option 17 sub option 2171 for Packet Cable 2.0 according to
CL-SP-CANN-DHCP-Reg-I03-090811.doc

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

14 years agoAdd Robert Hogan. Also update my entry.
morriss [Thu, 13 May 2010 16:28:32 +0000 (16:28 +0000)]
Add Robert Hogan.  Also update my entry.

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

14 years agoRemove some unused hf_ entries
morriss [Thu, 13 May 2010 15:22:55 +0000 (15:22 +0000)]
Remove some unused hf_ entries

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

14 years agoFrom Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4257 :
morriss [Thu, 13 May 2010 15:19:40 +0000 (15:19 +0000)]
From Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4257 :

Correctly decode and display the buffer address in SBA orders.

Note: This includes a macro with a new license which is added to COPYING.

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

14 years agoUpdate to V9.2.1 (2010-04)
etxrab [Thu, 13 May 2010 13:29:31 +0000 (13:29 +0000)]
Update to  V9.2.1 (2010-04)

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