added another behaviour specification to namespace tests

and found another error in the handling of Strings in xml2ns0 - length
seems to be not set correctly under all circumstances

examples/src/Makefile.am

@@ -5,6 +5,15 @@ __top_builddir__bin_xml2ns0_CFLAGS = -I$(top_builddir)/src -I$(top_builddir)/inc
 __top_builddir__bin_xml2ns0_LDADD = $(top_builddir)/lib/libopen62541.a $(GLOBAL_AM_LDADD)
 __top_builddir__bin_xml2ns0_LDFLAGS = -lexpat
 
+bin_PROGRAMS += $(top_builddir)/bin/generateSam 
+
+__top_builddir__bin_generateSam_SOURCES = generateSam.c
+__top_builddir__bin_generateSam_CFLAGS = -I$(top_builddir)/src -I$(top_builddir)/include $(GLOBAL_AM_CFLAGS)
+__top_builddir__bin_generateSam_LDADD = $(top_builddir)/lib/libopen62541.a $(GLOBAL_AM_LDADD)
+__top_builddir__bin_generateSam_LDFLAGS = -lexpat
+
+
+
 if MULTITHREADING
 bin_PROGRAMS += $(top_builddir)/bin/exampleServerMT 
 

examples/src/generateSam.c

@@ -0,0 +1,205 @@
+/*
+ * xml2ns0.c
+ *
+ *  Created on: 21.04.2014
+ *      Author: mrt
+ */
+
+#include "ua_xml.h"
+#include <fcntl.h>
+
+
+void sam_declareAttribute(UA_Node const * node) {
+	if (node->nodeClass == UA_NODECLASS_VARIABLE) {
+		UA_VariableNode* vn = (UA_VariableNode*) node;
+		// printf("\t%s %*.s;\n", vn->value.vt->name, node->browseName.name.length, node->browseName.name.data);
+		printf("\t%s %s;\n", vn->value.vt->name, node->browseName.name.data);
+	}
+}
+
+void sam_declareBuffer(UA_Node const * node) {
+	if (node->nodeClass == UA_NODECLASS_VARIABLE) {
+		UA_VariableNode* vn = (UA_VariableNode*) node;
+		switch (vn->dataType.identifier.numeric) {
+		case UA_BYTESTRING_NS0:
+		case UA_STRING_NS0:
+		case UA_LOCALIZEDTEXT_NS0:
+		case UA_QUALIFIEDNAME_NS0:
+		printf("\t UA_Byte cstr_%*.s[] = \"\"\n",vn->browseName.name.length, vn->browseName.name.data);
+		break;
+		default:
+		break;
+		}
+	}
+}
+
+void sam_assignBuffer(UA_Node const * node) {
+	if (node->nodeClass == UA_NODECLASS_VARIABLE) {
+		UA_VariableNode* vn = (UA_VariableNode*) node;
+		switch (vn->dataType.identifier.numeric) {
+		case UA_BYTESTRING_NS0:
+		case UA_STRING_NS0:
+		printf("\tSAM_ASSIGN_CSTRING(cstr_%*.s,sam.%*.s);\n",vn->browseName.name.length, vn->browseName.name.data,vn->browseName.name.length, vn->browseName.name.data);
+		break;
+		case UA_LOCALIZEDTEXT_NS0:
+		printf("\tSAM_ASSIGN_CSTRING(cstr_%*.s,sam.%*.stext);\n",vn->browseName.name.length, vn->browseName.name.data,vn->browseName.name.length, vn->browseName.name.data);
+		break;
+		case UA_QUALIFIEDNAME_NS0:
+		printf("\tSAM_ASSIGN_CSTRING(cstr_%*.s,sam.%*.s.name);\n",vn->browseName.name.length, vn->browseName.name.data,vn->browseName.name.length, vn->browseName.name.data);
+		break;
+		default:
+		break;
+		}
+	}
+}
+
+void sam_attachToNamespace(UA_Node const * node) {
+	if (node->nodeClass == UA_NODECLASS_VARIABLE) {
+		UA_VariableNode* vn = (UA_VariableNode*) node;
+		printf("\tsam_attach(ns,%d,%s,&sam.%*.s);\n",node->nodeId.identifier.numeric,UA_[UA_ns0ToVTableIndex(vn->dataType.identifier.numeric)].name,node->browseName.name.length, node->browseName.name.data);
+	}
+}
+
+typedef struct pattern {
+		char* s;
+		Namespace_nodeVisitor v;
+} pattern;
+
+pattern p[] = {
+{ "#define SAM_ASSIGN_CSTRING(src,dst) do { dst.length = strlen(src)-1; dst.data = (UA_Byte*) src; } while(0)\n",UA_NULL },
+{ "struct sam {\n", UA_NULL },
+{ UA_NULL, sam_declareAttribute },
+{ "} sam;\n", UA_NULL },
+{ UA_NULL, sam_declareBuffer },
+{ "void sam_init(Namespace* ns) {", UA_NULL },
+{ UA_NULL, sam_assignBuffer },
+{ UA_NULL, sam_attachToNamespace },
+{ "}\n", UA_NULL },
+{UA_NULL, UA_NULL}
+};
+
+
+UA_Int16 UA_NodeId_getNamespace(UA_NodeId const * id) {
+	return id->namespace;
+}
+// FIXME: to simple
+UA_Int16 UA_NodeId_getIdentifier(UA_NodeId const * id) {
+	return id->identifier.numeric;
+}
+
+_Bool UA_NodeId_isBasicType(UA_NodeId const * id) {
+	return (UA_NodeId_getNamespace(id) == 0) && (UA_NodeId_getIdentifier(id) <= UA_DIAGNOSTICINFO_NS0);
+}
+
+UA_Int32 Namespace_getNumberOfComponents(Namespace const * ns, UA_NodeId const * id, UA_Int32* number) {
+	UA_Int32 retval = UA_SUCCESS;
+	UA_Node const * node;
+	if ((retval = Namespace_get(ns,id,&node,UA_NULL)) != UA_SUCCESS)
+		return retval;
+	if (node == UA_NULL)
+		return UA_ERR_INVALID_VALUE;
+	UA_Int32 i, n;
+	for (i = 0, n = 0; i < node->referencesSize; i++ ) {
+		if (node->references[i]->referenceTypeId.identifier.numeric == 47 && node->references[i]->isInverse != UA_TRUE) {
+			n++;
+		}
+	}
+	*number = n;
+	return retval;
+}
+
+UA_Int32 Namespace_getComponent(Namespace const * ns, UA_NodeId const * id, UA_Int32 idx, UA_NodeId** result) {
+	UA_Int32 retval = UA_SUCCESS;
+
+	UA_Node const * node;
+	if ((retval = Namespace_get(ns,id,&node,UA_NULL)) != UA_SUCCESS)
+		return retval;
+
+	UA_Int32 i, n;
+	for (i = 0, n = 0; i < node->referencesSize; i++ ) {
+		if (node->references[i]->referenceTypeId.identifier.numeric == 47 && node->references[i]->isInverse != UA_TRUE) {
+			n++;
+			if (n == idx) {
+				*result = &(node->references[i]->targetId.nodeId);
+				return retval;
+			}
+		}
+	}
+	return UA_ERR_INVALID_VALUE;
+}
+
+
+UA_Int32 UAX_NodeId_encodeBinaryByMetaData(Namespace const * ns, UA_NodeId const * id, UA_Int32* pos, UA_ByteString *dst) {
+	UA_Int32 i, retval = UA_SUCCESS;
+	if (UA_NodeId_isBasicType(id)) {
+		UA_Node const * result;
+		Namespace_Entry_Lock* lock;
+		if ((retval = Namespace_get(ns,id,&result,&lock)) == UA_SUCCESS)
+			UA_Variant_encodeBinary(&((UA_VariableNode *) result)->value,pos,dst);
+	} else {
+		UA_Int32 nComp = 0;
+		if ((retval = Namespace_getNumberOfComponents(ns,id,&nComp)) == UA_SUCCESS) {
+			for (i=0; i < nComp; i++) {
+				UA_NodeId* comp = UA_NULL;
+				Namespace_getComponent(ns,id,i,&comp);
+				UAX_NodeId_encodeBinaryByMetaData(ns,comp, pos, dst);
+			}
+		}
+	}
+	return retval;
+}
+
+UA_Int32 UAX_NodeId_encodeBinary(Namespace const * ns, UA_NodeId const * id, UA_Int32* pos, UA_ByteString *dst) {
+	UA_Int32 retval = UA_SUCCESS;
+	UA_Node const * node;
+	Namespace_Entry_Lock* lock;
+
+	if ((retval = Namespace_get(ns,id,&node,&lock)) == UA_SUCCESS) {
+		if (node->nodeClass == UA_NODECLASS_VARIABLE) {
+			retval = UA_Variant_encodeBinary(&((UA_VariableNode*) node)->value,pos,dst);
+		}
+		Namespace_Entry_Lock_release(lock);
+	}
+	return retval;
+}
+
+int main(int argc, char** argv) {
+	if (argc != 2) {
+		printf("usage: %s filename\n",argv[0]);
+	} else {
+		int f = open(argv[1], O_RDONLY);
+		if (f==-1) {
+			perror("file not found");
+			exit(-1);
+		}
+
+		char buf[1024];
+		int len; /* len is the number of bytes in the current bufferful of data */
+		XML_Stack s;
+		XML_Stack_init(&s, "ROOT");
+		UA_NodeSet n;
+		UA_NodeSet_init(&n, 0);
+		XML_Stack_addChildHandler(&s, "UANodeSet", strlen("UANodeSet"), (XML_decoder) UA_NodeSet_decodeXML, UA_INVALIDTYPE, &n);
+
+		XML_Parser parser = XML_ParserCreate(NULL);
+		XML_SetUserData(parser, &s);
+		XML_SetElementHandler(parser, XML_Stack_startElement, XML_Stack_endElement);
+		XML_SetCharacterDataHandler(parser, XML_Stack_handleText);
+		while ((len = read(f, buf, 1024)) > 0) {
+			if (!XML_Parse(parser, buf, len, (len < 1024))) {
+				return 1;
+			}
+		}
+		XML_ParserFree(parser);
+		close(f);
+
+		for (pattern* pi = &p[0]; pi->s != UA_NULL || pi->v != UA_NULL; ++pi) {
+			if (pi->v) {
+				Namespace_iterate(n.ns, pi->v);
+			} else {
+				printf("%s\n",pi->s);
+			}
+		}
+	}
+	return 0;
+}

tests/check_namespace.c

@@ -7,7 +7,7 @@
 
 START_TEST(test_Namespace) {
 	Namespace *ns = UA_NULL;
-	Namespace_new(&ns, 512, 99);
+	Namespace_new(&ns, 512, 0);
 	Namespace_delete(ns);
 }
 END_TEST
@@ -23,7 +23,7 @@ UA_Int32 createNode(UA_Node** p, UA_Int16 nsid, UA_Int32 id) {
 START_TEST(findNodeInNamespaceWithSingleEntry) {
 	// given
 	Namespace *ns;
-	Namespace_new(&ns, 512, 99);
+	Namespace_new(&ns, 512, 0);
 	UA_Node* n1; createNode(&n1,0,2253); Namespace_insert(ns,n1);
 	const UA_Node* nr = UA_NULL;
 	Namespace_Entry_Lock* nl = UA_NULL;
@@ -41,7 +41,7 @@ END_TEST
 START_TEST(findNodeInNamespaceWithTwoEntries) {
 	// given
 	Namespace *ns;
-	Namespace_new(&ns, 512, 99);
+	Namespace_new(&ns, 512, 0);
 	UA_Node* n1; createNode(&n1,0,2253); Namespace_insert(ns,n1);
 	UA_Node* n2; createNode(&n2,0,2255); Namespace_insert(ns,n2);
 
@@ -58,10 +58,31 @@ START_TEST(findNodeInNamespaceWithTwoEntries) {
 }
 END_TEST
 
+START_TEST(failToFindNodeInOtherNamespace) {
+	// given
+	Namespace *ns;
+	Namespace_new(&ns, 512, 0);
+	UA_Node* n1; createNode(&n1,0,2253); Namespace_insert(ns,n1);
+	UA_Node* n2; createNode(&n2,0,2255); Namespace_insert(ns,n2);
+
+	const UA_Node* nr = UA_NULL;
+	Namespace_Entry_Lock* nl = UA_NULL;
+	UA_Int32 retval;
+	// when
+	UA_Node* n; createNode(&n,1,2255);
+	retval = Namespace_get(ns,&(n->nodeId),&nr,&nl);
+	// then
+	ck_assert_int_ne(retval, UA_SUCCESS);
+	// finally
+	UA_free(n);
+	Namespace_delete(ns);
+}
+END_TEST
+
 START_TEST(findNodeInNamespaceWithSeveralEntries) {
 	// given
 	Namespace *ns;
-	Namespace_new(&ns, 512, 99);
+	Namespace_new(&ns, 512, 0);
 	UA_Node* n1; createNode(&n1,0,2253); Namespace_insert(ns,n1);
 	UA_Node* n2; createNode(&n2,0,2255); Namespace_insert(ns,n2);
 	UA_Node* n3; createNode(&n3,0,2257); Namespace_insert(ns,n3);
@@ -85,7 +106,7 @@ END_TEST
 START_TEST(findNodeInExpandedNamespace) {
 	// given
 	Namespace *ns;
-	Namespace_new(&ns, 10, 99);
+	Namespace_new(&ns, 10, 0);
 	UA_Node* n;
 	for (UA_Int32 i=0; i<200; i++) {
 		createNode(&n,0,i); Namespace_insert(ns,n);
@@ -108,7 +129,7 @@ END_TEST
 START_TEST(failToFindNonExistantNodeInNamespaceWithSeveralEntries) {
 	// given
 	Namespace *ns;
-	Namespace_new(&ns, 512, 99);
+	Namespace_new(&ns, 512, 0);
 	UA_Node* n1; createNode(&n1,0,2253); Namespace_insert(ns,n1);
 	UA_Node* n2; createNode(&n2,0,2255); Namespace_insert(ns,n2);
 	UA_Node* n3; createNode(&n3,0,2257); Namespace_insert(ns,n3);
@@ -144,11 +165,13 @@ Suite * namespace_suite (void) {
 	tcase_add_test (tc_find, findNodeInNamespaceWithSeveralEntries);
 	tcase_add_test (tc_find, findNodeInExpandedNamespace);
 	tcase_add_test (tc_find, failToFindNonExistantNodeInNamespaceWithSeveralEntries);
+	tcase_add_test (tc_find, failToFindNodeInOtherNamespace);
 	suite_add_tcase (s, tc_find);
 
 	return s;
 }
 
+
 int main (void) {
 	int number_failed =0;
 	Suite *s = namespace_suite ();

tools/Makefile.am

@@ -3,7 +3,7 @@ INCLUDE_DIR = $(top_builddir)/include
 AUTO_NAME = opcua
 NS0_NAME = ua_namespace_0
 
-all-local: $(AUTO_NAME).cgen $(AUTO_NAME).hgen $(NS0_NAME).cgen $(NS0_NAME).hgen
+all-local: $(AUTO_NAME).cgen $(AUTO_NAME).hgen $(NS0_NAME).cgen $(NS0_NAME).hgen $(bin_PROGRAMS)
 
 $(AUTO_NAME).cgen $(AUTO_NAME).hgen: Opc.Ua.Types.bsd generate_builtin.py
 	python generate_builtin.py Opc.Ua.Types.bsd $(AUTO_NAME)