obnox/wireshark/wip.git
9 years agoMake the changes compile on Linux also.
jake [Tue, 11 May 2010 20:57:15 +0000 (20:57 +0000)]
Make the changes compile on Linux also.

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

9 years agoIf we have pcap_open(), and we're *not* opening an rpcap URL, open the
guy [Tue, 11 May 2010 20:19:35 +0000 (20:19 +0000)]
If we have pcap_open(), and we're *not* opening an rpcap URL, open the
device, don't just execute whatever comes after the open code as an else
clause.

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

9 years agoFrom Yaniv Kaul: Fix errors found by clang static code analyzer and add some consts.
wmeier [Tue, 11 May 2010 20:14:37 +0000 (20:14 +0000)]
From Yaniv Kaul:  Fix errors found by clang static code analyzer and add some consts.

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

9 years agoStart to replace deprecated gtk_combo_new() with
etxrab [Tue, 11 May 2010 19:52:40 +0000 (19:52 +0000)]
Start to replace deprecated gtk_combo_new() with
gtk_combo_box_entry_new_text().

(I'll try to get back to this tomorrow)

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

9 years agoFrom Paul J. Metzger: Add support for decoding DIS Electromagnetic Emission packets.
wmeier [Tue, 11 May 2010 19:03:33 +0000 (19:03 +0000)]
From Paul J. Metzger:  Add support for decoding DIS Electromagnetic Emission packets.

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

9 years agoAllow for heuristic dissection of Unicode XML.
jake [Tue, 11 May 2010 19:01:56 +0000 (19:01 +0000)]
Allow for heuristic dissection of Unicode XML.

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

9 years agoShow version as generated field.
jake [Tue, 11 May 2010 18:04:03 +0000 (18:04 +0000)]
Show version as generated field.

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

9 years agoUse consistent indentation; Whitesapce & formatting cleanup.
wmeier [Tue, 11 May 2010 16:54:55 +0000 (16:54 +0000)]
Use consistent indentation; Whitesapce & formatting cleanup.

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

9 years agoUse consistent indentation; Whitespace & formatting cleanup.
wmeier [Tue, 11 May 2010 15:34:57 +0000 (15:34 +0000)]
Use consistent indentation; Whitespace & formatting cleanup.

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

9 years agoReflect changes made in SVN #32752
wmeier [Tue, 11 May 2010 15:12:13 +0000 (15:12 +0000)]
Reflect changes made in SVN #32752

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

9 years agoFix handling of pa-data-type KRB5_PA_PAC_REQUEST (& KRB5_PA_S4U2SELF).
wmeier [Tue, 11 May 2010 14:34:16 +0000 (14:34 +0000)]
Fix handling of pa-data-type KRB5_PA_PAC_REQUEST (& KRB5_PA_S4U2SELF).

-Define pa-data-type KRB5_PA_PAC_REQUEST properly so that it is recognized.
  Fixes bug #4752 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4752)
-Also revert definition of  KRB5_PA_S4U2SELF (to be a positive number).
(All of the above reverts part of SVN #31400).

-Display pa-data-type as FT_INT32.
-Display the value for pa-data-type KRB5_PA_PAC_REQUEST as Boolean (not Int).

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

9 years agoFrom Jay Moran via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4697 :
morriss [Tue, 11 May 2010 13:42:13 +0000 (13:42 +0000)]
From Jay Moran via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4697 :

Fix generation of ~/.wireshark-etc/pangorc to fix font issue.

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

9 years agoReplace deprecated gtk_input_add_full()
etxrab [Tue, 11 May 2010 08:36:16 +0000 (08:36 +0000)]
Replace deprecated gtk_input_add_full()

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

9 years agoFixwes to 3GPP AVP:s from Tamás Regõs.
etxrab [Tue, 11 May 2010 06:53:03 +0000 (06:53 +0000)]
Fixwes to 3GPP AVP:s from Tamás Regõs.

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

9 years agoAdd a little more code to avoid not-very-useful blurbs:
morriss [Tue, 11 May 2010 03:53:31 +0000 (03:53 +0000)]
Add a little more code to avoid not-very-useful blurbs:
  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

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

9 years agoRegenerate a few more of the ASN.1 dissectors
morriss [Tue, 11 May 2010 02:58:27 +0000 (02:58 +0000)]
Regenerate a few more of the ASN.1 dissectors

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

9 years agoRegenerate a few more of the ASN.1 dissectors
morriss [Tue, 11 May 2010 02:51:39 +0000 (02:51 +0000)]
Regenerate a few more of the ASN.1 dissectors

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

9 years agoRegenerate a few more of the ASN.1 dissectors
morriss [Tue, 11 May 2010 02:37:46 +0000 (02:37 +0000)]
Regenerate a few more of the ASN.1 dissectors

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

9 years agoRegenerate a few more of the ASN.1 dissectors
morriss [Tue, 11 May 2010 02:33:30 +0000 (02:33 +0000)]
Regenerate a few more of the ASN.1 dissectors

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

9 years agoFollow on to rev 32593: apparently delaying the start of resolv_update_cb() isn't...
morriss [Tue, 11 May 2010 02:25:22 +0000 (02:25 +0000)]
Follow on to rev 32593: apparently delaying the start of resolv_update_cb() isn't always enough.  Delaying it further is would require adding the function call to several cases of an already complicated if/then/else + #ifdef/#else, so instead just put in a NULL check before calling gdk_window_invalidate_rect().

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

9 years agoRegenerate a few of the ASN.1 dissectors
morriss [Tue, 11 May 2010 02:13:26 +0000 (02:13 +0000)]
Regenerate a few of the ASN.1 dissectors

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

9 years agoAdd new packet list open bugs to the "known bugs" list.
gerald [Mon, 10 May 2010 22:10:59 +0000 (22:10 +0000)]
Add new packet list open bugs to the "known bugs" list.

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

9 years agoUpdates for 1.4.
gerald [Mon, 10 May 2010 21:58:44 +0000 (21:58 +0000)]
Updates for 1.4.

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

9 years agoFix for bug 4720:
jake [Mon, 10 May 2010 21:31:12 +0000 (21:31 +0000)]
Fix for bug 4720:
Assume all fields, except ProducerID, being LE, i.s.o. BE (network order).

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

9 years agoUpdate the ISPC lists up to ITU Operational Bulletin 940
dimeg [Mon, 10 May 2010 21:04:08 +0000 (21:04 +0000)]
Update the ISPC lists up to ITU Operational Bulletin 940

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

9 years agoFix a gcc -Wshadow warning.
wmeier [Mon, 10 May 2010 16:51:09 +0000 (16:51 +0000)]
Fix a gcc -Wshadow warning.

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

9 years agoFix a gcc -Wshadow warning.
wmeier [Mon, 10 May 2010 16:39:53 +0000 (16:39 +0000)]
Fix a gcc -Wshadow warning.

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

9 years agoIndentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
wmeier [Mon, 10 May 2010 15:54:57 +0000 (15:54 +0000)]
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)

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

9 years agoFix non-libz build.
martinm [Mon, 10 May 2010 12:56:01 +0000 (12:56 +0000)]
Fix non-libz build.

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

9 years agoBring back "1 min" and "10 min" in IO Graph Tick interval.
stig [Mon, 10 May 2010 10:48:45 +0000 (10:48 +0000)]
Bring back "1 min" and "10 min" in IO Graph Tick interval.

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

9 years agoAdd missing textify.sh to source distribution
kukosa [Mon, 10 May 2010 06:54:16 +0000 (06:54 +0000)]
Add missing textify.sh to source distribution

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

9 years agoAllow for proto_tree_add_item() with FT_ABSOLUTE_TIME and FT_RELATIVE_TIME.
jake [Mon, 10 May 2010 06:32:31 +0000 (06:32 +0000)]
Allow for proto_tree_add_item() with FT_ABSOLUTE_TIME and FT_RELATIVE_TIME.

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-05-09]
gerald [Sun, 9 May 2010 15:03:37 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-05-09]

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

9 years agoAs of release 1.5, MIT Kerberos moved krb5.h to krb5/krb5.h. Check both
sfisher [Sun, 9 May 2010 06:33:03 +0000 (06:33 +0000)]
As of release 1.5, MIT Kerberos moved krb5.h to krb5/krb5.h.  Check both
places.  Fix prompted by report on -dev from Jeff Blaine using MIT Kerberos
1.8.

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

9 years agoClean comments and indentation.
jake [Sun, 9 May 2010 05:40:29 +0000 (05:40 +0000)]
Clean comments and indentation.

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

9 years ago(Trivial) Fix some indentation.
wmeier [Sat, 8 May 2010 16:33:59 +0000 (16:33 +0000)]
(Trivial) Fix some indentation.

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

9 years ago(Trivial) Fix a typo & some indentation
wmeier [Sat, 8 May 2010 16:12:29 +0000 (16:12 +0000)]
(Trivial) Fix a typo & some indentation

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

9 years agoEnable "Decode As..." for ethertype 0x0000 (fix for bug 4721)
sake [Sat, 8 May 2010 07:55:12 +0000 (07:55 +0000)]
Enable "Decode As..." for ethertype 0x0000 (fix for bug 4721)

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

9 years agoInclude inet_v6defs.h after include the Windows socket headers, so it
guy [Sat, 8 May 2010 01:37:36 +0000 (01:37 +0000)]
Include inet_v6defs.h after include the Windows socket headers, so it
knows whether AF_INET6 is needed.

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

9 years agoPrune some includes.
guy [Sat, 8 May 2010 01:18:12 +0000 (01:18 +0000)]
Prune some includes.

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

9 years agoInclude inet_v6defs.h if needed to declare inet_ntop().
guy [Sat, 8 May 2010 01:15:56 +0000 (01:15 +0000)]
Include inet_v6defs.h if needed to declare inet_ntop().

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

9 years agoAdd wtap_cleareof().
guy [Sat, 8 May 2010 00:43:23 +0000 (00:43 +0000)]
Add wtap_cleareof().

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

9 years agoThe default capture buffer size is, in fact, *nominally* 1MB; however,
guy [Sat, 8 May 2010 00:39:07 +0000 (00:39 +0000)]
The default capture buffer size is, in fact, *nominally* 1MB; however,
libpcap/WinPcap and the capture mechanism atop which they run might
either silently limit the buffer size to a smaller value or raise it to
a higher value - that's the part that's platform-dependent.

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

9 years agoDon't define err_str twice if building on Win32 with AirPcap support.
guy [Sat, 8 May 2010 00:17:06 +0000 (00:17 +0000)]
Don't define err_str twice if building on Win32 with AirPcap support.

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

9 years agoZlib has an officially-sanctioned way of clearing EOF when we're tailing
gerald [Fri, 7 May 2010 21:15:24 +0000 (21:15 +0000)]
Zlib has an officially-sanctioned way of clearing EOF when we're tailing
a file.  Use it.

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

9 years agoEOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and we
gerald [Fri, 7 May 2010 19:45:47 +0000 (19:45 +0000)]
EOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and we
reach EOF, zlib's file handle seems to stay at EOF even when more data
is appended to the file. Add a check for 1.2.5 which calls gzseek in
order to unset EOF. Fixes bugs 4708 and 4748.

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

9 years agoAs with the list of data link types, so with the list of interfaces; move
guy [Fri, 7 May 2010 19:24:32 +0000 (19:24 +0000)]
As with the list of data link types, so with the list of interfaces; move
the code to print the machine-readable format into dumpcap, and have the
code in capture_opts.c just print the human-readable format.

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

9 years agoUpdate 3GPP AVP codes.
etxrab [Fri, 7 May 2010 14:25:16 +0000 (14:25 +0000)]
Update 3GPP AVP codes.

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

9 years agoRegister a dissector table for dissecting Ericsson AVP:s.
etxrab [Fri, 7 May 2010 11:08:56 +0000 (11:08 +0000)]
Register a dissector table for dissecting Ericsson AVP:s.

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

9 years agoAdd routines vfprintf_stderr() and fprintf_stderr() to print to the
guy [Fri, 7 May 2010 08:40:02 +0000 (08:40 +0000)]
Add routines vfprintf_stderr() and fprintf_stderr() to print to the
standard error and, in Wireshark on Windows, create a console if
necessary.  Have the cmdarg_err routines use them.

Use *fprintf_stderr() to print the output of -L, rather than using
cmdarg_err_cont(), so that we don't get extra newlines in the output (it
should look similar to the output of tcpdump).

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

9 years agoFor TShark and Wireshark, get the list of link-layer types for an
guy [Fri, 7 May 2010 08:06:25 +0000 (08:06 +0000)]
For TShark and Wireshark, get the list of link-layer types for an
interface by running dumpcap, so that if you need privileges to open an
interface, and dumpcap has those privileges, neither TShark nor
Wireshark need them.

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

9 years agoSet default seconds type in rawshark and dftest.
stig [Fri, 7 May 2010 06:35:17 +0000 (06:35 +0000)]
Set default seconds type in rawshark and dftest.

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

9 years ago-I is now a valid TShark option (at least if you have libpcap 1.x).
guy [Fri, 7 May 2010 05:59:32 +0000 (05:59 +0000)]
-I is now a valid TShark option (at least if you have libpcap 1.x).

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

9 years ago-B is no longer Windows-only.
guy [Fri, 7 May 2010 02:00:46 +0000 (02:00 +0000)]
-B is no longer Windows-only.

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

9 years agoAdd monitor mode support to Wireshark *on the command line*; support
guy [Fri, 7 May 2010 01:55:13 +0000 (01:55 +0000)]
Add monitor mode support to Wireshark *on the command line*; support
through the GUI requires more work.

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

9 years agoOops, -B disappeared from the list of dumpcap options in the change to
guy [Fri, 7 May 2010 01:50:22 +0000 (01:50 +0000)]
Oops, -B disappeared from the list of dumpcap options in the change to
support multiple, err, optional options.

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

9 years agoAdd monitor mode support to TShark.
guy [Fri, 7 May 2010 01:46:38 +0000 (01:46 +0000)]
Add monitor mode support to TShark.

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

9 years agoHandle -I in the options processing.
guy [Fri, 7 May 2010 01:25:53 +0000 (01:25 +0000)]
Handle -I in the options processing.

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

9 years agoBeginnings of monitor mode support with libpcap 1.x.
guy [Fri, 7 May 2010 01:22:33 +0000 (01:22 +0000)]
Beginnings of monitor mode support with libpcap 1.x.

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

9 years agoInstead, say that the default is platform-dependent.
guy [Fri, 7 May 2010 00:28:42 +0000 (00:28 +0000)]
Instead, say that the default is platform-dependent.

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

9 years agoNow that we support -B on various UN*X platforms as well as Windows, we
guy [Fri, 7 May 2010 00:16:52 +0000 (00:16 +0000)]
Now that we support -B on various UN*X platforms as well as Windows, we
can no longer state what the default is (it's platform-dependent).

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

9 years agoFrom Jouni Malinen via bug 4713:
gerald [Fri, 7 May 2010 00:13:33 +0000 (00:13 +0000)]
From Jouni Malinen via bug 4713:

The 0x80 bit in the Action Category field indicates that the
transmitter is reporting an unrecognized category (or somehow
incorrect frame). Rest of the frame body is identical to the original
Action frame, so we should handle dissecting of these just like with
the category without the 0x80 bit.

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

9 years agoOur default target platform is still win32.
gerald [Thu, 6 May 2010 23:58:18 +0000 (23:58 +0000)]
Our default target platform is still win32.

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

9 years agoSet the timestamp seconds type to TS_SECONDS_DEFAULT at startup so we
gerald [Thu, 6 May 2010 23:51:37 +0000 (23:51 +0000)]
Set the timestamp seconds type to TS_SECONDS_DEFAULT at startup so we
don't abort.

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

9 years agoFrom Hadar Shoham via bug 4750:
gerald [Thu, 6 May 2010 23:34:56 +0000 (23:34 +0000)]
From Hadar Shoham via bug 4750:

1. add docsis3.0 support in bootp option 60
2. change to text option 123 (Cable lab)
3. change to text option 43 sub option 8 (OUI)

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

9 years agoJust check for pcap_create(); it first appeared in libpcap 1.0.0, and
guy [Thu, 6 May 2010 23:33:41 +0000 (23:33 +0000)]
Just check for pcap_create(); it first appeared in libpcap 1.0.0, and
pcap_set_buffer_size() did as well, so there aren't any libpcap releases
with pcap_create() but not pcap_set_buffer_size().

Only do one check for pcap_create.

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

9 years agoFix compilation.
gerald [Thu, 6 May 2010 23:29:55 +0000 (23:29 +0000)]
Fix compilation.

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

9 years agoUse consistent indentation & whitespace.
wmeier [Thu, 6 May 2010 21:16:31 +0000 (21:16 +0000)]
Use consistent indentation & whitespace.

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

9 years agoFrom Mathieu Parent:
jake [Thu, 6 May 2010 19:16:45 +0000 (19:16 +0000)]
From Mathieu Parent:
* Added LineInstance and CallId to keypadButton-, stimulus-, offHook-, onHook-,
  startTone-, stopTone-, setRingerMessage
* Added RingMode to setRingerMessage
* Added displayName to LineStatMessage

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

9 years agotvbparse_len_left does not seem to exist in tvbparse.c
etxrab [Thu, 6 May 2010 19:15:25 +0000 (19:15 +0000)]
tvbparse_len_left does not seem to exist in tvbparse.c

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

9 years agoFollow up for revision 32670.
jake [Thu, 6 May 2010 18:41:23 +0000 (18:41 +0000)]
Follow up for revision 32670.
Straighten out is_acn() function.

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

9 years agoCleanup and export the TVB parser.
jake [Thu, 6 May 2010 18:37:47 +0000 (18:37 +0000)]
Cleanup and export the TVB parser.

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

9 years agoChecking in Stigs changes from
etxrab [Thu, 6 May 2010 18:34:30 +0000 (18:34 +0000)]
Checking in Stigs changes from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475
BUT not activating the check for
pcap_create()
pcap_set_buffer_size()
This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic.

The code for handling the 'B' option should be OK in any case.

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

9 years agoCheck for pcap_create
etxrab [Thu, 6 May 2010 15:39:08 +0000 (15:39 +0000)]
Check for pcap_create
Using pcap create and pcap_activate should make it possible
to set the capture buffer size on Linux systems as well as Windows.
Help to implement it would be apreciated :-)

Ref:
http://seclists.org/tcpdump/2009/q3/151

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

9 years agoAdd PPID 28 IRCP
etxrab [Thu, 6 May 2010 12:54:43 +0000 (12:54 +0000)]
Add PPID 28  IRCP

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

9 years agoMoved command line option for seconds type to -u.
stig [Thu, 6 May 2010 12:31:24 +0000 (12:31 +0000)]
Moved command line option for seconds type to -u.
Added this option to tshark.

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

9 years agoSimplified hour_min_sec calculations.
stig [Thu, 6 May 2010 11:25:15 +0000 (11:25 +0000)]
Simplified hour_min_sec calculations.

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

9 years agoAdded an option to display seconds as hours, minutes and seconds
stig [Thu, 6 May 2010 10:32:59 +0000 (10:32 +0000)]
Added an option to display seconds as hours, minutes and seconds
in the packet list, on this format: "1h 2m 3.456s".

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

9 years agoCalculate correct PDU lenght if the per_length_determinant is one byte long.
etxrab [Wed, 5 May 2010 19:22:28 +0000 (19:22 +0000)]
Calculate correct PDU lenght if the per_length_determinant is one byte long.

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

9 years ago- Remove check_col()
etxrab [Wed, 5 May 2010 17:22:40 +0000 (17:22 +0000)]
- Remove check_col()
- only read method string once.

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

9 years agoTry to avoid the user confusion reported in
morriss [Wed, 5 May 2010 14:29:55 +0000 (14:29 +0000)]
Try to avoid the user confusion reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3477 by not using blurbs
that look like abbreviations (filter strings).

While we're at it try to avoid giving blurbs that are identical (or nearly so)
to the field name.

Regenerate a couple of dissectors like this to prove out the idea.

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

9 years agoH.225.0 updated to version 7 (2009-12)
kukosa [Wed, 5 May 2010 13:14:41 +0000 (13:14 +0000)]
H.225.0 updated to version 7 (2009-12)

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

9 years agoFile updated from ASN.1 database where the bug in ASN.1 definition has been fixed...
kukosa [Wed, 5 May 2010 10:29:23 +0000 (10:29 +0000)]
File updated from ASN.1 database where the bug in ASN.1 definition has been fixed on request

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

9 years agoFrom Jim Schaettle:
etxrab [Wed, 5 May 2010 05:52:37 +0000 (05:52 +0000)]
From Jim Schaettle:
Add Ratified DMX to ACN Dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4745

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

9 years agoFrom Andrew Feren:
etxrab [Wed, 5 May 2010 05:41:07 +0000 (05:41 +0000)]
From Andrew Feren:
The current implementation of options templates continues reading past the end
of the option template.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4744

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

9 years agoUpdate the comment about being based on the GTK Tree View Tutorial,
sfisher [Wed, 5 May 2010 02:33:34 +0000 (02:33 +0000)]
Update the comment about being based on the GTK Tree View Tutorial,
including putting /tutorial/ at the end of the URL because the
main web-site is something unrelated to the tutorial.

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

9 years ago1.3.5 -> 1.3.6.
gerald [Wed, 5 May 2010 00:28:24 +0000 (00:28 +0000)]
1.3.5 -> 1.3.6.

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

9 years agoBuild 1.3.5.
gerald [Tue, 4 May 2010 23:03:42 +0000 (23:03 +0000)]
Build 1.3.5.

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

9 years agoUn-C++-ify a comment.
gerald [Tue, 4 May 2010 21:52:41 +0000 (21:52 +0000)]
Un-C++-ify a comment.

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

9 years ago H.245 updated to v15 (2009-12)
kukosa [Tue, 4 May 2010 19:01:25 +0000 (19:01 +0000)]
 H.245 updated to v15 (2009-12)

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

9 years agoRemove unused variables.
etxrab [Tue, 4 May 2010 15:36:54 +0000 (15:36 +0000)]
Remove unused variables.

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

9 years agoRefactor the code to parse SIP contact parameters.
etxrab [Tue, 4 May 2010 15:12:44 +0000 (15:12 +0000)]
Refactor the code to parse SIP contact parameters.

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

9 years agoFrom Andrew Feren:
etxrab [Tue, 4 May 2010 05:34:14 +0000 (05:34 +0000)]
From Andrew Feren:
Solve Problems decoding variable length strings in IPFIX.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4742

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

9 years agoFrom Jouni Malinen:
jake [Tue, 4 May 2010 05:31:29 +0000 (05:31 +0000)]
From Jouni Malinen:
Dissect the optional IEs following the fixed fields in Deauthentication
and Disassociation frames.

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

9 years agoRework code to handle multiple messages in a packet.
wmeier [Mon, 3 May 2010 23:05:27 +0000 (23:05 +0000)]
Rework code to handle multiple messages in a packet.
Fixes Bug #4709.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4709

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

9 years agoUpdate capinfos man page.
wmeier [Mon, 3 May 2010 20:38:06 +0000 (20:38 +0000)]
Update capinfos man page.

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

9 years agoUpdate the capinfos documentation.
wmeier [Mon, 3 May 2010 20:25:33 +0000 (20:25 +0000)]
Update the capinfos documentation.

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

9 years agoRemove extra % in printf format string.
morriss [Mon, 3 May 2010 19:42:09 +0000 (19:42 +0000)]
Remove extra % in printf format string.

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

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4734 :
morriss [Mon, 3 May 2010 19:33:23 +0000 (19:33 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4734 :

Don't crash on a malformed SMB packet.  According to svn blame, this code
has been here since rev 21713 though maybe something else changed to make the
crash apparent.

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

9 years agoAdd "inferred" snapshot length (if any) to the output.
wmeier [Mon, 3 May 2010 19:08:11 +0000 (19:08 +0000)]
Add "inferred" snapshot length (if any) to the output.
A snapshot length is inferred if there are records
in a capture file with "capture length" less than
"packet length".

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