obnox/wireshark/wip.git
13 years agoChange the ADDCARRY(x) macro to eliminate clang warning about unused
sfisher [Wed, 19 Jan 2011 22:53:38 +0000 (22:53 +0000)]
Change the ADDCARRY(x) macro to eliminate clang warning about unused
result from the ADDCARRY portion of the REDUCE macro.

-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
+#define ADDCARRY(x)  {if ((x) > 65535) (x) -= 65535;}

The new code is from in_cksum.c in the Tahoe/CGI port of 4.4BSD-Lite2 (we're
using the "Portable Version" copy otherwise).

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

13 years agoSimply this:
sfisher [Wed, 19 Jan 2011 21:51:30 +0000 (21:51 +0000)]
Simply this:

    #define SIP2_HDR "SIP/2.0"
    #define SIP2_HDR_LEN ((gint)strlen (SIP2_HDR))

To this:

    #define SIP2_HDR "SIP/2.0"
    #define SIP2_HDR_LEN 7

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

13 years agoFix warning found by clang...
sfisher [Wed, 19 Jan 2011 21:45:54 +0000 (21:45 +0000)]
Fix warning found by clang...

packet-dcerpc.c:4056:19: error: comparison of integers of different signs:
      'guint32' (aka 'unsigned int') and 'int' [-Wsign-compare]
    for (i = 0; i < (int) commands_nb; ++i) {
                ~ ^ ~~~~~~~~~~~~~~~~~

... by removing the "(int)" cast

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

13 years agoFrom Alexis La Goutte:
jake [Wed, 19 Jan 2011 20:57:39 +0000 (20:57 +0000)]
From Alexis La Goutte:
A patch to enhance the ICMPv6 dissector
- Make ICMP Type (sub)field filterable
- Add Inverse Neighbor Discovery (RFC 3122)
- Remove dependency to packet-ipv6.h
- Cleanup packet-ipv6.h
- Update RFC Draft to draft-ietf-roll-rpl-17 (with make a sub dissector
  for RPL Control and add Secure RPL...)
- Replace tvb_get_ipv6/ip6_to_str by new function tvb_ip6_to_str
- and other enchancements.....

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

13 years agoCast the returned value from strlen() to an int to make the Windows 64-bit
sfisher [Wed, 19 Jan 2011 19:42:00 +0000 (19:42 +0000)]
Cast the returned value from strlen() to an int to make the Windows 64-bit
buildbot happy.

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

13 years agoFrom Cal Turney via enhancement bug #5587: In hex or string searches of the
sfisher [Wed, 19 Jan 2011 18:21:21 +0000 (18:21 +0000)]
From Cal Turney via enhancement bug #5587: In hex or string searches of the
packet data highlight the target rather than the entire field.

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

13 years agoFrom Cal Turney via bug #5585: When searching in packet bytes, the field and
sfisher [Wed, 19 Jan 2011 17:58:53 +0000 (17:58 +0000)]
From Cal Turney via bug #5585: When searching in packet bytes, the field and
bytes are not immediately shown.

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

13 years agoFix the broken Edit Menu when UImanager is used.
etxrab [Wed, 19 Jan 2011 14:55:15 +0000 (14:55 +0000)]
Fix the broken Edit Menu when UImanager is used.
(UnmarkAllDisplayedPackets)

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

13 years agopacket-bssgp.c:6916: warning: 'bssgp_tree' may be used uninitialized in this function
etxrab [Wed, 19 Jan 2011 09:49:36 +0000 (09:49 +0000)]
packet-bssgp.c:6916: warning: 'bssgp_tree' may be used uninitialized in this function

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

13 years agoCleaned up splitt between old and new dissection style.
etxrab [Wed, 19 Jan 2011 09:35:34 +0000 (09:35 +0000)]
Cleaned up splitt between old and new dissection style.
A lot of conversion still needed.

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

13 years agoAdd the RAI value to "add_string"
etxrab [Wed, 19 Jan 2011 06:43:28 +0000 (06:43 +0000)]
Add the RAI value to "add_string"

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

13 years agoTry to enhance output at ValueError to ease debugging.
etxrab [Wed, 19 Jan 2011 06:33:33 +0000 (06:33 +0000)]
Try to enhance output at ValueError to ease debugging.

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

13 years agoUpdated to OMA-TS-ULP-V2_0-20100806-D
etxrab [Wed, 19 Jan 2011 06:27:50 +0000 (06:27 +0000)]
Updated to OMA-TS-ULP-V2_0-20100806-D
with asn1 files from eyimjia.
Files hand edited to pass as2wrs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593
(Does not fix the bug)

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

13 years agoIntroduce EXTRANEOUS_DATA_CHECK_EXPERT
etxrab [Tue, 18 Jan 2011 20:16:56 +0000 (20:16 +0000)]
Introduce EXTRANEOUS_DATA_CHECK_EXPERT
which adds an expert item.

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

13 years agodumpcap failed to link - add glib2 and wsutil libraries to fix this.
jmayer [Tue, 18 Jan 2011 17:49:41 +0000 (17:49 +0000)]
dumpcap failed to link - add glib2 and wsutil libraries to fix this.

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

13 years agoAdd another item.
gerald [Mon, 17 Jan 2011 22:23:35 +0000 (22:23 +0000)]
Add another item.

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

13 years agoHandle two length octets correctly in TELV.
etxrab [Mon, 17 Jan 2011 21:12:30 +0000 (21:12 +0000)]
Handle two length octets correctly in TELV.

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

13 years ago- append TLLI value.
etxrab [Mon, 17 Jan 2011 21:10:54 +0000 (21:10 +0000)]
- append TLLI value.
- Whitespace changes.

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

13 years ago(Until Anders comletes work): use #if 0 instead of //; init a variable;
wmeier [Mon, 17 Jan 2011 16:51:31 +0000 (16:51 +0000)]
(Until Anders comletes work): use #if 0 instead of //; init a variable;

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

13 years agoRemove redundant test for a non-null pointer;
wmeier [Mon, 17 Jan 2011 16:36:52 +0000 (16:36 +0000)]
Remove redundant test for a non-null pointer;

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

13 years agoActually use proto_tree_add_item() instead of proto_tree_add_ether(). I hope I didn...
morriss [Mon, 17 Jan 2011 15:22:11 +0000 (15:22 +0000)]
Actually use proto_tree_add_item() instead of proto_tree_add_ether().  I hope I didn't miss more of these...

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

13 years ago- Use correct data pointer during a comparison.
martinm [Mon, 17 Jan 2011 15:01:22 +0000 (15:01 +0000)]
- Use correct data pointer during a comparison.
- Add expert info to show when DRX command is received
- Get rid of some tabs

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

13 years agoRestore dissection of Mobile Identity(revert the code).
etxrab [Mon, 17 Jan 2011 14:18:54 +0000 (14:18 +0000)]
Restore dissection of Mobile Identity(revert the code).

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

13 years ago- Remove debug printout.
etxrab [Mon, 17 Jan 2011 13:09:08 +0000 (13:09 +0000)]
- Remove debug printout.
- Enhance dissection a bit.
- add new true_false_strings

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

13 years agoDo Windows compile with /WX flag: treat warnings as errors.
wmeier [Sun, 16 Jan 2011 23:47:05 +0000 (23:47 +0000)]
Do Windows compile with /WX flag: treat warnings as errors.

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

13 years agoCompile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;
wmeier [Sun, 16 Jan 2011 23:24:15 +0000 (23:24 +0000)]
Compile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;
(Treat warnings as errors);
Done by simplifing the dependency line for the objects so that the
 default .c.obj inference rule is used.

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

13 years agoFix a Windows compiler warning;
wmeier [Sun, 16 Jan 2011 23:04:33 +0000 (23:04 +0000)]
Fix a Windows compiler warning;
Minor whitespace cleanup.

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

13 years agoActually use proto_tree_add_item instead of proto_tree_add_bytes. Fixes bug 5588.
morriss [Sun, 16 Jan 2011 22:52:17 +0000 (22:52 +0000)]
Actually use proto_tree_add_item instead of proto_tree_add_bytes.  Fixes bug 5588.

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

13 years agoSwitch to using proto_add_bits_item in a couple of places and fix
etxrab [Sun, 16 Jan 2011 22:32:22 +0000 (22:32 +0000)]
Switch to using proto_add_bits_item in a couple of places and fix
missing stepping of bit_offset.

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

13 years agoFix Windows comiler warning: remove unused 'wsadata' variable.
wmeier [Sun, 16 Jan 2011 22:10:03 +0000 (22:10 +0000)]
Fix Windows comiler warning: remove unused 'wsadata' variable.

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

13 years agoFrom Vaibhav Katkade:
jake [Sun, 16 Jan 2011 21:32:39 +0000 (21:32 +0000)]
From Vaibhav Katkade:
Add support for newly defined LLDP Four-wire Power-via-MDI and
CDP Spare Pair PoE TLVs

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Sun, 16 Jan 2011 20:51:21 +0000 (20:51 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().

Use tvb_memeql() & tvb_memcmp().

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

13 years agoUse tvb_fc_to_str() and tvb_fcwwm_to_str().
morriss [Sun, 16 Jan 2011 18:37:56 +0000 (18:37 +0000)]
Use tvb_fc_to_str() and tvb_fcwwm_to_str().

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

13 years agoFrom Porus Mehta:
etxrab [Sun, 16 Jan 2011 18:36:17 +0000 (18:36 +0000)]
From Porus Mehta:
Corrections to ANSI MAP ASN.1 specifications.

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

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

13 years ago<shortcut> doesn't appear to be a valid element.
morriss [Sun, 16 Jan 2011 18:36:04 +0000 (18:36 +0000)]
<shortcut> doesn't appear to be a valid element.

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

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

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

13 years agor35546 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
etxrab [Sun, 16 Jan 2011 08:24:11 +0000 (08:24 +0000)]
r35546 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
Make the change also in the .cnf file

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

13 years agoMove assignment of 'oct' outside of if(tree)--it is used outside of the if block.
morriss [Sun, 16 Jan 2011 04:38:59 +0000 (04:38 +0000)]
Move assignment of 'oct' outside of if(tree)--it is used outside of the if block.

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

13 years agoIntroduce, and start using, tvb_fc_to_str() and tvb_fcwwm_to_str(): these
morriss [Sun, 16 Jan 2011 04:33:42 +0000 (04:33 +0000)]
Introduce, and start using, tvb_fc_to_str() and tvb_fcwwm_to_str(): these
functions act like their non-tvb counterparts except that they take a tvb and
and offset instead of a pointer to a byte array.

This basically saves the dissectors from having to call tvb_get_ptr()--which in
this case eliminates a couple of typos in the length given to tvb_get_ptr().

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

13 years agoReplace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
morriss [Sun, 16 Jan 2011 03:57:12 +0000 (03:57 +0000)]
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

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

13 years agoUse tvb_memeql().
morriss [Sun, 16 Jan 2011 03:46:16 +0000 (03:46 +0000)]
Use tvb_memeql().

Use tvb_ip_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

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

13 years agoUse tvb_memeql() and tvb_memcpy().
morriss [Sun, 16 Jan 2011 03:35:29 +0000 (03:35 +0000)]
Use tvb_memeql() and tvb_memcpy().

Use tvb_ip_to_str() and tvb_ip6_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

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

13 years agoUse tvb_ip_to_str().
morriss [Sun, 16 Jan 2011 03:29:03 +0000 (03:29 +0000)]
Use tvb_ip_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

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

13 years agoComitting work in progress to fix the linking problem.
etxrab [Sat, 15 Jan 2011 23:13:28 +0000 (23:13 +0000)]
Comitting work in progress to fix the linking problem.
>Linking fails now:
>epan/.libs/libwireshark.so: undefined reference to `hf_bssgp_elem_id'
>epan/.libs/libwireshark.so: undefined reference to `bssgp_elem_fcn'
>epan/.libs/libwireshark.so: undefined reference to `ett_bssgp_elem'
>epan/.libs/libwireshark.so: undefined reference to >`bssgp_elem_strings'
>Did you miss packet-bssgp.c in that commit?

I'll try to clean this up in the next few days.

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

13 years agoReplace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
morriss [Sat, 15 Jan 2011 19:01:53 +0000 (19:01 +0000)]
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().

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

13 years agoDon't (blindly) pass the result of match_strval() into proto_tree_add_*():
morriss [Sat, 15 Jan 2011 18:58:42 +0000 (18:58 +0000)]
Don't (blindly) pass the result of match_strval() into proto_tree_add_*():
some OS (like Solaris) don't like NULL pointers to strings in (s)printf
formats; use val_to_str() instead.

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

13 years agoReplace some duplicate blurbs with NULL
morriss [Sat, 15 Jan 2011 18:18:13 +0000 (18:18 +0000)]
Replace some duplicate blurbs with NULL

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

13 years agoReplace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
morriss [Sat, 15 Jan 2011 03:25:43 +0000 (03:25 +0000)]
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().

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

13 years ago- Add TELV to dissct IE's with an extention bit in the length vallue.
etxrab [Fri, 14 Jan 2011 21:43:31 +0000 (21:43 +0000)]
- Add TELV to dissct IE's with an extention bit in the length vallue.
- Add a BSSGP PDU type
- Put IE name in the top tree for ELEM_V

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

13 years agoAdd tvb_get_[n|le]toh[40|48|56]() accessors. Addresses bug 5082.
cmaynard [Fri, 14 Jan 2011 19:02:38 +0000 (19:02 +0000)]
Add tvb_get_[n|le]toh[40|48|56]() accessors.  Addresses bug 5082.

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

13 years agoFrom Cal Turney via bug 4964: Round & display 6 decimal places in tshark SRTs.
cmaynard [Fri, 14 Jan 2011 17:06:53 +0000 (17:06 +0000)]
From Cal Turney via bug 4964: Round & display 6 decimal places in tshark SRTs.

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

13 years agoRemoved redundant comparison that caused compilation failure on OSX
grahamb [Fri, 14 Jan 2011 14:39:40 +0000 (14:39 +0000)]
Removed redundant comparison that caused compilation failure on OSX

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

13 years agoWhen looking for previous frame for UL/DL retx, use harq-id + ndi bit.
martinm [Fri, 14 Jan 2011 14:25:24 +0000 (14:25 +0000)]
When looking for previous frame for UL/DL retx, use harq-id + ndi bit.

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

13 years agoAdded ignore for *.pkl build artefacts
grahamb [Fri, 14 Jan 2011 12:16:59 +0000 (12:16 +0000)]
Added ignore for *.pkl build artefacts

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

13 years agoUpdated dissector:
grahamb [Fri, 14 Jan 2011 12:15:10 +0000 (12:15 +0000)]
Updated dissector:
Additional function codes: Disable unsolicited messages, Open\Close\Delete file
Additional data objects: Analog output events, File objects and Octet string events.
Improved Info column display for reassembled fragments.
Changed all event timestamps to be UTC as per protocol spec.

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

13 years agoMove MAC and RLC stats menu items into a common LTE subtree.
martinm [Fri, 14 Jan 2011 11:32:58 +0000 (11:32 +0000)]
Move MAC and RLC stats menu items into a common LTE subtree.

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

13 years agoRather than repairing out-of-range subframe numbers, make sure error gets reported...
martinm [Fri, 14 Jan 2011 11:21:28 +0000 (11:21 +0000)]
Rather than repairing out-of-range subframe numbers, make sure error gets reported (and then are not used to access beyond subframe arrays).

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

13 years agoFrom Hadar Shoham:
jake [Fri, 14 Jan 2011 07:20:31 +0000 (07:20 +0000)]
From Hadar Shoham:
bootp option 123 has 2 chooses - coordinate based location RFC 3825 or
CableLabs DSS_ID. Add better support for having 2 DSS_ID with dynamic
size (up to 32 byte each)

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

13 years agoReplace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
morriss [Fri, 14 Jan 2011 03:44:58 +0000 (03:44 +0000)]
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.

Replace some memcpy()+tvb_get_ptr() with tvb_memcpy().

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

13 years agoVMS → HP OpenVMS.
gerald [Thu, 13 Jan 2011 22:45:27 +0000 (22:45 +0000)]
VMS → HP OpenVMS.

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

13 years agoAdd the TCP scaling graph.
gerald [Thu, 13 Jan 2011 22:43:01 +0000 (22:43 +0000)]
Add the TCP scaling graph.

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

13 years agoDon't (blindly) pass the result of match_strval() into proto_tree_add_*():
morriss [Thu, 13 Jan 2011 22:18:30 +0000 (22:18 +0000)]
Don't (blindly) pass the result of match_strval() into proto_tree_add_*():
some OS (like Solaris) don't like NULL pointers to strings in (s)printf
formats; use val_to_str() instead.

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

13 years agoAdd keyboard shortcuts.
gerald [Thu, 13 Jan 2011 22:08:26 +0000 (22:08 +0000)]
Add keyboard shortcuts.

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

13 years agoFrom Clemens Auer:
jake [Thu, 13 Jan 2011 21:22:57 +0000 (21:22 +0000)]
From Clemens Auer:
This patch adds support for the following fields in Meta protocol:
- Deciphered
- Local Device ID,
- Remote Device ID,
- Tap Group ID,
- TLLI,
- Calling Station ID,
- Called Station ID

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

13 years agoMention another RTP player feature.
jake [Thu, 13 Jan 2011 21:17:24 +0000 (21:17 +0000)]
Mention another RTP player feature.

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

13 years agoAdd "break;" to end of last case statement.
sfisher [Thu, 13 Jan 2011 17:54:30 +0000 (17:54 +0000)]
Add "break;" to end of last case statement.

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

13 years agoWrap include file in extern "C" { ... } for __cplusplus
sfisher [Thu, 13 Jan 2011 17:39:54 +0000 (17:39 +0000)]
Wrap include file in extern "C" { ... } for __cplusplus

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

13 years agoAdd some of my changes since 1.4 was released
sfisher [Thu, 13 Jan 2011 17:25:22 +0000 (17:25 +0000)]
Add some of my changes since 1.4 was released

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

13 years agoIntroduce, and start using, tvb_ip_to_str() and tvb_ip6_to_str(). These
morriss [Thu, 13 Jan 2011 15:53:30 +0000 (15:53 +0000)]
Introduce, and start using, tvb_ip_to_str() and tvb_ip6_to_str().  These
do the same as the non-tvb equivalents but take a TVB and an offset instead
of a pointer to an array of bytes.

Their purpose is to prevent (many) dissectors from doing:
ip_to_str(tvb_get_ptr(...)).

(About the names and the location: I like the names as they are but the names
imply that they should live in tvbuff.c.  That would make some sense but
I didn't want to pull to_str.h into tvbuff.c...)

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

13 years agoGetting ready for R9 versions of some LTE protocols.
martinm [Thu, 13 Jan 2011 15:16:45 +0000 (15:16 +0000)]
Getting ready for R9 versions of some LTE protocols.

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

13 years agoUse value_string_ext.
etxrab [Thu, 13 Jan 2011 15:03:55 +0000 (15:03 +0000)]
Use value_string_ext.

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

13 years agoRemove an unused variable.
etxrab [Thu, 13 Jan 2011 14:36:40 +0000 (14:36 +0000)]
Remove an unused variable.

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

13 years agoMake it possible to dissect the part pressent in short frames.
etxrab [Thu, 13 Jan 2011 14:07:34 +0000 (14:07 +0000)]
Make it possible to dissect the part pressent in short frames.

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

13 years agoAdded a couple of my new features
sake [Thu, 13 Jan 2011 08:35:29 +0000 (08:35 +0000)]
Added a couple of my new features

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

13 years agoFrom Pascal Quantin:
etxrab [Thu, 13 Jan 2011 06:32:23 +0000 (06:32 +0000)]
From Pascal Quantin:
Fix dissection of  protocol ID.

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

13 years agoMore 1.5 updates.
gerald [Thu, 13 Jan 2011 00:52:32 +0000 (00:52 +0000)]
More 1.5 updates.

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

13 years agoStart updating the release notes for 1.5.
gerald [Wed, 12 Jan 2011 23:20:03 +0000 (23:20 +0000)]
Start updating the release notes for 1.5.

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

13 years agoSet gsm_a_dtap_pinfo->link_dir to get proper dissection of PCO.
etxrab [Wed, 12 Jan 2011 21:36:11 +0000 (21:36 +0000)]
Set gsm_a_dtap_pinfo->link_dir to get proper dissection of PCO.

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

13 years agoThere's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly.
morriss [Wed, 12 Jan 2011 20:25:36 +0000 (20:25 +0000)]
There's no need to call tvb_get_ptr() in here: just call ensure_contiguous() directly.

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

13 years agoFix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5574 :
morriss [Wed, 12 Jan 2011 17:20:52 +0000 (17:20 +0000)]
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5574 :

The first time a value_string_ext() is accessed, _match_strval_ext_init() is
used before the real match function is called.  This function was not expanded
to take an idx parameter (in rev 35451).  It compiled only because the function:
  a) previously did not match _value_string_match_t
  b) and the difference was being cast away when assigning _match_strval to it
     (So the fact that the index parameter was not added was also ignored.)

To fix the problem, give _match_strval_ext_init() and index parameter and use
it instead of a dummy variable when calling the real match function.  That way
the first call to match_strval_ext_idx() will return an actual (initialized)
index.

To prevent the problem in the future, make the vse argument to
_match_strval_ext_init() const *and then cast away the constness* so the
function can modify the vse.

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

13 years agoMark a parameter as unused.
etxrab [Wed, 12 Jan 2011 17:05:58 +0000 (17:05 +0000)]
Mark a parameter as unused.

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

13 years agoEnhance IE dissection.
etxrab [Wed, 12 Jan 2011 16:43:59 +0000 (16:43 +0000)]
Enhance IE dissection.

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

13 years agoUpdate dissection of Protocol configuration options.
etxrab [Wed, 12 Jan 2011 16:43:19 +0000 (16:43 +0000)]
Update dissection of Protocol configuration options.

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

13 years agoFrom Eliad:
jake [Wed, 12 Jan 2011 07:46:46 +0000 (07:46 +0000)]
From Eliad:
Add dissector for P2P Group BSSID attribute (of p2p).

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

13 years agoFrom Steve Karg:
jake [Wed, 12 Jan 2011 07:42:18 +0000 (07:42 +0000)]
From Steve Karg:
Added a display filter on BACnet WhoIs Low Limit and High Limit.

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

13 years agoUpdate a value_string.
etxrab [Wed, 12 Jan 2011 07:39:54 +0000 (07:39 +0000)]
Update a value_string.

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

13 years agoUse value_string_ext in a couple of places.
etxrab [Wed, 12 Jan 2011 07:36:55 +0000 (07:36 +0000)]
Use value_string_ext in a couple of places.

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

13 years agoFrom Fulko Hew:
jake [Wed, 12 Jan 2011 07:31:49 +0000 (07:31 +0000)]
From Fulko Hew:
Improved the decoding of OID search ranges in AgentX dissector:

1/ OID highlighting on first OID of a range was too long.
   The code incorrectly used the length of the printable string instead
   of the length of the source data.
2/ Added bitwise dissection of the 'include' field of an OID decoding.
3/ Added corrected 'start/end' range information to SearchRange decoding to
   discriminate between an 'end' indicator (old way) and the new way that
   shows both an inclusive/exclusive indicator as well as a start/end range
   indicator. (applicable to getnext/getbulk requests).

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

13 years agoDocument and export:
etxrab [Wed, 12 Jan 2011 07:25:34 +0000 (07:25 +0000)]
Document and export:
tvb_bcd_dig_to_ep_str();

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

13 years agoTCAP- Application context name not been decoded correctly
etxrab [Wed, 12 Jan 2011 07:18:57 +0000 (07:18 +0000)]
TCAP- Application context name not been decoded correctly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5573

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Wed, 12 Jan 2011 03:35:14 +0000 (03:35 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_string(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.

In a couple of places an hf variable was being used as the length in a call to
proto_tree_add_*().  Use the appropriate variable instead.

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Wed, 12 Jan 2011 03:27:32 +0000 (03:27 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_string(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.

In a couple of places an hf variable was being used as the length in a call to
proto_tree_add_*().  Use the appropriate variable instead.

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

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in
morriss [Wed, 12 Jan 2011 03:19:07 +0000 (03:19 +0000)]
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_string(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.

In a couple of places an hf variable was being used as the length in a call to
proto_tree_add_*().  Use the appropriate variable instead.

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

13 years agoReplace some uses of tvb_get_ptr() with tvb_get_ephemeral_string().
morriss [Wed, 12 Jan 2011 03:08:05 +0000 (03:08 +0000)]
Replace some uses of tvb_get_ptr() with tvb_get_ephemeral_string().

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

13 years agoIntroduce, and start using, tvb_get_const_stringz(). This function returns a
morriss [Wed, 12 Jan 2011 02:25:08 +0000 (02:25 +0000)]
Introduce, and start using, tvb_get_const_stringz().  This function returns a
pointer to a NULL-terminated string in the TVB.  It is no safer than dissectors
which call tvb_get_strsize() and then tvb_get_ptr() but it makes it clear that
this usage of tvb_get_ptr() is safe.

This function is slightly more efficient than tvb_get_ephemeral_stringz()--but
only as long as we're not using composite TVBs.

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

13 years agoDon't attempt to reassemble short (reported_len > len) chunks.
morriss [Tue, 11 Jan 2011 22:41:19 +0000 (22:41 +0000)]
Don't attempt to reassemble short (reported_len > len) chunks.

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

13 years agoDon't store message fragments whose length is 0: there's no point. (Otherwise
morriss [Tue, 11 Jan 2011 22:36:31 +0000 (22:36 +0000)]
Don't store message fragments whose length is 0: there's no point.  (Otherwise
fragment->len was left unitialized.)

Also (unrelated): save a couple of calls to tvb_reported_length() since the
value is already stored in a variable.

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

13 years agoUse value_string_ext and friends.
etxrab [Tue, 11 Jan 2011 20:15:04 +0000 (20:15 +0000)]
Use value_string_ext and friends.

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

13 years agoComplement to
etxrab [Tue, 11 Jan 2011 20:02:30 +0000 (20:02 +0000)]
Complement to
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35477

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

13 years agoImprove dissection of UE Time Zone.
etxrab [Tue, 11 Jan 2011 17:06:38 +0000 (17:06 +0000)]
Improve dissection of UE Time Zone.

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