obnox/wireshark/wip.git
12 years agoDo some more conversions of proto_tree_add_item() 'encoding' arg
wmeier [Tue, 18 Oct 2011 00:39:20 +0000 (00:39 +0000)]
Do some more conversions of proto_tree_add_item() 'encoding' arg
  (previously missed).

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

12 years agoDo some more conversions of proto_tree_add_item() 'encoding' arg
wmeier [Tue, 18 Oct 2011 00:17:48 +0000 (00:17 +0000)]
Do some more conversions of proto_tree_add_item() 'encoding' arg
 (previously missed).

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

12 years agoFixup some display filter names.
cmaynard [Mon, 17 Oct 2011 23:59:32 +0000 (23:59 +0000)]
Fixup some display filter names.

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

12 years agoCleanup AFP Version display filter name.
cmaynard [Mon, 17 Oct 2011 23:58:25 +0000 (23:58 +0000)]
Cleanup AFP Version display filter name.

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

12 years agoRemove #if 0'd code which appears to duplicate existing code
wmeier [Mon, 17 Oct 2011 22:23:11 +0000 (22:23 +0000)]
Remove #if 0'd code which appears to duplicate existing code

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

12 years agoEnhance BGP Capability message
alagoutte [Mon, 17 Oct 2011 18:19:18 +0000 (18:19 +0000)]
Enhance BGP Capability message
* Make field filterable
* Use expert info to display a wrong length
* Remove duplicate code for type and length

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

12 years agoFrom Michael Mann: Add cf_callback_invoke to cf_open to tidy up the currently open...
cmaynard [Mon, 17 Oct 2011 14:56:37 +0000 (14:56 +0000)]
From Michael Mann: Add cf_callback_invoke to cf_open to tidy up the currently open file before opening a new one.  Fixes bugs 5987 and 6457.

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

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

12 years agoAdd dissectors/packet-lcsap.c to CMake. Remove dissect_lcsap_Correlation_ID_PDU...
morriss [Mon, 17 Oct 2011 14:53:13 +0000 (14:53 +0000)]
Add dissectors/packet-lcsap.c to CMake.  Remove dissect_lcsap_Correlation_ID_PDU() from list of exports since it's only used within libwireshark.

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

12 years agodissect_lcsap_Correlation_ID_PDU() is used in one module and exported in
guy [Mon, 17 Oct 2011 06:09:04 +0000 (06:09 +0000)]
dissect_lcsap_Correlation_ID_PDU() is used in one module and exported in
another; see if this fixes the Ubuntu build.

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

12 years agoDo some conversions of proto_tree_add_item() 'encoding' arg.
wmeier [Sun, 16 Oct 2011 23:38:49 +0000 (23:38 +0000)]
Do some conversions of proto_tree_add_item() 'encoding' arg.
(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN

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

12 years agoHave to include packet-lcsap.h, so it gets put into the source tarball.
guy [Sun, 16 Oct 2011 18:34:45 +0000 (18:34 +0000)]
Have to include packet-lcsap.h, so it gets put into the source tarball.

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

12 years agoFrom Jouni Malinen:
etxrab [Sun, 16 Oct 2011 17:29:12 +0000 (17:29 +0000)]
From Jouni Malinen:
Reassemble GAS Query Response if needed.

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

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

12 years agoFrom Eliot:
etxrab [Sun, 16 Oct 2011 17:24:50 +0000 (17:24 +0000)]
From Eliot:
This patch adds the symbols to a filter expression, and should remove them if
you
are building without python.

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

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

12 years agoFrom Donnie Savage:
etxrab [Sun, 16 Oct 2011 17:21:19 +0000 (17:21 +0000)]
From Donnie Savage:
EIGRP dissector cleanup.

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

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

12 years agoFrom Pascal Quantin.
etxrab [Sun, 16 Oct 2011 16:54:44 +0000 (16:54 +0000)]
From Pascal Quantin.
LTE Positioning Protocol dissector. Add missing file.

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

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

12 years agoFrom Pascal Quantin.
etxrab [Sun, 16 Oct 2011 16:02:26 +0000 (16:02 +0000)]
From Pascal Quantin.
LTE Positioning Protocol dissector

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

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

12 years ago[Automatic manuf, services and enterprise-numbers update for 2011-10-16]
gerald [Sun, 16 Oct 2011 14:03:24 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-10-16]

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

12 years agoWindows: Fix and re-enable asn1\t124 build;
wmeier [Sat, 15 Oct 2011 21:43:46 +0000 (21:43 +0000)]
Windows: Fix and re-enable asn1\t124 build;

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

12 years ago Update 2 generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
wmeier [Sat, 15 Oct 2011 20:41:07 +0000 (20:41 +0000)]
 Update 2 generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
 The only change in each file is in a comment showing the asn2wrs cmd used to build that file.

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

12 years agoFix a 'set but not used' compiler warning.
wmeier [Sat, 15 Oct 2011 20:39:35 +0000 (20:39 +0000)]
Fix a 'set but not used' compiler warning.

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

12 years agoConvert plugin files proto_tree_add_item() 'encoding' arg for field types FT_STRING...
wmeier [Sat, 15 Oct 2011 19:58:31 +0000 (19:58 +0000)]
Convert plugin files proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
 1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).

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

12 years agoConvert asn1 template files proto_tree_add_item() 'encoding' arg for field types...
wmeier [Sat, 15 Oct 2011 19:48:19 +0000 (19:48 +0000)]
Convert asn1 template files proto_tree_add_item() 'encoding' arg for field types FT_STRING as follows:
 1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. Always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).

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

12 years agoUpdate generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
wmeier [Sat, 15 Oct 2011 19:27:27 +0000 (19:27 +0000)]
Update generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
The only change in each file is in a comment showing the asn2wrs cmd used to build that file.

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

12 years agoConvert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ...
wmeier [Sat, 15 Oct 2011 18:46:26 +0000 (18:46 +0000)]
Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
 1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).

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

12 years agoRemove some unneeded code form proto_reg_handoff...();
wmeier [Sat, 15 Oct 2011 15:21:35 +0000 (15:21 +0000)]
Remove some unneeded code form proto_reg_handoff...();
Comment out an unused #define;
Do some whitespace cleanup ("4 space tabs" ==> spaces).

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

12 years agoMake make_menu_actions() static again, but protect with
martinm [Fri, 14 Oct 2011 16:03:11 +0000 (16:03 +0000)]
Make make_menu_actions() static again, but protect with
#ifdef HAVE_LUA_5_1
#endif
As per discission on wireshark-dev, this function might later see wider use, so don't add 'lua' to the function name.

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

12 years agoBuild generate_export when building 'all' on Windows too.
morriss [Fri, 14 Oct 2011 13:26:32 +0000 (13:26 +0000)]
Build generate_export when building 'all' on Windows too.

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

12 years agomake_menu_items() isn't called without LUA support, so can't be static.
martinm [Fri, 14 Oct 2011 11:03:29 +0000 (11:03 +0000)]
make_menu_items() isn't called without LUA support, so can't be static.

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

12 years agoDon't generate the conformance file for exported types when building the
morriss [Fri, 14 Oct 2011 10:22:01 +0000 (10:22 +0000)]
Don't generate the conformance file for exported types when building the
dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

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

12 years agoRemoved unused old_offset in mapi_dissect_struct_request.
stig [Fri, 14 Oct 2011 08:39:23 +0000 (08:39 +0000)]
Removed unused old_offset in mapi_dissect_struct_request.

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

12 years agoRemoved newencap as it's unused.
stig [Fri, 14 Oct 2011 08:22:16 +0000 (08:22 +0000)]
Removed newencap as it's unused.

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

12 years agoFrom Iain Arnell:
guy [Fri, 14 Oct 2011 08:00:21 +0000 (08:00 +0000)]
From Iain Arnell:

Adds additional header fields for AJP13 request attributes.

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

12 years agoFrom Iain Arnell:
guy [Fri, 14 Oct 2011 07:52:11 +0000 (07:52 +0000)]
From Iain Arnell:

The existing code adds all ajp13 header names to the protocol tree as
ajp13.hval; header values aren't added at all. The original intention
appears to have been to add header names as ajp13.hname and their values
as ajp13.hval. Even if implemented properly, this doesn't allow
filtering properly (unless there's some funky syntax I'm not aware of).

This patch uses dedicated header fields for those request/response
headers that are explicitly defined in AJP13 protocol. Undefined headers
names and their values are added as a single ajp13.additional_header in
easily matched "Header-Name: Value" string format.

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

12 years agoFrom Iain Arnell:
guy [Fri, 14 Oct 2011 07:45:22 +0000 (07:45 +0000)]
From Iain Arnell:

AJP13 uses a string size of 0xFFFF to indicate a null string;
ajp13_get_nstring function would incorrectly return invalid data.

In disaply_req_body function, the content_length really is the length of
the data; there is no trailing null.

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

12 years agoAdded support for SIO-Label from draft-zeilenga-email-seclabel-04.
stig [Fri, 14 Oct 2011 07:44:50 +0000 (07:44 +0000)]
Added support for SIO-Label from draft-zeilenga-email-seclabel-04.

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

12 years agoExport MessageSecurityLabel_PDU.
stig [Fri, 14 Oct 2011 07:44:40 +0000 (07:44 +0000)]
Export MessageSecurityLabel_PDU.

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

12 years agoExport ESSSecurityLabel_PDU.
stig [Fri, 14 Oct 2011 07:44:20 +0000 (07:44 +0000)]
Export ESSSecurityLabel_PDU.

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

12 years ago{0, NULL} is required as the last value_string array entry: value_string VALS_GROUP_N...
etxrab [Fri, 14 Oct 2011 06:19:37 +0000 (06:19 +0000)]
{0, NULL} is required as the last value_string array entry: value_string VALS_GROUP_NAMES[]

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

12 years agoFrom Rob Kruciak:
etxrab [Fri, 14 Oct 2011 05:42:37 +0000 (05:42 +0000)]
From Rob Kruciak:
Add a port preference setting.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6430

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

12 years agoFrom Tony Trinh:
etxrab [Fri, 14 Oct 2011 05:08:39 +0000 (05:08 +0000)]
From Tony Trinh:
Patch to fix/restore Lua menu functionality

Remove unnecessary Lua placeholder in UI definition for the main menu bar

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

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

12 years agoUse g_list_first() to find the first element in the list.
tuexen [Thu, 13 Oct 2011 20:13:52 +0000 (20:13 +0000)]
Use g_list_first() to find the first element in the list.

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

12 years agoDissect NSAP encoded transport layer address.
etxrab [Thu, 13 Oct 2011 19:41:34 +0000 (19:41 +0000)]
Dissect NSAP encoded transport layer address.

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

12 years agoAdded some Lua pinfo fields:
stig [Thu, 13 Oct 2011 19:39:35 +0000 (19:39 +0000)]
Added some Lua pinfo fields:
ethertype, fragmented, in_error_pkt, match_uint and match_string.

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

12 years agoMake clang on Mac OS X 10.7.2. happy.
tuexen [Thu, 13 Oct 2011 19:04:25 +0000 (19:04 +0000)]
Make clang on Mac OS X 10.7.2. happy.

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

12 years agoFrom Pascal Quantin.
etxrab [Thu, 13 Oct 2011 18:22:55 +0000 (18:22 +0000)]
From Pascal Quantin.
a follow-up patch that fixes the dissection of the Generic NAS transport messages.

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

12 years agoDelete unused hf_ entries found by checkhf.pl.
cmaynard [Thu, 13 Oct 2011 15:49:45 +0000 (15:49 +0000)]
Delete unused hf_ entries found by checkhf.pl.

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

12 years agoFrom Christophe PALETOU:
etxrab [Thu, 13 Oct 2011 06:06:53 +0000 (06:06 +0000)]
From Christophe PALETOU:
Add dissector for public protocol Flight Message Transfer Protocol (FMTP)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6433

- Modified and moved col_add_fstr outside of if(tree)
- call data dissector for data
- use ENC_BIG_ENDIAN
- minor cleanups

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

12 years agoFrom Horaci Macias:
etxrab [Thu, 13 Oct 2011 05:15:50 +0000 (05:15 +0000)]
From Horaci Macias:
Parse User-to-User header
http://tools.ietf.org/html/draft-ietf-cuss-sip-uui-02

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

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

12 years agoFix a typo
wmeier [Thu, 13 Oct 2011 02:05:00 +0000 (02:05 +0000)]
Fix a typo

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

12 years agoInitial a variable to prevent a (not actualy valid) compiler warning:
wmeier [Thu, 13 Oct 2011 01:24:43 +0000 (01:24 +0000)]
Initial a variable to prevent a (not actualy valid) compiler warning:
'inst_count' may be used uninitialized in this function.

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

12 years agoFix a "set but not used" compiler warning.
wmeier [Thu, 13 Oct 2011 01:17:51 +0000 (01:17 +0000)]
Fix a "set but not used" compiler warning.

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

12 years agoFix a "defined but not used" compiler warning.
wmeier [Thu, 13 Oct 2011 01:09:17 +0000 (01:09 +0000)]
Fix a "defined but not used" compiler warning.

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

12 years agoMark some function parameters as unused (_U_); Fixes compiler warnings.
wmeier [Thu, 13 Oct 2011 00:16:54 +0000 (00:16 +0000)]
Mark some function parameters as unused (_U_); Fixes compiler warnings.

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

12 years agoFrom Benjamin Stocks (with some work by Michael Mann): "CIP Motion" dissector;
wmeier [Thu, 13 Oct 2011 00:00:52 +0000 (00:00 +0000)]
From Benjamin Stocks (with some work by Michael Mann): "CIP Motion" dissector;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5929

From me:
packet-cipmotion.c:
  FT_BOOLEAN fields with bitmasks need a bit-fieldwidth in the hf[] entry 'display' field;
  Define attribute_size as guint32 since it has to store guint8*guint16;
  Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;
  Remove trailing whitespace from lines;
  Other minor cleanup and reformatting.

packet-enip.c:
  Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;

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

12 years agoFrom Pascal Quantin.
etxrab [Wed, 12 Oct 2011 21:17:23 +0000 (21:17 +0000)]
From Pascal Quantin.
Add dissection of Location services messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6454

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

12 years agoFrom Tobias Witek:
etxrab [Wed, 12 Oct 2011 18:57:50 +0000 (18:57 +0000)]
From Tobias Witek:
This patch extends the ATM parser so as to allow GPRS NS traffic encapsulated
in ATM AAL5.

Additionally, added support for this into the 'Meta' dissector.

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

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

12 years agoWhen looping, be sure to iterate over the right number of elements. Fixes Coverity...
cmaynard [Wed, 12 Oct 2011 18:38:38 +0000 (18:38 +0000)]
When looping, be sure to iterate over the right number of elements.  Fixes Coverity OVERRUN_STATIC errors reported in CID's 1305 and 1306.  Also, fix the 3 offending display filter names discovered with tools/checkfiltername.pl.

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

12 years agoFrom Robert Bullen: Fix for: Two minor bugs in Wiretap library:
wmeier [Wed, 12 Oct 2011 18:04:58 +0000 (18:04 +0000)]
From Robert Bullen: Fix for: Two minor bugs in Wiretap library:

First bug: The Network Instruments Observer file format abbreviation is
incorrect. It is "niobserverv" instead of "niobserver", which is probably a
vestige from 1.4 when the abbreviation was "niobserverv9".

Second bug: The packet header magic number field is correctly swapped the first
time when reading the entire packet header. It is incorrectly swapped yet again
when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op
on little-endian platforms. But the error message that is displayed to users of
big-endian platforms will contain a byte-reversed value.

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

12 years agoThere are no preferences for this dissector so eliminate unneeded preference-related...
cmaynard [Wed, 12 Oct 2011 18:01:41 +0000 (18:01 +0000)]
There are no preferences for this dissector so eliminate unneeded preference-related code.  Fixes Coverity CID 1311.

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

12 years agoFrom Iain Arnell:
guy [Wed, 12 Oct 2011 17:55:49 +0000 (17:55 +0000)]
From Iain Arnell:

A missing value_ptr parameter in the handling of ajp13 response headers
led to them being displayed differently than the request headers.

This patch also simplifies the offset/length calculation for header
values, and skips the size for consistency with handling of other ajp13
string values.

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

12 years agoAdd Iain Arnell, who contributed ajp13 patches.
guy [Wed, 12 Oct 2011 17:54:23 +0000 (17:54 +0000)]
Add Iain Arnell, who contributed ajp13 patches.

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

12 years agoFrom Iain Arnell:
guy [Wed, 12 Oct 2011 17:53:58 +0000 (17:53 +0000)]
From Iain Arnell:

Revision 35984 introduced a regression in ajp13_get_nstring. According
to the comments here, the returned length _includes_ the trailing null.
The encoded length, however, does _not_ including the trailing null.
This patch resolves the problem by simply adding 1 to the returned
length.

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

12 years agoFix a benign bug: use intended proto_tree_add_uint() instaed of proto_tree_add_item();
wmeier [Wed, 12 Oct 2011 17:30:31 +0000 (17:30 +0000)]
Fix a benign bug: use intended proto_tree_add_uint() instaed of proto_tree_add_item();
Fix an endianness issue;
Add a comment re "tvb_memcpy to a struct is not kosher".

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

12 years agoUpdate the Camel and MAP ASN.1 files.
etxrab [Wed, 12 Oct 2011 16:41:42 +0000 (16:41 +0000)]
Update the Camel and MAP ASN.1 files.

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

12 years agoCleanup use of proto_tree_add_item()/proto_tree_add_uint() in a few cases
wmeier [Wed, 12 Oct 2011 16:31:41 +0000 (16:31 +0000)]
Cleanup use of proto_tree_add_item()/proto_tree_add_uint() in a few cases

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

12 years agoFix a benign bug: Use correct proto_tree_add_item() encoding arg.
wmeier [Wed, 12 Oct 2011 15:02:11 +0000 (15:02 +0000)]
Fix a benign bug: Use correct proto_tree_add_item() encoding arg.

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

12 years agoFix some proto_tree_add_item() FT_ABSOLUTE_TIME encoding parameters:
wmeier [Wed, 12 Oct 2011 14:12:36 +0000 (14:12 +0000)]
Fix some proto_tree_add_item() FT_ABSOLUTE_TIME encoding parameters:

Again: a tip o'the hat to Guy.

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

12 years agoAdd Modification CMake (Following add in Rev 39379)
alagoutte [Wed, 12 Oct 2011 07:44:14 +0000 (07:44 +0000)]
Add Modification CMake (Following add in Rev 39379)

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

12 years agoRevert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39380
etxrab [Wed, 12 Oct 2011 05:27:41 +0000 (05:27 +0000)]
Revert anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39380

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

12 years agoFrom Eliot:
etxrab [Wed, 12 Oct 2011 05:12:49 +0000 (05:12 +0000)]
From Eliot:
Patch libwireshark.def adding some symbols needed by wspyton
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

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

12 years agoFrom Jouni Malinen:
etxrab [Wed, 12 Oct 2011 05:08:51 +0000 (05:08 +0000)]
From Jouni Malinen:
Move sniffer meta data parsing to separate files

packet-ieee80211.c includes dissectors for three different styles
of IEEE 802.11 sniffer meta data (like signal strength). Move these
to separate files in the same style as a fourth format (radiotap)
was already handled, so that packet-ieee80211.c focuses on the
actual IEEE 802.11 frame dissecting.

This reverts
http://anonsvn.wireshark.org/viewvc?revision=23911&view=revision
Objections?
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443

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

12 years agoFix a case wherein proto_tree_add_boolean() was intended instead of proto_tree_add_it...
wmeier [Wed, 12 Oct 2011 03:28:07 +0000 (03:28 +0000)]
Fix a case wherein proto_tree_add_boolean() was intended instead of proto_tree_add_item().
Also: Use proto_tree_add_boolean() instead of proto_tree_add_item() for code consistency in 2 other cases.

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

12 years agoUpdate template to match generated dissector - dissector_try_port() is
guy [Tue, 11 Oct 2011 20:19:46 +0000 (20:19 +0000)]
Update template to match generated dissector - dissector_try_port() is
dead, long live dissector_try_uint().

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

12 years agoUse dissector_try_uint()
etxrab [Tue, 11 Oct 2011 19:35:43 +0000 (19:35 +0000)]
Use dissector_try_uint()

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

12 years agoFrom Eliot:
etxrab [Tue, 11 Oct 2011 19:24:19 +0000 (19:24 +0000)]
From Eliot:
Patch wspy_dissector.py to use dissector_add_uint
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

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

12 years agoFrom Eliot:
etxrab [Tue, 11 Oct 2011 19:16:15 +0000 (19:16 +0000)]
From Eliot:
Patch homeplug.py wspython sample to not conflict with built in homeplug

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

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

12 years agoMake asn1/lcsap/Makefile
stig [Tue, 11 Oct 2011 19:01:32 +0000 (19:01 +0000)]
Make asn1/lcsap/Makefile

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

12 years agoSet svn:ignore targets.
stig [Tue, 11 Oct 2011 19:01:15 +0000 (19:01 +0000)]
Set svn:ignore targets.

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

12 years agoFrom Jouni Malinen:
etxrab [Tue, 11 Oct 2011 18:46:27 +0000 (18:46 +0000)]
From Jouni Malinen:
Dissect Time Advertisement and Time Zone elements.

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

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

12 years agoFrom Jouni Malinen:
etxrab [Tue, 11 Oct 2011 18:43:13 +0000 (18:43 +0000)]
From Jouni Malinen:
ieee80211: Start splitting add_tagged_field into helper functions.

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

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

12 years agoFrom Jouni Malinen:
etxrab [Tue, 11 Oct 2011 18:40:02 +0000 (18:40 +0000)]
From Jouni Malinen:
Simplify tag_num_vals.

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

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

12 years agoFrom Jouni Malinen:
etxrab [Tue, 11 Oct 2011 18:29:29 +0000 (18:29 +0000)]
From Jouni Malinen:
Dissect WNM (IEEE 802.11v) information.

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

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

12 years agoFrom Jouni Malinen:
etxrab [Tue, 11 Oct 2011 18:26:03 +0000 (18:26 +0000)]
From Jouni Malinen:
Wi-Fi P2P: Show frame name in col_info

Make it easier to find specific P2P frames by adding the name of the P2P
Public Action frames into col_info.

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

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

12 years agoFrom Harald Welte:
etxrab [Tue, 11 Oct 2011 18:21:27 +0000 (18:21 +0000)]
From Harald Welte:
In order to ensure one consistent GSMTAP definition, some comments are added to
the code in order to make sure modifications are first merged in the GSMTAP
mainline header file, and then propagated to wireshark.

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

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

12 years agoBuild the LCS-AP dissector.
etxrab [Tue, 11 Oct 2011 18:16:53 +0000 (18:16 +0000)]
Build the LCS-AP dissector.

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

12 years agoAvoid longjmp warning by making adding volatile.
martinm [Tue, 11 Oct 2011 18:06:01 +0000 (18:06 +0000)]
Avoid longjmp warning by making adding volatile.

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

12 years agoEnable GeoIP lookups by default. Don't add GeoIP subtrees if we didn't
gerald [Tue, 11 Oct 2011 17:57:09 +0000 (17:57 +0000)]
Enable GeoIP lookups by default. Don't add GeoIP subtrees if we didn't
find any databases.

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

12 years agoFrom Spenser Sheng:
etxrab [Tue, 11 Oct 2011 16:49:18 +0000 (16:49 +0000)]
From Spenser Sheng:
LCS-AP dissector.

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

12 years agoFix benign bugs wherein proto_tree_add_uint() was intended instead of proto_tree_add_...
wmeier [Tue, 11 Oct 2011 15:39:47 +0000 (15:39 +0000)]
Fix benign bugs wherein proto_tree_add_uint() was intended instead of proto_tree_add_item();
 (Replaces changes made in SVN #39351).

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

12 years agoFix a bug wherein proto_tree_add_uint() was intended instead of proto_tree_add_item();
wmeier [Tue, 11 Oct 2011 15:11:51 +0000 (15:11 +0000)]
Fix a bug wherein proto_tree_add_uint() was intended instead of proto_tree_add_item();
This bug would have caused display of a FT_UINT32 field with the wrong endianness.
(Replaces change made in SVN #39350).

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

12 years agoUse intended proto_tree_add_uint() instead of proto_tree_add_item() to fix benign...
wmeier [Tue, 11 Oct 2011 14:58:54 +0000 (14:58 +0000)]
Use intended proto_tree_add_uint() instead of proto_tree_add_item() to fix benign bugs (Replaces SVN #39348).

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

12 years agoFix several cases wherein proto_tree_add_uint() was intended iso proto_tree_add_item();
wmeier [Tue, 11 Oct 2011 14:49:09 +0000 (14:49 +0000)]
Fix several cases wherein proto_tree_add_uint() was intended iso proto_tree_add_item();
One case would have caused display of a FT_UINT16 field with the wrong endianness.

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

12 years agoRevert SVN #39347; There's a better way.
wmeier [Tue, 11 Oct 2011 14:31:01 +0000 (14:31 +0000)]
Revert SVN #39347; There's a better way.

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

12 years agoFix a number of benign bugs wherein proto_tree_add_uint was intended (rather than...
wmeier [Tue, 11 Oct 2011 14:10:52 +0000 (14:10 +0000)]
Fix a number of benign bugs wherein proto_tree_add_uint was intended (rather than proto_tree_add_item).
Tip o' the hat to Guy ...

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

12 years agoRevert SVN #39345; (There's a better way ...)
wmeier [Tue, 11 Oct 2011 14:02:26 +0000 (14:02 +0000)]
Revert SVN #39345; (There's a better way ...)

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

12 years agoNo libpcap, no capturing, no capture filters, no capture_filter_init().
guy [Tue, 11 Oct 2011 01:25:54 +0000 (01:25 +0000)]
No libpcap, no capturing, no capture filters, no capture_filter_init().

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

12 years agoIgnore (this directory's copy of) MCS-PROTOCOL.asn
morriss [Tue, 11 Oct 2011 00:46:21 +0000 (00:46 +0000)]
Ignore (this directory's copy of) MCS-PROTOCOL.asn

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

12 years agoFix "unused variable" compile error.
wmeier [Mon, 10 Oct 2011 23:45:33 +0000 (23:45 +0000)]
Fix "unused variable" compile error.

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

12 years ago Fix benign bugs in some proto_tree_add_item() 'encoding' args;
wmeier [Mon, 10 Oct 2011 23:36:07 +0000 (23:36 +0000)]
 Fix benign bugs in some proto_tree_add_item() 'encoding' args;

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

12 years agoFix bugs which caused certain fields to display with the wrong endianness;
wmeier [Mon, 10 Oct 2011 23:34:24 +0000 (23:34 +0000)]
Fix bugs which caused certain fields to display with the wrong endianness;
Specifically: some proto_tree_add_item() 'encoding' args were incorrect.

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