jake [Fri, 21 Oct 2011 08:32:10 +0000 (08:32 +0000)]
Fix for bug 6449:
Last RTPS2 submessage could have zero as octets_to_next_header.
From me: coding style unused parameters.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39506
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 21 Oct 2011 02:54:58 +0000 (02:54 +0000)]
Fix two proto_tree_add_item() encoding args not handled by fix-encoding-arg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39505
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 21 Oct 2011 02:34:05 +0000 (02:34 +0000)]
Exit with number of lines needing an encoding arg change.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39504
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 21 Oct 2011 02:10:19 +0000 (02:10 +0000)]
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39503
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 21 Oct 2011 01:50:25 +0000 (01:50 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5221 :
Don't assume that the Called party number has digits: it may not, especially
in protocols like INAP.
Rearrange the (pre-existing) no-digits check when dissecting Calling addresses
so we don't pass the empty address to taps.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39502
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 21 Oct 2011 01:03:48 +0000 (01:03 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 :
Solaris doesn't like _XOPEN_SOURCE being defined but with no value, at least
when being compiled in C99-mode. So set it to 600 (XPG6); hopefully this
won't break any other systems.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39501
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 20 Oct 2011 23:46:04 +0000 (23:46 +0000)]
From Huzaifa Sidhpurwala: Fix a null pointer dereference.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39500
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 20 Oct 2011 20:45:34 +0000 (20:45 +0000)]
FromThomas Buchanan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6467
Add Binary JSON (BSON) decoding support to Mongo packet dissector
Implement BSON spec to correctly see BSON document type and not in Bytes format...
The specification for BSON can be found at http://bsonspec.org/
The decoding is not entirely complete, there are still potential enhancements to provide more information about a couple of data types, but it greatly enhances visibility into these packet types.
From me :
* Fix warning from fix-encoding-args.pl script.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39499
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 20 Oct 2011 19:44:40 +0000 (19:44 +0000)]
Back out infrastructure change. We missed supporting
stdin and pipes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39498
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 20 Oct 2011 19:15:38 +0000 (19:15 +0000)]
(Try to) fix compilation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39497
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Thu, 20 Oct 2011 18:57:26 +0000 (18:57 +0000)]
Use g_strdup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39496
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 20 Oct 2011 18:17:54 +0000 (18:17 +0000)]
Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.
This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.
This patch was provided by Irene Ruengeler.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39495
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Thu, 20 Oct 2011 17:49:19 +0000 (17:49 +0000)]
Fix for bug 6469:
Retrieve the fill bits in the correct amount and from the correct place.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39494
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Thu, 20 Oct 2011 16:09:58 +0000 (16:09 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39493
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 20 Oct 2011 14:43:11 +0000 (14:43 +0000)]
Add conversion for FT_ETHER hf[] field type;
Add capability to convert encoding arg for 'proto' hf_index_names [the
variable which stores the return value from proto_register_protocol()].
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39492
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 20 Oct 2011 14:36:14 +0000 (14:36 +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@39491
f5534014-38df-0310-8fa8-
9805f1628bb7
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
object").
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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