Ver código fonte

fix use of inttypes.h printf formatters in example

Julius Pfrommer 8 anos atrás
pai
commit
24f5a886fc

+ 2 - 9
CMakeLists.txt

@@ -126,7 +126,7 @@ option(UA_ENABLE_EMBEDDED_LIBC "Target has no libc, use internal definitions" OF
 mark_as_advanced(UA_ENABLE_EMBEDDED_LIBC)
 
 option(UA_ENABLE_EMBEDDED_CLOCK "Target has no standard time APIs (link custom implementation)" OFF)
-mark_as_advanced(UA_ENABLE_EMBEDDED_LIBC)
+mark_as_advanced(UA_ENABLE_EMBEDDED_CLOCK)
 
 option(UA_ENABLE_EXTERNAL_NAMESPACES "Enable namespace handling by an external component (experimental)" OFF)
 mark_as_advanced(UA_ENABLE_EXTERNAL_NAMESPACES)
@@ -414,13 +414,6 @@ if(UA_BUILD_EXAMPLECLIENT)
         target_link_libraries(client_static urcu-cds urcu urcu-common pthread)
         target_link_libraries(client urcu-cds urcu urcu-common pthread)
     endif()
-    if(UA_ENABLE_NONSTANDARD_STATELESS AND NOT UA_ENABLE_AMALGAMATION)
-        add_executable(client_stateless examples/client_stateless.c ${client_source})
-        target_link_libraries(client_stateless open62541 ${open62541_LIBRARIES})
-        if(UA_ENABLE_MULTITHREADING)
-            target_link_libraries(client_stateless urcu-cds urcu urcu-common pthread)
-        endif()
-    endif()
 endif()
 
 if(UA_BUILD_UNIT_TESTS)
@@ -446,7 +439,7 @@ if(UA_BUILD_EXAMPLES)
     if(UA_ENABLE_MULTITHREADING)
       list(APPEND LIBS urcu-cds urcu urcu-common)
     endif(UA_ENABLE_MULTITHREADING)
-    
+
     add_executable(server_variable ${PROJECT_SOURCE_DIR}/examples/server_variable.c $<TARGET_OBJECTS:open62541-object>)
     target_link_libraries(server_variable ${LIBS})
 

+ 5 - 0
examples/client.c

@@ -1,3 +1,8 @@
+/*
+ * This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ */
+
 #ifdef UA_NO_AMALGAMATION
 # include "ua_types.h"
 # include "ua_client.h"

+ 1 - 0
examples/client_firstSteps.c

@@ -2,6 +2,7 @@
 //http://open62541.org/doc/sphinx/tutorial_firstStepsClient.html
 
 #include <stdio.h>
+#include <inttypes.h>
 
 #ifdef UA_NO_AMALGAMATION
 # include "ua_client.h"

+ 0 - 129
examples/client_stateless.c

@@ -1,129 +0,0 @@
-/*
- * C ECHO client example using sockets
- */
-#include <stdio.h>	//printf
-#include <string.h>	//strlen
-#include <sys/socket.h>	//socket
-#include <arpa/inet.h>	//inet_addr
-#include <unistd.h> // for close
-#include <stdlib.h> // pulls in declaration of malloc, free
-
-//this stuff can not be build with amalgamation options, since it need internal APIs
-#include "ua_util.h"
-#include "ua_transport_generated_encoding_binary.h"
-#include "ua_types_generated_encoding_binary.h"
-
-
-int main(int argc , char *argv[]) {
-	int sock;
-	struct sockaddr_in server;
-	UA_ByteString message;
-	message.data = (UA_Byte*)malloc(1000*sizeof(UA_Byte));
-	message.length = 1000;
-	//UA_UInt32 messageEncodedLength = 0;
-	UA_Byte server_reply[2000];
-	unsigned int messagepos = 0;
-
-	//Create socket
-#ifdef UA_ENABLE_NONSTANDARD_UDP
-	sock = socket(AF_INET , SOCK_DGRAM , 0);
-#else
-	sock = socket(AF_INET , SOCK_STREAM , 0);
-#endif
-	if(sock == -1) {
-		printf("Could not create socket");
-	}
-	server.sin_addr.s_addr = inet_addr("127.0.0.1");
-	server.sin_family = AF_INET;
-	server.sin_port = htons( 16664 );
-
-	//Connect to remote server
-	if(connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0) {
-		perror("connect failed. Error");
-		return 1;
-	}
-
-	UA_TcpMessageHeader reqTcpHeader;
-	UA_UInt32 reqSecureChannelId = 0;
-	UA_UInt32 reqTokenId = 0;
-	UA_SequenceHeader reqSequenceHeader;
-	UA_NodeId reqRequestType;
-	UA_ReadRequest req;
-	UA_RequestHeader reqHeader;
-	UA_NodeId reqHeaderAuthToken;
-	UA_ExtensionObject reqHeaderAdditionalHeader;
-
-	UA_NodeId_init(&reqRequestType);
-	reqRequestType.identifierType = UA_NODEIDTYPE_NUMERIC;
-	reqRequestType.identifier.numeric = 631; //read request
-
-	UA_SequenceHeader_init(&reqSequenceHeader);
-	reqSequenceHeader.sequenceNumber = 42;
-
-	UA_ReadRequest_init(&req);
-	req.requestHeader = reqHeader;
-	UA_RequestHeader_init(&(req.requestHeader));
-	req.requestHeader.authenticationToken = reqHeaderAuthToken;
-	UA_NodeId_init(&(req.requestHeader.authenticationToken));
-	req.requestHeader.additionalHeader = reqHeaderAdditionalHeader;
-	UA_ExtensionObject_init(&(req.requestHeader.additionalHeader));
-
-	req.nodesToRead= UA_Array_new(1, &UA_TYPES[UA_TYPES_READVALUEID]);
-	req.nodesToReadSize = 1;
-
-	UA_ReadValueId_init(&(req.nodesToRead[0]));
-	req.nodesToRead[0].attributeId = 13; //UA_ATTRIBUTEID_VALUE
-	UA_NodeId_init(&(req.nodesToRead[0].nodeId));
-	req.nodesToRead[0].nodeId.identifierType = UA_NODEIDTYPE_NUMERIC;
-	req.nodesToRead[0].nodeId.identifier.numeric = 2255;
-	UA_QualifiedName_init(&(req.nodesToRead[0].dataEncoding));
-
-	/**messageEncodedLength = UA_TcpMessageHeader_calcSizeBinary(&reqTcpHeader) +
-			UA_UInt32_calcSizeBinary(&reqSecureChannelId)+
-			UA_UInt32_calcSizeBinary(&reqTokenId)+
-			UA_SequenceHeader_calcSizeBinary(&reqSequenceHeader)+
-			UA_NodeId_calcSizeBinary(&reqRequestType) +
-			UA_ReadRequest_calcSizeBinary(&req);**/
-
-	UA_TcpMessageHeader_init(&reqTcpHeader);
-	reqTcpHeader.messageTypeAndChunkType = UA_MESSAGETYPE_MSG + UA_CHUNKTYPE_FINAL;
-
-	UA_TcpMessageHeader_encodeBinary(&reqTcpHeader, &message, &messagepos);
-	UA_UInt32_encodeBinary(&reqSecureChannelId, &message, &messagepos);
-	UA_UInt32_encodeBinary(&reqTokenId, &message, &messagepos);
-	UA_SequenceHeader_encodeBinary(&reqSequenceHeader, &message, &messagepos);
-	UA_NodeId_encodeBinary(&reqRequestType, &message, &messagepos);
-	UA_ReadRequest_encodeBinary(&req, &message, &messagepos);
-    reqTcpHeader.messageSize = messagepos;
-    messagepos=0;
-
-    UA_TcpMessageHeader_encodeBinary(&reqTcpHeader, &message, &messagepos);
-    UA_UInt32_encodeBinary(&reqSecureChannelId, &message, &messagepos);
-    UA_UInt32_encodeBinary(&reqTokenId, &message, &messagepos);
-    UA_SequenceHeader_encodeBinary(&reqSequenceHeader, &message, &messagepos);
-    UA_NodeId_encodeBinary(&reqRequestType, &message, &messagepos);
-    UA_ReadRequest_encodeBinary(&req, &message, &messagepos);
-
-	//Send some data
-	if(send(sock , message.data, messagepos , 0) < 0) {
-		puts("Send failed");
-		return 1;
-	}
-
-	//Receive a reply from the server
-	int received = recv(sock , server_reply , 2000 , 0);
-	if(received < 0) {
-		puts("recv failed");
-		return 1;
-	}
-
-
-	for(int i=0;i<received;i++) {
-		  //show only printable ascii
-		  if(server_reply[i] >= 32 && server_reply[i]<= 126)
-			  printf("%c",server_reply[i]);
-	}
-	printf("\n");
-	close(sock);
-	return 0;
-}

+ 6 - 1
examples/server_firstSteps.c

@@ -1,4 +1,9 @@
-//This file contains source-code that is discussed in a tutorial located here:
+/*
+ * This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ */
+
+// This file contains source-code that is discussed in a tutorial located here:
 // http://open62541.org/doc/sphinx/tutorial_firstStepsServer.html
 
 #include <stdio.h>