obnox/wireshark/wip.git
13 years agoFix bug #5509: CommView file format now uses reserved bytes and adds a
sfisher [Mon, 20 Dec 2010 23:34:14 +0000 (23:34 +0000)]
Fix bug #5509: CommView file format now uses reserved bytes and adds a
new use for the direction field per:

  http://www.tamos.com/htmlhelp/commview/logformat.htm

Add basic support for new fields and don't reject files that fit the new
format.

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

13 years agoSaying that patches will be reviewed in "a few days" may be a bit optimistic. Also...
morriss [Mon, 20 Dec 2010 20:54:33 +0000 (20:54 +0000)]
Saying that patches will be reviewed in "a few days" may be a bit optimistic.  Also point out that it's not necessary for patch submitters to mark the bug as ASSIGNED nor assign it to themselves.

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

13 years agoFix warnings with format.
cmaynard [Mon, 20 Dec 2010 18:16:12 +0000 (18:16 +0000)]
Fix warnings with format.

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

13 years agoSome PIM enhancements, mostly to allow more fields to be filterable.
cmaynard [Mon, 20 Dec 2010 17:48:26 +0000 (17:48 +0000)]
Some PIM enhancements, mostly to allow more fields to be filterable.

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

13 years agodissector_add() --> dissector_add_uint();
wmeier [Mon, 20 Dec 2010 17:48:20 +0000 (17:48 +0000)]
dissector_add() --> dissector_add_uint();
Rempve trailing blanks from lines.

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

13 years agoDeprecate dissector_add(), dissector_change(), dissector_delete(),
morriss [Mon, 20 Dec 2010 16:39:09 +0000 (16:39 +0000)]
Deprecate dissector_add(), dissector_change(), dissector_delete(),
dissector_get_port_handle(), dissector_reset(), dissector_try_port(),
dissector_try_port_new(), and next_tvb_add_port().

Re-tabify the file.

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

13 years agoFrom Papan Kumar Singh (bug 5504 & 5505):
martinm [Mon, 20 Dec 2010 11:26:50 +0000 (11:26 +0000)]
From Papan Kumar Singh (bug 5504 & 5505):
Add missing break so that PDCP-LTE direction is set properly.

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

13 years agoFrom Rob Casey:
jake [Mon, 20 Dec 2010 07:57:52 +0000 (07:57 +0000)]
From Rob Casey:
Patch to add support for DNP3 protocol Binary Output Change object type.

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

13 years agoFrom Mathieu Parent:
jake [Mon, 20 Dec 2010 07:49:56 +0000 (07:49 +0000)]
From Mathieu Parent:
* Support for XMLAlarmMessage (0x015A)
* every xml data is parsed using the XML dissector

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

13 years agoAnother #define for old code.
guy [Mon, 20 Dec 2010 05:58:42 +0000 (05:58 +0000)]
Another #define for old code.

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

13 years agoRename the routines that handle dissector tables with unsigned integer
guy [Mon, 20 Dec 2010 05:35:29 +0000 (05:35 +0000)]
Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

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

13 years agoPrepare for handling DLT_IPV4 and DLT_IPV6.
jake [Sun, 19 Dec 2010 18:46:08 +0000 (18:46 +0000)]
Prepare for handling DLT_IPV4 and DLT_IPV6.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2010-12-19]
gerald [Sun, 19 Dec 2010 16:03:24 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-12-19]

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

13 years agoRevert SVN #35213 based upon comments in the Wireshark-dev list.
wmeier [Sat, 18 Dec 2010 18:07:36 +0000 (18:07 +0000)]
Revert SVN #35213 based upon comments in the Wireshark-dev list.
 http://www.wireshark.org/lists/wireshark-dev/201012/msg00206.html

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

13 years agoRevert SVN #35214 based upon comments in the Wireshark-dev list.
wmeier [Sat, 18 Dec 2010 17:55:06 +0000 (17:55 +0000)]
Revert SVN #35214 based upon comments in the Wireshark-dev list.
http://www.wireshark.org/lists/wireshark-dev/201012/msg00206.html

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

13 years agoFrom Daniel Black:
jake [Sat, 18 Dec 2010 14:29:21 +0000 (14:29 +0000)]
From Daniel Black:
Adds support for GOST algorithm as per RFC5933. This is used as an option
DNSSEC algorithm.

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

13 years agoAdd support for the TLSv1.2 format of the CertificateRequest handshake message.
sake [Sat, 18 Dec 2010 01:16:11 +0000 (01:16 +0000)]
Add support for the TLSv1.2 format of the CertificateRequest handshake message.

(see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5485 )

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

13 years agoConvert indentation tabs within <programlisting> elements to 4 spaces.
wmeier [Fri, 17 Dec 2010 21:31:55 +0000 (21:31 +0000)]
Convert indentation tabs within <programlisting> elements to 4 spaces.

As the book says:
 "Often a program listing will include tab characters to indent lines of code.
  When such a listing is imported to DocBook XML and formatted, the tab
  characters are not expanded as they are in the program editor.
  That's because in XSL-FO and HTML, tab stops and tab expansion are not
  described in either HTML or XSL-FO standards.
  By default, an XSL-FO processor treats a tab character as a single space,
  which leads to unsatisfactory results."

http://www.sagehill.net/docbookxsl/TabExpansion.html

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

13 years agoThe Styleguide section has been moved to the Wireshark Developer's Guide.
wmeier [Fri, 17 Dec 2010 20:55:45 +0000 (20:55 +0000)]
The Styleguide section has been moved to the Wireshark Developer's Guide.

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

13 years agoIntegrate README.developer into the WSDG: Step 1: Styleguide;
wmeier [Fri, 17 Dec 2010 20:30:26 +0000 (20:30 +0000)]
Integrate README.developer into the WSDG: Step 1: Styleguide;
Also: add list of README.developer contributors to the WSDG preface.

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

13 years agoRefactor EDCH-T2 function to also support the very similar EDCH-Common format.
martinm [Fri, 17 Dec 2010 17:40:42 +0000 (17:40 +0000)]
Refactor EDCH-T2 function to also support the very similar EDCH-Common format.
N.B. EDCH-Common support itself not yet tested.

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

13 years agoUse printf modifier %u for guint32 values.
stig [Fri, 17 Dec 2010 13:03:34 +0000 (13:03 +0000)]
Use printf modifier %u for guint32 values.

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

13 years agoSwitched to bitwise & instead of logical && in bit operations.
stig [Fri, 17 Dec 2010 13:01:52 +0000 (13:01 +0000)]
Switched to bitwise & instead of logical && in bit operations.

This bug was found by clang.

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

13 years agoSwitched to bitwise | instead of logical || in bit operations.
stig [Fri, 17 Dec 2010 13:01:12 +0000 (13:01 +0000)]
Switched to bitwise | instead of logical || in bit operations.

This bug was found by clang.

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

13 years agoFrom Jouni Malinen:
etxrab [Thu, 16 Dec 2010 21:49:55 +0000 (21:49 +0000)]
From Jouni Malinen:
Add support for dissecting TDLS (IEEE 802.11z) frames.
These are mostly used as Action frames that are encapsulated in Data frames (to go through any AP).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5493

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

13 years agoOnly call GetSystemMetrics(SM_REMOTESESSION) if running on MS Windows.
sfisher [Thu, 16 Dec 2010 20:38:06 +0000 (20:38 +0000)]
Only call GetSystemMetrics(SM_REMOTESESSION) if running on MS Windows.

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

13 years agoSimplify our Remote Desktop session detection.
gerald [Thu, 16 Dec 2010 19:52:59 +0000 (19:52 +0000)]
Simplify our Remote Desktop session detection.

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

13 years agoAdd comment that this file is apparently not referenced when building docs;
wmeier [Thu, 16 Dec 2010 18:42:03 +0000 (18:42 +0000)]
Add comment that this file is apparently not referenced when building docs;
 "AFAIK this file is *not* referenced on either Windows or *nix during the
  process of generating Wireshark documentation.
  (The catalogs referenced seem to be those in the "usual places": /etc/xml/...)"

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

13 years agoFrom Jouni Malinen:
etxrab [Thu, 16 Dec 2010 18:06:32 +0000 (18:06 +0000)]
From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)
The patch hunks that were missed in r33436.

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

13 years agoUpdate filter for Windows-only symbols.
rbalint [Thu, 16 Dec 2010 17:22:17 +0000 (17:22 +0000)]
Update filter for Windows-only symbols.

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

13 years agoExport only defined symbols from libwsutil.
rbalint [Thu, 16 Dec 2010 16:42:34 +0000 (16:42 +0000)]
Export only defined symbols from libwsutil.
Exported symbols are the symbols listed in libwsutil.def, but the
symbols defined in not used optional objects are filtered out.

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

13 years agoThere is no exceptions.h file here, remove it from DISSECTOR_INCLUDES.
morriss [Thu, 16 Dec 2010 14:39:33 +0000 (14:39 +0000)]
There is no exceptions.h file here, remove it from DISSECTOR_INCLUDES.

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

13 years agoFrom Pascal Quantin:
etxrab [Thu, 16 Dec 2010 12:33:36 +0000 (12:33 +0000)]
From Pascal Quantin:
When I coded the decoding of the feature group indicator, I decided to do not display the feature group content when it is not supported. After further thinking I find it more useful to always display the features of a given indicator whether it is supported or not.

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

13 years agoFrom Vincent Helfre:
etxrab [Thu, 16 Dec 2010 12:26:49 +0000 (12:26 +0000)]
From Vincent Helfre:
fixed the conversions for utran and eutran threshold which are used for Enhanced Measurement Report.

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

13 years agoFix a comment.
etxrab [Thu, 16 Dec 2010 12:26:01 +0000 (12:26 +0000)]
Fix a comment.

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

13 years agoDissect AVP Code: 606 User-Data if it's xml.
etxrab [Thu, 16 Dec 2010 10:04:00 +0000 (10:04 +0000)]
Dissect  AVP Code: 606 User-Data if it's xml.

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

13 years agoFrom Harald Welte:
jake [Thu, 16 Dec 2010 08:03:57 +0000 (08:03 +0000)]
From Harald Welte:
It seems that Hay Systems Limited (HSL) is using stream 0xDD to transport
human-readable debug messages from the BTS to the BSC.

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

13 years agoFrom Harald Welte:
jake [Thu, 16 Dec 2010 07:55:35 +0000 (07:55 +0000)]
From Harald Welte:
As it seems, there are systems that use an IPA multiplex layer but don't use
it on the standard ports that ip.access is using them for the A-bis interface.

This patch adds a user-configurable preference for the TCP and UDP ports the
IPA dissector should work on.

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

13 years agoFix for bug 5475:
jake [Thu, 16 Dec 2010 07:25:01 +0000 (07:25 +0000)]
Fix for bug 5475:
Track dissection properly of Packet Flow Identifier IE to
avoid Extraneous Data reporting.

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

13 years agoFrom Guido Reismueller:
jake [Thu, 16 Dec 2010 07:01:22 +0000 (07:01 +0000)]
From Guido Reismueller:
packet-mdd.c
- TLV 15 fixed

packet-tlv.c
- Added Support for DOCSIS 3.0 TLVs (38-66)

Added Support for the following DOCSIS 3.0 MAC Management Messages
- DBC-REQ (packet-dbcreq.c)
- DBC-RSP (packet-dbcrsp.c)
- DBC-ACK (packet-dbcack.c)
- CM-CTRL-REQ (packet-cmctrlreq.c)
- CM-CTRL-RSP (packet-cmctrlrsp.c)
- DPV-REQ (packet-dpvreq.c)
- DPV-RSP (packet-dpvrsp.c)

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

13 years agoFrom k barnard:
jake [Wed, 15 Dec 2010 18:38:17 +0000 (18:38 +0000)]
From k barnard:
Flag when a packet has been dropped by the jitter buffer in the audio player,
by showing:
 D dropped packet
 W wrong timestamp
 S silence added by wireshark

To show when audio 'glitches' may have come from the processing the received
packets through the jitter buffer.

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

13 years agoUse value_string for MAC-is descriptor lchid.
martinm [Wed, 15 Dec 2010 12:07:41 +0000 (12:07 +0000)]
Use value_string for MAC-is descriptor lchid.

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

13 years agoFrom Tobias Witek:
martinm [Wed, 15 Dec 2010 10:59:10 +0000 (10:59 +0000)]
From Tobias Witek:
Bug 5494 -  FP-Hint: Display correct DCH-ID value

In FP-Hint, DCH-IDs are stored as a 5-bit value. While a 5-bit value can
hold values from 0..31, DCH-IDs in the NBAP, RNSAP and RRC protocols
have values from 1..32.

This patch adds 1 to the DCH-ID in FP-Hint in order to display the
correct DCH-ID value in the protcol tree.

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

13 years agoPrettify the dissection of EDCH T2 data.
martinm [Wed, 15 Dec 2010 10:53:35 +0000 (10:53 +0000)]
Prettify the dissection of EDCH T2 data.

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

13 years agoAdd support for FP E-DCH T2 frames.
martinm [Wed, 15 Dec 2010 01:45:43 +0000 (01:45 +0000)]
Add support for FP E-DCH T2 frames.

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

13 years agoIntroduce a preference to display the third and forth bytes of the RIPv2
sfisher [Tue, 14 Dec 2010 18:27:04 +0000 (18:27 +0000)]
Introduce a preference to display the third and forth bytes of the RIPv2
header as the "Routing Domain" field as introduced in RFC 1388 [January 1993]
and obsoleted as of RFC 1723 [November 1994].  Defaults to FALSE.

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

13 years agoRename "Secure Socket Layer" to "Secure Sockets Layer" (plural) and update
sfisher [Tue, 14 Dec 2010 17:02:00 +0000 (17:02 +0000)]
Rename "Secure Socket Layer" to "Secure Sockets Layer" (plural) and update
protocol reference URLs.

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

13 years agoUpdate the "Following Conversations" section to use se_alloc() instead of GMemChunks.
wmeier [Tue, 14 Dec 2010 14:23:27 +0000 (14:23 +0000)]
Update the "Following Conversations" section to use se_alloc() instead of GMemChunks.
Also: add information about the conversation_set_dissector() function.

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

13 years agoRiverbed published patch for dissection of Riverbed TCP Probe/Transparency TCP options.
jake [Tue, 14 Dec 2010 07:43:17 +0000 (07:43 +0000)]
Riverbed published patch for dissection of Riverbed TCP Probe/Transparency TCP options.

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

13 years agoMinor cleanup:
wmeier [Tue, 14 Dec 2010 01:50:31 +0000 (01:50 +0000)]
Minor cleanup:
- Initialize a few static global variables;
- Remove two unnecessary calls to g_hash_table_foreach_remove;
- Do whitespace cleanup and use consistent indentation;
- Fix a few typos and fix up several comments.

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

13 years agoFrom Marton Nemeth via bug #5490: Cleanup USB endpoint direction display.
cmaynard [Mon, 13 Dec 2010 15:59:14 +0000 (15:59 +0000)]
From Marton Nemeth via bug #5490: Cleanup USB endpoint direction display.

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

13 years agoShow DDI config info.
martinm [Mon, 13 Dec 2010 11:00:05 +0000 (11:00 +0000)]
Show DDI config info.

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

13 years ago[Automatic manuf, services and enterprise-numbers update for 2010-12-12]
gerald [Sun, 12 Dec 2010 16:03:46 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2010-12-12]

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

13 years agoAdded opcua_extensionobjecttable.c from revision 34906.
stig [Sat, 11 Dec 2010 21:40:01 +0000 (21:40 +0000)]
Added opcua_extensionobjecttable.c from revision 34906.

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

13 years agoRework some comments.
wmeier [Sat, 11 Dec 2010 04:11:31 +0000 (04:11 +0000)]
Rework some comments.

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

13 years agoFix bug #5477: fuzz-test failure found by using G_SLICE=debug-blocks.
wmeier [Sat, 11 Dec 2010 03:22:09 +0000 (03:22 +0000)]
Fix bug #5477: fuzz-test failure found by using G_SLICE=debug-blocks.
Essentially: doing g_slice_free with the wrong 'type' for the data to be freed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5477

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

13 years agoFrom Richard Sharpe via bug 5466: "Changes to dissect persistentreserveout
cmaynard [Fri, 10 Dec 2010 15:49:33 +0000 (15:49 +0000)]
From Richard Sharpe via bug 5466: "Changes to dissect persistentreserveout
parameters", with some whitespace changes by me.

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

13 years agoAdditions to allow the valgrind to test for reassembly.c memory leaks.
wmeier [Fri, 10 Dec 2010 15:35:59 +0000 (15:35 +0000)]
Additions to allow the valgrind to test for reassembly.c memory leaks.
 Specifically: free all dynamically allocated memory after each test (or
 at program completion).
Also: add some debug functions (conditionally enabled) to print information
about the fragment_table and reassembled_table fd-chains.

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

13 years agoFrom Rob Casey:
etxrab [Fri, 10 Dec 2010 15:32:47 +0000 (15:32 +0000)]
From Rob Casey:
Addition of support for DNP3 Analog Input Deadband object type
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5471

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

13 years agoFrom Lori Tribble:
etxrab [Fri, 10 Dec 2010 14:23:48 +0000 (14:23 +0000)]
From Lori Tribble:
Enhancements to BACnet's bacapp dissector
Details:
1) Added the low and high instance parameters of the who-is command to the
summary view, if present.
2) Added dissecting of the property active-cov-subscriptions.
3) Added tag details to the decoded view of ProcessId.
4) Fixed the indent levels of the recipientProcess decoding.
5) Fixed the indent tree levels for ReadPropertyMultiple-ACK when decoding
error response.

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

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

13 years agoFrom Mike Morrin:
etxrab [Fri, 10 Dec 2010 12:39:59 +0000 (12:39 +0000)]
From Mike Morrin:
Fix RSL Channel description and interference dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5479

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

13 years agoMove wslua_plugin_list to epan/plugins.c, that should fix the Solaris builds finally.
rbalint [Fri, 10 Dec 2010 10:37:03 +0000 (10:37 +0000)]
Move wslua_plugin_list to epan/plugins.c, that should fix the Solaris builds finally.

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

13 years agoExport G_SLICE=debug-blocks to do additional memory checks;
wmeier [Fri, 10 Dec 2010 05:23:40 +0000 (05:23 +0000)]
Export G_SLICE=debug-blocks to do additional memory checks;

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

13 years agoExport G_SLICE=debug-blocks to do additional memory checks;
wmeier [Fri, 10 Dec 2010 03:13:09 +0000 (03:13 +0000)]
Export G_SLICE=debug-blocks to do additional memory checks;

From the GLib docs
 "Using this option (present since GLib-2.13) engages extra code which
  performs sanity checks on the released memory slices. Invalid slice
  addresses or slice sizes will be reported and lead to a program halt."

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

13 years agoDrop init_wslua.h from EXTRA_DIST
rbalint [Thu, 9 Dec 2010 15:47:23 +0000 (15:47 +0000)]
Drop init_wslua.h from EXTRA_DIST

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

13 years agoAlways provide wslua_plugin_list, even if we don't have Lua configured.
rbalint [Thu, 9 Dec 2010 15:20:14 +0000 (15:20 +0000)]
Always provide wslua_plugin_list, even if we don't have Lua configured.

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

13 years agorevert commit 35160 (filter out wlua_plugin_list from libwireshark.sym when compiling...
rbalint [Thu, 9 Dec 2010 15:19:28 +0000 (15:19 +0000)]
revert commit 35160 (filter out wlua_plugin_list from libwireshark.sym when compiling without Lua)

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

13 years agofilter out wlua_plugin_list from libwireshark.sym when compiling without Lua
rbalint [Wed, 8 Dec 2010 23:36:01 +0000 (23:36 +0000)]
filter out wlua_plugin_list from libwireshark.sym when compiling without Lua

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

13 years agoMark parameter as unused.
etxrab [Wed, 8 Dec 2010 11:25:22 +0000 (11:25 +0000)]
Mark parameter as unused.
reassemble.c:220: warning: unused parameter 'key_arg'

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

13 years agoreassemble.c: In function 'free_all_fragments':
etxrab [Wed, 8 Dec 2010 09:12:03 +0000 (09:12 +0000)]
reassemble.c: In function 'free_all_fragments':
reassemble.c:222: warning: unused variable 'key'

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

13 years agofragment_free_key to be used only if Glib >= 2.10
etxrab [Wed, 8 Dec 2010 08:26:40 +0000 (08:26 +0000)]
fragment_free_key to be used only if Glib >= 2.10

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

13 years agoReassemble.c leaks memory for GLIB > 2.8
etxrab [Wed, 8 Dec 2010 06:32:04 +0000 (06:32 +0000)]
Reassemble.c leaks memory for GLIB > 2.8
Free fragment data and fragment keys in fragment_table when neccessary. reassembled_table remains to be fixed.

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

13 years agoChange "DCE RPC" to "Distributed Computing Environment / Remote Procedure
sfisher [Wed, 8 Dec 2010 00:16:42 +0000 (00:16 +0000)]
Change "DCE RPC" to "Distributed Computing Environment / Remote Procedure
Call (DCE/RPC)" for the DCERPC dissector's PROTONAME.

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

13 years agoInit fragment_table and reassembly table every "session" rather than just once in...
wmeier [Tue, 7 Dec 2010 23:27:11 +0000 (23:27 +0000)]
Init fragment_table and reassembly table every "session" rather than just once in proto_register...()

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

13 years agoChange includes for getenv_utf8()
morriss [Tue, 7 Dec 2010 21:20:39 +0000 (21:20 +0000)]
Change includes for getenv_utf8()

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

13 years agoInclude stdlib.h for getenv().
morriss [Tue, 7 Dec 2010 20:45:22 +0000 (20:45 +0000)]
Include stdlib.h for getenv().

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

13 years agoMove getenv_utf8() to wsutil.
morriss [Tue, 7 Dec 2010 20:24:57 +0000 (20:24 +0000)]
Move getenv_utf8() to wsutil.

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

13 years agoRevert rev 35145 for wsutil: go back to exporting all symbols. libwsutil's list...
morriss [Tue, 7 Dec 2010 18:31:50 +0000 (18:31 +0000)]
Revert rev 35145 for wsutil: go back to exporting all symbols.  libwsutil's list of exported symbols includes our optional targets and trying to export symbols that don't (always) exist upsets some linkers.  Anyway, the list of global symbols in libwsutil is (so far) quite short.

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

13 years agoFill out libwiretap's DEPENDENCIES line with the rest of the dependencies (from LIBADD).
morriss [Tue, 7 Dec 2010 14:28:28 +0000 (14:28 +0000)]
Fill out libwiretap's DEPENDENCIES line with the rest of the dependencies (from LIBADD).

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

13 years agoMake libtool export only symbols listed in *.def files
rbalint [Tue, 7 Dec 2010 13:38:15 +0000 (13:38 +0000)]
Make libtool export only symbols listed in *.def files

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

13 years ago... and update the documentation too :-)
sake [Tue, 7 Dec 2010 11:59:15 +0000 (11:59 +0000)]
... and update the documentation too :-)

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

13 years agoChange the accelerator keys for "goto previous/next packet in conversation" from...
sake [Tue, 7 Dec 2010 11:42:32 +0000 (11:42 +0000)]
Change the accelerator keys for "goto previous/next packet in conversation" from "<ctrl>+[" and "<ctrl>+]" to "<ctrl>+," and "<ctrl>+." as the bracket keys cause problems on many keyboards where they are "hidden" behind AltGr (I was tipped by a user with a German keyboard that has that "problem"). The new keys should cause no problems on most keyboards according to en.wikipedia.org/wiki/Keyboard_layout.

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

13 years agoFrom Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5377 :
morriss [Tue, 7 Dec 2010 03:46:10 +0000 (03:46 +0000)]
From Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5377 :

Add a bunch of NetFlow/IPFIX extensions from Plixer and ntop.

A little cleanup as well.

From me: remove duplicate blurbs.

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

13 years agoFrom Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5438 :
morriss [Tue, 7 Dec 2010 02:44:25 +0000 (02:44 +0000)]
From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5438 :

Various fixes for AgentX protocol decoding:

1/ Fixed the decode of get & getnext PDU to correctly iterate over range lists.
2/ Re-adjust PDU header highlighting to hightlight all 20 octets instead of
only the first 4.
3/ Altered the decode hierarchy so that PDU bodys are no longer a sub-component
of the PDU header, but is now at the same level as the header.
4/ Corrected the highlighted length of decoded OIDs.
5/ Added bitwise decoding of the PDU 'flag' octet.

From me:
- Remove unnecessary includes.
- Some indentation/white space cleanup.
- Remove (new) duplicate blurbs

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

13 years agoMake some symbols static.
morriss [Mon, 6 Dec 2010 23:20:21 +0000 (23:20 +0000)]
Make some symbols static.

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

13 years agoMake a whole bunch of symbols static.
morriss [Mon, 6 Dec 2010 23:17:43 +0000 (23:17 +0000)]
Make a whole bunch of symbols static.

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

13 years agoMake some prefs callback functions static. (These modules don't use proto_reg_handof...
morriss [Mon, 6 Dec 2010 22:08:48 +0000 (22:08 +0000)]
Make some prefs callback functions static.  (These modules don't use proto_reg_handoff_*() as their prefs callback.)

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

13 years agoImprove dissection of bit-oriented fields. Patch from Richard Sharpe via
cmaynard [Mon, 6 Dec 2010 22:00:08 +0000 (22:00 +0000)]
Improve dissection of bit-oriented fields.  Patch from Richard Sharpe via
bug #5466 with some minor whitespace modifications from me and a fix of an
invalid offset introduced with the patch.  Fuzz testing still needs to be done.
I can't seem to get the fuzz tester to work with the capture files attached to
the bug report.

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

13 years agoRevert r35132 so that a better fix can be implemented that doesn't break
sfisher [Mon, 6 Dec 2010 21:33:19 +0000 (21:33 +0000)]
Revert r35132 so that a better fix can be implemented that doesn't break
non-printable non-UTF8 ASCII characters such as in binary streams.

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

13 years agoRemove unnecessary #include "../isprint.h"
sfisher [Mon, 6 Dec 2010 21:24:25 +0000 (21:24 +0000)]
Remove unnecessary #include "../isprint.h"

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

13 years agoMake some (preference) variables static.
morriss [Mon, 6 Dec 2010 19:48:05 +0000 (19:48 +0000)]
Make some (preference) variables static.

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

13 years agoUpdate the location of make-manuf.
gerald [Mon, 6 Dec 2010 18:34:49 +0000 (18:34 +0000)]
Update the location of make-manuf.

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

13 years agoChange isprint() calls in follow_stream.c (shared code that supports Follow
sfisher [Mon, 6 Dec 2010 18:34:26 +0000 (18:34 +0000)]
Change isprint() calls in follow_stream.c (shared code that supports Follow
TCP, UDP and SSL streams) to g_unichar_isprint() so that UTF-8 characters
are displayed properly.

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

13 years agoChange format_text() and format_text_wsp() to use g_unichar_isprint() for
sfisher [Mon, 6 Dec 2010 18:30:39 +0000 (18:30 +0000)]
Change format_text() and format_text_wsp() to use g_unichar_isprint() for
UTF-8 support instead of isprint().  This allows the middle packet details
pane to display UTF-8 strings instead of escaping them with \xxx notation.

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

13 years agoMove make-manuf to the tools directory.
gerald [Mon, 6 Dec 2010 18:30:14 +0000 (18:30 +0000)]
Move make-manuf to the tools directory.

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

13 years agoRemove an unused include.
gerald [Mon, 6 Dec 2010 18:29:46 +0000 (18:29 +0000)]
Remove an unused include.

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

13 years agoFix bug #5463 (and likely others) so that ep_strbuf_new() no longer
sfisher [Mon, 6 Dec 2010 17:30:08 +0000 (17:30 +0000)]
Fix bug #5463 (and likely others) so that ep_strbuf_new() no longer
truncates newly created and copied strings.  The problem was that
strlen() (which returns a length not counting the NULL terminator) was
being mixed with functions that do malloc() (which need to allocate
memory large enough to inculde the NULL string terminator).

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

13 years agoFrom Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5372 :
morriss [Mon, 6 Dec 2010 15:57:39 +0000 (15:57 +0000)]
From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5372 :

Fix crash in LDAP dissector, in a generic way (for all callers of
dissect_nt_sid()).

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

13 years agoFix various typos and spelling errors.
wmeier [Mon, 6 Dec 2010 01:34:58 +0000 (01:34 +0000)]
Fix various typos and spelling errors.

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

13 years agoAdd more PHY attributes to MAC frames.
martinm [Sun, 5 Dec 2010 23:34:11 +0000 (23:34 +0000)]
Add more PHY attributes to MAC frames.

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