still merging

examples/src/opcuaServer.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 
 #include "networklayer.h"
+#include "ua_application.h"
 
 UA_Int32 serverCallback(void * arg) {
 	char *name = (char *) arg;

src/ua_services_view.c

@@ -1,9 +1,11 @@
 #include "ua_services.h"
 
-UA_Int32 Service_Read(SL_Channel *channel, const UA_ReadRequest *request, UA_ReadResponse *response) {
-	UA_NodeId_printf("BrowseService - view=",&(p->view.viewId));
+UA_Int32 Service_Browse(SL_Channel *channel, const UA_BrowseRequest *request, UA_BrowseResponse *response) {
+	UA_Int32 retval = UA_SUCCESS;
+	DBG_VERBOSE(UA_NodeId_printf("BrowseService - view=",&(request->view.viewId)));
 	UA_Int32 i = 0;
-	for (i=0;p->nodesToBrowseSize > 0 && i<p->nodesToBrowseSize;i++) {
-		UA_NodeId_printf("BrowseService - nodesToBrowse=", &(p->nodesToBrowse[i]->nodeId));
+	for (i=0;request->nodesToBrowseSize > 0 && i<request->nodesToBrowseSize;i++) {
+		UA_NodeId_printf("BrowseService - nodesToBrowse=", &(request->nodesToBrowse[i]->nodeId));
 	}
+	return retval;
 }

tests/check_namespace.c

@@ -24,18 +24,24 @@ START_TEST(test_Namespace) {
 }
 END_TEST
 
+UA_Int32 createNode(UA_Node** p, UA_Int16 nsid, UA_Int32 id) {
+	UA_Node_new(p);
+	(*p)->nodeId.encodingByte = UA_NODEIDTYPE_FOURBYTE;
+	(*p)->nodeId.namespace = nsid;
+	(*p)->nodeId.identifier.numeric = id;
+	return UA_SUCCESS;
+}
+
 START_TEST(findNodeInNamespaceWithSingleEntry) {
 	// given
 	namespace *ns;
 	create_ns(&ns, 512);
-	UA_Node n1 = { (UA_NodeId) { UA_NODEIDTYPE_FOURBYTE, 0, { 2253 }}, 0 };
-	insert_node(ns,&n1);
+	UA_Node* n1; createNode(&n1,0,2253); insert_node(ns,n1);
 	UA_Node* nr = UA_NULL;
 	ns_lock* nl = UA_NULL;
 	UA_Int32 retval;
 	// when
-	UA_NodeId nid1 = { UA_NODEIDTYPE_FOURBYTE, 0, { 2253 }};
-	retval = get_node(ns,&nid1,&nr,&nl);
+	retval = get_node(ns,&(n1->nodeId),&nr,&nl);
 	// then
 	ck_assert_int_eq(retval, UA_SUCCESS);
 	ck_assert_ptr_eq(nr,&n1);
@@ -48,16 +54,14 @@ START_TEST(findNodeInNamespaceWithTwoEntries) {
 	// given
 	namespace *ns;
 	create_ns(&ns, 512);
-	UA_Node n1 = { (UA_NodeId) { UA_NODEIDTYPE_FOURBYTE, 0, { 2253 }}, 0 };
-	UA_Node n2 = { (UA_NodeId) { UA_NODEIDTYPE_FOURBYTE, 0, { 2255 }}, 0 };
-	insert_node(ns,&n1);
-	insert_node(ns,&n2);
+	UA_Node* n1; createNode(&n1,0,2253); insert_node(ns,n1);
+	UA_Node* n2; createNode(&n2,0,2255); insert_node(ns,n2);
+
 	UA_Node* nr = UA_NULL;
 	ns_lock* nl = UA_NULL;
 	UA_Int32 retval;
 	// when
-	UA_NodeId nid1 = { UA_NODEIDTYPE_FOURBYTE, 0, { 2255 }};
-	retval = get_node(ns,&nid1,&nr,&nl);
+	retval = get_node(ns,&(n2->nodeId),&nr,&nl);
 	// then
 	ck_assert_int_eq(retval, UA_SUCCESS);
 	ck_assert_ptr_eq(nr,&n1);