8 years agoUse ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
wmeier [Thu, 20 Oct 2011 14:30:27 +0000 (14:30 +0000)]
Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.

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

8 years agoFix a typo.
wmeier [Thu, 20 Oct 2011 14:11:32 +0000 (14:11 +0000)]
Fix a typo.

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

8 years agoUse ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
wmeier [Thu, 20 Oct 2011 14:07:54 +0000 (14:07 +0000)]
Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
(Some minor whitespace cleanup).

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

8 years agoUpdate minimum version requirement for GTK to 2.12.
jake [Thu, 20 Oct 2011 06:51:53 +0000 (06:51 +0000)]
Update minimum version requirement for GTK to 2.12.

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

8 years agoAs bug 3954 notes, nowhere does RFC 3954 indicate that a system or
guy [Thu, 20 Oct 2011 02:38:40 +0000 (02:38 +0000)]
As bug 3954 notes, nowhere does RFC 3954 indicate that a system or
interface scope is always 4 bytes.  For that matter, nowhere does it
indicate that the scopes have any particular interpretation except as a
sequence of octets.

Get rid of the checks for a length of 4, and make ScopeSystem an
FT_BYTES.  If, by *convention*, they're usually IPv4 or IPv6 addresses,
somebody can throw in code to display them as such if they happen to be
4 or 16 bytes, respectively.  Leave ScopeInterface as an integer for
now, in case, by convention, they're interface indices, but still leave
the length check out.

Fixes bug 3954.

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

8 years agoDelay freeing of seasonal memory until after the conversation cleanup routine
morriss [Thu, 20 Oct 2011 02:29:13 +0000 (02:29 +0000)]
Delay freeing of seasonal memory until after the conversation cleanup routine
has been called.

In the conversation cleanup routine, free the GSlist for any proto_data which
may have been hanging off the (se_allocated) conversation.

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

8 years agoFrom András Veres-Szentkirályi via https://bugs.wireshark.org/bugzilla/show_bug.cgi...
morriss [Thu, 20 Oct 2011 01:55:04 +0000 (01:55 +0000)]
From András Veres-Szentkirályi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6426 :

The current MySQL dissector ignored the execute parameters as metadata is
needed from previous packets to decode the fields. I added the necessary code
to store these in conn_data and developed dissector for all fields I could
reproduce on the network.

This also fixes a memory leak by moving the stmts structure (the pointer to
which is stored in se_allocated memory) into se_trees.

From me: use se_tree_create_non_persistent() so the entire tree is forgotten when
the se_ memory goes away.  Also some reformatting.

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

8 years agoSpecify ENC_TIME_TIMESPEC for a proto_tree_add_item() encoding arg for a field with...
wmeier [Wed, 19 Oct 2011 23:24:52 +0000 (23:24 +0000)]
Specify ENC_TIME_TIMESPEC for a proto_tree_add_item() encoding arg for a field with type FT_ABSOLUTE_TIME.

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

8 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 19 Oct 2011 21:55:08 +0000 (21:55 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6463
alagoutte [Wed, 19 Oct 2011 21:52:31 +0000 (21:52 +0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6463
dissector for HDCP (High bandwidth Digital Content Protection)

HDCP can run on top of TCP, there's no fixed port number assigned. I created a heuristic dissector that's disabled by default and can be enabled by setting a preference (similar to the hilscher dissector). The idea behind this is that some HDCP messages are hard to recognize (e.g. one byte message id + 8 random bytes). Having the dissector enabled at all times may generate false positives.

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

8 years agoCopy/Paste is a devil...
alagoutte [Wed, 19 Oct 2011 21:29:02 +0000 (21:29 +0000)]
Copy/Paste is a devil...

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

8 years agoFrom pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6465
alagoutte [Wed, 19 Oct 2011 21:22:42 +0000 (21:22 +0000)]
From pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6465
New Protocol Submission for MVRP (Multiple VLAN Registration Protocol)

Missed modification of etypes.h file

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

8 years agoFrom pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6465
alagoutte [Wed, 19 Oct 2011 21:19:08 +0000 (21:19 +0000)]
From pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6465
New Protocol Submission for MVRP (Multiple VLAN Registration Protocol)

New dissector submission for Multiple VLAN Registration Protocol (MVRP) defined in 802.1ak Standard, section 11. MVRP is used to to dynamically create and update Dynamic VLAN Registration Entries.

From me :
* Fix error from fix-encodings-args script
* Add Modeline information
* Added packet-mrp-mvrp.c to CMakeLists.txt

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

8 years agoUse ENC_... instead of locally defined NSIP_LITTLE_ENDIAN for proto_tree_add_item...
wmeier [Wed, 19 Oct 2011 20:58:36 +0000 (20:58 +0000)]
Use ENC_... instead of locally defined NSIP_LITTLE_ENDIAN for proto_tree_add_item() encoding arg.

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

8 years agoFix several benign instances wherein proto_tree_add_[uint|boolean]() was intended...
wmeier [Wed, 19 Oct 2011 20:32:21 +0000 (20:32 +0000)]
Fix several benign instances wherein proto_tree_add_[uint|boolean]() was intended rather than proto_tree_add_item().

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

8 years agoManually fix a proto_tree_add_item() encoding arg.
wmeier [Wed, 19 Oct 2011 20:29:36 +0000 (20:29 +0000)]
Manually fix a proto_tree_add_item() encoding arg.

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

8 years agouse consistent indentation.
wmeier [Wed, 19 Oct 2011 20:28:08 +0000 (20:28 +0000)]
use consistent indentation.

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

8 years agoLet subdissectors have a stab at the packet even if it's cut short.
etxrab [Wed, 19 Oct 2011 17:59:47 +0000 (17:59 +0000)]
Let subdissectors have a stab at the packet even if it's cut short.

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

8 years agoPerl program to fix proto_tree_add_item() encoding args as appropriate (and as possible).
wmeier [Wed, 19 Oct 2011 17:17:35 +0000 (17:17 +0000)]
Perl program to fix proto_tree_add_item() encoding args as appropriate (and as possible).

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

8 years agoFix Coverity ID #1288: UNUSED_VALUE in spotlight_dissect_query_loop:
sfisher [Wed, 19 Oct 2011 16:15:53 +0000 (16:15 +0000)]
Fix Coverity ID #1288: UNUSED_VALUE in spotlight_dissect_query_loop:
"returned_pointer: Pointer ... is never used" due to break and end
of function after the switch block.

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

8 years agoFix Coverity ID 1300: UNUSED_VALUE in dissect_spotlight: "returned_pointer
sfisher [Wed, 19 Oct 2011 16:08:13 +0000 (16:08 +0000)]
Fix Coverity ID 1300: UNUSED_VALUE in dissect_spotlight: "returned_pointer
is never used" because of the return -1 at the end of this if block.
Removed item_toc = assignment and fixed indentation.

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

8 years agoDuplicate Lua strings we put into the private_table.
stig [Wed, 19 Oct 2011 15:32:49 +0000 (15:32 +0000)]
Duplicate Lua strings we put into the private_table.

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

8 years agoMore conversions of proto_tree_add_item() 'encoding' arg
wmeier [Wed, 19 Oct 2011 15:04:44 +0000 (15:04 +0000)]
More conversions of proto_tree_add_item() 'encoding' arg

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

8 years agoFix a bug when drawing TSN plots which results in a crash.
tuexen [Wed, 19 Oct 2011 09:53:39 +0000 (09:53 +0000)]
Fix a bug when drawing TSN plots which results in a crash.
Obtained from Irene Ruengeler.

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

8 years agoFrom pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6464
alagoutte [Wed, 19 Oct 2011 06:44:44 +0000 (06:44 +0000)]
From pascl via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6464
MRP-MSRP: Missing error descriptions (error code 17, 18 and 19)

Multiple Stream Reservation Protocol (MSRP) defines 19 failures codes in 802.1Qat (table 35-6). Actual packet-mrp-msrp.c only defines the first 16 failures codes.

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

8 years agoFrom Pascal Quantin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6468 :
morriss [Wed, 19 Oct 2011 00:37:52 +0000 (00:37 +0000)]
From Pascal Quantin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6468 :

The attached patch fixes a memory corruption of the ep_allocated buffer when
building the decoded bitmap.

From me: some reformatting.

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

8 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 18 Oct 2011 23:21:15 +0000 (23:21 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
packet-btamp.c:xxx:y: warning: Value stored to 'offset' is never read (x14)

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

8 years agoThere's only one expert info dialog now; dispense with the "composite" part
morriss [Tue, 18 Oct 2011 18:05:11 +0000 (18:05 +0000)]
There's only one expert info dialog now; dispense with the "composite" part
of the name (at least what we show users; the files and functions still
reference composite).

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

8 years agoAdded a private hash table to transport string values between dissectors.
stig [Tue, 18 Oct 2011 17:46:00 +0000 (17:46 +0000)]
Added a private hash table to transport string values between dissectors.
This works between C and Lua.

In C the pinfo.private_table pointer must be initialized using
g_hash_table_new (g_str_hash, g_str_equal);

In Lua the values are available using pinfo.private.<key>, and the
table is created automatically on first usage.  It's possible to use
this datatypes: nil, boolean, number and string, but every value
is converted to string so numbers must be converted using tonumber()
on usage.  Boolean is either nil or an empty string.

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

8 years agoAdd an expert info if we found the checksum to be bad.
morriss [Tue, 18 Oct 2011 16:13:12 +0000 (16:13 +0000)]
Add an expert info if we found the checksum to be bad.
Add the checksum info to the tree even when !tree so that the expert_info
summary... "icon"... in the lower-left corner is correct.

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

8 years agoAdded support for User-Agent.
stig [Tue, 18 Oct 2011 16:06:17 +0000 (16:06 +0000)]
Added support for User-Agent.
Fixed finding line end for content type parameters.

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

8 years agoUse PINFO_GET_BOOLEAN for visited.
stig [Tue, 18 Oct 2011 10:17:19 +0000 (10:17 +0000)]
Use PINFO_GET_BOOLEAN for visited.

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

8 years agoSet svn:ignore targets.
stig [Tue, 18 Oct 2011 09:13:33 +0000 (09:13 +0000)]
Set svn:ignore targets.

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

8 years agoNote some character encodings that can probably be used Real Soon Now,
guy [Tue, 18 Oct 2011 06:50:20 +0000 (06:50 +0000)]
Note some character encodings that can probably be used Real Soon Now,
and the dissectors that deal with them.

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

8 years agoFrom Dirk Jagdmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6450 :
morriss [Tue, 18 Oct 2011 01:51:01 +0000 (01:51 +0000)]
From Dirk Jagdmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6450 :

Several updates to the DCE/RPC dissector:

- changed the variable name "ndr64_uuid" to "uuid_ndr64" to make it similar the
the other UUID variable names. Minor changes to the UUID names.

- changes the UUID name for the 32bit NDR to describe that. In the DCE/RPC
standard this UUID is described as "Version 1.1 network data representation
protocol", but this is an unnecessarily long name and it's the only 32bit
version defined for DCE/RPC anyway. The new name "32bit NDR" is similar to the
changed name for the 64bit NDR.

- added an UUID for "bind time feature negotiation" found with Microsoft PDUs.

- added an UUID for "asynchonous MAPI". Of course this UUID/name should be
added to the MAPI dissector, but the MAPI dissector is generated C code from
Samba/OpenChange pidl sources. Eventually those might get updated. An
alternative would be to create a new file to specifically register UUIDs used
in the DCE/RPC context.

- when the g_hash_table_insert() function is used, I've removed the code to
lookup and remove the key, as g_hash_table_insert() is doing that internally
(or more precise, it is overwriting the old value).

- in the dissector function for Bind and BindAck, I now print all context items
into COL_INFO and not just the first one.

- added a new value for Bind results, used by Microsoft products. (The
"Negotiate ACK" is used with the "bind time feature negotiation" UUID)

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

8 years agoFrom Roberto Morro via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6451 :
morriss [Tue, 18 Oct 2011 01:27:01 +0000 (01:27 +0000)]
From Roberto Morro via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6451 :

The patch fixes a bug in the PCEP Objective Function (OF) object tree
visualization (it didn't recognize the object and showed it as "Unknown

Also fixes a small bug.

From me: remove a couple of unnecessary includes.

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

8 years agoFrom Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6461 :
morriss [Tue, 18 Oct 2011 01:05:57 +0000 (01:05 +0000)]
From Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6461 :

Register the USB dissector by name.

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

8 years agoDisplay filter name cleanup.
cmaynard [Tue, 18 Oct 2011 00:49:16 +0000 (00:49 +0000)]
Display filter name cleanup.

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.


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

8 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

8 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

8 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).


    10   FT_BYTES:         ENC_BIG_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:        TRUE-->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


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

8 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

8 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.


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

8 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
are building without python.


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

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


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

8 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.


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

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


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

8 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

8 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

8 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

8 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

8 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

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

8 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

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

8 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

8 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

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

8 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

8 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
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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 years agoFrom Rob Kruciak:
etxrab [Fri, 14 Oct 2011 05:42:37 +0000 (05:42 +0000)]
From Rob Kruciak:
Add a port preference setting.

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

8 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


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

8 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

8 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

8 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

8 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

8 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

8 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

8 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)

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

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

8 years agoFrom Horaci Macias:
etxrab [Thu, 13 Oct 2011 05:15:50 +0000 (05:15 +0000)]
From Horaci Macias:
Parse User-to-User header


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

8 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

8 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

8 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

8 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

8 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

8 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;

From me:
  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.

  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

8 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

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

8 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.


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

8 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

8 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

8 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

8 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

8 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

8 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

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