obnox/wireshark/wip.git
12 years agoFix encoding arg for a proto_tree_add_bitmask() function call.
wmeier [Mon, 24 Oct 2011 20:18:01 +0000 (20:18 +0000)]
Fix encoding arg for a proto_tree_add_bitmask() function call.

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

12 years agoFix encoding arg for various fcn calls:
wmeier [Mon, 24 Oct 2011 19:57:53 +0000 (19:57 +0000)]
Fix encoding arg for various fcn calls:
 - proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64

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

12 years agoConvert proto_tree_add_bitmask(), proto_tree_add_bitmask_text(), proto_tree_add_bitma...
wmeier [Mon, 24 Oct 2011 19:52:43 +0000 (19:52 +0000)]
Convert proto_tree_add_bitmask(), proto_tree_add_bitmask_text(), proto_tree_add_bitmask_tree() to have 'encoding' arg rather than 'little_endian' arg

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

12 years agoFix bug (introduced in SVN #39504) which caused only 1st file of a list to be processed.
wmeier [Mon, 24 Oct 2011 17:36:20 +0000 (17:36 +0000)]
Fix bug (introduced in SVN #39504) which caused only 1st file of a list to be processed.

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

12 years agoFrom Eliot:
etxrab [Mon, 24 Oct 2011 16:37:07 +0000 (16:37 +0000)]
From Eliot:
Change to python support functions.

Avoid passing C dissector callback via python to create_dissector_handle.
This caused problems at least on 64 bit linux.

Get all dissector args in one call.  Simplifies common usage.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

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

12 years agoFrom Eliot:
etxrab [Mon, 24 Oct 2011 16:33:01 +0000 (16:33 +0000)]
From Eliot:
Search personal plugins dir for python plugins

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

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

12 years agofix Wunused-but-set-variable warnings.
etxrab [Mon, 24 Oct 2011 16:18:08 +0000 (16:18 +0000)]
fix Wunused-but-set-variable warnings.

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

12 years agoFix Giorgio Tino's e-mail address and change Nessjoen's @ to [AT] like everyone else.
cmaynard [Mon, 24 Oct 2011 12:58:48 +0000 (12:58 +0000)]
Fix Giorgio Tino's e-mail address and change Nessjoen's @ to [AT] like everyone else.

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

12 years agoReplace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_...
wmeier [Sun, 23 Oct 2011 23:13:57 +0000 (23:13 +0000)]
Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg.

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

12 years agoReplace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_...
wmeier [Sun, 23 Oct 2011 22:58:45 +0000 (22:58 +0000)]
Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.

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

12 years agoSpeak of a "link-layer header type" rather than a "link-layer type"; a
guy [Sun, 23 Oct 2011 22:49:11 +0000 (22:49 +0000)]
Speak of a "link-layer header type" rather than a "link-layer type"; a
given link-layer type, e.g. 802.11, might have multiple header types
(802.11, 802.11 plus various radio headers, Ethernet), and multiple
link-layer types might have the same header type (802.11 interfaces
might supply Ethernet headers, and Linux loopback interfaces supply
Ethernet headers as well).

Point to tcpdump.org's page of link-layer header types, rather than to
the net/bpf.h header that 1) might not exist on your system and 2) might
not be up-to-date if it does exist.

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

12 years agoAdd a comment about tvb_get_ephemeral_faked_unicode() has been replaced by tvb_get_ep...
wmeier [Sun, 23 Oct 2011 22:02:56 +0000 (22:02 +0000)]
Add a comment about tvb_get_ephemeral_faked_unicode() has been replaced by tvb_get_ephemeral_unicode_string().

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

12 years agoFix a proto_tree_add_item() encoding arg.
wmeier [Sun, 23 Oct 2011 20:50:48 +0000 (20:50 +0000)]
Fix a proto_tree_add_item() encoding arg.

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

12 years agoRemove some unneeded lines of code.
wmeier [Sun, 23 Oct 2011 20:50:12 +0000 (20:50 +0000)]
Remove some unneeded lines of code.

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

12 years agoRemove an unneeded #include.
wmeier [Sun, 23 Oct 2011 20:49:19 +0000 (20:49 +0000)]
Remove an unneeded #include.

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

12 years agoFix a proto_tree_add_item() encoding arg;
wmeier [Sun, 23 Oct 2011 20:48:47 +0000 (20:48 +0000)]
Fix a proto_tree_add_item() encoding arg;
Remove some unneeded #includes.

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

12 years ago Try to get rid of "defined but not used" warnings.
etxrab [Sun, 23 Oct 2011 20:42:29 +0000 (20:42 +0000)]
 Try to get rid of "defined but not used" warnings.

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

12 years agoTry to get rid of "defined but not used" warnings.
etxrab [Sun, 23 Oct 2011 20:24:23 +0000 (20:24 +0000)]
Try to get rid of "defined but not used" warnings.

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

12 years agoSet svn:ignore targets.
stig [Sun, 23 Oct 2011 19:44:44 +0000 (19:44 +0000)]
Set svn:ignore targets.

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

12 years agoRemove csg added by mistake.
etxrab [Sun, 23 Oct 2011 18:52:57 +0000 (18:52 +0000)]
Remove csg added by mistake.

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

12 years agoFix a few proto_tree_add_item() encoding args.
wmeier [Sun, 23 Oct 2011 18:48:50 +0000 (18:48 +0000)]
Fix a few proto_tree_add_item() encoding args.

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

12 years agoGet rid of trailing backslash on last element of a list.
guy [Sun, 23 Oct 2011 18:27:07 +0000 (18:27 +0000)]
Get rid of trailing backslash on last element of a list.

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

12 years agoFrom Pascal Quantin.
etxrab [Sun, 23 Oct 2011 18:06:53 +0000 (18:06 +0000)]
From Pascal Quantin.
The attached patch adds the LPPa (LTE Positioning Protocol A) dissector as
specified in 3GPP 36.455 release 9.4.1.
(Part 2)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

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

12 years agoFrom Pascal Quantin.
etxrab [Sun, 23 Oct 2011 18:05:07 +0000 (18:05 +0000)]
From Pascal Quantin.
The attached patch adds the LPPa (LTE Positioning Protocol A) dissector as
specified in 3GPP 36.455 release 9.4.1.
(Part 2)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

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

12 years agoFrom Pascal Quantin.
etxrab [Sun, 23 Oct 2011 17:58:45 +0000 (17:58 +0000)]
From Pascal Quantin.
The attached patch adds the LPPa (LTE Positioning Protocol A) dissector as
specified in 3GPP 36.455 release 9.4.1.
(Just adding the asn1 dir)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

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

12 years agoFix a few proto_tree_add_item() encoding args.
wmeier [Sun, 23 Oct 2011 17:11:39 +0000 (17:11 +0000)]
Fix a few proto_tree_add_item() encoding args.

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

12 years ago(Trivial) Whitespace cleanup.
wmeier [Sun, 23 Oct 2011 17:10:59 +0000 (17:10 +0000)]
(Trivial) Whitespace cleanup.

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

12 years agoSet default focus to the filter text box.
stig [Sun, 23 Oct 2011 14:06:17 +0000 (14:06 +0000)]
Set default focus to the filter text box.

Don't use a tree view for IP addresses, as it's not possible to
do any actions on them.  Just list them as labels.  Maybe we should
have the scrolled window only if having more than 2 IP addresses?

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

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

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

12 years agoFrom Huzaifa Sidhpurwala of Red Hat Security Response Team:
gerald [Fri, 21 Oct 2011 19:07:42 +0000 (19:07 +0000)]
From Huzaifa Sidhpurwala of Red Hat Security Response Team:

I found a heap-based buffer overflow, when parsing ERF file format.
The overflow seems to be controlled by the values read from the file,
and hence seems exploitable to me.

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

12 years agoFix a few proto_tree_add_item() encoding args manually.
wmeier [Fri, 21 Oct 2011 14:33:43 +0000 (14:33 +0000)]
Fix a few proto_tree_add_item() encoding args manually.
Some whitespace cleanup.

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

12 years agoFix for bug 6449:
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

12 years agoFix two proto_tree_add_item() encoding args not handled by fix-encoding-arg.
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

12 years agoExit with number of lines needing an encoding arg change.
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

12 years agoFor proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
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

12 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5221 :
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

12 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 :
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

12 years agoFrom Huzaifa Sidhpurwala: Fix a null pointer dereference.
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

12 years agoFromThomas Buchanan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6467
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

12 years agoBack out infrastructure change. We missed supporting
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

12 years ago(Try to) fix compilation.
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

12 years agoUse g_strdup.
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

12 years agoUse a global list containing all interfaces and only change
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

12 years agoFix for bug 6469:
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

12 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
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

12 years agoAdd conversion for FT_ETHER hf[] field type;
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

12 years agoUse ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

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

12 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

12 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

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