소스 검색

hopefully last commit, now its either TCP or UDP rel #153

Stasik0 10 년 전
부모
커밋
3a5a59f641
2개의 변경된 파일2개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 7
      examples/networklayer_udp.c
  2. 2 1
      examples/opcuaServer.c

+ 0 - 7
examples/networklayer_udp.c

@@ -50,12 +50,6 @@ typedef struct NetworkLayerUDP {
 	fd_set fdset;
 	UA_Int32 serversockfd;
     UA_UInt32 port;
-    /* We remove the connection links only in the main thread. Attach
-       to-be-deleted links with atomic operations */
-    struct deleteLink {
-        UA_Int32 sockfd;
-        struct deleteLink *next;
-    } *deleteLinkList;
 } NetworkLayerUDP;
 
 static UA_StatusCode setNonBlocking(int sockid) {
@@ -268,7 +262,6 @@ UA_NetworkLayer NetworkLayerUDP_new(UA_ConnectionConfig conf, UA_UInt32 port) {
     NetworkLayerUDP *udplayer = malloc(sizeof(NetworkLayerUDP));
 	udplayer->conf = conf;
     udplayer->port = port;
-    udplayer->deleteLinkList = UA_NULL;
 
     UA_NetworkLayer nl;
     nl.nlHandle = udplayer;

+ 2 - 1
examples/opcuaServer.c

@@ -61,9 +61,10 @@ int main(int argc, char** argv) {
 
 	UA_Server *server = UA_Server_new();
     UA_Server_setServerCertificate(server, loadCertificate());
-    UA_Server_addNetworkLayer(server, NetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
 #ifdef EXTENSION_UDP
     UA_Server_addNetworkLayer(server, NetworkLayerUDP_new(UA_ConnectionConfig_standard, 16664));
+#else
+    UA_Server_addNetworkLayer(server, NetworkLayerTCP_new(UA_ConnectionConfig_standard, 16664));
 #endif