aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/opcua
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/opcua')
-rw-r--r--plugins/opcua/Makefile.common12
-rw-r--r--plugins/opcua/opcua.c7
-rw-r--r--plugins/opcua/opcua_application_layer.c (renamed from plugins/opcua/ua_application_layer.c)0
-rw-r--r--plugins/opcua/opcua_application_layer.h (renamed from plugins/opcua/ua_application_layer.h)0
-rw-r--r--plugins/opcua/opcua_security_layer.c (renamed from plugins/opcua/ua_security_layer.c)2
-rw-r--r--plugins/opcua/opcua_security_layer.h (renamed from plugins/opcua/ua_security_layer.h)0
-rw-r--r--plugins/opcua/opcua_simpletypes.c18
-rw-r--r--plugins/opcua/opcua_transport_layer.c (renamed from plugins/opcua/ua_transport_layer.c)4
-rw-r--r--plugins/opcua/opcua_transport_layer.h (renamed from plugins/opcua/ua_transport_layer.h)0
9 files changed, 14 insertions, 29 deletions
diff --git a/plugins/opcua/Makefile.common b/plugins/opcua/Makefile.common
index 9812d9ba5e..689f4807a2 100644
--- a/plugins/opcua/Makefile.common
+++ b/plugins/opcua/Makefile.common
@@ -30,9 +30,9 @@ PLUGIN_NAME = opcua
# the dissector sources (without any helpers)
DISSECTOR_SRC = \
opcua.c \
- ua_transport_layer.c \
- ua_security_layer.c \
- ua_application_layer.c \
+ opcua_transport_layer.c \
+ opcua_security_layer.c \
+ opcua_application_layer.c \
opcua_serviceparser.c \
opcua_complextypeparser.c \
opcua_enumparser.c \
@@ -48,6 +48,6 @@ DISSECTOR_INCLUDES = \
opcua_identifiers.h \
opcua_serviceparser.h \
opcua_simpletypes.h \
- ua_application_layer.h \
- ua_security_layer.h \
- ua_transport_layer.h
+ opcua_application_layer.h \
+ opcua_security_layer.h \
+ opcua_transport_layer.h
diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c
index 7b9ac17afc..6f21594bd1 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/opcua/opcua.c
@@ -30,9 +30,9 @@
#include <epan/emem.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/prefs.h>
-#include "ua_transport_layer.h"
-#include "ua_security_layer.h"
-#include "ua_application_layer.h"
+#include "opcua_transport_layer.h"
+#include "opcua_security_layer.h"
+#include "opcua_application_layer.h"
#include "opcua_complextypeparser.h"
#include "opcua_serviceparser.h"
#include "opcua_enumparser.h"
@@ -253,3 +253,4 @@ static void dissect_opcua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree
}
+
diff --git a/plugins/opcua/ua_application_layer.c b/plugins/opcua/opcua_application_layer.c
index 0626cfb517..0626cfb517 100644
--- a/plugins/opcua/ua_application_layer.c
+++ b/plugins/opcua/opcua_application_layer.c
diff --git a/plugins/opcua/ua_application_layer.h b/plugins/opcua/opcua_application_layer.h
index 13a52e07b1..13a52e07b1 100644
--- a/plugins/opcua/ua_application_layer.h
+++ b/plugins/opcua/opcua_application_layer.h
diff --git a/plugins/opcua/ua_security_layer.c b/plugins/opcua/opcua_security_layer.c
index c139f67275..61d97e5c40 100644
--- a/plugins/opcua/ua_security_layer.c
+++ b/plugins/opcua/opcua_security_layer.c
@@ -27,7 +27,7 @@
#include <gmodule.h>
#include <epan/packet.h>
-#include "ua_application_layer.h"
+#include "opcua_application_layer.h"
#include "opcua_simpletypes.h"
/** NodeClass enum table */
diff --git a/plugins/opcua/ua_security_layer.h b/plugins/opcua/opcua_security_layer.h
index d42f739e2f..d42f739e2f 100644
--- a/plugins/opcua/ua_security_layer.h
+++ b/plugins/opcua/opcua_security_layer.h
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 32e2db9ec0..1411226cc5 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -693,7 +693,6 @@ void parseNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldNa
proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_nodeid);
gint iOffset = *pOffset;
guint8 EncodingMask;
- guint32 Numeric = 0, NSId = 0;
EncodingMask = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE);
@@ -702,28 +701,22 @@ void parseNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldNa
switch(EncodingMask)
{
case 0x00: /* two byte node id */
- Numeric = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, TRUE);
iOffset+=1;
break;
case 0x01: /* four byte node id */
- NSId = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, TRUE);
iOffset+=1;
- Numeric = tvb_get_letohs(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, TRUE);
iOffset+=2;
break;
case 0x02: /* numeric, that does not fit into four bytes */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
- Numeric = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, TRUE);
iOffset+=4;
break;
case 0x03: /* string */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
parseString(subtree, tvb, &iOffset, hf_opcua_String);
@@ -735,7 +728,6 @@ void parseNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldNa
parseGuid(subtree, tvb, &iOffset, hf_opcua_Guid);
break;
case 0x06: /* byte string */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
parseByteString(subtree, tvb, &iOffset, hf_opcua_ByteString);
@@ -781,8 +773,7 @@ void parseExpandedNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *s
proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, "%s: ExpandedNodeId", szFieldName);
proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_nodeid);
gint iOffset = *pOffset;
- guint8 EncodingMask, NSId = 0;
- guint32 Numeric = 0;
+ guint8 EncodingMask;
EncodingMask = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE);
@@ -791,28 +782,22 @@ void parseExpandedNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *s
switch(EncodingMask)
{
case 0x00: /* two byte node id */
- Numeric = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, TRUE);
iOffset+=1;
break;
case 0x01: /* four byte node id */
- NSId = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, TRUE);
iOffset+=1;
- Numeric = tvb_get_letohs(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, TRUE);
iOffset+=2;
break;
case 0x02: /* numeric, that does not fit into four bytes */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
- Numeric = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, TRUE);
iOffset+=4;
break;
case 0x03: /* string */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
parseString(subtree, tvb, &iOffset, hf_opcua_String);
@@ -824,7 +809,6 @@ void parseExpandedNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *s
parseGuid(subtree, tvb, &iOffset, hf_opcua_Guid);
break;
case 0x06: /* byte string */
- NSId = tvb_get_letohl(tvb, iOffset);
proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE);
iOffset+=4;
parseByteString(subtree, tvb, &iOffset, hf_opcua_ByteString);
diff --git a/plugins/opcua/ua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c
index 27045d1f36..b96e92adff 100644
--- a/plugins/opcua/ua_transport_layer.c
+++ b/plugins/opcua/opcua_transport_layer.c
@@ -27,8 +27,8 @@
#include <gmodule.h>
#include <epan/packet.h>
-#include "ua_security_layer.h"
-#include "ua_application_layer.h"
+#include "opcua_security_layer.h"
+#include "opcua_application_layer.h"
#include "opcua_simpletypes.h"
#include <string.h>
#include <epan/emem.h>
diff --git a/plugins/opcua/ua_transport_layer.h b/plugins/opcua/opcua_transport_layer.h
index 3ee1efe78f..3ee1efe78f 100644
--- a/plugins/opcua/ua_transport_layer.h
+++ b/plugins/opcua/opcua_transport_layer.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 04:36:42 +0000