added handling for closeSecureChannelRequest (one reason for packet loss)

Makefile.am

@@ -1,10 +1,10 @@
-AM_CFLAGS = -std=c99 -pedantic -pipe -fstack-protector -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wformat -Wreturn-type -Wsign-compare -Wmultichar -Wformat-nonliteral -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -Werror -ffunction-sections -fdata-sections -Wl,--gc-sections
+AM_CFLAGS  = -std=c99 -pedantic -pipe -fstack-protector -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wformat -Wreturn-type -Wsign-compare -Wmultichar -Wformat-nonliteral -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -Werror -ffunction-sections -fdata-sections -Wl,--gc-sections
 AM_LDFLAGS =
 AM_LDADD =
 
 if TARGET_WIN
 else
-AM_CFLAGS += -fPIC
+AM_CFLAGS += -fPIC 
 endif
 
 if DEBUG
@@ -14,7 +14,7 @@ AM_CFLAGS += -O2
 endif
 
 if COVERAGE
-AM_CFLAGS += --coverage
+AM_CFLAGS  += --coverage
 AM_LDFLAGS += --coverage
 endif
 
@@ -34,16 +34,16 @@ export GLOBAL_AM_LDADD = $(AM_LDADD)
 
 SUBDIRS=src
 if HAVE_CHECK
-SUBDIRS+= tests
+	SUBDIRS+= tests
 endif
 
 if ENABLE_DOXYGEN
-SUBDIRS+= doc
+	SUBDIRS+= doc
 endif
 
 if TARGET_WIN
 else
-SUBDIRS += examples/src
+SUBDIRS += examples/src	
 endif
 
 if PYTHON_WRAPPER
@@ -52,4 +52,4 @@ endif
 
 if LUA_WRAPPER
 SUBDIRS += wrappers wrappers/lua
-endif
+endif

examples/src/networklayer.c

@@ -29,7 +29,7 @@ _Bool NL_ConnectionComparer(void *p1, void* p2) {
 	NL_Connection* c1 = (NL_Connection*) p1;
 	NL_Connection* c2 = (NL_Connection*) p2;
 
-	return (c1->connectionHandle == c2->connectionHandle)
+	return (c1->connectionHandle == c2->connectionHandle);
 
 }
 int NL_TCP_SetNonBlocking(int sock) {
@@ -47,33 +47,27 @@ int NL_TCP_SetNonBlocking(int sock) {
 }
 
 void NL_Connection_printf(void* payload) {
-  UA_UInt32 id;
   NL_Connection* c = (NL_Connection*) payload;
-  UA_TL_Connection_getHandle(c->connection,&id);
-  printf("ListElement connectionHandle = %d\n",id);
+  printf("ListElement connectionHandle = %d\n",c->connectionHandle);
 }
 void NL_addHandleToSet(UA_Int32 handle, NL_data* nl) {
 	FD_SET(handle, &(nl->readerHandles));
 	nl->maxReaderHandle = (handle > nl->maxReaderHandle) ? handle : nl->maxReaderHandle;
 }
 void NL_setFdSet(void* payload) {
-  UA_UInt32 h;
   NL_Connection* c = (NL_Connection*) payload;
-  UA_TL_Connection_getHandle(c->connection,&h);
-
-  NL_addHandleToSet(h, c->networkLayer);
+  NL_addHandleToSet(c->connectionHandle, c->networkLayer);
 }
 void NL_checkFdSet(void* payload) {
-  UA_UInt32 h;
   NL_Connection* c = (NL_Connection*) payload;
-  UA_TL_Connection_getHandle(c->connection,&h);
-  if (FD_ISSET(h, &(c->networkLayer->readerHandles))) {
+  if (FD_ISSET(c->connectionHandle, &(c->networkLayer->readerHandles))) {
 	  c->reader((void*)c);
   }
 }
 UA_Int32 NL_msgLoop(NL_data* nl, struct timeval *tv, UA_Int32(*worker)(void*), void *arg)  {
 	UA_Int32 result;
 	while (UA_TRUE) {
+		//sleep(1);
 		// determine the largest handle
 		nl->maxReaderHandle = 0;
 
@@ -127,20 +121,23 @@ void* NL_TCP_reader(NL_Connection *c) {
 	TL_Buffer localBuffers;
 	UA_Int32 connectionState;
 	UA_UInt32 connectionHandle;
-	UA_TL_Connection_getLocalConfiguration(c->connection, &localBuffers);
+	UA_TL_Connection_getLocalConfig(c->connection, &localBuffers);
 	UA_TL_Connection_getHandle(c->connection, &connectionHandle);
 	UA_alloc((void**)&(readBuffer.data),localBuffers.recvBufferSize);
 
 
 	if (c->state  != CONNECTIONSTATE_CLOSE) {
-	//	DBG_VERBOSE(printf("NL_TCP_reader - enter read\n"));
+		DBG_VERBOSE(printf("NL_TCP_reader - enter read\n"));
+
+
 		readBuffer.length = read(connectionHandle, readBuffer.data, localBuffers.recvBufferSize);
-	//	DBG_VERBOSE(printf("NL_TCP_reader - leave read\n"));
+		DBG_VERBOSE(printf("NL_TCP_reader - leave read\n"));
 
-	//	DBG_VERBOSE(printf("NL_TCP_reader - src={%*.s}, ",c->connection.remoteEndpointUrl.length,c->connection.remoteEndpointUrl.data));
-	//	DBG(UA_ByteString_printx("NL_TCP_reader - received=",&readBuffer));
+		DBG_VERBOSE(printf("NL_TCP_reader - src={%*.s}, ",c->connection.remoteEndpointUrl.length,c->connection.remoteEndpointUrl.data));
+		DBG(UA_ByteString_printx("NL_TCP_reader - received=",&readBuffer));
 
 		if (readBuffer.length  > 0) {
+
 #ifdef DEBUG
 #include "ua_transport_binary_secure.h"
 			UA_UInt32 pos = 0;
@@ -154,6 +151,7 @@ void* NL_TCP_reader(NL_Connection *c) {
 				UA_NodeId_printf("Service Type\n",&serviceRequestType);
 			}
 #endif
+
 			TL_Process((c->connection),&readBuffer);
 		} else {
 //TODO close connection - what does close do?

examples/src/opcuaServer.c

@@ -10,15 +10,10 @@
 #include <unistd.h>
 #include <time.h>
 #include <fcntl.h>
-<<<<<<< HEAD
+
 #include "ua_stack_channel_manager.h"
 #include "ua_stack_session_manager.h"
 
-#ifdef RASPI
-	#include "raspberrypi_io.h"
-#endif
-=======
->>>>>>> origin/master
 
 
 UA_Int32 serverCallback(void * arg) {
@@ -43,59 +38,10 @@ int main(int argc, char** argv) {
 	NL_data* nl = NL_init(&NL_Description_TcpBinary,16664);
 
 	struct timeval tv = {1, 0}; // 1 second
-<<<<<<< HEAD
-#ifdef RASPI
-  	Namespace* ns0 = (Namespace*)UA_indexedList_find(appMockup.namespaces, 0)->payload;
-		const UA_Node *foundNode1 = UA_NULL;
-		const UA_Node *foundNode2 = UA_NULL;
-		const UA_Node *foundNode3 = UA_NULL;
-		Namespace_Entry_Lock *lock;
-		//node which should be filled with data (float value)
-		UA_NodeId tmpNodeId1;
-		UA_NodeId tmpNodeId2;
-		UA_NodeId tmpNodeId3;
-
-		tmpNodeId1.encodingByte = UA_NODEIDTYPE_TWOBYTE;
-		tmpNodeId1.identifier.numeric = 108;
-		tmpNodeId1.namespace =  0;
-
-		tmpNodeId2.encodingByte = UA_NODEIDTYPE_TWOBYTE;
-		tmpNodeId2.identifier.numeric = 109;
-		tmpNodeId2.namespace =  0;
-
-		tmpNodeId3.encodingByte = UA_NODEIDTYPE_TWOBYTE;
-		tmpNodeId3.identifier.numeric = 110;
-		tmpNodeId3.namespace =  0;
-            	
-			if(Namespace_get(ns0,&tmpNodeId1, &foundNode1,&lock) != UA_SUCCESS){
-				_exit(1);
-			}
-
-			if(Namespace_get(ns0,&tmpNodeId2, &foundNode2,&lock) != UA_SUCCESS){
-				_exit(1);
-			}
-
-			if(Namespace_get(ns0,&tmpNodeId3, &foundNode3,&lock) != UA_SUCCESS){
-				_exit(1);
-			}
-
-		((UA_VariableNode *)foundNode1)->value.data = &sharedTemperature;
-		((UA_VariableNode *)foundNode2)->value.data = &sharedLED1;
-		((UA_VariableNode *)foundNode3)->value.data = &sharedLED2;
-
-		pthread_t t;
-		pthread_create(&t, NULL, &ioloop, UA_NULL);
-
-	printf("raspi enabled \n");	
-  	//pid_t i = fork();
-	//printf("process id i=%d \n",i);
-#endif    
 
 	SL_ChannelManager_init(2,3600000, 873, 23, &nl->endpointUrl);
 	UA_SessionManager_init(2,300000,5);
 
-=======
->>>>>>> origin/master
   	NL_msgLoop(nl, &tv, serverCallback, argv[0]);
 
 }

src/Makefile.am

@@ -24,18 +24,13 @@ libopen62541_la_SOURCES = ua_types.c \
 						  ua_services_view.c \
 						  ua_services_subscription.c\
 						  ua_services_monitoreditems.c\
-<<<<<<< HEAD
 						  ua_application.c \
 			              ua_stack_session.c\
 			              ua_stack_session_manager.c\
 			              ua_stack_channel.c \
 						  ua_stack_channel_manager.c \
 						  ua_transport_connection_manager.c \
-						  ua_transport_connection.c\
-						  ua_xml.c
-=======
-						  ua_application.c
-
+						  ua_transport_connection.c
 WITH_XML =
 if UA_ENCODING_XML
 libopen62541_la_SOURCES += ua_types_encoding_xml.c \
@@ -44,7 +39,6 @@ libopen62541_la_SOURCES += ua_types_encoding_xml.c \
 WITH_XML = --with-xml
 endif
 
->>>>>>> origin/master
 ua_types.c: ua_namespace_0.h
 ua_namespace_0.h: ua_types_generated.h
 
@@ -82,4 +76,4 @@ clean-local: clean-convenience-link
 	rm -rf ua_types_generated.c ua_types_generated.h || true;
 	rm -rf ua_namespace_0.c ua_namespace_0.h || true;
 	rm -rf *.gcov || true;
-	rm -rf util/*.gcov || true;
+	rm -rf util/*.gcov || true;

src/ua_stack_session_manager.c

@@ -46,7 +46,8 @@ UA_Int32 UA_SessionManager_init(UA_UInt32 maxSessionCount,UA_UInt32 sessionLifet
 
 UA_Boolean UA_SessionManager_sessionExists(UA_Session *session)
 {
-	if(UA_list_search(&sessionManager->sessions,(UA_list_PayloadComparer)UA_Session_compare,(void*)session))
+
+	if(sessionManager && UA_list_search(&sessionManager->sessions,(UA_list_PayloadComparer)UA_Session_compare,(void*)session))
 	{
 		return UA_TRUE;
 	}
@@ -55,19 +56,22 @@ UA_Boolean UA_SessionManager_sessionExists(UA_Session *session)
 
 UA_Int32 UA_SessionManager_getSessionById(UA_NodeId *sessionId, UA_Session *session)
 {
- 	UA_list_Element* current = sessionManager->sessions.first;
-	while (current)
+	if(sessionManager != UA_NULL)
 	{
-		if (current->payload)
+		UA_list_Element* current = sessionManager->sessions.first;
+		while (current)
 		{
-			UA_list_Element* elem = (UA_list_Element*) current;
-			*session = *((UA_Session*) (elem->payload));
-		 	if(UA_Session_compareById(*session,sessionId) == UA_EQUAL)
-		 	{
-		 		return UA_SUCCESS;
-		 	}
+			if (current->payload)
+			{
+				UA_list_Element* elem = (UA_list_Element*) current;
+				*session = *((UA_Session*) (elem->payload));
+				if(UA_Session_compareById(*session,sessionId) == UA_EQUAL)
+				{
+					return UA_SUCCESS;
+				}
+			}
+			current = current->next;
 		}
-		current = current->next;
 	}
 	*session = UA_NULL;
 	return UA_ERROR;
@@ -75,7 +79,7 @@ UA_Int32 UA_SessionManager_getSessionById(UA_NodeId *sessionId, UA_Session *sess
 
 UA_Int32 UA_SessionManager_getSessionByToken(UA_NodeId *token, UA_Session *session)
 {
-	if(sessionManager->sessions.first)
+	if(sessionManager != UA_NULL)
 	{
 		UA_list_Element* current = sessionManager->sessions.first;
 		while (current)

src/ua_transport.c

@@ -482,12 +482,8 @@ UA_Int32 UA_SecureConversationMessageFooter_copy(const UA_SecureConversationMess
     	UA_Int32 retval = UA_SUCCESS;
 	memcpy(dst, src, sizeof(UA_SecureConversationMessageFooter));
 
-<<<<<<< HEAD
-	dst->padding = src->padding;
-	retval |= UA_Array_copy(&src->padding, src->paddingSize,&UA_.types[UA_BYTE],(void**)&dst->padding);
-=======
+
 	retval |= UA_Array_copy(src->padding, src->paddingSize,&UA_.types[UA_BYTE],(void**)&dst->padding);
->>>>>>> origin/master
 	return retval;
 }
 

src/ua_transport_binary.c

@@ -25,7 +25,7 @@ static UA_Int32 TL_handleHello(UA_TL_Connection1 connection, const UA_ByteString
 		// build acknowledge response
 		UA_OPCUATcpAcknowledgeMessage ackMessage;
 		TL_Buffer localConfig;
-		UA_TL_Connection_getLocalConfiguration(connection, &localConfig);
+		UA_TL_Connection_getLocalConfig(connection, &localConfig);
 		ackMessage.protocolVersion = localConfig.protocolVersion;
 		ackMessage.receiveBufferSize = localConfig.recvBufferSize;
 		ackMessage.sendBufferSize = localConfig.sendBufferSize;
@@ -94,6 +94,7 @@ static UA_Int32 TL_handleOpen(UA_TL_Connection1 connection, const UA_ByteString*
 				UA_SECURITYMODE_INVALID);
 
 		if(SL_Channel_initByRequest(*channel,connection, msg, pos) == UA_SUCCESS){
+			//TODO remove SL_ProcessOpenChannel (only a special case in SL_Process)
 			retval |= SL_ProcessOpenChannel(*channel, msg, pos);
 			retval |= SL_ChannelManager_addChannel(channel);
 			return retval;
@@ -119,16 +120,8 @@ static UA_Int32 TL_handleMsg(UA_TL_Connection1 connection, const UA_ByteString*
 
 static UA_Int32 TL_handleClo(UA_TL_Connection1 connection, const UA_ByteString* msg, UA_UInt32* pos) {
 	UA_Int32 retval = UA_SUCCESS;
-	UA_SecureConversationMessageHeader *header;
-	retval |= UA_SecureConversationMessageHeader_new(&header);
-	retval |= UA_SecureConversationMessageHeader_decodeBinary(msg,pos,header);
+	SL_Process(msg,pos);
 
-	retval |= SL_ChannelManager_removeChannel(header->secureChannelId);
-
-	retval |= UA_SecureConversationMessageHeader_delete(header);
-
-
-//TODO remove that
 	UA_TL_Connection_close(connection);
 	return retval;
 }
@@ -139,8 +132,10 @@ UA_Int32 TL_Process(UA_TL_Connection1 connection, const UA_ByteString* msg) {
 	UA_OPCUATcpMessageHeader tcpMessageHeader;
 
 	DBG_VERBOSE(printf("TL_Process - entered \n"));
+	UA_Int32 messageCounter = 0;
 
 	do{
+
 		if ((retval = UA_OPCUATcpMessageHeader_decodeBinary(msg,&pos,&tcpMessageHeader)) == UA_SUCCESS) {
 			printf("TL_Process - messageType=%.*s\n",3,msg->data);
 			switch(tcpMessageHeader.messageType) {
@@ -157,10 +152,21 @@ UA_Int32 TL_Process(UA_TL_Connection1 connection, const UA_ByteString* msg) {
 				retval = TL_handleClo(connection, msg, &pos);
 				break;
 			default: // dispatch processing to secureLayer
+				//Invalid packet was received which could have led to a wrong offset (pos).
+				//It was not possible to extract the following packet from the buffer
 				retval = UA_ERR_INVALID_VALUE;
 				break;
 			}
 		}
+		else
+		{
+			printf("TL_Process - ERROR:decoding of header failed \n");
+		}
+
+		messageCounter++;
+		printf("TL_Process - multipleMessage in Buffer: %i \n",messageCounter);
+
+
 	}while(msg->length > (UA_Int32)pos);
 	/* if (retval != UA_SUCCESS) { */
 	/* 	// FIXME: compose real error message */

src/ua_transport_binary_secure.c

@@ -137,7 +137,7 @@ static void init_response_header(UA_RequestHeader const * p,
 	UA_##TYPE##Request p; \
 	UA_##TYPE##Response r; \
 	UA_Session session = UA_NULL; \
-	UA_##TYPE##Request_decodeBinary(msg, pos, &p); \
+	UA_##TYPE##Request_decodeBinary(msg, &recvOffset, &p); \
 	UA_##TYPE##Response_init(&r); \
 	init_response_header(&p.requestHeader, &r.responseHeader); \
 	UA_SessionManager_getSessionByToken(&p.requestHeader.authenticationToken, &session); \
@@ -147,16 +147,16 @@ static void init_response_header(UA_RequestHeader const * p,
 	UA_##TYPE##Request p; \
 	UA_##TYPE##Response r; \
 	UA_Session session = UA_NULL; \
-	UA_##TYPE##Request_decodeBinary(msg, pos, &p); \
+	UA_##TYPE##Request_decodeBinary(msg, &recvOffset, &p); \
 	UA_##TYPE##Response_init(&r); \
 	init_response_header(&p.requestHeader, &r.responseHeader); \
 	UA_SessionManager_getSessionByToken(&p.requestHeader.authenticationToken, &session); \
 	DBG_VERBOSE(printf("Invoke Service: %s\n", #TYPE)); \
 	Service_##TYPE(session, &p, &r); \
 	DBG_VERBOSE(printf("Finished Service: %s\n", #TYPE)); \
-    *pos = 0; \
+    sendOffset = 0; \
 	UA_ByteString_newMembers(&response_msg, UA_##TYPE##Response_calcSizeBinary(&r)); \
-	UA_##TYPE##Response_encodeBinary(&r, pos, &response_msg); \
+	UA_##TYPE##Response_encodeBinary(&r, &sendOffset, &response_msg); \
 	UA_##TYPE##Request_deleteMembers(&p); \
 	UA_##TYPE##Response_deleteMembers(&r); \
 /*
@@ -167,9 +167,9 @@ static void init_response_header(UA_RequestHeader const * p,
 */
 #define RESPONSE_CLEANUP(TYPE) \
 	DBG_VERBOSE(printf("Finished Service: %s\n", #TYPE)); \
-	*pos = 0; \
+	sendOffset = 0; \
 	UA_ByteString_newMembers(&response_msg, UA_##TYPE##Response_calcSizeBinary(&r)); \
-	UA_##TYPE##Response_encodeBinary(&r, &response_msg,pos); \
+	UA_##TYPE##Response_encodeBinary(&r, &response_msg,&sendOffset); \
 	UA_##TYPE##Request_deleteMembers(&p); \
 	UA_##TYPE##Response_deleteMembers(&r); \
 
@@ -178,10 +178,11 @@ UA_Int32 SL_handleRequest(SL_secureChannel channel, const UA_ByteString* msg,
 		UA_UInt32 *pos)
 {
 	UA_Int32 retval = UA_SUCCESS;
-
+	UA_UInt32 recvOffset = *pos;
+	UA_UInt32 sendOffset = 0;
 	// Every Message starts with a NodeID which names the serviceRequestType
 	UA_NodeId serviceRequestType;
-	UA_NodeId_decodeBinary(msg, pos,&serviceRequestType);
+	UA_NodeId_decodeBinary(msg, &recvOffset,&serviceRequestType);
 #ifdef DEBUG
 	UA_NodeId_printf("SL_processMessage - serviceRequestType=",
 			&serviceRequestType);
@@ -256,6 +257,24 @@ UA_Int32 SL_handleRequest(SL_secureChannel channel, const UA_ByteString* msg,
 
 		responsetype = UA_READRESPONSE_NS0;
 	}
+	else if (serviceid == UA_WRITEREQUEST_NS0)
+	{
+
+		RESPONSE_PREPARE(Write);
+		DBG_VERBOSE(printf("Finished Service: %s\n", Write));
+		if (UA_Session_verifyChannel(session,channel)){
+			Service_Write(session,&p, &r);
+		}
+		else
+		{
+			DBG_VERBOSE(printf("session does not match secure channel"));
+		}
+		DBG_VERBOSE(printf("Finished Service: %s\n", Write));
+		RESPONSE_CLEANUP(Write);
+		//TODO prepare userdefined implementation
+
+		responsetype = UA_WRITERESPONSE_NS0;
+	}
 	else if (serviceid == UA_BROWSEREQUEST_NS0)
 	{
 
@@ -372,19 +391,19 @@ UA_Int32 SL_handleRequest(SL_secureChannel channel, const UA_ByteString* msg,
 		UA_RequestHeader p;
 		UA_ResponseHeader r;
 
-		UA_RequestHeader_decodeBinary(msg, pos, &p);
+		UA_RequestHeader_decodeBinary(msg, &recvOffset, &p);
 		UA_ResponseHeader_init(&r);
 		r.requestHandle = p.requestHandle;
 		r.serviceResult = UA_STATUSCODE_BADSERVICEUNSUPPORTED;
-		*pos = 0;
+		sendOffset = 0;
 		UA_ByteString_newMembers(&response_msg, UA_ResponseHeader_calcSizeBinary(&r));
-		UA_ResponseHeader_encodeBinary(&r, &response_msg,pos);
+		UA_ResponseHeader_encodeBinary(&r, &response_msg,&sendOffset);
 		responsetype = UA_RESPONSEHEADER_NS0;
 	}
 
 	SL_Send(channel, &response_msg, responsetype);
 	UA_ByteString_deleteMembers(&response_msg);
-
+	*pos = recvOffset;
 	return retval;
 }
 /**
@@ -400,7 +419,11 @@ UA_Int32 SL_ProcessOpenChannel(SL_secureChannel channel, const UA_ByteString* ms
 {
 	return SL_handleRequest(channel, msg, pos);
 }
-
+UA_Int32 SL_ProcessCloseChannel(SL_secureChannel channel, const UA_ByteString* msg,
+		UA_UInt32 *pos)
+{
+	return SL_handleRequest(channel, msg, pos);
+}
 UA_Int32 SL_Process(const UA_ByteString* msg,
 		UA_UInt32* pos)
 {

src/ua_transport_binary_secure.h

@@ -52,4 +52,6 @@ UA_Int32 SL_Process(const UA_ByteString* msg, UA_UInt32* pos);
  */
 UA_Int32 SL_ProcessOpenChannel(SL_secureChannel channel, const UA_ByteString* msg,
 		UA_UInt32 *pos);
+UA_Int32 SL_ProcessCloseChannel(SL_secureChannel channel, const UA_ByteString* msg,
+		UA_UInt32 *pos);
 #endif /* OPCUA_TRANSPORT_BINARY_SECURE_H_ */

src/ua_transport_connection.c

@@ -138,7 +138,7 @@ UA_Int32 UA_TL_Connection_getProtocolVersion(UA_TL_Connection1 connection, UA_UI
 		return UA_ERROR;
 	}
 }
-UA_Int32 UA_TL_Connection_getLocalConfiguration(UA_TL_Connection1 connection, TL_Buffer *localConfiguration)
+UA_Int32 UA_TL_Connection_getLocalConfig(UA_TL_Connection1 connection, TL_Buffer *localConfiguration)
 {
 	if(connection)
 	{

src/ua_transport_connection.h

@@ -44,7 +44,7 @@ UA_Int32 UA_TL_Connection_setConnectionHandle(UA_TL_Connection1 connection, UA_I
 UA_Int32 UA_TL_Connection_getHandle(UA_TL_Connection1 connection, UA_UInt32 *connectionId);
 UA_Int32 UA_TL_Connection_getProtocolVersion(UA_TL_Connection1 connection, UA_UInt32 *protocolVersion);
 UA_Int32 UA_TL_Connection_getState(UA_TL_Connection1 connection, UA_Int32 *connectionState);
-UA_Int32 UA_TL_Connection_getLocalConfiguration(UA_TL_Connection1 connection, TL_Buffer *localConfiguration);
+UA_Int32 UA_TL_Connection_getLocalConfig(UA_TL_Connection1 connection, TL_Buffer *localConfiguration);
 UA_Int32 UA_TL_Connection_getNetworkLayerData(UA_TL_Connection1 connection,void** networkLayerData);
 
 

src/util/ua_list.c

@@ -119,17 +119,12 @@ UA_Int32 UA_list_removeLast(UA_list_List* list, UA_list_PayloadVisitor visitor){
 		UA_free(list->last);
 		temp->next = UA_NULL;
 		list->last = temp;
-<<<<<<< HEAD
-		list->last->next = UA_NULL;
-=======
 		if(temp){
 			temp->next = UA_NULL;
 		}
->>>>>>> origin/master
 		list->size--;
 		if(list->size == 1){
 			list->first = temp;
-			list->first->next = UA_NULL;
 		}else if(list->size==0){
 			list->first = UA_NULL;
 		}