Browse Source

adding serverTime node
revering automatic pushes

Stasik0 10 years ago
parent
commit
f70beb04d9
3 changed files with 33 additions and 2 deletions
  1. 31 0
      src/server/ua_server.c
  2. 1 1
      tools/.coverity.sh
  3. 1 1
      tools/.deployDoxygen.sh

+ 31 - 0
src/server/ua_server.c

@@ -115,6 +115,28 @@ static void releaseStatus(const void *handle, UA_DataValue *value) {
     UA_DataValue_deleteMembers(value);
     UA_DataValue_deleteMembers(value);
 }
 }
 
 
+static UA_StatusCode readCurrentTime(const void *handle, UA_Boolean sourceTimeStamp, UA_DataValue *value) {
+	UA_DateTime *currentTime = UA_DateTime_new();
+	if(!currentTime)
+		return UA_STATUSCODE_BADOUTOFMEMORY;
+	*currentTime = UA_DateTime_now();
+	value->value.type = &UA_TYPES[UA_TYPES_DATETIME];
+	value->value.arrayLength = 1;
+	value->value.dataPtr = currentTime;
+	value->value.arrayDimensionsSize = -1;
+	value->value.arrayDimensions = NULL;
+	value->hasVariant = UA_TRUE;
+	if(sourceTimeStamp) {
+		value->hasSourceTimestamp = UA_TRUE;
+		value->sourceTimestamp = *currentTime;
+	}
+	return UA_STATUSCODE_GOOD;
+}
+
+static void releaseCurrentTime(const void *handle, UA_DataValue *value) {
+	UA_DateTime_delete((UA_DateTime*)value->value.dataPtr);
+}
+
 static void copyNames(UA_Node *node, char *name) {
 static void copyNames(UA_Node *node, char *name) {
     UA_QualifiedName_copycstring(name, &node->browseName);
     UA_QualifiedName_copycstring(name, &node->browseName);
     UA_LocalizedText_copycstring(name, &node->displayName);
     UA_LocalizedText_copycstring(name, &node->displayName);
@@ -539,6 +561,15 @@ UA_Server * UA_Server_new(void) {
     ADDREFERENCE(UA_NODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS), UA_NODEID_STATIC(0, UA_NS0ID_HASCOMPONENT),
     ADDREFERENCE(UA_NODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS), UA_NODEID_STATIC(0, UA_NS0ID_HASCOMPONENT),
                      UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE));
                      UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE));
 
 
+    UA_VariableNode *currenttime = UA_VariableNode_new();
+    copyNames((UA_Node*)serverstatus, "CurrentTime");
+    currenttime->nodeId = UA_NODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    currenttime->variableType = UA_VARIABLENODETYPE_DATASOURCE;
+    currenttime->variable.dataSource = (UA_DataSource) {.handle = NULL, .read = readCurrentTime,
+                                                         .release = releaseCurrentTime, .write = UA_NULL};
+    UA_Server_addNode(server, (UA_Node*)currenttime, &UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS),
+                      &UA_NODEID_STATIC(0, UA_NS0ID_HASCOMPONENT));
+
     /**************/
     /**************/
     /* Data Types */
     /* Data Types */
     /**************/
     /**************/

+ 1 - 1
tools/.coverity.sh

@@ -6,7 +6,7 @@
 #
 #
 
 
 git fetch origin coverity_scan
 git fetch origin coverity_scan
-COMMITS=`git log --oneline origin/coverity_scan --since=today.midnight -- | wc -l`
+COMMITS=`git log --oneline --since=today.midnight | wc -l`
 if [[ "$COMMITS" -le "1" ]]; then
 if [[ "$COMMITS" -le "1" ]]; then
     #first commit a day - push changes to branch coverity_scan
     #first commit a day - push changes to branch coverity_scan
     git clone -b coverity_scan https://$GITAUTH@github.com/acplt/open62541
     git clone -b coverity_scan https://$GITAUTH@github.com/acplt/open62541

+ 1 - 1
tools/.deployDoxygen.sh

@@ -6,7 +6,7 @@
 #
 #
 
 
 git fetch origin coverity_scan
 git fetch origin coverity_scan
-COMMITS=`git log --oneline origin/coverity_scan --since=today.midnight -- | wc -l`
+COMMITS=`git log --oneline --since=today.midnight | wc -l`
 if [[ "$COMMITS" -le "1" ]]; then
 if [[ "$COMMITS" -le "1" ]]; then
    git clone --depth=50 -b gh-pages https://$GITAUTH@github.com/acplt/open62541-www
    git clone --depth=50 -b gh-pages https://$GITAUTH@github.com/acplt/open62541-www
    cd open62541-www
    cd open62541-www