removing legacy code. xml handling is kept in the repository for now.

doc/building.rst

@@ -62,6 +62,3 @@ Building with CMake on Windows (Visual Studio)
 Build Options
 -------------
 
-
-Building the Examples
-=====================

src/ongoing/opcuaServerMini.c

@@ -1,344 +0,0 @@
-/*
- * This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- */
-
-/**************************************************************
- * opcuaServerMini is a pathologically unstructured bare bone
- * implementation of the 62541 communications w/o any structures
- * or comfort. Furthermore, the implementation assumes a
- * little endian target and consequently ignores all the rules
- * of 62541 towards security.
- *
- * The nice thing about this approach is that you can easily see
- * that the memory footprint of a simple server can be held
- * quite small and memory allocation capabilities is not needed
- * as long as features are consequently minimized.
- ****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <errno.h> // errno, EINTR
-
-
-#include "ua_statuscodes.h"
-#include "ua_transport.h"
-#include "ua_transport_binary.h"
-#include "networklayer.h"
-
-#ifdef LINUX
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/socketvar.h>
-#include <unistd.h>
-
-void server_run();
-
-#endif
-
-#define PORT 16664
-#define MAXMSG 512
-#define BUFFER_SIZE 8192
-
-int main(void) {
-
-#ifdef LINUX
-	printf("Starting open62541 demo server on port %d\n", PORT);
-	server_run();
-#endif
-
-	return EXIT_SUCCESS;
-}
-
-#ifdef LINUX
-
-UA_Byte ack_msg_buf[] = { 			0x41, 0x43, /*       AC */
-0x4b, 0x46, 0x1c, 0x00, 0x00, 0x00, 0xff, 0xff, /* KF...... */
-0xff, 0xff, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, /* ... ...  */
-0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0x00, /* ...@.... */
-0x00, 0x00                                      /* ..       */
-};
-UA_ByteString ack_msg = { sizeof(ack_msg_buf), ack_msg_buf };
-UA_ByteString* ack_msg_gb[] = { &ack_msg };
-
-
-UA_Byte opn_msg_buf[] = {           0x4f, 0x50, /*       OP */
-0x4e, 0x46, 0x88, 0x00, 0x00, 0x00, 0x19, 0x00, /* NF...... */
-0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x68, 0x74, /* ../...ht */
-0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x70, 0x63, /* tp://opc */
-0x66, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, 0x69, /* foundati */
-0x6f, 0x6e, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x55, /* on.org/U */
-0x41, 0x2f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, /* A/Securi */
-0x74, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, /* tyPolicy */
-0x23, 0x4e, 0x6f, 0x6e, 0x65, 0xff, 0xff, 0xff, /* #None... */
-0xff, 0xff, 0xff, 0xff, 0xff, 0x33, 0x00, 0x00, /* .....3.. */
-0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc1, /* ........ */
-0x01, 0x10, 0x56, 0x73, 0x9e, 0xdf, 0x63, 0xcf, /* ..Vs..c. */
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0x00, 0xff, 0xff, 0xff, 0xff, 0x19, 0x00, 0x00, /* ........ */
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0x00, 0x01, 0x00, 0x00, 0x00, 0x48              /* .....H   */
-};
-
-UA_ByteString opn_msg = { sizeof(opn_msg_buf), opn_msg_buf };
-UA_ByteString* opn_msg_gb[] = { &opn_msg };
-
-UA_Byte scm_msg_buf[] = {           0x4d, 0x53, /*       MS */
-0x47, 0x46, 0x8b, 0x01, 0x00, 0x00, 0x19, 0x00, /* GF<XX>.. */ // <XX> = msglen. TODO: should be set or checked by writer?
-0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x34, 0x00, /* ......4. */
-0x00, 0x00, 0x02, 0x00, 0x00, 0x00              /* ......   */
-};
-UA_Byte rsp_msg_buf[] = {           0x01, 0x00, /* ........ */
-0xaf, 0x01, 0x2c, 0xc1, 0x73, 0x9e, 0xdf, 0x63, /* <><XXXXX */ // <> = response nS0-ID
-0xcf, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* X>....<A */ // <X> = timestamp,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* A>...... */ // <A> = statuscode
-0x00, 0x00                                      /* ..       */
-};
-
-UA_Byte gep_msg_buf[] = {
-		    0x01, 0x00, 0x00, 0x00, 0x1b, 0x00, /*   ...... */
-0x00, 0x00, 0x6f, 0x70, 0x63, 0x2e, 0x74, 0x63, /* ..opc.tc */
-0x70, 0x3a, 0x2f, 0x2f, 0x31, 0x30, 0x2e, 0x30, /* p://10.0 */
-0x2e, 0x35, 0x33, 0x2e, 0x31, 0x39, 0x38, 0x3a, /* .53.198: */
-0x31, 0x36, 0x36, 0x36, 0x34, 0x27, 0x00, 0x00, /* 16664'.. */
-0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, /* .http:// */
-0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, /* open6254 */
-0x31, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x61, /* 1.info/a */
-0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, /* pplicati */
-0x6f, 0x6e, 0x73, 0x2f, 0x34, 0x37, 0x31, 0x31, /* ons/4711 */
-0x25, 0x00, 0x00, 0x00, 0x68, 0x74, 0x74, 0x70, /* %...http */
-0x3a, 0x2f, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x36, /* ://open6 */
-0x32, 0x35, 0x34, 0x31, 0x2e, 0x69, 0x6e, 0x66, /* 2541.inf */
-0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, /* o/produc */
-0x74, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, /* t/releas */
-0x65, 0x03, 0x02, 0x00, 0x00, 0x00, 0x45, 0x4e, /* e.....EN */
-0x19, 0x00, 0x00, 0x00, 0x54, 0x68, 0x65, 0x20, /* ....The  */
-0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, /* open6254 */
-0x31, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, /* 1 applic */
-0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, /* ation... */
-0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* ........ */
-0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, /* ........ */
-0xff, 0x01, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, /* ...../.. */
-0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, /* .http:// */
-0x6f, 0x70, 0x63, 0x66, 0x6f, 0x75, 0x6e, 0x64, /* opcfound */
-0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x6f, 0x72, /* ation.or */
-0x67, 0x2f, 0x55, 0x41, 0x2f, 0x53, 0x65, 0x63, /* g/UA/Sec */
-0x75, 0x72, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6c, /* urityPol */
-0x69, 0x63, 0x79, 0x23, 0x4e, 0x6f, 0x6e, 0x65, /* icy#None */
-0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, /* ........ */
-0x6d, 0x79, 0x2d, 0x61, 0x6e, 0x6f, 0x6e, 0x79, /* my-anony */
-0x6d, 0x6f, 0x75, 0x73, 0x2d, 0x70, 0x6f, 0x6c, /* mous-pol */
-0x69, 0x63, 0x79, 0x00, 0x00, 0x00, 0x00, 0xff, /* icy..... */
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* ........ */
-0xff, 0xff, 0xff, 0x41, 0x00, 0x00, 0x00, 0x68, /* ...A...h */
-0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x70, /* ttp://op */
-0x63, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, /* cfoundat */
-0x69, 0x6f, 0x6e, 0x2e, 0x6f, 0x72, 0x67, 0x2f, /* ion.org/ */
-0x55, 0x41, 0x2d, 0x50, 0x72, 0x6f, 0x66, 0x69, /* UA-Profi */
-0x6c, 0x65, 0x2f, 0x54, 0x72, 0x61, 0x6e, 0x73, /* le/Trans */
-0x70, 0x6f, 0x72, 0x74, 0x2f, 0x75, 0x61, 0x74, /* port/uat */
-0x63, 0x70, 0x2d, 0x75, 0x61, 0x73, 0x63, 0x2d, /* cp-uasc- */
-0x75, 0x61, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, /* uabinary */
-0x00                                            /* . */
-};
-
-UA_Byte csr_msg_buf[] = {
-		    0x01, 0x01, 0x9a, 0x02, 0x00, 0x00, /*   <XX>.. */ // <X> = sessionID
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* ........ */
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* ........ */
-0x00, 0x00, 0x00, 0x00                          /* ....     */
-};
-
-UA_Byte asr_msg_buf[] = {
-            0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /*   ...... */
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00              /* ......   */
-};
-UA_ByteString scm_msg = { sizeof(scm_msg_buf), scm_msg_buf };
-UA_ByteString rsp_msg = { sizeof(rsp_msg_buf), rsp_msg_buf };
-UA_ByteString* sf_msg_gb[] = { &scm_msg, &rsp_msg }; // servicefault
-
-UA_ByteString gep_msg = { sizeof(gep_msg_buf), gep_msg_buf };
-UA_ByteString* gep_msg_gb[] = { &scm_msg, &rsp_msg, &gep_msg }; //getendpoint response
-
-UA_ByteString csr_msg = { sizeof(csr_msg_buf), csr_msg_buf };
-UA_ByteString* csr_msg_gb[] = { &scm_msg, &rsp_msg, &csr_msg }; // create session response
-
-UA_ByteString asr_msg = { sizeof(asr_msg_buf), asr_msg_buf };
-UA_ByteString* asr_msg_gb[] = { &scm_msg, &rsp_msg, &asr_msg }; // activate session response
-
-UA_Int32 myProcess(TL_Connection* connection, const UA_ByteString* msg) {
-	switch (*((UA_Int32*) &(msg->data[0]))) { // compare first four bytes
-		case 0x464c4548: // HELF
-			connection->writerCallback(connection, (const UA_ByteString**) &ack_msg_gb, 1);
-		break;
-		case 0x464e504f: // OPNF
-			connection->writerCallback(connection, (const UA_ByteString**) &opn_msg_gb, 1);
-		break;
-		case 0x464f4c43: // CLOF
-			connection->connectionState = CONNECTIONSTATE_CLOSE;
-		break;
-		case 0x4647534d: // MSGF
-			switch (*((UA_Int16*) &(msg->data[26]))) {
-				case 428: // GetEndpointsRequest
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-					printf("server_run - GetEndpointsRequest\n");
-					*(UA_Int32*) (&scm_msg_buf[4]) = sizeof(scm_msg_buf) + sizeof(rsp_msg_buf) + sizeof(gep_msg_buf);
-					*(UA_Int16*) (&rsp_msg_buf[2]) = *(UA_Int16*) (&msg->data[26]) + 3;
-					*(UA_Int32*) (&rsp_msg_buf[16]) = UA_STATUSCODE_GOOD;
-					connection->writerCallback(connection, (const UA_ByteString**) &gep_msg_gb, 3);
-				break;
-				case 461: // CreateSessionRequest
-					printf("server_run - CreateSessionRequest\n");
-					*(UA_Int32*) (&scm_msg_buf[4]) = sizeof(scm_msg_buf) + sizeof(rsp_msg_buf) + sizeof(csr_msg_buf);
-					*(UA_Int16*) (&rsp_msg_buf[2]) = *(UA_Int16*) (&msg->data[26]) + 3;
-					*(UA_Int32*) (&rsp_msg_buf[16]) = UA_STATUSCODE_GOOD;
-					connection->writerCallback(connection, (const UA_ByteString**) &csr_msg_gb, 3);
-				break;
-				case 467: // FIXME: ActivateSessionRequest
-					printf("server_run - ActivateSessionRequest\n");
-					*(UA_Int32*) (&scm_msg_buf[4]) = sizeof(scm_msg_buf) + sizeof(rsp_msg_buf) + sizeof(asr_msg_buf);
-					*(UA_Int16*) (&rsp_msg_buf[2]) = *(UA_Int16*) (&msg->data[26]) + 3;
-					*(UA_Int32*) (&rsp_msg_buf[16]) = UA_STATUSCODE_GOOD;
-					connection->writerCallback(connection, (const UA_ByteString**) &asr_msg_gb, 3);
-				break;
-				default: // unknown service - send a simple response header of type UA_SERVICEFAULT
-					*(UA_Int32*) (&scm_msg_buf[4]) = sizeof(scm_msg_buf) + sizeof(rsp_msg_buf);
-					*(UA_Int16*) (&rsp_msg_buf[2]) = UA_SERVICEFAULT_NS0 + 2; // encodingBinary
-					*(UA_Int32*) (&rsp_msg_buf[16]) = UA_STATUSCODE_BADNOTIMPLEMENTED;
-#pragma GCC diagnostic pop
-					printf("server_run - unknown request %d\n", *((UA_Int16*) &(msg->data[26])));
-					connection->writerCallback(connection, (const UA_ByteString**) &sf_msg_gb, 2);
-				break;
-			}
-		break;
-	}
-	return UA_SUCCESS;
-}
-
-/** write message provided in the gather buffers to a tcp transport layer connection */
-UA_Int32 myWriter(struct TL_Connection const * c, UA_ByteString const * const * gather_buf, UA_UInt32 gather_len) {
-
-	struct iovec iov[gather_len];
-	UA_UInt32 total_len = 0;
-	for(UA_UInt32 i=0;i<gather_len;i++) {
-		iov[i].iov_base = gather_buf[i]->data;
-		iov[i].iov_len = gather_buf[i]->length;
-		total_len += gather_buf[i]->length;
-	}
-
-	struct msghdr message;
-	message.msg_name = UA_NULL;
-	message.msg_namelen = 0;
-	message.msg_iov = iov;
-	message.msg_iovlen = gather_len;
-	message.msg_control = UA_NULL;
-	message.msg_controllen = 0;
-	message.msg_flags = 0;
-
-	UA_UInt32 nWritten = 0;
-	while (nWritten < total_len) {
-		int n=0;
-		do {
-			DBG_VERBOSE(printf("myWriter - enter write with %d bytes to write\n",total_len));
-			n = sendmsg(c->connectionHandle, &message, 0);
-			DBG_VERBOSE(printf("myWriter - leave write with n=%d,errno={%d,%s}\n",n,(n>0)?0:errno,(n>0)?"":strerror(errno)));
-		} while (n == -1L && errno == EINTR);
-		if (n >= 0) {
-			nWritten += n;
-			break;
-			// TODO: handle incompletely send messages
-		} else {
-			break;
-			// TODO: error handling
-		}
-	}
-	return UA_SUCCESS;
-}
-
-void server_run() {
-	TL_Connection connection;
-	connection.connectionState = CONNECTIONSTATE_CLOSED;
-	connection.writerCallback = (TL_Writer) myWriter;
-	connection.localConf.maxChunkCount = 1;
-	connection.localConf.maxMessageSize = BUFFER_SIZE;
-	connection.localConf.protocolVersion = 0;
-	connection.localConf.recvBufferSize = BUFFER_SIZE;
-	connection.localConf.recvBufferSize = BUFFER_SIZE;
-
-	UA_ByteString slMessage = { -1, UA_NULL };
-
-	int optval = 1;
-	int sockfd, newsockfd, portno, clilen;
-	char buffer[BUFFER_SIZE];
-	struct sockaddr_in serv_addr, cli_addr;
-	int n;
-
-	/* First call to socket() function */
-	sockfd = socket(PF_INET, SOCK_STREAM, 0);
-	if (sockfd < 0) {
-		perror("ERROR opening socket");
-		exit(1);
-	}
-
-	/* Initialize socket structure */
-    memset((void *) &serv_addr, 0, sizeof(serv_addr));
-	portno = PORT;
-	serv_addr.sin_family = AF_INET;
-	serv_addr.sin_addr.s_addr = INADDR_ANY;
-	serv_addr.sin_port = htons(portno);
-
-	if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval) == -1) {
-		perror("setsockopt");
-		exit(1);
-	}
-
-	/* Now bind the host address using bind() call.*/
-	if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
-		perror("ERROR on binding");
-		exit(1);
-	}
-
-	/* Now start listening for the clients, here process will
-	 * go in sleep mode and will wait for the incoming connection
-	 */
-	while (listen(sockfd, 5) != -1) {
-		clilen = sizeof(cli_addr);
-		/* Accept actual connection from the client */
-		newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t*) &clilen);
-		if (newsockfd < 0) {
-			perror("ERROR on accept");
-			exit(1);
-		}
-
-		printf("server_run - connection accepted: %i, state: %i\n", newsockfd, connection.connectionState);
-		connection.connectionHandle = newsockfd;
-		do {
-            memset(buffer, 0, BUFFER_SIZE);
-			n = read(newsockfd, buffer, BUFFER_SIZE);
-			if (n > 0) {
-                slMessage.data = (UA_Byte*) buffer;
-				slMessage.length = n;
-				DBG(printf("server_run - received=%d\n",n));
-				myProcess(&connection, &slMessage);
-			} else if (n <= 0) {
-				perror("ERROR reading from socket1");
-				connection.connectionState = CONNECTIONSTATE_CLOSE;
-			}
-		} while(connection.connectionState != CONNECTIONSTATE_CLOSE);
-		shutdown(newsockfd,2);
-		close(newsockfd);
-		connection.connectionState = CONNECTIONSTATE_CLOSED;
-	}
-	shutdown(sockfd,2);
-	close(sockfd);
-}
-
-#endif

src/ongoing/ua_base64.c

@@ -1,149 +0,0 @@
-/*
-   begin library headers
- */
-
-/*
-   cdecode.h - c header for a base64 decoding algorithm
-
-   This is part of the libb64 project, and has been placed in the public domain.
-   For details, see http://sourceforge.net/projects/libb64
- */
-#ifndef BASE64_CDECODE_H
-#define BASE64_CDECODE_H
-
-typedef enum {
-    step_a, step_b, step_c, step_d
-} base64_decodestep;
-
-typedef struct {
-    base64_decodestep step;
-    char plainchar;
-} base64_decodestate;
-
-void base64_init_decodestate(base64_decodestate *state_in);
-
-int base64_decode_value(char value_in);
-
-int base64_decode_block(const char *code_in, const int length_in, char *plaintext_out,
-                        base64_decodestate *state_in);
-
-#endif /* BASE64_CDECODE_H */
-
-/*
-   end library headers
- */
-
-#include "ua_base64.h"
-
-UA_Int32 UA_base64_getDecodedSize(UA_String *const base64EncodedData) {
-    //note that base64-encoded data length is always divisible by 4
-    UA_Int32 temp = base64EncodedData->length * 3 / 4;
-
-    //subtract padding
-    if(base64EncodedData->data[base64EncodedData->length-1] == '=') {
-        temp--;
-        if(base64EncodedData->data[base64EncodedData->length-2] == '=')
-            temp--;
-    }
-
-    return temp;
-}
-
-UA_Int32 UA_base64_decode(UA_String *const base64EncodedData, UA_Byte *target) {
-    if(target == UA_NULL)
-        return UA_ERROR;
-    base64_decodestate state;
-    base64_init_decodestate(&state);
-    base64_decode_block((char *)(base64EncodedData->data), base64EncodedData->length, (char *)target, &state);
-    return UA_NO_ERROR;
-}
-
-/*
-   begin library code
- */
-
-/*
-   cdecoder.c - c source to a base64 decoding algorithm implementation
-
-   This is part of the libb64 project, and has been placed in the public domain.
-   For details, see http://sourceforge.net/projects/libb64
- */
-
-int base64_decode_value(char value_in) {
-    static const char decoding[]    =
-    { 62, -1,   -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1, -1, 0,  1,  2,  3,
-      4,  5,
-      6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26,
-      27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 };
-    static const char decoding_size = sizeof(decoding);
-    value_in -= 43;
-    if(value_in > decoding_size) return -1;
-    return decoding[(int)value_in];
-}
-
-void base64_init_decodestate(base64_decodestate *state_in) {
-    state_in->step      = step_a;
-    state_in->plainchar = 0;
-}
-
-int base64_decode_block(const char *code_in, const int length_in, char *plaintext_out,
-                        base64_decodestate *state_in) {
-    const char *codechar  = code_in;
-    char       *plainchar = plaintext_out;
-    signed char fragment;
-
-    *plainchar = state_in->plainchar;
-
-    switch(state_in->step) {
-        while(1) {
-        case step_a:
-            do {
-                if(codechar == code_in+length_in) {
-                    state_in->step      = step_a;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while(fragment < 0);
-            *plainchar = (fragment & 0x03f) << 2;
-
-        case step_b:
-            do {
-                if(codechar == code_in+length_in) {
-                    state_in->step      = step_b;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while(fragment < 0);
-            *plainchar++ |= (fragment & 0x030) >> 4;
-            *plainchar    = (fragment & 0x00f) << 4;
-
-        case step_c:
-            do {
-                if(codechar == code_in+length_in) {
-                    state_in->step      = step_c;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while(fragment < 0);
-            *plainchar++ |= (fragment & 0x03c) >> 2;
-            *plainchar    = (fragment & 0x003) << 6;
-
-        case step_d:
-            do {
-                if(codechar == code_in+length_in) {
-                    state_in->step      = step_d;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while(fragment < 0);
-            *plainchar++ |= (fragment & 0x03f);
-        }
-    }
-    /* control should not reach here */
-    return plainchar - plaintext_out;
-}
-

src/ongoing/ua_base64.h

@@ -1,20 +0,0 @@
-/*
- * ua_base64.h
- *
- *  Created on: Jun 10, 2014
- *      Author: sten
- */
-
-#ifndef UA_BASE64_H_
-#define UA_BASE64_H_
-
-#include "ua_types.h"
-#include "ua_util.h"
-
-/** @brief calculates the exact size for the binary data that is encoded in base64 encoded string */
-UA_Int32 UA_base64_getDecodedSize(UA_String *const base64EncodedData);
-
-/** @brief decodes base64 encoded string into target, target should be at least of the size returned by UA_base64_getDecodedSizeUB */
-UA_Int32 UA_base64_decode(UA_String *const base64EncodedData, UA_Byte *target);
-
-#endif /* UA_BASE64_H_ */

src/ongoing/ua_services_monitoreditems.c

@@ -1,27 +0,0 @@
-#include "ua_services.h"
-#include "ua_namespace_0.h"
-#include "ua_statuscodes.h"
-
-void Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
-                                  const UA_CreateMonitoredItemsRequest *request,
-                                  UA_CreateMonitoredItemsResponse *response) {
-    if(request->itemsToCreateSize <= 0)
-        return;
-
-    //mock up
-    response->resultsSize = request->itemsToCreateSize;
-    UA_Array_new((void**)&response->results, response->resultsSize, &UA_[UA_MONITOREDITEMCREATERESULT]);
-    for(int i = 0;request->itemsToCreateSize > 0 && i < request->itemsToCreateSize;i++) {
-        //FIXME: search the object in the namespace
-        if(request->itemsToCreate[i].itemToMonitor.nodeId.identifier.numeric == 2253) {  // server
-            response->results[i].statusCode       = UA_STATUSCODE_GOOD;
-            response->results[i].monitoredItemId  = 1;
-            response->results[i].revisedSamplingInterval = 4294967295;
-            response->results[i].revisedQueueSize = 0;
-            continue;
-        } else {
-            // response->results[i]->statusCode = UA_STATUSCODE_BAD_NODEIDUNKNOWN;
-            response->results[i].statusCode = -1;
-        }
-    }
-}

src/ongoing/ua_services_subscription.c

@@ -1,30 +0,0 @@
-#include "ua_services.h"
-#include "ua_statuscodes.h"
-#include "ua_util.h"
-
-UA_Int32 Service_CreateSubscription(UA_Server *server, UA_Session *session,
-                                    const UA_CreateSubscriptionRequest *request,
-                                    UA_CreateSubscriptionResponse *response) {
-    response->subscriptionId            = 42;
-    response->revisedPublishingInterval = 100000;
-    response->revisedLifetimeCount      = 120000;
-    response->revisedMaxKeepAliveCount  = 50;
-    return UA_SUCCESS;
-}
-
-UA_Int32 Service_Publish(UA_Server *server, UA_Session *session, const UA_PublishRequest *request,
-                         UA_PublishResponse *response) {
-    response->subscriptionId = 42;
-    response->notificationMessage.sequenceNumber = 1;
-    response->notificationMessage.publishTime    = UA_DateTime_now();
-    return UA_SUCCESS;
-}
-
-UA_Int32 Service_SetPublishingMode(UA_Server *server, UA_Session *session,
-                                   const UA_SetPublishingModeRequest *request,
-                                   UA_SetPublishingModeResponse *response) {
-    response->diagnosticInfos = UA_NULL;
-    response->results = UA_NULL;
-    response->resultsSize     = 0;
-    return UA_SUCCESS;
-}

src/ongoing/ua_types_encoding_json.c

@@ -1,4 +0,0 @@
-#include "ua_types_encoding_json.h"
-
-// TODO: Implement encoding of the builtin types (in ua_types.h). Then add JSON
-// encoding to the structure generation in tools/generate_builtin.py

src/ongoing/ua_types_encoding_json.h

@@ -1,73 +0,0 @@
-#ifndef UA_TYPES_ENCODING_JSON_H_
-#define UA_TYPES_ENCODING_JSON_H_
-
-#include "util/ua_util.h"
-#include "ua_types.h"
-
-/**
- * @ingroup encoding
- * @defgroup encoding_json JSON Encoding
- *
- * @brief Encoding of UA datatypes in JSON. This extends the IEC 62541 standard
- * and is only included in the "extended" profile. The extension is intended to
- * be used with a webserver that transmits JSON over HTTP.
- *
- * @{
- */
-
-#define UA_TYPE_CALCSIZEJSON_AS(TYPE, TYPE_AS)       \
-    UA_Int32 TYPE##_calcSizeJSON(TYPE const *p) {    \
-		return TYPE_AS##_calcSizeJSON((TYPE_AS *)p); \
-	}
-
-#define UA_TYPE_ENCODEJSON_AS(TYPE, TYPE_AS)                                             \
-    UA_Int32 TYPE##_encodeJSON(TYPE const *src, UA_ByteString *dst, UA_UInt32 *offset) { \
-		return TYPE_AS##_encodeJSON((TYPE_AS *)src, dst, offset);                        \
-	}
-
-#define UA_TYPE_DECODEJSON_AS(TYPE, TYPE_AS)                                             \
-    UA_Int32 TYPE##_decodeJSON(UA_ByteString const *src, UA_UInt32 *offset, TYPE *dst) { \
-		return TYPE_AS##_decodeJSON(src, offset, (TYPE_AS *)dst);                        \
-	}
-#define UA_TYPE_JSON_ENCODING_AS(TYPE, TYPE_AS) \
-    UA_TYPE_CALCSIZEJSON_AS(TYPE, TYPE_AS)      \
-    UA_TYPE_ENCODEJSON_AS(TYPE, TYPE_AS)        \
-    UA_TYPE_DECODEJSON_AS(TYPE, TYPE_AS)
-
-#define UA_TYPE_JSON_ENCODING(TYPE)                                                     \
-    UA_Int32 TYPE##_calcSizeJSON(TYPE const *p);                                        \
-    UA_Int32 TYPE##_encodeJSON(TYPE const *src, UA_ByteString *dst, UA_UInt32 *offset); \
-    UA_Int32 TYPE##_decodeJSON(UA_ByteString const *src, UA_UInt32 *offset, TYPE *dst);
-
-UA_TYPE_JSON_ENCODING(UA_Boolean)
-UA_TYPE_JSON_ENCODING(UA_SByte)
-UA_TYPE_JSON_ENCODING(UA_Byte)
-UA_TYPE_JSON_ENCODING(UA_Int16)
-UA_TYPE_JSON_ENCODING(UA_UInt16)
-UA_TYPE_JSON_ENCODING(UA_Int32)
-UA_TYPE_JSON_ENCODING(UA_UInt32)
-UA_TYPE_JSON_ENCODING(UA_Int64)
-UA_TYPE_JSON_ENCODING(UA_UInt64)
-UA_TYPE_JSON_ENCODING(UA_Float)
-UA_TYPE_JSON_ENCODING(UA_Double)
-UA_TYPE_JSON_ENCODING(UA_String)
-UA_TYPE_JSON_ENCODING(UA_DateTime)
-UA_TYPE_JSON_ENCODING(UA_Guid)
-UA_TYPE_JSON_ENCODING(UA_ByteString)
-UA_TYPE_JSON_ENCODING(UA_XmlElement)
-UA_TYPE_JSON_ENCODING(UA_NodeId)
-UA_TYPE_JSON_ENCODING(UA_ExpandedNodeId)
-UA_TYPE_JSON_ENCODING(UA_StatusCode)
-UA_TYPE_JSON_ENCODING(UA_QualifiedName)
-UA_TYPE_JSON_ENCODING(UA_LocalizedText)
-UA_TYPE_JSON_ENCODING(UA_ExtensionObject)
-UA_TYPE_JSON_ENCODING(UA_DataValue)
-UA_TYPE_JSON_ENCODING(UA_Variant)
-UA_TYPE_JSON_ENCODING(UA_DiagnosticInfo)
-
-/* Not built-in types */
-UA_TYPE_JSON_ENCODING(UA_InvalidType)
-
-/// @} /* end of group */
-
-#endif /* UA_TYPES_ENCODING_JSON_H_ */