8 years agoDo length checking for Integer32, Integer64, Unsigned64, Float32, and
guy [Mon, 3 Jan 2011 03:30:20 +0000 (03:30 +0000)]
Do length checking for Integer32, Integer64, Unsigned64, Float32, and
Float64, as well as for Unsigned32.

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

8 years agoNote that this is ultimately not necessarily the right fix.
guy [Sun, 2 Jan 2011 21:49:00 +0000 (21:49 +0000)]
Note that this is ultimately not necessarily the right fix.

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

8 years agoFor those cases where we interpret the contents of an OCTET STRING,
guy [Sun, 2 Jan 2011 21:27:57 +0000 (21:27 +0000)]
For those cases where we interpret the contents of an OCTET STRING,
which could be of arbitrary length - even if it's not supposed to be! -
as a value of some other type, by adding them as a registered field,
first check to make sure the length of the field is appropriate for the
type and, if not, show a dissection error, rather than showing a
dissector-bug assertion when we call proto_tree_add_item().

This fixes a bunch of dissector-bug assertions that show up with
malformed BER-encoded packets.

Also, fix a typo, and expand a comment.

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

8 years agoFix indentation.
guy [Sun, 2 Jan 2011 19:53:48 +0000 (19:53 +0000)]
Fix indentation.

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

8 years agoFix some cut-and-pasteos and other typoes.
guy [Sun, 2 Jan 2011 19:39:24 +0000 (19:39 +0000)]
Fix some cut-and-pasteos and other typoes.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-01-02]
gerald [Sun, 2 Jan 2011 16:03:26 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-01-02]

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

8 years agoAdd missing packet-btsdp.h
krj [Sun, 2 Jan 2011 08:29:33 +0000 (08:29 +0000)]
Add missing packet-btsdp.h

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

8 years agoFrom Allan M. Madsen via. bug 5445:
krj [Sun, 2 Jan 2011 08:13:40 +0000 (08:13 +0000)]
From Allan M. Madsen via. bug 5445:

Bluetooth profiles and protocols above RFCOMM and L2CAP can not be dissected correctly because the required information (server channel and dynamic PSM value mappings to services/profiles) about the type of data carried in the payload is not available. RFCOMM is currently hardcoded to handoff all payload data to the obex dissector though it may carry e.g. handsfree, dial-up networking or serial port profile related data.

The patch consists of modifcations to the following dissectors:

btsdp: Extraction of RFCOMM server channel and L2CAP dynamic PSM with service mapping is provided to RFCOMM and L2CAP through a tap interface. In addition, the packet list info is beautyfied and extended with more details for better

btl2cap: Adds a new dissector table with services and dynamic PSM mapping which is filled by a tap listner catching the info from btsdp. More info added to packet list.

btrfcomm: Adds a new dissector table with services and server channel mapping which is filled by a tap listner catching the info from btsdp. Dissectors for handsfree, dial-up netorking and serial port profiles (all based on RFCOMM) are also added.

btobex: Registers several obex based profiles (e.g. obex push, file transfer, basic printing etc.) in both RFCOMM and L2CAP. Some cleanup.

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

8 years agoNew Year.
stig [Sat, 1 Jan 2011 12:23:21 +0000 (12:23 +0000)]
New Year.

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

8 years agoAdd packet-json.c
krj [Sat, 1 Jan 2011 09:42:12 +0000 (09:42 +0000)]
Add packet-json.c

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

8 years agoUpdate some URLs, add another spec.
guy [Fri, 31 Dec 2010 23:30:38 +0000 (23:30 +0000)]
Update some URLs, add another spec.

At least for one of the DOCSIS suboptions, do length checking.

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

8 years agoA Query List has more than one has multiple QCODEs; you cannot handle
guy [Fri, 31 Dec 2010 22:28:57 +0000 (22:28 +0000)]
A Query List has more than one has multiple QCODEs; you cannot handle
that by doing the entire list as a single FT_UINT8 field, you must
handle each QCODE, in a loop, as that field.

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

8 years agoFrom FRAsse via bug 5539:
gerald [Fri, 31 Dec 2010 22:24:06 +0000 (22:24 +0000)]
From FRAsse via bug 5539:

There's a buffer overflow in ENTTEC DMX Data RLE, leading to crashes and
potential code execution.

From me: ep_allocate our buffers.

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

8 years agoFrom Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
cmaynard [Fri, 31 Dec 2010 18:03:23 +0000 (18:03 +0000)]
From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
1) Add links to RFC 4627 and the json.org web site.
2) Comment out hf_json_member_key to keep tools/checkhf.pl happy.
3) Avoid duplicate (application/json) from being displayed in Info column.

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

8 years agoWhops, packet-sgsap.c is not ASN1.
stig [Fri, 31 Dec 2010 16:25:53 +0000 (16:25 +0000)]
Whops, packet-sgsap.c is not ASN1.

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

8 years agoAdded missing packet-sgsap.c
stig [Fri, 31 Dec 2010 16:24:24 +0000 (16:24 +0000)]
Added missing packet-sgsap.c

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

8 years agoAdd current list of ROHC profile names, taken from:
martinm [Fri, 31 Dec 2010 00:24:50 +0000 (00:24 +0000)]
Add current list of ROHC profile names, taken from:

As raised by bug 5536, we now at least show which profile is present.
Supporting all of the specific message types is another matter...

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

8 years agoIt's not a good idea to use tcph->th_seglen if you haven't set it.
guy [Fri, 31 Dec 2010 00:02:54 +0000 (00:02 +0000)]
It's not a good idea to use tcph->th_seglen if you haven't set it.

Fixes bug 4211.

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

8 years agoUpdate the export dialog screen shots.
gerald [Thu, 30 Dec 2010 20:22:42 +0000 (20:22 +0000)]
Update the export dialog screen shots.

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

8 years agoCorrected comment for col_custom_occurrence.
stig [Thu, 30 Dec 2010 20:16:33 +0000 (20:16 +0000)]
Corrected comment for col_custom_occurrence.

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

8 years agoOnly chop the last character (new line) from the error message.
stig [Thu, 30 Dec 2010 20:15:55 +0000 (20:15 +0000)]
Only chop the last character (new line) from the error message.

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

8 years agoFix checkAPI.
gerald [Thu, 30 Dec 2010 19:52:24 +0000 (19:52 +0000)]
Fix checkAPI.

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

8 years agoExtend a comment
etxrab [Thu, 30 Dec 2010 14:10:35 +0000 (14:10 +0000)]
Extend a comment

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

8 years agoExtend IE dissetcion.
etxrab [Thu, 30 Dec 2010 14:09:09 +0000 (14:09 +0000)]
Extend IE dissetcion.

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

8 years agoClarify that "don't make changes here" refers to the copy of Pidl, not
guy [Thu, 30 Dec 2010 03:22:45 +0000 (03:22 +0000)]
Clarify that "don't make changes here" refers to the copy of Pidl, not
to the .cnf files (or perhaps even the .idl files).

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

8 years agoOK, I found a URL that will get you to the CPAN page for Yapp without
guy [Thu, 30 Dec 2010 03:13:37 +0000 (03:13 +0000)]
OK, I found a URL that will get you to the CPAN page for Yapp without
embedding a version number.  Use it.

"This will build and install the binaries and the manpage (pidl.1)."
refers to the process of installing Pidl; put it immediately after the
steps for installing Pidl.

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

8 years agoThe rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
guy [Thu, 30 Dec 2010 02:56:51 +0000 (02:56 +0000)]
The rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
an array of samr_RidWithAttributeArray structures.  Don't equate it to
hf_samr_rid; that causes hf_samr_rid to be added as an item with a
length of -1, but, as hf_samr_rid is an FT_UINT32 field, that causes a
dissector bug error.

The version of Yapp I was using, at least, didn't like C++-style
comments in the IDL file; replace them with C-style comments.

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

8 years agoAdd some white space.
guy [Thu, 30 Dec 2010 02:10:49 +0000 (02:10 +0000)]
Add some white space.

Give more information about getting Yapp; not everybody using it is
necessarily using SUSE (and, yes, that's how it appears to be spelled
now, even though the "u" was for "und" and not originally capitalized).

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

8 years agoAdd GEOIP_COUNTRY_EDITION_V6 to geoip_type_name_vals[].
cmaynard [Wed, 29 Dec 2010 21:06:05 +0000 (21:06 +0000)]
Add GEOIP_COUNTRY_EDITION_V6 to geoip_type_name_vals[].

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

8 years agoUpdate list of relevant protocol specs. Some drafts are now RFC's.
cmaynard [Wed, 29 Dec 2010 20:58:14 +0000 (20:58 +0000)]
Update list of relevant protocol specs.  Some drafts are now RFC's.

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

8 years agoUpdates for Wireshark portable installer. Using nsis unicode now.
cmaynard [Wed, 29 Dec 2010 20:41:53 +0000 (20:41 +0000)]
Updates for Wireshark portable installer.  Using nsis unicode now.

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

8 years agoFix two minor typos.
cmaynard [Wed, 29 Dec 2010 20:30:36 +0000 (20:30 +0000)]
Fix two minor typos.

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

8 years agoFix a buffer overflow in the engineId preferences. Fixes bug 5530.
gerald [Wed, 29 Dec 2010 20:09:27 +0000 (20:09 +0000)]
Fix a buffer overflow in the engineId preferences. Fixes bug 5530.

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

8 years agoFix incomplete conversion from an on-the-stack buffer to an ep_allocated
guy [Wed, 29 Dec 2010 19:40:36 +0000 (19:40 +0000)]
Fix incomplete conversion from an on-the-stack buffer to an ep_allocated
buffer - the size of the latter can't be found with sizeof, as all you
have is a pointer to the buffer.  sizeof (pointer) happened, by chance,
to give the right answer on ILP32 platforms, but gave a too-big answer
on LP64 and LLP64 platforms, which meant we overflowed the buffer when
clearing it.

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

8 years agoAdd Compile BPF to the capture options dialog description.
jake [Wed, 29 Dec 2010 18:26:04 +0000 (18:26 +0000)]
Add Compile BPF to the capture options dialog description.

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

8 years agoUpdate capture options dialog description.
jake [Wed, 29 Dec 2010 18:16:50 +0000 (18:16 +0000)]
Update capture options dialog description.

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

8 years agoFix the HAI value display filter string.
jake [Wed, 29 Dec 2010 07:39:52 +0000 (07:39 +0000)]
Fix the HAI value display filter string.

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

8 years agoFix Windows build, which complained about possible loss of data converting
sfisher [Wed, 29 Dec 2010 00:29:05 +0000 (00:29 +0000)]
Fix Windows build, which complained about possible loss of data converting
from a double to a time_t.  I removed nstime_to_secs() and grab the
seconds portion of the nstime (which is a time_t), since that's all the
precision needed in the code right now anyway.

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

8 years agoFrom non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
gerald [Tue, 28 Dec 2010 20:47:48 +0000 (20:47 +0000)]
From non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
dissector.  From me: Add a define, ep_allocate the buffer.

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

8 years agoIt is not guaranteed that the records in numerical (frame table) order
guy [Tue, 28 Dec 2010 20:32:58 +0000 (20:32 +0000)]
It is not guaranteed that the records in numerical (frame table) order
will be in sequential (byte offset) order in the file; don't treat the
record offset going backwards as an error.

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

8 years agoFrom non-customers [AT] operamail [DOT] com, submitted via bug 5529:
cmaynard [Tue, 28 Dec 2010 20:19:41 +0000 (20:19 +0000)]
From non-customers [AT] operamail [DOT] com, submitted via bug 5529:
    Values[9] is fetched twice but Values[8] not at all, despite printing it
    later on.

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

8 years agoFrom Alexis La Goutte via bug 5528:
cmaynard [Tue, 28 Dec 2010 18:26:16 +0000 (18:26 +0000)]
From Alexis La Goutte via bug 5528:
    Fix wrong Field Type for HAI-Value and MN-Value (RFC 5271)

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

8 years agoImplement first part of request in bug #5527 - allow the user to change
sfisher [Tue, 28 Dec 2010 18:22:59 +0000 (18:22 +0000)]
Implement first part of request in bug #5527 - allow the user to change
the timestamp display in the RTP Player to time of day with a checkbox
similar to in the IO Stats graph.

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

8 years agoImprove sanity checking of reception claim count. Fixes bug 5521.
cmaynard [Tue, 28 Dec 2010 18:02:24 +0000 (18:02 +0000)]
Improve sanity checking of reception claim count.  Fixes bug 5521.

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

8 years agoAdd tvb_bcd_dig_to_ep_str()
etxrab [Tue, 28 Dec 2010 12:36:26 +0000 (12:36 +0000)]
Add tvb_bcd_dig_to_ep_str()
 * Given a tvbuff, an offset into the tvbuff, and a length that starts
 * at that offset (which may be -1 for "all the way to the end of the
 * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either
 * the low or high half byte, formating the digits according to an input digit set,
 * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used.
 * A pointer to the EP allocated string will be returned.
 * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion.

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

8 years agoAdd dissection of NAS message container.
etxrab [Tue, 28 Dec 2010 11:24:46 +0000 (11:24 +0000)]
Add dissection of NAS message container.

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

8 years agoAdd application id="16777232" name="Ericsson Charging-CIP.
etxrab [Tue, 28 Dec 2010 11:23:47 +0000 (11:23 +0000)]
Add application id="16777232" name="Ericsson Charging-CIP.

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

8 years agoFrom Alexis La Goutte:
jake [Tue, 28 Dec 2010 10:34:19 +0000 (10:34 +0000)]
From Alexis La Goutte:
A patch to enchance the ICMPv6 dissector
- Update RFC Draft (draft-ietf-ipngwg-icmp-name-lookups-07/08) to Final RFC (RFC 4620)
- Make NI field filterable
- ....

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

8 years agoFrom Masashi Honma:
jake [Tue, 28 Dec 2010 09:30:24 +0000 (09:30 +0000)]
From Masashi Honma:
EAP WPS RF band may be '2.4 GHz and 5 GHz'.

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

8 years agoAdd support for showing errors matching substrings (like LTE RLC stats supports)...
martinm [Tue, 28 Dec 2010 01:06:51 +0000 (01:06 +0000)]
Add support for showing errors matching substrings (like LTE RLC stats supports).  TODO: fix the loayout/spacing....

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

8 years agoAdd a tooltip.
martinm [Tue, 28 Dec 2010 01:05:45 +0000 (01:05 +0000)]
Add a tooltip.

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

8 years agoClarify some comments
sfisher [Mon, 27 Dec 2010 22:24:07 +0000 (22:24 +0000)]
Clarify some comments

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

8 years agoThe RTP Player shows the number of seconds since the beginning of that
sfisher [Mon, 27 Dec 2010 21:44:34 +0000 (21:44 +0000)]
The RTP Player shows the number of seconds since the beginning of that
call's packet flow along the x-axis.  Add " s" to the end of each number
to give the user an idea those numbers are seconds.

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

8 years agoGet rid of trailing white space.
guy [Mon, 27 Dec 2010 21:40:48 +0000 (21:40 +0000)]
Get rid of trailing white space.

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

8 years agoAdd dissection of Radio Priority LCS.
etxrab [Mon, 27 Dec 2010 20:23:26 +0000 (20:23 +0000)]
Add dissection of Radio Priority LCS.

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

8 years agoRemove de_sgsap_tmsi as it's not needed.
etxrab [Mon, 27 Dec 2010 20:19:55 +0000 (20:19 +0000)]
Remove de_sgsap_tmsi as it's not needed.

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

8 years agoFix build by #if 0 out unused de_sgsap_tmsi() function.
sfisher [Mon, 27 Dec 2010 16:38:03 +0000 (16:38 +0000)]
Fix build by #if 0 out unused de_sgsap_tmsi() function.

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

8 years agoAdd more IE dissection.
etxrab [Mon, 27 Dec 2010 15:15:55 +0000 (15:15 +0000)]
Add more IE dissection.

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

8 years agoFrom Alexis La Goutte:
etxrab [Mon, 27 Dec 2010 10:57:42 +0000 (10:57 +0000)]
From Alexis La Goutte:
ICMPv6 Enhancements : make ICMP option filterable (Part 2)

*Merge (and update) FMIPv6 Option with ND Option
*Make ICMP option filterable (use proto_tree_add_item..)
*Reorder ND Option
*Add dissector for RA Flags Extension (RFC5075)
*Add dissector for Handover Key Request/Reply (RFC5269)
*Add dissector for Handover Assist Info / Mobile Node ID (RFC5271)
*Add dissector for DNS Search List (RFC6106

From me removed a c++ style comment and changed
to tvb_memcpy(tvb, (guint8 *)&prefix.bytes in a couple of places.

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

8 years agoFix the Message numbering.
etxrab [Mon, 27 Dec 2010 09:33:39 +0000 (09:33 +0000)]
Fix the Message numbering.

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

8 years agoTry to apiece the Ubuntu buildbot.
etxrab [Mon, 27 Dec 2010 08:23:55 +0000 (08:23 +0000)]
Try to apiece the Ubuntu buildbot.

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

8 years agomove the enum to packet-gsm_a_common to
etxrab [Mon, 27 Dec 2010 05:33:58 +0000 (05:33 +0000)]
move the enum to packet-gsm_a_common to
make it possible to use element dissecton from this dissector
in other dissectors.
It is left in packet-nas_EPS.c as a comment for easier reference.

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

8 years agoOnly a new transmission grant should end a Scheduling Request.
martinm [Sun, 26 Dec 2010 23:40:22 +0000 (23:40 +0000)]
Only a new transmission grant should end a Scheduling Request.

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

8 years agoCorrect:
etxrab [Sun, 26 Dec 2010 21:23:06 +0000 (21:23 +0000)]

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

8 years agoStart of a SGSAP (TS 29.118) dissector for LTE.
etxrab [Sun, 26 Dec 2010 21:06:08 +0000 (21:06 +0000)]
Start of a SGSAP (TS 29.118) dissector for LTE.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2010-12-26]
gerald [Sun, 26 Dec 2010 16:03:29 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-12-26]

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

8 years agoAdd a comment asking where to check for YACC/Bison and Flex.
guy [Sat, 25 Dec 2010 08:21:53 +0000 (08:21 +0000)]
Add a comment asking where to check for YACC/Bison and Flex.

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

8 years agoWe only need to do AC_PATH_PROG on flex once.
guy [Fri, 24 Dec 2010 22:51:53 +0000 (22:51 +0000)]
We only need to do AC_PATH_PROG on flex once.

We don't define FLEX_PATH, so no need to AC_SUBST it.

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

8 years agoProperly define and dissect BGP_EXT_COM_LINKBAND. Fixes bug 4409 reported by
cmaynard [Fri, 24 Dec 2010 13:53:26 +0000 (13:53 +0000)]
Properly define and dissect BGP_EXT_COM_LINKBAND.  Fixes bug 4409 reported by
Max Ivanov.

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

8 years agoFrom Julien Kerihuel:
jake [Thu, 23 Dec 2010 23:50:14 +0000 (23:50 +0000)]
From Julien Kerihuel:
I've just finished to write a ncacn_http dissector for Wireshark which
provides the ability to dissect Outlook anywhere packets properly (as
specified by [MS-RPCH].pdf documentation.

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

8 years agoRaise Exceptions containing a string instead of string exceptions
rbalint [Thu, 23 Dec 2010 23:36:48 +0000 (23:36 +0000)]
Raise Exceptions containing a string instead of string exceptions
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4846

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

8 years agoClean up indentation.
guy [Thu, 23 Dec 2010 21:22:55 +0000 (21:22 +0000)]
Clean up indentation.

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

8 years agoAdd a couple more comments to new unicode function to remind us when a
sfisher [Thu, 23 Dec 2010 18:26:25 +0000 (18:26 +0000)]
Add a couple more comments to new unicode function to remind us when a
variable is counting UTF-16 characters vs. normal bytes.

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

8 years agoRemove comment to myself that I forgot to remove before commiting r35253
sfisher [Thu, 23 Dec 2010 18:24:39 +0000 (18:24 +0000)]
Remove comment to myself that I forgot to remove before commiting r35253
and change comments to fit within 80 column display.

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

8 years agoProof of concept for using new tvb_get_ephemeral_unicode_stringz(), which was
sfisher [Thu, 23 Dec 2010 18:01:28 +0000 (18:01 +0000)]
Proof of concept for using new tvb_get_ephemeral_unicode_stringz(), which was
just introduced in SVN revision 35253.  This new function has many more uses
in the SMB (and other) dissectors.

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

8 years agoIntroduce new function called tvb_get_ephemeral_unicode_stringz(), which
sfisher [Thu, 23 Dec 2010 17:59:34 +0000 (17:59 +0000)]
Introduce new function called tvb_get_ephemeral_unicode_stringz(), which
is a unicode (UTF-16) version of tvb_get_ephemeral_stringz().  It scans
a tvbuff for a UTF-16 string and converts it to UTF-8 upon return.

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

8 years agoFix for bug 5517:
jake [Thu, 23 Dec 2010 17:45:02 +0000 (17:45 +0000)]
Fix for bug 5517:
MEG ID, ICC-based format is text, not binary.

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

8 years agoProperly read UL grant subframe number.
martinm [Thu, 23 Dec 2010 12:16:37 +0000 (12:16 +0000)]
Properly read UL grant subframe number.

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

8 years agoSkip an outheader field.
martinm [Thu, 23 Dec 2010 11:09:52 +0000 (11:09 +0000)]
Skip an outheader field.

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

8 years agoFrom Jiří Engelthaler:
jake [Wed, 22 Dec 2010 23:28:23 +0000 (23:28 +0000)]
From Jiří Engelthaler:
Fixes computing of milliseconds in CP56time2a and add "bitstring of 32 bits"
and "step position" support (ASDU types 5,7,32,33,47,51,60 and 64).

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

8 years agoAvoid the need for cf_mark_frame stubs.
jake [Wed, 22 Dec 2010 23:09:31 +0000 (23:09 +0000)]
Avoid the need for cf_mark_frame stubs.

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

8 years agoFix for bug 5513:
jake [Wed, 22 Dec 2010 20:24:51 +0000 (20:24 +0000)]
Fix for bug 5513:
Prepare filter must take Fwd and Rev part in combined filter.

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

8 years agoAdd #define and value_string entries for the remaining SSH message type
sfisher [Wed, 22 Dec 2010 19:46:57 +0000 (19:46 +0000)]
Add #define and value_string entries for the remaining SSH message type
numbers as defined in RFC 4250.

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

8 years agoChange prefixes in #define:
sfisher [Wed, 22 Dec 2010 18:53:21 +0000 (18:53 +0000)]
Change prefixes in #define:

  SSH -> SSH1
  SSH2 -> SSH

This will make it easier to compare the code to the SSH RFCs, which only
cover SSH version 2.

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

8 years agoFix marking functionality (bug 5279)
sake [Wed, 22 Dec 2010 17:25:06 +0000 (17:25 +0000)]
Fix marking functionality (bug 5279)

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

8 years agoFrom Alexis La Goutte via bug 5514:
stig [Wed, 22 Dec 2010 13:19:38 +0000 (13:19 +0000)]
From Alexis La Goutte via bug 5514:
Fix a Git issue.

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

8 years agoAllow for NULL preference descriptions.
jake [Wed, 22 Dec 2010 06:25:33 +0000 (06:25 +0000)]
Allow for NULL preference descriptions.

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

8 years agoFrom daulis0@gmail.com:
jake [Tue, 21 Dec 2010 21:29:47 +0000 (21:29 +0000)]
From daulis0@gmail.com:
There are 2 parts to the CIGI protocol. 1) Host to IG messages and 2) IG to
Host messages. Currently, Host to IG messages are parsed correctly, but IG to
Host messages show Malformed Packet (or may not even detect as CIGI at all)

Some of the protocol format is different between versions. The "Minor Version"
is used by the dissector to separate the differences, but this field is in a
different location in the IG Control Packet (Host to IG message) vs the Start
of Frame Packet (IG to Host message).

Attached patch to correct this.

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

8 years agoAdd a comment about not needing to g_free() the value returned from g_locale_to_utf8().
wmeier [Tue, 21 Dec 2010 21:01:01 +0000 (21:01 +0000)]
Add a comment about not needing to g_free() the value returned from g_locale_to_utf8().

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

8 years agoRemoved duplicate rawshark.html entry from DOC.
cmaynard [Tue, 21 Dec 2010 19:45:16 +0000 (19:45 +0000)]
Removed duplicate rawshark.html entry from DOC.

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

8 years agoFix indentation: change from a mixture of 2 and 4 spaces to tabs (which
sfisher [Tue, 21 Dec 2010 17:51:35 +0000 (17:51 +0000)]
Fix indentation: change from a mixture of 2 and 4 spaces to tabs (which
is what packet-smb.c uses) and add extra line breaks.  Both changes are
for improved readbility of the frequent complex and cryptic loops.

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

8 years agoBe more consistent about how offset is updated while dissecting lte_rrc fields.
martinm [Tue, 21 Dec 2010 17:46:25 +0000 (17:46 +0000)]
Be more consistent about how offset is updated while dissecting lte_rrc fields.
Show cell-id in info column (if don't manage to call RRC).

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

8 years agoSet default graph file format to more appropriate Portable Network Graphics.
jake [Tue, 21 Dec 2010 08:08:28 +0000 (08:08 +0000)]
Set default graph file format to more appropriate Portable Network Graphics.

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

8 years agoFrom Marc Giertzsch:
jake [Tue, 21 Dec 2010 08:07:24 +0000 (08:07 +0000)]
From Marc Giertzsch:
Dialog RTP Graph analysis is not showing forward and reverse delta.

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

8 years agoFix bug #5509: CommView file format now uses reserved bytes and adds a
sfisher [Mon, 20 Dec 2010 23:34:14 +0000 (23:34 +0000)]
Fix bug #5509: CommView file format now uses reserved bytes and adds a
new use for the direction field per:


Add basic support for new fields and don't reject files that fit the new

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

8 years agoSaying that patches will be reviewed in "a few days" may be a bit optimistic. Also...
morriss [Mon, 20 Dec 2010 20:54:33 +0000 (20:54 +0000)]
Saying that patches will be reviewed in "a few days" may be a bit optimistic.  Also point out that it's not necessary for patch submitters to mark the bug as ASSIGNED nor assign it to themselves.

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

8 years agoFix warnings with format.
cmaynard [Mon, 20 Dec 2010 18:16:12 +0000 (18:16 +0000)]
Fix warnings with format.

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

8 years agoSome PIM enhancements, mostly to allow more fields to be filterable.
cmaynard [Mon, 20 Dec 2010 17:48:26 +0000 (17:48 +0000)]
Some PIM enhancements, mostly to allow more fields to be filterable.

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

8 years agodissector_add() --> dissector_add_uint();
wmeier [Mon, 20 Dec 2010 17:48:20 +0000 (17:48 +0000)]
dissector_add() --> dissector_add_uint();
Rempve trailing blanks from lines.

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

8 years agoDeprecate dissector_add(), dissector_change(), dissector_delete(),
morriss [Mon, 20 Dec 2010 16:39:09 +0000 (16:39 +0000)]
Deprecate dissector_add(), dissector_change(), dissector_delete(),
dissector_get_port_handle(), dissector_reset(), dissector_try_port(),
dissector_try_port_new(), and next_tvb_add_port().

Re-tabify the file.

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