Commit graph

1474 commits

Author SHA1 Message Date
Guy Harris
a8bc4a0d13 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.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jeff Morriss
84aebe5af7 There is no exceptions.h file here, remove it from DISSECTOR_INCLUDES.
svn path=/trunk/; revision=35201
2010-12-16 14:39:33 +00:00
Jaap Keuter
a6b55e6530 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)

svn path=/trunk/; revision=35193
2010-12-16 07:01:22 +00:00
Stig Bjørlykke
d9af8b16ba Added opcua_extensionobjecttable.c from revision 34906.
svn path=/trunk/; revision=35177
2010-12-11 21:40:01 +00:00
Jeff Morriss
64a099a652 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5429 :
Until now the info column only shows the OPC UA transport protocol type (Hello,
Ack, Secure Conversion message).
After connections establishment has finished this column shows only Secure
Conversion message, because every service is sent over the secure channel.

This patch adds the useful support of displaying the service type in the info
column. This makes it easier to find specific service calls in huge capture
files.

svn path=/trunk/; revision=35119
2010-12-04 02:54:59 +00:00
Jeff Morriss
4f6ea6ef47 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5427 :
This patch adds support for dissecting all Extension Objects types defined by
the OPC Foundation.

svn path=/trunk/; revision=35118
2010-12-04 02:54:25 +00:00
Anders Broman
a06eef00b8 From Gerhard Gappmeier:
Fix mapping of datatype strings in opcua plugin
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5428

svn path=/trunk/; revision=35105
2010-12-02 20:44:18 +00:00
Anders Broman
dd43cbec82 From Robert Groenenberg:
Assert when using ASN.1 dissector with loading a 'type table'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5447

svn path=/trunk/; revision=35055
2010-11-28 21:03:43 +00:00
Jaap Keuter
b1914ff4df Fix for bug 5435:
Add support for dissecting SLL type 0x17 frames.

svn path=/trunk/; revision=35029
2010-11-25 19:59:19 +00:00
Bill Meier
a25be762f5 Fix properties.
svn path=/trunk/; revision=34997
2010-11-21 19:33:46 +00:00
Jeff Morriss
9aeb1dac17 From David Katz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5166 :
Add a configuration parameter of the NWG version for WiMAX ASN CP dissector.
The format and meaning of TLVs, as well as function types  and messages changed
between the different NWG versions.
Added support for the version number of TLVs in the dictionary xml, its parser,
and of course in the packet itself.
Added support for the version number of function-types and message-types by
extending the value_string structure to contain also a "since" version number.

Successfully tested with a live capture and capture file, containing WiMAX ASN
packets (full Network entry).
Also fuzzed 500 passes successfully.

The XML doesn't contain all existing NWG versions, only selected ones. This is
a little tedious work to go over all TLVs of each version, so I'll add some
newer versions later on. can add a short how-to of adding a new version, for
others to use, if needed.


svn path=/trunk/; revision=34919
2010-11-17 03:16:30 +00:00
Jeff Morriss
3c7ac06886 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5410 :
This patch adds support for displaying OPC UA ExtensionObjects.

An ExtensionObject is a mechanism to transport user defined structures as
serialized blobs. Some types of ExtensionObjects are already defined by the OPC
Foundation's OPC UA Specifications.
These types can be implemented by this dissector, because they are well-known.

Real user-defined or vendor-defined types are unlikely to be implemented by a
passive dissector, because this would require browsing of the UA server's
address space to retrieve the type information.

Currently only the following types are supported:

 * DataChangeNotification
 * EventNotification

Others OPC defined types will follow.


From me: fix warnings: "format not a string literal and no format arguments"

svn path=/trunk/; revision=34906
2010-11-16 17:00:50 +00:00
Jeff Morriss
b7b98d4315 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5409 :
This patch fixes displaying OPCUA Strings and ByteStrings.

From me: fix warnings: "format not a string literal and no format arguments"

svn path=/trunk/; revision=34905
2010-11-16 16:45:22 +00:00
Jeff Morriss
987e35df39 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5406 :
I attached a patch which fixes some problems in the array handling of OPC UA 
data when the array length is zero or -1 which is a Null-Array.

svn path=/trunk/; revision=34880
2010-11-15 18:52:41 +00:00
Stig Bjørlykke
1f2f2e918e Simply use %c for printing char.
svn path=/trunk/; revision=34789
2010-11-05 09:59:40 +00:00
Stig Bjørlykke
75c2052a01 Fixed a printf modifier to remove a warning from clang.
svn path=/trunk/; revision=34784
2010-11-05 08:04:24 +00:00
Stig Bjørlykke
4b1be2be63 Remove some unused hf entries.
svn path=/trunk/; revision=34549
2010-10-17 20:57:11 +00:00
Stig Bjørlykke
333ef8b5b7 Removed unused hf_pn_dcp and hf_pn_ptcp.
svn path=/trunk/; revision=34544
2010-10-17 16:49:10 +00:00
Stig Bjørlykke
763e03b407 Removed unused hf_ecat_mailbox.
svn path=/trunk/; revision=34543
2010-10-17 16:43:07 +00:00
Jeff Morriss
7502bd4a8f From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :
In the profinet plugin, the decoding of the MRP LinkUp and MRP LinkDown
messages is missing the MRP_SA field which garbles the decode of the rest of
the packet.

This fix adds the decoding of the MRP_SA field to the MRP LinkUp and MRP
LinkDown dissectors.

svn path=/trunk/; revision=34524
2010-10-15 17:17:04 +00:00
Jeff Morriss
2d9d0900c5 From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :
In profinet plugin, there is a dissection based on whether the read data
returned is expected to contain a single or multiple blocks. Currently, the
I&M0FilterData case assumes only a single block is returned. Profinet specifies
two optional additional blocks.

This change moves I&M0FilterData to expect multiple blocks to correct decode
the optional information.

svn path=/trunk/; revision=34523
2010-10-15 17:10:29 +00:00
Anders Broman
5984fb4888 From Yu Zhang:
MRP packet is not correctly parsed in PROFINET multiple write record request.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5267

svn path=/trunk/; revision=34358
2010-10-04 06:16:45 +00:00
Guy Harris
ac3ac6c476 Plugins are not shared libraries, so:
1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
2010-09-24 20:41:34 +00:00
Jaap Keuter
5025165845 Track offset even when tree==NULL.
svn path=/trunk/; revision=34239
2010-09-24 18:46:28 +00:00
Jeff Morriss
9ce0915786 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34231
2010-09-24 02:55:52 +00:00
Jeff Morriss
0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
Jörg Mayer
de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Uwe Girlich
9a1c175692 interlink type is decimal
some keyword substitution added

svn path=/trunk/; revision=34178
2010-09-22 07:18:49 +00:00
Jeff Morriss
381664535b As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

svn path=/trunk/; revision=34165
2010-09-21 03:14:49 +00:00
Bill Meier
7219ee2a49 Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;

svn path=/trunk/; revision=34143
2010-09-17 04:51:21 +00:00
Jeff Morriss
d2b84da490 prefs_register_string_preference() overwrites the given value pointer with a copy of the string. Since the string this dissector passes in is mallocated, keep a pointer to it and then free it after the pointer has been overwritten.
svn path=/trunk/; revision=33872
2010-08-21 03:44:36 +00:00
Bill Meier
e600394937 (Trivial) Use consistent indentation; Whitespace cleanup.
svn path=/trunk/; revision=33788
2010-08-12 16:27:16 +00:00
Bill Meier
32ea9657c8 Add new expansion.h file left out of the previous commit.
svn path=/trunk/; revision=33787
2010-08-12 15:58:01 +00:00
Bill Meier
ead0425688 From Don Newton: Added dissection of Expansion Module (KEM,GEM) messages to Unistim plugin.
From me: Add expansion.h to list of .h files in Makefile.common;
         #include <stdio.h> not required.

svn path=/trunk/; revision=33786
2010-08-12 15:47:31 +00:00
Jaap Keuter
ccf61ec3b2 From Don Newton:
Fails to decrement msg_len on 3 different message types which causes the
dissector to attempt to decode an addition or misplaced unistim cmd.

svn path=/trunk/; revision=33643
2010-07-27 06:46:00 +00:00
Guy Harris
75ffa6bb71 The only reason to escape "%" in a string is if you are, incorrectly,
passing a string directly to a routine that expects a format string. 
The correct way to handle that is to pass "%s" as the string.

As long as you're escaping non-printable characters, just let
tvb_format_string() handle that.

For null-terminated strings, get the length of the string with
tvb_strsize(), and then just put the string into the protocol tree as a
regular item.

svn path=/trunk/; revision=33482
2010-07-09 21:27:08 +00:00
Gerald Combs
bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Gerald Combs
423669df7d Back out r33088 for now.
svn path=/trunk/; revision=33102
2010-06-05 00:29:31 +00:00
Gerald Combs
d123b9e737 Add a checkapis target.
svn path=/trunk/; revision=33092
2010-06-04 19:49:12 +00:00
Gerald Combs
f6b2458924 From Matt Poduska via bug 1957 (with minor changes):
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader
protocol (see llrp.org for more information). This dissector has passed fuzz
testing.

svn path=/trunk/; revision=33088
2010-06-04 18:45:02 +00:00
Guy Harris
1b444c55fd Refer to the endianness arguments as "encoding" rather than
"representation" - we already use "representation" to refer to the text
representation of fields.

Change some routines with an endianness argument to make it a
representation argument instead; 

svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
Stig Bjørlykke
aa6dc5e692 Fixed warning "Field width should have type 'int'".
svn path=/trunk/; revision=32909
2010-05-20 14:53:29 +00:00
Jaap Keuter
eb6efdc4a4 Synchronize Makefiles even more.
svn path=/trunk/; revision=32808
2010-05-14 16:48:17 +00:00
Jeff Morriss
54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +00:00
Guy Harris
998677339e Create a new REP_NA value for fields where there are no representations
from which to choose; use that for protocol fields in some protocols
(modify the CORBA generator to use it, and manually update the generated
CORBA dissectors accordingly).

svn path=/trunk/; revision=32777
2010-05-13 00:20:40 +00:00
Jeff Morriss
d85cc79af1 Add some information about how/why this dissector is (partially) machine-generated and what that means to Wireshark maintainers.
svn path=/trunk/; revision=32577
2010-04-27 13:50:43 +00:00
Jeff Morriss
85885007ef Make the OpcUa plugin's fields filterable (by giving them abbreviations).
(Thank you, sed, for doing the 90% of the work for me.)

Note that two of these files says "do not modify" implying that they are
machine generated but AFAIK we don't have the means to rebuild them.

svn path=/trunk/; revision=32561
2010-04-26 00:15:30 +00:00
Bill Meier
17b57d46d3 Simplify Makefile.nmake so that adding a new plugin to Makefile.nmake
requires only adding the plugin (directory) name to a list of plugins.

svn path=/trunk/; revision=32516
2010-04-19 14:38:20 +00:00
Jeff Morriss
b09f79f414 Be sure we initialize the p_id in hf's. This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3010 .

Also finish the implementation of ShowTimes for GOGs so that the variable gets
initialized (preventing another uninitialized variable warning from Valgrind).

svn path=/trunk/; revision=32465
2010-04-14 18:39:00 +00:00
Jeff Morriss
ef2548d093 Fix up MATE's hf display values so MATE will actually run.
svn path=/trunk/; revision=32464
2010-04-14 14:20:16 +00:00