obnox/wireshark/wip.git
13 years agoAllow DRB frames to be passed to PDCP (where they may be decoded as IP).
martinm [Wed, 28 Jul 2010 16:58:13 +0000 (16:58 +0000)]
Allow DRB frames to be passed to PDCP (where they may be decoded as IP).

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

13 years agoSplit dissection of GTP and GTP' in ordet to try to fix bug
etxrab [Wed, 28 Jul 2010 16:13:56 +0000 (16:13 +0000)]
Split dissection of GTP and GTP' in ordet to try to fix bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055

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

13 years ago(Trivial) Fix some typos; Also: Use consistent indentation.
wmeier [Wed, 28 Jul 2010 13:34:41 +0000 (13:34 +0000)]
(Trivial) Fix some typos; Also: Use consistent indentation.

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

13 years agoBacking out r33631 for now - it has a number of issues.
guy [Wed, 28 Jul 2010 01:12:41 +0000 (01:12 +0000)]
Backing out r33631 for now - it has a number of issues.

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

13 years ago(Trivial) Fix a typo
wmeier [Tue, 27 Jul 2010 18:59:30 +0000 (18:59 +0000)]
(Trivial) Fix a typo

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

13 years agoFrom Don Newton:
jake [Tue, 27 Jul 2010 06:46:00 +0000 (06:46 +0000)]
From Don Newton:
Fails to decrement msg_len on 3 different message types which causes the
dissector to attempt to decode an addition or misplaced unistim cmd.

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

13 years agoFix grammaro, indent example code.
guy [Tue, 27 Jul 2010 01:19:06 +0000 (01:19 +0000)]
Fix grammaro, indent example code.

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

13 years agoTell people to be careful about loops like
guy [Tue, 27 Jul 2010 01:06:10 +0000 (01:06 +0000)]
Tell people to be careful about loops like

for (guint8 = 0; guint8 < guint; guint8++)

(one of which recently caused an infinite loop with a fuzzed packet in
the buildbot).

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

13 years ago(Trivial) Fix a typo.
wmeier [Mon, 26 Jul 2010 19:24:06 +0000 (19:24 +0000)]
(Trivial) Fix a typo.

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

13 years agoFix potential infinite loop: for (guint8=0; guint8 < int; guint8++);
wmeier [Mon, 26 Jul 2010 19:00:44 +0000 (19:00 +0000)]
Fix potential infinite loop: for (guint8=0; guint8 < int; guint8++);
Fixes bug #5053.

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

13 years ago(Trivial) use gboolean instead of int in a few places; Whitespace cleanup.
wmeier [Mon, 26 Jul 2010 16:22:33 +0000 (16:22 +0000)]
(Trivial) use gboolean instead of int in a few places; Whitespace cleanup.

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

13 years ago(Trivial) Fix references to "clist" in comments;
wmeier [Mon, 26 Jul 2010 16:15:34 +0000 (16:15 +0000)]
(Trivial) Fix references to "clist" in comments;

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

13 years ago(Trivial) Use gboolean instead of int in a few places; Whitespace cleanup.
wmeier [Mon, 26 Jul 2010 16:11:56 +0000 (16:11 +0000)]
(Trivial) Use gboolean instead of int in a few places; Whitespace cleanup.

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

13 years agopacket-mip6.h has been removed....
wmeier [Mon, 26 Jul 2010 14:16:57 +0000 (14:16 +0000)]
packet-mip6.h has been removed....

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

13 years agoMove contents of packet-mip6.h to packet-mip6.c
wmeier [Mon, 26 Jul 2010 13:32:13 +0000 (13:32 +0000)]
Move contents of packet-mip6.h to packet-mip6.c
  - packet-mip6.h is not used elsewhere;
  - packet-mip6.h includes value string definitions.
Rename enum variables to be more distinct: ... ==> MIP6_...
Whitespace cleanup.

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

13 years agoFrom Cal Turney:
etxrab [Mon, 26 Jul 2010 13:23:30 +0000 (13:23 +0000)]
From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
(Modified to include SVN version).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

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

13 years agoFrom John Sucaet:
etxrab [Mon, 26 Jul 2010 13:04:10 +0000 (13:04 +0000)]
From John Sucaet:
The committed changes in 33624 did not include all fixes of the previous patch
file - Please add the fix for the field description of the 8-bit Deep Hops Left
field
Attached file contains this fix (+as well as small correction to the field
descriptions of V and F flags, according to the terminology of RFC 4944)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5047

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

13 years agoFrom KATAOKA Toshihiro:
etxrab [Sun, 25 Jul 2010 18:24:43 +0000 (18:24 +0000)]
From KATAOKA Toshihiro:

I've made next updates for MIPv6 Mobility Options.

- Restart Counter
- IPv4 Default Router Address
 I've made some minor change re-using same type of header fields.

- IPv4 Home Address field in several IPv4 related mobility options.
- Status field in several IPv4 related mobility options.
- Prefix Len field in several IPv4 related mobility options.

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

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

13 years ago[Automatic manuf and enterprise-numbers update for 2010-07-25]
gerald [Sun, 25 Jul 2010 15:03:38 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-07-25]

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

13 years agoFrom John Sucaet:
jake [Fri, 23 Jul 2010 20:19:05 +0000 (20:19 +0000)]
From John Sucaet:
packet-6lowpan.c dissects the non-compressed ipv6 fields in an order different
from the one specified in RFC 4944 §10.3.1.
The patch fixes the wrong order and an additional problem with the dissection
of the mesh header: support for the Deep Hops Left field (RFC 4944 §5.2)

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

13 years agoFrom Jan van den Boom:
jake [Fri, 23 Jul 2010 19:40:32 +0000 (19:40 +0000)]
From Jan van den Boom:
Correct the V and F flag interpretation in the Mesh Addressing Type and Header
for correct address interpretation.

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

13 years ago(Trivial) Use enum definitions instead of numbers in a switch statement;
wmeier [Fri, 23 Jul 2010 14:01:47 +0000 (14:01 +0000)]
(Trivial) Use enum definitions instead of numbers in a switch statement;
Whitespace cleanup.

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

13 years agoAt least in some NetMon 3.4 VPN captures, the per-packet link-layer type
guy [Fri, 23 Jul 2010 10:11:44 +0000 (10:11 +0000)]
At least in some NetMon 3.4 VPN captures, the per-packet link-layer type
is 0, but the packets have Ethernet headers.  We handle this by mapping
0 to WTAP_ENCAP_ETHERNET.

(XXX - should we, instead, use the per-file link-layer type?)

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

13 years agoBacking out r33612.
jake [Fri, 23 Jul 2010 05:08:07 +0000 (05:08 +0000)]
Backing out r33612.

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

13 years ago(Trivial): Whitespace cleanup.
wmeier [Thu, 22 Jul 2010 20:53:24 +0000 (20:53 +0000)]
(Trivial): Whitespace cleanup.

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

13 years agoRework code so start-time, end-time, & packets columns sort properly and are right...
wmeier [Thu, 22 Jul 2010 18:44:11 +0000 (18:44 +0000)]
Rework code so start-time, end-time, & packets columns sort properly and are right-justified;
Remove some redundant code;
Widen the VOIP calls window slightly so all columns are displayed initially;
Minor whitespace cleanup.

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

13 years agoSet missing svn:keywords and svn:eol-style.
stig [Thu, 22 Jul 2010 12:18:36 +0000 (12:18 +0000)]
Set missing svn:keywords and svn:eol-style.

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

13 years agoCorrected length check for I05 Downstream Service.
stig [Thu, 22 Jul 2010 10:07:25 +0000 (10:07 +0000)]
Corrected length check for I05 Downstream Service.

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

13 years agoIn the frame_data structure, expand the per-packet
guy [Thu, 22 Jul 2010 09:11:16 +0000 (09:11 +0000)]
In the frame_data structure, expand the per-packet
encapsulation/data-link type to 16 bits, and shuffle some fields to
eliminate some unnecessary padding - the net result should be no change
in the structure size for 32 bits and a few bytes removed for 64 bits.

This allows more encapsulation types - we've just about run out of the
ones that fit in a signed 8-bit integer - and thus should fix bug 5025.

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

13 years agoFrom Cal Turney:
jake [Wed, 21 Jul 2010 19:42:01 +0000 (19:42 +0000)]
From Cal Turney:
Remember folder of capture selected from Welcome screen file dialog.

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

13 years agoFrom Zachary Mark:
jake [Wed, 21 Jul 2010 19:31:56 +0000 (19:31 +0000)]
From Zachary Mark:
It appears that SCSI_SPC_ACCESS_CONTROL_IN is incorrectly set to opcode 0x85
where the actual opcode is 0x86.  0x85 is the opcode for the 16-byte version
of the ATA PASSTHROUGH command of the SAT standards family.

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

13 years agoThe 32-bit unsigned time offset in version 1.x files should be converted
guy [Wed, 21 Jul 2010 18:37:01 +0000 (18:37 +0000)]
The 32-bit unsigned time offset in version 1.x files should be converted
to a gint64 (which won't sign-extend it) before multiplying by 1000, so
that the product is 64-bit and won't overflow.

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

13 years agoAccording to mail from Paul Long at Microsoft, in the 1.x NetMon file
guy [Wed, 21 Jul 2010 16:25:59 +0000 (16:25 +0000)]
According to mail from Paul Long at Microsoft, in the 1.x NetMon file
format, the time offset from the start of the capture always had a
positive value, so it's an unsigned value.  (In newer versions of NetMon
3.x, the capture can start before the "capture start" time stamp is set,
so packets can have a *negative* offset from the capture start time
stamp.  Those captures are in the 2.x file format.)

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

13 years agoUse correct length for I04/I05 Envelope headers.
stig [Wed, 21 Jul 2010 14:43:02 +0000 (14:43 +0000)]
Use correct length for I04/I05 Envelope headers.

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

13 years agoAdded "Attribute Aggregation Rule Mask" from PKT-SP-MM-I05-091029.
stig [Wed, 21 Jul 2010 14:17:00 +0000 (14:17 +0000)]
Added "Attribute Aggregation Rule Mask" from PKT-SP-MM-I05-091029.

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

13 years agoFix warnings as seen in gcc 3.4.6
martinm [Wed, 21 Jul 2010 12:29:32 +0000 (12:29 +0000)]
Fix warnings as seen in gcc 3.4.6

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

13 years agoFrom KATAOKA Toshihiro via bug 5033:
stig [Wed, 21 Jul 2010 10:28:46 +0000 (10:28 +0000)]
From KATAOKA Toshihiro via bug 5033:
3GPP GTPv2 header Update:
- piggybacked flag
- sequence number

From me:
Updated the comments for sequence number.

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

13 years agoFixed adding a boolean value as a custom column.
stig [Wed, 21 Jul 2010 09:47:24 +0000 (09:47 +0000)]
Fixed adding a boolean value as a custom column.

This is reported in bug 5039.

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

13 years agoFrom Alex Burlyga: Make hf_nfs_slotid4 useful again.
wmeier [Wed, 21 Jul 2010 01:43:14 +0000 (01:43 +0000)]
From Alex Burlyga:  Make hf_nfs_slotid4 useful again.

"hf_slotid4 is used for all possible slotid fields in sequence op. This patch
 separates them out and makes it useful for filtering."

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

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

13 years ago(Trivial) add a few comments about date/time formats.
wmeier [Wed, 21 Jul 2010 01:38:11 +0000 (01:38 +0000)]
(Trivial) add a few comments about date/time formats.

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

13 years agoFix checkAPI targets so gtk-deprecated and gtk-deprecated-todo checks are
wmeier [Wed, 21 Jul 2010 00:04:04 +0000 (00:04 +0000)]
Fix checkAPI targets so gtk-deprecated and gtk-deprecated-todo checks are
properly done. (gtk-deprecated check got inadvertantly removed a while back).

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

13 years agoAll use of deprecated GtkOptionMenu functions fixed: Error if any usage found.
wmeier [Tue, 20 Jul 2010 23:58:56 +0000 (23:58 +0000)]
All use of deprecated GtkOptionMenu functions fixed: Error if any usage found.
Warn instead of Error for several deprecated GTK functions used recently
 in Wireshark source (1 GtkCombo function and 2 GtkItemFactory functions).
 (ToDo: replace remaining use of GtkCombo and all use of GtkItemFactory).

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

13 years ago(Minor) Fix several usages of deprecated GTK functions.
wmeier [Tue, 20 Jul 2010 23:48:56 +0000 (23:48 +0000)]
(Minor) Fix several usages of deprecated GTK functions.

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

13 years agoInitialize a variable. Fixes bug 5026.
gerald [Tue, 20 Jul 2010 17:16:42 +0000 (17:16 +0000)]
Initialize a variable. Fixes bug 5026.

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

13 years agoFrom Mat Ford via bug 5031:
stig [Tue, 20 Jul 2010 16:18:18 +0000 (16:18 +0000)]
From Mat Ford via bug 5031:
Minor update to packet-ipv6.h to reference the correct RFC, and more accurately
describe the ip6_un1_flow data structure.

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

13 years agoDump the error output when we have a problem.
gerald [Tue, 20 Jul 2010 15:49:57 +0000 (15:49 +0000)]
Dump the error output when we have a problem.

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

13 years ago(Minor) use NULL instead of "" for hf[] blurbs.
wmeier [Tue, 20 Jul 2010 15:41:42 +0000 (15:41 +0000)]
(Minor) use NULL instead of "" for hf[] blurbs.

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

13 years agoGtkOptionMenu ==> GtkComboBox
wmeier [Tue, 20 Jul 2010 14:34:00 +0000 (14:34 +0000)]
GtkOptionMenu ==> GtkComboBox
(Let's see if the UI seems OK or should be replaced with something
 simpler. (See comments in thecode)).

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

13 years agoAdd ws_combo_box_new_text_and_pointer_full() to allow returning
wmeier [Tue, 20 Jul 2010 14:30:41 +0000 (14:30 +0000)]
Add ws_combo_box_new_text_and_pointer_full() to allow returning
the cell renderer associated with the ComboBox.

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

13 years agoMinor formatting change.
martinm [Tue, 20 Jul 2010 13:27:20 +0000 (13:27 +0000)]
Minor formatting change.

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

13 years agoAdd new UEs to the end of the list.
martinm [Tue, 20 Jul 2010 08:57:15 +0000 (08:57 +0000)]
Add new UEs to the end of the list.

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

13 years agoAdd dissectors/packet-netmon-802_11.c
jmayer [Tue, 20 Jul 2010 08:28:49 +0000 (08:28 +0000)]
Add dissectors/packet-netmon-802_11.c

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

13 years agoUpdading opensuse 11.2 -> 11.3 updated gcc to 4.5.0, which created
jmayer [Tue, 20 Jul 2010 08:27:34 +0000 (08:27 +0000)]
Updading opensuse 11.2 -> 11.3 updated gcc to 4.5.0, which created
a few warnings that needed fixing when compiling with -Werror.

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

13 years agoUse sscanf() to parse clientaddr4 instead of trying to parse it
gerald [Mon, 19 Jul 2010 21:47:51 +0000 (21:47 +0000)]
Use sscanf() to parse clientaddr4 instead of trying to parse it
ourselves. Add support for IPv6 addresses. Fixes bug 5019.

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

13 years agoInitial support for Network Monitor 802.11 radio header.
guy [Mon, 19 Jul 2010 18:00:20 +0000 (18:00 +0000)]
Initial support for Network Monitor 802.11 radio header.

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

13 years agoGive up dissecting a MAC PDU if we see control LCIDs after data ones.
martinm [Mon, 19 Jul 2010 14:14:47 +0000 (14:14 +0000)]
Give up dissecting a MAC PDU if we see control LCIDs after data ones.
This saves us getting into a mess trying to keep track of PDU sizes in an array...

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

13 years agoRemoved call to check_col().
stig [Mon, 19 Jul 2010 13:55:12 +0000 (13:55 +0000)]
Removed call to check_col().

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

13 years agoAdded SharedResourceID.
stig [Mon, 19 Jul 2010 13:31:02 +0000 (13:31 +0000)]
Added SharedResourceID.

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

13 years agoAdd an entry in encap_table_base for SocketCAN.
guy [Sun, 18 Jul 2010 22:14:56 +0000 (22:14 +0000)]
Add an entry in encap_table_base for SocketCAN.

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

13 years agoThe time delta in a NetMon frame header is signed - it can be negative.
guy [Sun, 18 Jul 2010 20:47:48 +0000 (20:47 +0000)]
The time delta in a NetMon frame header is signed - it can be negative.

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

13 years agoNetMon per-packet link-layer types with 0xE000 in the upper 4 bits are
guy [Sun, 18 Jul 2010 20:27:46 +0000 (20:27 +0000)]
NetMon per-packet link-layer types with 0xE000 in the upper 4 bits are
converted pcap files; the LINKTYPE_ value is in the lower 12 bits.

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

13 years agoInitial support for the trailer information in versions 2.1 and later of
guy [Sun, 18 Jul 2010 19:41:11 +0000 (19:41 +0000)]
Initial support for the trailer information in versions 2.1 and later of
the NetMon file format.  Currently, we just use the network type field,
and we ignore all the special record types and don't try to handle any
of the other special network types.

We also catch bogus frame tables where the record is bigger than the
frame table says it is.

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

13 years agoAdded some bootp option strings from IANA.
stig [Sun, 18 Jul 2010 16:20:29 +0000 (16:20 +0000)]
Added some bootp option strings from IANA.

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

13 years agoAdded "LISP Canonical Address Format (LCAF)".
stig [Sun, 18 Jul 2010 16:05:48 +0000 (16:05 +0000)]
Added "LISP Canonical Address Format (LCAF)".

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

13 years agoAdded some ARP options from RFC 5494.
stig [Sun, 18 Jul 2010 16:01:11 +0000 (16:01 +0000)]
Added some ARP options from RFC 5494.

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

13 years agoUse correct length for the IPv6 item.
stig [Sun, 18 Jul 2010 15:06:13 +0000 (15:06 +0000)]
Use correct length for the IPv6 item.

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

13 years ago[Automatic manuf and enterprise-numbers update for 2010-07-18]
gerald [Sun, 18 Jul 2010 15:03:32 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-07-18]

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

13 years agoAdded some values from IANA's icmpv6-parameters.
stig [Sun, 18 Jul 2010 12:09:14 +0000 (12:09 +0000)]
Added some values from IANA's icmpv6-parameters.
Note: option 29 and 30 still not dissected according to RFC 5271.

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

13 years agoAdded some updates from RFC 4443.
stig [Sun, 18 Jul 2010 11:47:43 +0000 (11:47 +0000)]
Added some updates from RFC 4443.

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

13 years agoShow the reserved values in type 135, 137 and 143 in the packet tree.
stig [Sun, 18 Jul 2010 11:07:04 +0000 (11:07 +0000)]
Show the reserved values in type 135, 137 and 143 in the packet tree.

This fixes the issues in bug 5018.

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

13 years agoFrom KATAOKA Toshihiro:
jake [Sat, 17 Jul 2010 21:43:25 +0000 (21:43 +0000)]
From KATAOKA Toshihiro:
Additional patch reparing proto.avvrb.

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

13 years ago- Copy over from Makefile.am: dumpcap doesn't need to link
jmayer [Sat, 17 Jul 2010 14:07:13 +0000 (14:07 +0000)]
- Copy over from Makefile.am: dumpcap doesn't need to link
  in libgcrypt and gnutls.
- capinfos has a dependency on svnversion.h

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

13 years agoFrom KATAOKA Toshihiro:
jake [Sat, 17 Jul 2010 07:55:28 +0000 (07:55 +0000)]
From KATAOKA Toshihiro:
I've made some update for MIPv6 Mobility Options according to the IETF RFCs.
See also: http://www.iana.org/assignments/mobility-parameters/mobility-parameters.xhtml#mobility-parameters-2

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

13 years agoFrom Robert Ancell:
jake [Fri, 16 Jul 2010 20:57:08 +0000 (20:57 +0000)]
From Robert Ancell:
XDMCP Query contains authentication names, not authorization names.

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

13 years agoFix for bug 5015:
jake [Fri, 16 Jul 2010 20:42:25 +0000 (20:42 +0000)]
Fix for bug 5015:
Remove redundancy from VRRP MAC address name resolution,
even though it's fitting for the protocol ;)

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

13 years agoMake sure we call wtap_cleareof() before each read.
gerald [Fri, 16 Jul 2010 18:20:32 +0000 (18:20 +0000)]
Make sure we call wtap_cleareof() before each read.

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

13 years agoIt makes (slightly) more sense for comments to be "sent" by the context than "received".
martinm [Fri, 16 Jul 2010 13:52:18 +0000 (13:52 +0000)]
It makes (slightly) more sense for comments to be "sent" by the context than "received".

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

13 years agoMake frames containing Malformed expert items match with "malformed" display filter.
martinm [Fri, 16 Jul 2010 11:17:32 +0000 (11:17 +0000)]
Make frames containing Malformed expert items match with "malformed" display filter.

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

13 years agoFix for bug 5008:
jmayer [Fri, 16 Jul 2010 09:52:43 +0000 (09:52 +0000)]
Fix for bug 5008:
- Interval is now a 12 bit value in 1/100 s.
- The address type of the virtual address is the address type
  of the network protocol.

Bugs: Currently the mbz and the interval don't look nice.
      The checksum is incorrect (but it was incorrect with the
      old code as well, so it isn't a regression).

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

13 years agoMake whitespace consistent (in preparation for bug 5008)
jmayer [Fri, 16 Jul 2010 07:48:50 +0000 (07:48 +0000)]
Make whitespace consistent (in preparation for bug 5008)

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

13 years agoFix cmake build for wireshark-filters.
jmayer [Thu, 15 Jul 2010 22:50:28 +0000 (22:50 +0000)]
Fix cmake build for wireshark-filters.

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

13 years agoMore information on getting the distribution name and release.
guy [Thu, 15 Jul 2010 22:31:53 +0000 (22:31 +0000)]
More information on getting the distribution name and release.

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

13 years agoMore details on getting the distribution name and version on Linux.
guy [Thu, 15 Jul 2010 20:59:26 +0000 (20:59 +0000)]
More details on getting the distribution name and version on Linux.

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

13 years agoOn OS X, give the OS version as
guy [Thu, 15 Jul 2010 20:55:46 +0000 (20:55 +0000)]
On OS X, give the OS version as

Mac OS X 10.x.y (Darwin a.b.c)

rather than as

Darwin a.b.c (Mac OS X 10.x.y)

and also note that, on Linux, the lsb_release command might be able to
give you the *distribution* name and version.

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

13 years agoOnly link programs that call stuff in Application Services or Core
guy [Thu, 15 Jul 2010 19:43:01 +0000 (19:43 +0000)]
Only link programs that call stuff in Application Services or Core
Foundation with those frameworks.

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

13 years agoDon't clean wireshark-filter.pod. It's not generated any more.
gerald [Thu, 15 Jul 2010 17:12:18 +0000 (17:12 +0000)]
Don't clean wireshark-filter.pod. It's not generated any more.

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

13 years agoDon't include the filter list (which is now over 16MB) in the
gerald [Thu, 15 Jul 2010 16:18:13 +0000 (16:18 +0000)]
Don't include the filter list (which is now over 16MB) in the
wireshark-filter man page. Point to other sources for the list instead.

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

13 years agoChange ws_combo_box... to use a tree-store instead of a list-store;
wmeier [Thu, 15 Jul 2010 15:05:39 +0000 (15:05 +0000)]
Change ws_combo_box... to use a tree-store instead of a list-store;
This allows the dispay of the ws_combo_box choices as a tree.
Also: Rename ws_combo_box_append_text_and_pointer_with_sensitivity() to
             ws_combo_box_append_text_and_pointer_full().

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

13 years agoUpdated with some items.
stig [Thu, 15 Jul 2010 12:26:12 +0000 (12:26 +0000)]
Updated with some items.

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

13 years agocapinfos.c includes gcrypt.h, so it needs the GNU TLS flags.
guy [Thu, 15 Jul 2010 09:41:34 +0000 (09:41 +0000)]
capinfos.c includes gcrypt.h, so it needs the GNU TLS flags.

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

13 years agoDon't include headers we don't need (they might be generating external
guy [Thu, 15 Jul 2010 09:04:10 +0000 (09:04 +0000)]
Don't include headers we don't need (they might be generating external
references to functions in libraries with which we're not necessarily
being linked).

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

13 years agoThere shouldn't be any need to build stuff in the top-level directory
guy [Thu, 15 Jul 2010 03:31:51 +0000 (03:31 +0000)]
There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

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

13 years agoNo need to link dumpcap with libgnutls.
guy [Thu, 15 Jul 2010 03:28:42 +0000 (03:28 +0000)]
No need to link dumpcap with libgnutls.

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

13 years agoIf we have neither libgnutls nor libgcrypt,
guy [Thu, 15 Jul 2010 03:22:49 +0000 (03:22 +0000)]
If we have neither libgnutls nor libgcrypt,
epan_get_runtime_version_info() does nothing, and thus doesn't use its
argument.

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

13 years agoMove the code to get version information for libraries used by
guy [Thu, 15 Jul 2010 02:07:16 +0000 (02:07 +0000)]
Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

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

13 years agoAdd an option to print the first, the last or all occurrences of each field
sake [Wed, 14 Jul 2010 21:53:57 +0000 (21:53 +0000)]
Add an option to print the first, the last or all occurrences of each field
(when using tshark -T fields)

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

13 years agoOops... forgot to update the "-E usage" text
sake [Wed, 14 Jul 2010 21:05:11 +0000 (21:05 +0000)]
Oops... forgot to update the "-E usage" text

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

13 years agoMake 'tshark -T fields' print all values for fields with multiple occurences.
sake [Wed, 14 Jul 2010 20:28:34 +0000 (20:28 +0000)]
Make 'tshark -T fields' print all values for fields with multiple occurences.

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

13 years agoDon't pass tvb data to col_set_str(), as it will not stay around.
stig [Wed, 14 Jul 2010 20:24:38 +0000 (20:24 +0000)]
Don't pass tvb data to col_set_str(), as it will not stay around.
Added support for Note (dumping as text).
Renamed Info to Power (as used in PacketLogger).

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

13 years agoGet our dynamic payload name from the correct location.
gerald [Wed, 14 Jul 2010 18:40:11 +0000 (18:40 +0000)]
Get our dynamic payload name from the correct location.

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