switch to ppathstatus

Author: virco

poverlay.c

@@ -26,7 +26,7 @@
 #include "pcompat.h"
 #include "plibs.h"
 #include "poverlay.h"
-#include "pexternalstatus.h"
+#include "ppathstatus.h"
 #include "pcache.h"
 
 int overlays_running = 1;
@@ -44,7 +44,7 @@ int callbacks_running = 1;
 
 #include "poverlay_mac.c"
 
-#else 
+#else
 
 void overlay_main_loop(VOID){}
 void instance_thread(LPVOID){}
@@ -55,6 +55,8 @@ poverlay_callback * callbacks;
 static int callbacks_size = 15;
 static const int calbacks_lower_band = 20;
 
+/* disable cache, psync_path_status_get() has many layers of caching internally
+
 #define CACHE_PREF "P_OVERLA_CACHE_PREFIX"
 #define CACHE_PREF_LEN 21
 
@@ -69,10 +71,10 @@ static int get_item_from_cache(const char* key, external_status* stat){
   char* reckey =  psync_malloc(ketlen + CACHE_PREF_LEN + 1);
   overlay_cache_t * rec = NULL;
   uint64_t now = 0;
-  
+
   memcpy(reckey, CACHE_PREF, CACHE_PREF_LEN);
   memcpy(reckey + CACHE_PREF_LEN , key, ketlen + 1);
-  
+
   if ((rec = (overlay_cache_t *) psync_cache_get(reckey))) {
     now = psync_millitime();
     if ((now - rec->timestamp) < 100) {
@@ -89,7 +91,7 @@ static void add_item_to_cache(const char* key, external_status* stat){
   int ketlen = strlen(key);
   char* reckey =  psync_malloc(ketlen + CACHE_PREF_LEN + 1);
   overlay_cache_t * rec = psync_malloc(sizeof(overlay_cache_t));
-  
+
   strncpy(reckey, CACHE_PREF, CACHE_PREF_LEN);
   strncpy(reckey + CACHE_PREF_LEN , key, ketlen);
 
@@ -98,9 +100,9 @@ static void add_item_to_cache(const char* key, external_status* stat){
   psync_cache_add(key, rec, 1, psync_free, 1);
 }
 
-  
+*/
 
-int psync_add_overlay_callback(int id, poverlay_callback callback) 
+int psync_add_overlay_callback(int id, poverlay_callback callback)
 {
   poverlay_callback * callbacks_old = callbacks;
   int callbacks_size_old = callbacks_size;
@@ -139,14 +141,13 @@ void get_answer_to_request(message *request, message *replay)
 {
   char msg[4] = "Ok.";
   external_status stat = INVSYNC;
-  msg[3] = '\0';
   //debug(D_NOTICE, "Client Request type [%u] len [%lu] string: [%s]", request->type, request->length, request->value);
   if (request->type < 20 ) {
-    
-    if (overlays_running && !get_item_from_cache(request->value, &stat)) {
+
+/*    if (overlays_running && !get_item_from_cache(request->value, &stat)) {
      stat = do_psync_external_status(request->value);
     }
-    
+
     if (stat == INSYNC) {
       replay->type = 10;
     }
@@ -159,11 +160,30 @@ void get_answer_to_request(message *request, message *replay)
     }
     else {
       replay->type = 13;
-      strncpy(msg,"No.\0",4);
+      memcpy(msg, "No.", 4);
     }
     replay->length = sizeof(message)+4;
     strncpy(replay->value, msg, 4);
     add_item_to_cache(request->value, &stat);
+    */
+    if (overlays_running)
+      stat=psync_path_status_get(request->value);
+    switch (psync_path_status_get_status(stat)) {
+      case PSYNC_PATH_STATUS_IN_SYNC:
+        replay->type=10;
+        break;
+      case PSYNC_PATH_STATUS_IN_PROG:
+        replay->type=12;
+        break;
+      case PSYNC_PATH_STATUS_PAUSED:
+      case PSYNC_PATH_STATUS_REMOTE_FULL:
+      case PSYNC_PATH_STATUS_LOCAL_FULL:
+        replay->type=11;
+        break;
+      default:
+        replay->type=13;
+        memcpy(msg, "No.", 4);
+    }
   } else if ((callbacks_running)&&(request->type < 36)) {
     int ind = request->type - 20;
     int ret = 0;
@@ -193,4 +213,4 @@ void get_answer_to_request(message *request, message *replay)
 
 
 int psync_overlays_running(){return overlays_running;}
-int psync_ovr_callbacks_running(){return callbacks_running;}
+int psync_ovr_callbacks_running(){return callbacks_running;}

ppathstatus.h

@@ -32,10 +32,13 @@
 
 typedef uint32_t psync_path_status_t;
 
-#define PSYNC_PATH_STATUS_IN_SYNC   0
-#define PSYNC_PATH_STATUS_IN_PROG   1
-#define PSYNC_PATH_STATUS_NOT_OURS  2
-#define PSYNC_PATH_STATUS_NOT_FOUND 3
+#define PSYNC_PATH_STATUS_IN_SYNC     0
+#define PSYNC_PATH_STATUS_IN_PROG     1
+#define PSYNC_PATH_STATUS_PAUSED      2
+#define PSYNC_PATH_STATUS_REMOTE_FULL 3
+#define PSYNC_PATH_STATUS_LOCAL_FULL  4
+#define PSYNC_PATH_STATUS_NOT_OURS    5
+#define PSYNC_PATH_STATUS_NOT_FOUND   6
 
 #define PSYNC_PATH_STATUS_BITS 5