summaryrefslogtreecommitdiff
path: root/plugins/opcua
AgeCommit message (Collapse)AuthorFilesLines
2014-12-22plugins: Cleanup #includesBill Meier11-15/+2
Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c Mostly: remove '#include <glib/glib.h>' and certain other #includes already included in packet.h Reviewed-on: https://code.wireshark.org/review/5971 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-08Fix full name of NodeId namespace index field, was a copy&pase errorHannes Mezger1-1/+1
Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4 Reviewed-on: https://code.wireshark.org/review/5668 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-17Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a ↵Michael Mann1-3/+2
few places. Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7 Reviewed-on: https://code.wireshark.org/review/5312 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-18Use proto_tree_add_expert_format instead of proto_tree_add_textHannes Mezger1-12/+16
Change-Id: Ia017fa9535cbc7570ce6bd442972eedd2143825a Reviewed-on: https://code.wireshark.org/review/4729 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-17Use proto_tree_add_bitmask for ExpandedNodeId EncodingMaskHannes Mezger1-9/+16
Instead of adding the items using proto_tree_add_item, use proto_tree_add_bitmask in parseExpandedNodeId(). Also, the redundant 'NodeId ' text is removed from hf_opcua_nodeid_... items for better readability. Change-Id: Ie68f1d280dd733fd2eede0b2b73ad8d7f28396b3 Reviewed-on: https://code.wireshark.org/review/4730 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-17Add argument 'packet_info *pinfo' to all dissecting functionsHannes Mezger15-1623/+1624
Change-Id: Ie02326e365ee3f620fcbe3f2e8e45dc5300d3418 Reviewed-on: https://code.wireshark.org/review/4728 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-16Replace proto_tree_add_text in non-generated filesHannes Mezger2-36/+39
As requested by Michael Mann, most of the occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) or proto_tree_add_item/proto_item_append_text in the non-generated files. Change-Id: I27cccde88780adef43c78efd26333f47af098ad6 Reviewed-on: https://code.wireshark.org/review/4726 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-16Replace proto_tree_add_text with proto_tree_add_subtree(_format) in ↵Hannes Mezger2-432/+431
generated files As requested by Michael Mann, all occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) in the generated files. Our generator templates have also been updated accordingly. Change-Id: I49ddd664dffef4b3ceda77edd1b2d7e01da363f3 Reviewed-on: https://code.wireshark.org/review/4725 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13fix forward declarations in opcua_serviceparser.hHannes Mezger1-271/+159
The declarations from opcua_complextypeparser.h were used instead of the serviceparser ones, this is also fixed in our generator Change-Id: I3d78d26a3b2b4995dfd4556720d29ecdd6960c4b Reviewed-on: https://code.wireshark.org/review/4650 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-12Add support for NTTIME_hyper and NTTIME_1secMatthieu Patou1-1/+1
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution Bug: 10541 Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9 Reviewed-on: https://code.wireshark.org/review/4606 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09CMake: Bundle our plugins.Gerald Combs1-3/+12
plugins/*/CMakeLists.txt has a lot of repitition. We might want to create a module or include file to simplify things. Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 Reviewed-on: https://code.wireshark.org/review/4582 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06plugins: Add editor modelines; Adjust whitespace as needed.Bill Meier5-100/+158
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-17opcua: prefix all hf_register_info with opcua, unify namingHannes Mezger4-67/+67
Change-Id: I575bd2f93202837b2ce15a39b1b0bd9b5c53f5bf Reviewed-on: https://code.wireshark.org/review/4151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: use BASE_NONE instead of 0Hannes Mezger1-4/+4
Change-Id: I5ca5d41edf1f56b24da6360a10f0c6e2600572d2 Reviewed-on: https://code.wireshark.org/review/4150 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: format all hf_register_info tables by aligning them to longest valueHannes Mezger5-176/+89
Change-Id: I0b533edd7bad52922dd1e0aaa2c980e56dd88b78 Reviewed-on: https://code.wireshark.org/review/4149 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: remove unused codeHannes Mezger2-20/+0
Change-Id: I78963640e32393f3ac399e59a659ddf619d15c3d Reviewed-on: https://code.wireshark.org/review/4148 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: add hint to OPCUA settings tooltipHannes Mezger1-1/+1
It's unclear how the ports should be separated, this additional text in the tooltip clarifies it Change-Id: I686482522d006024f920a3cc26b83cd21c19f8a5 Reviewed-on: https://code.wireshark.org/review/4147 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-31Don't show the echo/python command lines when making plugin.cРоман Донченко1-3/+4
For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-24Remove obsolete comments regarding the shell version of make-dissector-regРоман Донченко1-5/+0
Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-12Remove make-dissector-reg and require python for autotool builds as wellJoerg Mayer1-12/+4
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко1-12/+1
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-05Fix Bug #10348 Different dissection results for same file.AndersBroman1-90/+99
The fault is that reassembly_table_init() must be called when reloading the file - move it to an init routine and register the init routine. While there move the proto_register_opcua() routine to the end of the file to be more consistent with other dissectors. Change soft deprecated APIs Change-Id: I2b93692be24dbf60f4ef09aa7283e55ebf3c1874 Reviewed-on: https://code.wireshark.org/review/3431 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-30fix encodingmask of DiagnosticInfoHannes Mezger1-4/+16
In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly. Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136 Reviewed-on: https://code.wireshark.org/review/3259 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10convert to proto_tree_add_subtree[_format] for plugin dissectorsMichael Mann2-36/+32
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97 Reviewed-on: https://code.wireshark.org/review/2974 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-06make-dissectors-reg: optimize by factoring out the loopsРоман Донченко2-10/+10
Instead of calling the grep/sed pipelines for each file, build the list of files in the beginning and call each pipeline only once, passing the list to the first grep. This results in a massive speedup in Cygwin; in my test, the time it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where the time do to the same goes from ~6 to ~0.5 seconds. Amend makefile comments to elide mentions of invoking multiple processes per file. Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34 Reviewed-on: https://code.wireshark.org/review/2826 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-20Add .rc files to the sources to have them included in the buildJoerg Mayer1-0/+1
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17Create and register subtree identifiers for all opcua array typesHannes Mezger8-439/+1571
Currently for all arrays, the generic ett_opcua_array is used, instead we want to be more selective for storing the expanded state of subtrees. This commit adds subtree identifiers for all array types. Change-Id: Idcec51a200d1109cdb557d3366021d3b066b453d Reviewed-on: https://code.wireshark.org/review/2176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Unify how opcua arrays are displayedHannes Mezger5-419/+450
- Display 'Array of <fieldname>' instead of 'Array of Simple Type' - Display array indexes for simple types - Display data type in simple type arrays Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4 Reviewed-on: https://code.wireshark.org/review/2161 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17Add myself as author for the opcua dissector pluginHannes Mezger2-4/+5
Change-Id: If8349e778fd91426a6a4b6d6e98d3ab870d188d5 Reviewed-on: https://code.wireshark.org/review/2302 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16Cleanup subtree types in opcua pluginHannes Mezger3-14/+23
- make ett_opcua_transport static, is only used locally - format code grouping extern ett variables - add subtree variables for encodingmasks of simple types Change-Id: Ia044ca6ca0ff19e940a03d21610db67fe3679b01 Reviewed-on: https://code.wireshark.org/review/2157 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16Display status code info bits if setHannes Mezger1-2/+92
Checks if a StatusCode has any of the additional info bits set and displays them accordingly. Change-Id: Ic584233083174d3fd30c6ec6684f308e0e5ae22e Reviewed-on: https://code.wireshark.org/review/2127 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16Display text representation of status codesHannes Mezger5-2/+297
Adds a table containing all known StatusCodes and displays them if found. The list of StatusCodes is in a separate file for easy generating of the list if necessary. Change-Id: Iab74b22b7fc4fb53d8f072c4e3a4cea4ae18196c Reviewed-on: https://code.wireshark.org/review/2126 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-11opcua_simpletypes.c:94:12: error: static declaration of ↵AndersBroman1-2/+0
'hf_opcua_NamespaceUri' follows non-static declaration Change-Id: I2cae9691408c22a64144f5482cc536a5dc88ec6c Reviewed-on: https://code.wireshark.org/review/2135 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11Remove unused array length fieldsHannes Mezger2-324/+0
The NoOf... fields are not used at all in the dissector. Change-Id: I1f20a9992eab5d47c7e0ad34dabeaed07efa4a80 Reviewed-on: https://code.wireshark.org/review/2130 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11Regenerate all sources using latest OPC UA specificationHannes Mezger8-201/+28
- HistoryUpdateEventResult has been removed - Fixes two enums - Removes unused identifier defines Change-Id: I39c65c1eca1701b60dfaa3541cd7a5d1b479fb9b Reviewed-on: https://code.wireshark.org/review/2129 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11Improve display of Open/CloseSecureChannel requests and responsesHannes Mezger1-2/+24
- Return the ServiceId of the service calls for displaying if it's a request or response - Add the missing parsing code for CloseSecureChannel, some fields were missing Change-Id: Id9b1e1986e222a77ad979fb615adc6ac62a4ced8 Reviewed-on: https://code.wireshark.org/review/2125 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11Move ServiceFault from ComplexType- to ServiceParserHannes Mezger8-12/+14
ServiceFaults are always sent as a service response and never as value, this moves the parsing code to the correct location. Change-Id: Ida9cb561aa40fcbfc3c0429aed732d108b295138 Reviewed-on: https://code.wireshark.org/review/2124 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11Unify displaying of NodeIdHannes Mezger1-9/+13
Adds hf_register_info for all possible NodeId identifier types for unified displaying. Change-Id: Ic7a8077a32f435d5acfb1a956117d21a0b51b43b Reviewed-on: https://code.wireshark.org/review/2123 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11Fix NodeId and ExpandedNodeId encoding mask displayHannes Mezger2-19/+20
There are no 'URI' NodeIds, removed this option and changed GUID/Opaque to their correct values as stated in the UA specification. Change-Id: Ibf9afdbd72f8ad336f5eb83ece5adbcce51e8365 Reviewed-on: https://code.wireshark.org/review/2122 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11Unify variable and identifier names according to the UA specificationHannes Mezger2-20/+20
- Rename Uri to NamespaceUri for clarity - Correct NsId to NsIndex - ByteString NodeIds are called 'Opaque' Change-Id: I622d408ef9e19a2a899906b4127bae497735d402 Reviewed-on: https://code.wireshark.org/review/2121 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-11Fix switch case on ExpandedNodeId encoding maskHannes Mezger1-2/+2
Only the bits 0-3 are significant for the type of the NodeId contained in the ExpandedNodeId. The other bits are a mask telling if a NamespaceUri and/or a ServerIndex is set. Change-Id: I17948524f8a1bf6cb9dffc5f66ec5cddee580bcd Reviewed-on: https://code.wireshark.org/review/2120 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+2
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte23-46/+0
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space) Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d Reviewed-on: https://code.wireshark.org/review/884 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte5-10/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier7-21/+21
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-05Introduce end-of-line normalizationPascal Quantin1-34/+34
Change-Id: Ie6991af2432b193fbdc23bbbd335f83c091f14e8 Reviewed-on: https://code.wireshark.org/review/114 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-01-14More prototype cleanup.Guy Harris5-1/+25
svn path=/trunk/; revision=54752
2014-01-13dispatchService() is imported from other code; declare it inGuy Harris2-3/+1
opcua_transport_layer.h, not opcua_transport_layer.c. svn path=/trunk/; revision=54730
2014-01-01Fix [-Wmissing-prototypes]Anders Broman2-2/+3
svn path=/trunk/; revision=54528