obnox/wireshark/wip.git
13 years agoRegister a bunch of ett_ variables.
morriss [Fri, 11 Feb 2011 21:27:46 +0000 (21:27 +0000)]
Register a bunch of ett_ variables.

Use gint (instead of int) for ett_ variables (for consistency only).

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

13 years agoUpdate 8.12 Indication IE to 3GPP TS 29.274 version 9.4.0 Release 9
etxrab [Fri, 11 Feb 2011 21:21:45 +0000 (21:21 +0000)]
Update 8.12 Indication IE to 3GPP TS 29.274 version 9.4.0 Release 9

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

13 years agoRegister a couple of ett_ variables.
morriss [Fri, 11 Feb 2011 21:15:41 +0000 (21:15 +0000)]
Register a couple of ett_ variables.

Move the declaration of all the ett_ variables after the hf_ variables
(instead of in between some of them).

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

13 years agoRegister a couple ett_ variables. Declare all the ett_ variables together.
morriss [Fri, 11 Feb 2011 21:13:38 +0000 (21:13 +0000)]
Register a couple ett_ variables. Declare all the ett_ variables together.

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

13 years agoAdd a command line argument for the configure script of "--with-gtk3" to
sfisher [Fri, 11 Feb 2011 20:21:32 +0000 (20:21 +0000)]
Add a command line argument for the configure script of "--with-gtk3" to
attempt to compile against GTK+ 3.0 (which can be installed at the same
time as GTK+ 2.0).  Also place a copy of the autoconf macro for finding
GTK+ 3.0 in the aclocal-fallback directory taken from the GTK+ 3.0
distribution.

(Note: Wireshark won't finish compiling with GTK+ 3.0 yet...)

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

13 years agoRemove #ifndef GSEAL_ENABLE hack to work-around the lack of an accessor
sfisher [Fri, 11 Feb 2011 18:28:55 +0000 (18:28 +0000)]
Remove #ifndef GSEAL_ENABLE hack to work-around the lack of an accessor
for a GSEALed variable since GTK 3.0 is out, which has the accessor.

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

13 years agoDon't assume we're on port 631.
guy [Fri, 11 Feb 2011 09:28:05 +0000 (09:28 +0000)]
Don't assume we're on port 631.

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

13 years agoFrom Joe McEachern:
jake [Fri, 11 Feb 2011 08:00:21 +0000 (08:00 +0000)]
From Joe McEachern:
Add support the 6RD DHCP option defined in RFC 5969.

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

13 years agoRegister for the media type "application/ipp", so *any* HTTP request or
guy [Fri, 11 Feb 2011 05:54:34 +0000 (05:54 +0000)]
Register for the media type "application/ipp", so *any* HTTP request or
response with that content type will be dissected as IPP.

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

13 years agoRename arphrdaddr_to_str() to tvb_arphrdaddr_to_str() and make it take a pointer...
morriss [Fri, 11 Feb 2011 03:33:11 +0000 (03:33 +0000)]
Rename arphrdaddr_to_str() to tvb_arphrdaddr_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.

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

13 years agoRename vines_to_str() to tvb_vines_to_str() and make it take a pointer a TVB
morriss [Fri, 11 Feb 2011 03:13:24 +0000 (03:13 +0000)]
Rename vines_to_str() to tvb_vines_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.

Move most of the contents of packet-vines.h into packet-vines.c: the moved
content is only needed in that file.

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

13 years agoCheck for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
morriss [Fri, 11 Feb 2011 02:43:07 +0000 (02:43 +0000)]
Check for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
should be used (instead of the non-tvb functions with a call to tvb_get_ptr()).

Use those functions in a bunch of places.

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

13 years agoOops, put a comma back
morriss [Fri, 11 Feb 2011 02:29:45 +0000 (02:29 +0000)]
Oops, put a comma back

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

13 years agoClean up indentation
morriss [Fri, 11 Feb 2011 02:27:33 +0000 (02:27 +0000)]
Clean up indentation

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

13 years agoShow subheaders summary in subheader root item.
martinm [Fri, 11 Feb 2011 00:29:40 +0000 (00:29 +0000)]
Show subheaders summary in subheader root item.

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

13 years agoDocument that proto_tree_add_bytes_format() and
morriss [Thu, 10 Feb 2011 22:57:50 +0000 (22:57 +0000)]
Document that proto_tree_add_bytes_format() and
proto_tree_add_bytes_format_value() may be given a NULL value_ptr.

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

13 years agoAdd (commented-out for now) code to check certain function calls for embedded
morriss [Thu, 10 Feb 2011 22:53:48 +0000 (22:53 +0000)]
Add (commented-out for now) code to check certain function calls for embedded
(in the argument list) calls to tvb_get_ptr().

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

13 years agoUse tvb_ip_to_str() and tvb_ether_to_str().
morriss [Thu, 10 Feb 2011 22:14:05 +0000 (22:14 +0000)]
Use tvb_ip_to_str() and tvb_ether_to_str().

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

13 years agoPass NULL as the value_ptr to proto_tree_add_bytes_format().
morriss [Thu, 10 Feb 2011 22:07:29 +0000 (22:07 +0000)]
Pass NULL as the value_ptr to proto_tree_add_bytes_format().

Simplify the code a bit since tvb_ensure_bytes_exist() was already throwing
an exception if all the bytes weren't there.

Use tvb_ether_to_str().

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

13 years agoFrom Alexis La Goutte:
etxrab [Thu, 10 Feb 2011 21:45:36 +0000 (21:45 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector :Enhance SSID, Supported Rates, DS, FH, CFP.. Information Element sub dissector

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

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

13 years agoDeclare ett's as gint, not guint.
cmaynard [Thu, 10 Feb 2011 20:55:26 +0000 (20:55 +0000)]
Declare ett's as gint, not guint.

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

13 years agoAdd the rest of the changes from the patch in bug 5924. Squelches some
guy [Thu, 10 Feb 2011 20:27:35 +0000 (20:27 +0000)]
Add the rest of the changes from the patch in bug 5924.  Squelches some
compiler warnings.

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

13 years ago#ifdef → #ifndef.
gerald [Thu, 10 Feb 2011 20:15:31 +0000 (20:15 +0000)]
#ifdef → #ifndef.

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

13 years agoMark a parameter unused if needed.
gerald [Thu, 10 Feb 2011 19:50:05 +0000 (19:50 +0000)]
Mark a parameter unused if needed.

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

13 years agoAdd some information based on a Tektronix manual whose name popped up in
guy [Thu, 10 Feb 2011 18:27:39 +0000 (18:27 +0000)]
Add some information based on a Tektronix manual whose name popped up in
an email I found when looking for some other stuff and which I then
found with a Google search.

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

13 years agoRemove a bunch of prototypes in airpcap_dlg.h for functions which are
gerald [Thu, 10 Feb 2011 17:09:36 +0000 (17:09 +0000)]
Remove a bunch of prototypes in airpcap_dlg.h for functions which are
now static. Make another function static.

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

13 years agoModify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
morriss [Thu, 10 Feb 2011 16:31:00 +0000 (16:31 +0000)]
Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

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

13 years agoObtained from Thomas Dreibholz: Update SCTP PPIDs.
tuexen [Thu, 10 Feb 2011 12:54:20 +0000 (12:54 +0000)]
Obtained from Thomas Dreibholz: Update SCTP PPIDs.

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

13 years agoAdded a dissector table for AttributeId localForm.
stig [Thu, 10 Feb 2011 10:11:38 +0000 (10:11 +0000)]
Added a dissector table for AttributeId localForm.
Use correct object identifier in ModificationList.

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

13 years ago- Add message name to info col in case of SERVICE REQUEST.
etxrab [Thu, 10 Feb 2011 08:28:18 +0000 (08:28 +0000)]
- Add message name to info col in case of SERVICE REQUEST.
- Get rid of check_col
- proto_tree_add_item -> ENC_BIG_ENDIAN

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

13 years agoUse tvb_bytes_to_str_punct() instead of a homegrown version.
morriss [Wed, 9 Feb 2011 22:43:06 +0000 (22:43 +0000)]
Use tvb_bytes_to_str_punct() instead of a homegrown version.

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

13 years agoUse tvb_bytes_to_str_punct() instead of bytestring_to_str(tvb_get_ptr(), ...)
morriss [Wed, 9 Feb 2011 22:37:26 +0000 (22:37 +0000)]
Use tvb_bytes_to_str_punct() instead of bytestring_to_str(tvb_get_ptr(), ...)

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

13 years agoRegister ett_gtp_bcm.
morriss [Wed, 9 Feb 2011 18:45:32 +0000 (18:45 +0000)]
Register ett_gtp_bcm.

Replace some tabs with spaces.

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

13 years agoFrom Grzegorz Szczytowski:
jake [Wed, 9 Feb 2011 08:46:21 +0000 (08:46 +0000)]
From Grzegorz Szczytowski:
Update of packet-e212.c dissector according to local national regulatory
MNC assignment document.
www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439

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

13 years agoAccommodate the CMake build on Ubuntu 10.10.
jake [Wed, 9 Feb 2011 07:43:34 +0000 (07:43 +0000)]
Accommodate the CMake build on Ubuntu 10.10.

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

13 years agoA couple of dissectors have/need an NTP-to-nstime routine, so put it in
morriss [Wed, 9 Feb 2011 03:24:12 +0000 (03:24 +0000)]
A couple of dissectors have/need an NTP-to-nstime routine, so put it in
packet-ntp and export it to the other dissectors.

Move some macros (now) only used in packet-ntp.c into that file.

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

13 years agoRename ntp_fmt_ts() to tvb_ntp_fmt_ts() and make it take a pointer to a TVB and
morriss [Wed, 9 Feb 2011 03:00:51 +0000 (03:00 +0000)]
Rename ntp_fmt_ts() to tvb_ntp_fmt_ts() and make it take a pointer to a TVB and
an offset instead of (generally) a pointer into the TVB. Then use the standard
accessor functions to get data out of the TVB.

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

13 years agoRewrite this dissector's NTP-to-nstime routine to take a TVB and an offset
morriss [Wed, 9 Feb 2011 02:54:12 +0000 (02:54 +0000)]
Rewrite this dissector's NTP-to-nstime routine to take a TVB and an offset
instead of a pointer into the TVB.  Then use the standard accessor functions
to get data out of the TVB.

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

13 years agoDocument that NTP times can be added with proto_tree_add_item().
morriss [Wed, 9 Feb 2011 02:43:10 +0000 (02:43 +0000)]
Document that NTP times can be added with proto_tree_add_item().

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

13 years agoAdd NTP times using proto_tree_add_item().
morriss [Wed, 9 Feb 2011 02:27:41 +0000 (02:27 +0000)]
Add NTP times using proto_tree_add_item().

Replace a couple not-very-descriptive blurbs with NULL.

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

13 years agoFrom Holger Freyther:
etxrab [Tue, 8 Feb 2011 22:01:33 +0000 (22:01 +0000)]
From  Holger Freyther:
Fix the GSMTAP to TETRA table

GSMTAP has the BSCH at 1... this means the table needs to have 9 entries, the
first being 0.

--------------------------------------------------------------------------------

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

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

13 years agoAdd 3GPP Requesting-Node-Type AVP: it's old but apparently still out there.
morriss [Tue, 8 Feb 2011 17:45:34 +0000 (17:45 +0000)]
Add 3GPP Requesting-Node-Type AVP: it's old but apparently still out there.

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

13 years agofrom Václav Horčák:
etxrab [Tue, 8 Feb 2011 12:33:34 +0000 (12:33 +0000)]
from Václav Horčák:
Bug 5663 - [PATCH] Fix for MEGACO dissector context tracking.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5663

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

13 years ago- Use ENC_BIG_ENDIAN.
etxrab [Tue, 8 Feb 2011 12:32:34 +0000 (12:32 +0000)]
- Use ENC_BIG_ENDIAN.
- GSM_A_PDU_TYPE_BSSMAP.

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

13 years agoDon't look at any of the fields that come from the Auxiliary Security
guy [Tue, 8 Feb 2011 06:55:53 +0000 (06:55 +0000)]
Don't look at any of the fields that come from the Auxiliary Security
Header unless there *is* an Auxiliary Security Header.

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

13 years agoFix compilation problem for GTK+ < 2.18
sfisher [Tue, 8 Feb 2011 04:12:09 +0000 (04:12 +0000)]
Fix compilation problem for GTK+ < 2.18

graph_analysis.c(1450): error C2039: 'allocation' : is not a member of
'_GtkStyle'

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

13 years agoAdd NTP times using proto_tree_add_item().
morriss [Tue, 8 Feb 2011 03:16:35 +0000 (03:16 +0000)]
Add NTP times using proto_tree_add_item().

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

13 years agoAdd support for 4-byte NTP times (only the seconds) in proto_tree_add_item().
morriss [Tue, 8 Feb 2011 02:38:51 +0000 (02:38 +0000)]
Add support for 4-byte NTP times (only the seconds) in proto_tree_add_item().

Use it in packet-diameter.c .  Eliminate an unnecessary local variable.

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

13 years agoBuild with pre-2.18 GTK+es.
guy [Tue, 8 Feb 2011 01:48:07 +0000 (01:48 +0000)]
Build with pre-2.18 GTK+es.

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

13 years agoRename some hf_... vars so name starts with hf_docsis_cmstatus
wmeier [Tue, 8 Feb 2011 01:15:44 +0000 (01:15 +0000)]
Rename some hf_... vars so name starts with hf_docsis_cmstatus

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

13 years agoMore -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0...
sfisher [Tue, 8 Feb 2011 01:01:50 +0000 (01:01 +0000)]
More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0...

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

13 years agoThe checkAPI script doesn't understand arrays of value_string tables,
guy [Tue, 8 Feb 2011 00:57:21 +0000 (00:57 +0000)]
The checkAPI script doesn't understand arrays of value_string tables,
and that flavor of two-dimensional array requires you to declare a
maximum size for the value_string tables in the array.  Don't use an
array of value_string tables.

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

13 years agoMore -DGSEAL_ENABLE cleanup (hopefully without breaking anything)...
sfisher [Tue, 8 Feb 2011 00:56:22 +0000 (00:56 +0000)]
More -DGSEAL_ENABLE cleanup (hopefully without breaking anything)...

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

13 years ago#if 0 code related to unused "docsis" dissector table;
wmeier [Tue, 8 Feb 2011 00:24:10 +0000 (00:24 +0000)]
#if 0 code related to unused "docsis" dissector table;
Use consistent indentation & other whitespace cleanup.

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

13 years agoFix bug #5657: Update my mail address
sfisher [Mon, 7 Feb 2011 23:14:54 +0000 (23:14 +0000)]
Fix bug #5657: Update my mail address

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

13 years agoFrom Masashi Honma:
jake [Mon, 7 Feb 2011 22:47:43 +0000 (22:47 +0000)]
From Masashi Honma:
Currently the Wireshark does not support Primary Device Type dissection.
I made a patch for the dissection based on "Wi-Fi Simple Configuration
Specification DRAFT Version 2.0.0.51".

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

13 years agoFrom Hendrik Robbel:
jake [Mon, 7 Feb 2011 22:19:38 +0000 (22:19 +0000)]
From Hendrik Robbel:
Dissector for DOCSIS 3.0 CM-STATUS Report Messages.

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

13 years agoFix parameters to gtk_widget_get_allocation() call.
jake [Mon, 7 Feb 2011 22:11:14 +0000 (22:11 +0000)]
Fix parameters to gtk_widget_get_allocation() call.

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

13 years agofrom Holger Freyther:
etxrab [Mon, 7 Feb 2011 21:38:55 +0000 (21:38 +0000)]
from  Holger Freyther:
gsmtap: Update header file, add tetra support

0001 Minor cleanup - made it look crocked in visual studio, changed bu hand.
0002 Update the definitions from the 'upstream' source
0003 First bits of tetra decoding included in GSMTAP
0004 Pass the tetra PDUs to the TETRA decoder

Changed def. of gsmtap_to_tetra to make it compile.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5659

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

13 years agoFrom Alexis La Goutte:
etxrab [Mon, 7 Feb 2011 20:50:13 +0000 (20:50 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Enhance add_tagged_field (and sub tagged field dissector)

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

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

13 years agoSwitch from GtkCList (which is deprecated) to GtkTreeView+GtkListStore.
gerald [Mon, 7 Feb 2011 20:24:42 +0000 (20:24 +0000)]
Switch from GtkCList (which is deprecated) to GtkTreeView+GtkListStore.
Make a bunch of functions static. Get rid of a no-longer-necessary
struct. Clean up other parts of the code.

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

13 years agoSimilar corrections here.
guy [Mon, 7 Feb 2011 19:43:18 +0000 (19:43 +0000)]
Similar corrections here.

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

13 years agoFix typo.
guy [Mon, 7 Feb 2011 19:39:05 +0000 (19:39 +0000)]
Fix typo.

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

13 years agoCheck for a large packet_len. Fixes a bug reported by Huzaifa
gerald [Mon, 7 Feb 2011 19:39:05 +0000 (19:39 +0000)]
Check for a large packet_len. Fixes a bug reported by Huzaifa
Sidhpurwala of the Red Hat Security Response Team.

See also: bug 5661.

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

13 years ago"XXX takes a foo * as an argument" != "pass a variable of type foo * to
guy [Mon, 7 Feb 2011 19:37:51 +0000 (19:37 +0000)]
"XXX takes a foo * as an argument" != "pass a variable of type foo * to
XXX"; in the case of gtk_widget_get_allocation(), you have to pass it a
pointer to a variable of type foo, where foo = GtkAllocation.

The same applies to the pre-GTK-2.18 code.

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

13 years agoMore -DGSEAL_ENABLE cleanup in preparation for GTK+ 3
sfisher [Mon, 7 Feb 2011 19:24:26 +0000 (19:24 +0000)]
More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3

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

13 years agoMore -DGSEAL_ENABLE cleanup in preparation for GTK+ 3
sfisher [Mon, 7 Feb 2011 19:21:45 +0000 (19:21 +0000)]
More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3

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

13 years agoFix crash introduced in r35849
sfisher [Mon, 7 Feb 2011 19:18:19 +0000 (19:18 +0000)]
Fix crash introduced in r35849

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

13 years agoRemove unneeded #includes (stdio.h,stdlib.h);
wmeier [Mon, 7 Feb 2011 18:49:29 +0000 (18:49 +0000)]
Remove unneeded #includes (stdio.h,stdlib.h);
Whitespace cleanup: trailing, indentation, "4-space tabs"

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

13 years agoAnd even more -DGSEAL_ENABLE cleanup for GTK+ 3.0 preparation...
sfisher [Mon, 7 Feb 2011 18:41:38 +0000 (18:41 +0000)]
And even more -DGSEAL_ENABLE cleanup for GTK+ 3.0 preparation...

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

13 years agoMore -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0
sfisher [Mon, 7 Feb 2011 18:38:33 +0000 (18:38 +0000)]
More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0

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

13 years agoSome -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0
sfisher [Mon, 7 Feb 2011 18:37:11 +0000 (18:37 +0000)]
Some -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0

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

13 years agoUpdate URL (the document now includes all updates through Technical
guy [Mon, 7 Feb 2011 18:35:22 +0000 (18:35 +0000)]
Update URL (the document now includes all updates through Technical
Corrigendum 1; presumably that's the "c1").

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

13 years agoMark a parameter unused.
gerald [Mon, 7 Feb 2011 18:05:26 +0000 (18:05 +0000)]
Mark a parameter unused.

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

13 years agoUse value_string_ext and ENC_BIG_ENDIAN.
etxrab [Mon, 7 Feb 2011 17:45:49 +0000 (17:45 +0000)]
Use value_string_ext and ENC_BIG_ENDIAN.

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

13 years agoDissect V1 version , found in trace from:
etxrab [Mon, 7 Feb 2011 17:44:34 +0000 (17:44 +0000)]
Dissect V1 version , found in trace from:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637

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

13 years agoAdd a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug...
etxrab [Mon, 7 Feb 2011 17:43:26 +0000 (17:43 +0000)]
Add a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637

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

13 years agoFor FT_{ABSOLUTE,RELATIVE}_TIME, make the rest of the encoding
guy [Mon, 7 Feb 2011 08:18:12 +0000 (08:18 +0000)]
For FT_{ABSOLUTE,RELATIVE}_TIME, make the rest of the encoding
orthogonal to the byte order.

This means that we can't just test for a non-zero encoding to determine
whether the format is big-endian or little-endian when we set the
field's endianness flag; instead, for the types where we accept any
non-zero value as meaning "litle-endian", map it to ENC_LITTLE_ENDIAN.

When we use ENC_TIME_NTP, OR in the byte order flag.  While we're at it,
in the dissectors that used ENC_TIME_NTP, update all the other encoding
items in proto_tree_add_item() calls to use the appropriate ENC_ value.

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

13 years agoAdd support for passing NTP times to proto_tree_add_item() by specifying
morriss [Mon, 7 Feb 2011 03:31:40 +0000 (03:31 +0000)]
Add support for passing NTP times to proto_tree_add_item() by specifying
an encoding of ENC_TIME_NTP.

This increases the number of decimal places shown for NTP times (from 6 to 9),
so round the value to the nearest microsecond.  (I can't tell if NTP times are
ever more precise than a microsecond--this rounding is mainly to be closer to
the old behavior.)

Use proto_tree_add_item() for some NTP times.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-02-06]
gerald [Sun, 6 Feb 2011 16:03:43 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-02-06]

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

13 years agoFrom Alexis La Goutte:
etxrab [Sun, 6 Feb 2011 14:15:12 +0000 (14:15 +0000)]
From Alexis La Goutte:
A patch to enhance add_fixed_field dissector
* Replace proto_tree_add_uint/boolean/... by proto_tree_add_item
* Replace some macro by bitmask (TSI..)
* Other stuff...

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

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

13 years agoRemove debug printouts.
etxrab [Sat, 5 Feb 2011 14:37:52 +0000 (14:37 +0000)]
Remove debug printouts.

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

13 years agoFrom Jason Masker (bug 5240):
sake [Fri, 4 Feb 2011 21:09:55 +0000 (21:09 +0000)]
From  Jason Masker  (bug 5240):
`
Allow editcap to chop from beginning of packet for decapsulation

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

13 years agoFix checkAPIs errors
kukosa [Fri, 4 Feb 2011 19:10:35 +0000 (19:10 +0000)]
Fix checkAPIs errors

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

13 years agoFix for bug 5645 : Ethernet packets with both VLAN tag and LLC header no longer displ...
sake [Fri, 4 Feb 2011 17:12:47 +0000 (17:12 +0000)]
Fix for bug 5645 : Ethernet packets with both VLAN tag and LLC header no longer displayed correctly

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

13 years agoGet rid of check_col().
etxrab [Fri, 4 Feb 2011 16:28:26 +0000 (16:28 +0000)]
Get rid of check_col().

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

13 years agoAdd Erlang Distribution Protocol.
gerald [Fri, 4 Feb 2011 16:25:55 +0000 (16:25 +0000)]
Add Erlang Distribution Protocol.

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

13 years agoWhite space changes.
etxrab [Fri, 4 Feb 2011 16:22:37 +0000 (16:22 +0000)]
White space changes.

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

13 years agoFrom Alexis La Goutte:
etxrab [Fri, 4 Feb 2011 16:21:58 +0000 (16:21 +0000)]
From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 16(Final)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

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

13 years agoGet rid of check_col().
etxrab [Fri, 4 Feb 2011 16:13:44 +0000 (16:13 +0000)]
Get rid of check_col().

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

13 years agoIntroduce preferences to set the strictness of Invoke/response
etxrab [Fri, 4 Feb 2011 16:12:59 +0000 (16:12 +0000)]
Introduce preferences to set the strictness of Invoke/response
tracking.

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

13 years agoMark a parameter as unused.
morriss [Fri, 4 Feb 2011 15:19:46 +0000 (15:19 +0000)]
Mark a parameter as unused.

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

13 years agoMark some parameters as unused.
morriss [Fri, 4 Feb 2011 15:19:27 +0000 (15:19 +0000)]
Mark some parameters as unused.

Add a format string to some proto_tree_add_text()s.

Add a cast.

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

13 years agoErlang Port Mapper Daemon protocol updated and Erlang Distribution Protocol implemented
kukosa [Fri, 4 Feb 2011 14:10:37 +0000 (14:10 +0000)]
Erlang Port Mapper Daemon protocol updated and Erlang Distribution Protocol implemented

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

13 years agoFrom Samu Varjonen:
etxrab [Fri, 4 Feb 2011 12:30:42 +0000 (12:30 +0000)]
From Samu Varjonen:
Bug fix: Incorrect presentation of Domain Identifier type and length in HIP dissector

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

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

13 years agoFix Bug 5500 - failed assertion in ISAKMP dissector (proto.c:4002)
etxrab [Fri, 4 Feb 2011 12:16:26 +0000 (12:16 +0000)]
Fix  Bug 5500 - failed assertion in ISAKMP dissector (proto.c:4002)
By reinseringt the check in proto_tree_move_item() if tree vissible
removed in http://anonsvn.wireshark.org/viewvc?view=rev&revision=32443
Hopefully not breaking tshark again.

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

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

13 years agoFrom Alexis La Goutte:
etxrab [Fri, 4 Feb 2011 11:52:50 +0000 (11:52 +0000)]
From Alexis La Goutte:
Patch to fix a typo error....

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

13 years agoShow some top-level info about PDCP frame in protocol root.
martinm [Fri, 4 Feb 2011 11:47:38 +0000 (11:47 +0000)]
Show some top-level info about PDCP frame in protocol root.
Especially useful when PDCP is called from RLC.

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

13 years agoFrom Václav Horčák:
etxrab [Fri, 4 Feb 2011 11:45:37 +0000 (11:45 +0000)]
From Václav Horčák:
Fix keeps  parser function in scope of current transactions, allowing multiple
transaction in one packet.

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

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

13 years agoClean up indentation.
guy [Fri, 4 Feb 2011 10:23:22 +0000 (10:23 +0000)]
Clean up indentation.

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