Commit Graph

37617 Commits

Author SHA1 Message Date
Bill Meier 05b50ef697 Fix a typo.
svn path=/trunk/; revision=39489
2011-10-20 14:11:32 +00:00
Bill Meier d65261d344 Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
(Some minor whitespace cleanup).

svn path=/trunk/; revision=39488
2011-10-20 14:07:54 +00:00
Jaap Keuter f27e3fa74b Update minimum version requirement for GTK to 2.12.
svn path=/trunk/; revision=39487
2011-10-20 06:51:53 +00:00
Guy Harris a03cc7137b 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.

svn path=/trunk/; revision=39485
2011-10-20 02:38:40 +00:00
Jeff Morriss ab7ec88be5 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.

svn path=/trunk/; revision=39484
2011-10-20 02:29:13 +00:00
Jeff Morriss db8bf387c8 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.

svn path=/trunk/; revision=39483
2011-10-20 01:55:04 +00:00
Bill Meier 33f6f89401 Specify ENC_TIME_TIMESPEC for a proto_tree_add_item() encoding arg for a field with type FT_ABSOLUTE_TIME.
svn path=/trunk/; revision=39482
2011-10-19 23:24:52 +00:00
Alexis La Goutte 3f5cf478f4 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39481
2011-10-19 21:55:08 +00:00
Alexis La Goutte 8d21b886f7 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.

svn path=/trunk/; revision=39480
2011-10-19 21:52:31 +00:00
Alexis La Goutte fc68bea2b9 Copy/Paste is a devil...
svn path=/trunk/; revision=39479
2011-10-19 21:29:02 +00:00
Alexis La Goutte 0f50a6fb7e 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

svn path=/trunk/; revision=39478
2011-10-19 21:22:42 +00:00
Alexis La Goutte f03f4de4c5 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


svn path=/trunk/; revision=39477
2011-10-19 21:19:08 +00:00
Bill Meier d2170c5b99 Use ENC_... instead of locally defined NSIP_LITTLE_ENDIAN for proto_tree_add_item() encoding arg.
svn path=/trunk/; revision=39476
2011-10-19 20:58:36 +00:00
Bill Meier d7aabb730a Fix several benign instances wherein proto_tree_add_[uint|boolean]() was intended rather than proto_tree_add_item().
svn path=/trunk/; revision=39475
2011-10-19 20:32:21 +00:00
Bill Meier d9d97688a3 Manually fix a proto_tree_add_item() encoding arg.
svn path=/trunk/; revision=39474
2011-10-19 20:29:36 +00:00
Bill Meier ff9b00ff56 use consistent indentation.
svn path=/trunk/; revision=39473
2011-10-19 20:28:08 +00:00
Anders Broman 24a011d8db Let subdissectors have a stab at the packet even if it's cut short.
svn path=/trunk/; revision=39472
2011-10-19 17:59:47 +00:00
Bill Meier 71ecdce1b9 Perl program to fix proto_tree_add_item() encoding args as appropriate (and as possible).
svn path=/trunk/; revision=39471
2011-10-19 17:17:35 +00:00
Stephen Fisher 082938900c 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.


svn path=/trunk/; revision=39470
2011-10-19 16:15:53 +00:00
Stephen Fisher 20ae7e93d5 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.


svn path=/trunk/; revision=39469
2011-10-19 16:08:13 +00:00
Stig Bjørlykke 4b930ccb33 Duplicate Lua strings we put into the private_table.
svn path=/trunk/; revision=39468
2011-10-19 15:32:49 +00:00
Bill Meier f1b784b474 More conversions of proto_tree_add_item() 'encoding' arg
svn path=/trunk/; revision=39467
2011-10-19 15:04:44 +00:00
Michael Tüxen 708520c263 Fix a bug when drawing TSN plots which results in a crash.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=39466
2011-10-19 09:53:39 +00:00
Alexis La Goutte c4471ccf69 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.

svn path=/trunk/; revision=39465
2011-10-19 06:44:44 +00:00
Jeff Morriss a413376abc 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.

svn path=/trunk/; revision=39464
2011-10-19 00:37:52 +00:00
Alexis La Goutte 9d46a65bfd 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)

svn path=/trunk/; revision=39463
2011-10-18 23:21:15 +00:00
Jeff Morriss 3d7ad335e8 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).

svn path=/trunk/; revision=39462
2011-10-18 18:05:11 +00:00
Stig Bjørlykke 82e0b65038 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.

svn path=/trunk/; revision=39461
2011-10-18 17:46:00 +00:00
Jeff Morriss cc4fe5789b 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.

svn path=/trunk/; revision=39460
2011-10-18 16:13:12 +00:00
Stig Bjørlykke cc182a8bad Added support for User-Agent.
Fixed finding line end for content type parameters.

svn path=/trunk/; revision=39459
2011-10-18 16:06:17 +00:00
Stig Bjørlykke 424463e083 Use PINFO_GET_BOOLEAN for visited.
svn path=/trunk/; revision=39458
2011-10-18 10:17:19 +00:00
Guy Harris 6358754048 Note some character encodings that can probably be used Real Soon Now,
and the dissectors that deal with them.

svn path=/trunk/; revision=39456
2011-10-18 06:50:20 +00:00
Jeff Morriss 56981d384d 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)

svn path=/trunk/; revision=39455
2011-10-18 01:51:01 +00:00
Jeff Morriss bd128abe64 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
object").

Also fixes a small bug.

From me: remove a couple of unnecessary includes.

svn path=/trunk/; revision=39454
2011-10-18 01:27:01 +00:00
Jeff Morriss 431332092d From Daniel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6461 :
Register the USB dissector by name.

svn path=/trunk/; revision=39453
2011-10-18 01:05:57 +00:00
Chris Maynard 49fed7ed0d Display filter name cleanup.
svn path=/trunk/; revision=39452
2011-10-18 00:49:16 +00:00
Bill Meier a6e35df202 Do some more conversions of proto_tree_add_item() 'encoding' arg
(previously missed).

svn path=/trunk/; revision=39451
2011-10-18 00:39:20 +00:00
Bill Meier cca6984ab9 Do some more conversions of proto_tree_add_item() 'encoding' arg
(previously missed).

svn path=/trunk/; revision=39450
2011-10-18 00:17:48 +00:00
Chris Maynard 3a64aed966 Fixup some display filter names.
svn path=/trunk/; revision=39449
2011-10-17 23:59:32 +00:00
Chris Maynard c553e708a2 Cleanup AFP Version display filter name.
svn path=/trunk/; revision=39448
2011-10-17 23:58:25 +00:00
Bill Meier 43efae210b Remove #if 0'd code which appears to duplicate existing code
svn path=/trunk/; revision=39447
2011-10-17 22:23:11 +00:00
Alexis La Goutte 097e9bb397 Enhance BGP Capability message
* Make field filterable 
* Use expert info to display a wrong length
* Remove duplicate code for type and length

svn path=/trunk/; revision=39446
2011-10-17 18:19:18 +00:00
Chris Maynard e86ebd872d 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


svn path=/trunk/; revision=39445
2011-10-17 14:56:37 +00:00
Jeff Morriss b9dbaf28c0 Add dissectors/packet-lcsap.c to CMake. Remove dissect_lcsap_Correlation_ID_PDU() from list of exports since it's only used within libwireshark.
svn path=/trunk/; revision=39444
2011-10-17 14:53:13 +00:00
Guy Harris 03fd5fd589 dissect_lcsap_Correlation_ID_PDU() is used in one module and exported in
another; see if this fixes the Ubuntu build.

svn path=/trunk/; revision=39443
2011-10-17 06:09:04 +00:00
Bill Meier 293049dfba 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


svn path=/trunk/; revision=39442
2011-10-16 23:38:49 +00:00
Guy Harris 0bef3129f3 Have to include packet-lcsap.h, so it gets put into the source tarball.
svn path=/trunk/; revision=39441
2011-10-16 18:34:45 +00:00
Anders Broman 6231e52968 From Jouni Malinen:
Reassemble GAS Query Response if needed.

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

svn path=/trunk/; revision=39440
2011-10-16 17:29:12 +00:00
Anders Broman 22d5e8a8d1 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

svn path=/trunk/; revision=39439
2011-10-16 17:24:50 +00:00
Anders Broman 44eb67d3c7 From Donnie Savage:
EIGRP dissector cleanup.

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

svn path=/trunk/; revision=39438
2011-10-16 17:21:19 +00:00