Revert "Bug in processRepeatedJobs()"

include/ua_server.h

@@ -619,9 +619,6 @@ UA_Server_addInstanceOf(UA_Server *server, UA_NodeId nodeId, const UA_QualifiedN
                         const UA_ExpandedNodeId typeDefinition, UA_InstantiationCallback callback, void *handle, 
                         UA_NodeId *createdNodeId);
 
-// Debug Stuff
-void UA_Server_cleanup(UA_Server *server, void *nothing);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

include/ua_types.h

@@ -350,11 +350,7 @@ UA_DateTimeStruct UA_EXPORT UA_DateTime_toStruct(UA_DateTime time);
 
 /* Guid */
 UA_Guid UA_EXPORT * UA_Guid_new(void);
-static UA_INLINE void UA_Guid_init(UA_Guid *p) 
-{ 
-    //*p = (UA_Guid){0,0,0,{0,0,0,0,0,0,0,0}}; 
-    memset(p, 0, sizeof(*p));
-}
+static UA_INLINE void UA_Guid_init(UA_Guid *p) { *p = (UA_Guid){0,0,0,{0,0,0,0,0,0,0,0}}; }
 void UA_EXPORT UA_Guid_delete(UA_Guid *p);
 static UA_INLINE void UA_Guid_deleteMembers(UA_Guid *p) { }
 static UA_INLINE UA_StatusCode UA_Guid_copy(const UA_Guid *src, UA_Guid *dst) { *dst = *src; return UA_STATUSCODE_GOOD; }

src/server/ua_server.c

@@ -184,7 +184,7 @@ void UA_Server_delete(UA_Server *server) {
 }
 
 /* Recurring cleanup. Removing unused and timed-out channels and sessions */
-/*static */void UA_Server_cleanup(UA_Server *server, void *nothing) {
+static void UA_Server_cleanup(UA_Server *server, void *nothing) {
     UA_DateTime now = UA_DateTime_now();
     UA_SessionManager_cleanupTimedOut(&server->sessionManager, server, now);
     UA_SecureChannelManager_cleanupTimedOut(&server->secureChannelManager, now);

src/server/ua_server_worker.c

@@ -346,17 +346,7 @@ static UA_UInt16 processRepeatedJobs(UA_Server *server) {
         dispatchJobs(server, jobsCopy, tw->jobsSize); // frees the job pointer
 #else
         for(size_t i=0;i<tw->jobsSize;i++)
-        {
             processJobs(server, &tw->jobs[i].job, 1); // does not free the job ptr
-            if (tw->jobs[i].job.type == UA_JOBTYPE_METHODCALL
-                && tw->jobs[i].job.job.methodCall.method == UA_Server_cleanup)
-            {
-                // UA_Server_cleanup may delete members
-                // next is invalid Pointer
-                // this no solution
-                next = LIST_NEXT(tw, pointers);
-            }
-        }
 #endif
         tw->nextTime += tw->interval;
         struct RepeatedJobs *prevTw = tw; // after which tw do we insert?
@@ -367,8 +357,6 @@ static UA_UInt16 processRepeatedJobs(UA_Server *server) {
             prevTw = n;
         }
         if(prevTw != tw) {
-            // this is very dangerous
-            // so UA_Server_cleanup job comes up
             LIST_REMOVE(tw, pointers);
             LIST_INSERT_AFTER(prevTw, tw, pointers);
         }