new

Author: Ivan Stoev

pCloudCC/control_tools.cpp

@@ -104,7 +104,7 @@ int daemonize(bool do_commands) {
   close(STDOUT_FILENO);
   close(STDERR_FILENO);
 
-  if (console_client::clibrary::pclsync_lib::init())
+  if (console_client::clibrary::pclsync_lib::get_lib().init())
      exit(EXIT_FAILURE);
   while (1) {
     sleep(10);

pCloudCC/lib/pclsync/poverlay.c

@@ -55,57 +55,6 @@ 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
-
-
-typedef struct overlay_cache_{
-  external_status stat;
-  uint64_t timestamp;
-} overlay_cache_t;
-
-static int get_item_from_cache(const char* key, external_status* stat){
-  int ketlen = strlen(key);
-  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) {
-      *stat = rec->stat;
-      psync_cache_add(reckey, rec, 1, psync_free, 1);
-      psync_free(reckey);
-      return 1;
-    } else {
-      psync_free(rec);
-    }
-  }
-  psync_free(reckey);
-  return 0;
-}
-
-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);
-
-  rec->stat = *stat;
-  rec->timestamp = psync_millitime();
-  psync_cache_add(reckey, rec, 1, psync_free, 1);
-  psync_free(reckey);
-}
-
-*/
-
 int psync_add_overlay_callback(int id, poverlay_callback callback)
 {
   poverlay_callback * callbacks_old = callbacks;
@@ -148,29 +97,6 @@ void get_answer_to_request(message *request, message *replay)
   replay->length=sizeof(message)+4;
   //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)) {
-     stat = do_psync_external_status(request->value);
-    }
-
-    if (stat == INSYNC) {
-      replay->type = 10;
-    }
-    else if (stat == NOSYNC) {
-      replay->type = 11;
-    }
-    else if (stat == INPROG) {
-
-      replay->type = 12;
-    }
-    else {
-      replay->type = 13;
-      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)) {
@@ -189,11 +115,18 @@ void get_answer_to_request(message *request, message *replay)
         replay->type=13;
         memcpy(replay->value, "No.", 4);
     }
-  } else if ((callbacks_running)&&(request->type < 36)) {
+  } else if ((callbacks_running)&&(request->type < (calbacks_lower_band + callbacks_size))) {
     int ind = request->type - 20;
     int ret = 0;
+    message *rep = NULL;
+    
     if (callbacks[ind]) {
-      if ((ret = callbacks[ind](request->value)) == 0) {
+      if ((ret = callbacks[ind](request->value, rep)) == 0) {
+        if (rep) {
+          psync_free(replay);
+          replay = rep;
+        }
+        else 
         replay->type = 0;
       } else {
         replay->type = ret;

pCloudCC/lib/pclsync/poverlay.h

@@ -33,6 +33,5 @@ int psync_ovr_callbacks_running();
 void init_overlay_callbacks();
 int psync_add_overlay_callback(int id, poverlay_callback callback);
 
-
 #endif // POVERLAY_H
 

pCloudCC/lib/pclsync/poverlay_lin.c

@@ -116,7 +116,7 @@ void instance_thread(void* lpvParam)
   request = (message *)chbuf;
   if (request) {
   get_answer_to_request(request, reply);
-    if (reply ) {
+    if (reply) {
       rc = write(*cl,reply,reply->length);
       if (rc != reply->length)
         debug(D_ERROR,"Unix socket reply not sent.");
@@ -126,6 +126,7 @@ void instance_thread(void* lpvParam)
   if (cl) {
     close(*cl);
   }
+  psync_free(reply);
   //debug(D_NOTICE, "InstanceThread exitting.\n");
   return;
 };

pCloudCC/lib/pclsync/poverlay_mac.c

@@ -133,6 +133,7 @@ void instance_thread(void* lpvParam)
   if (cl) {
     close(*cl);
   }
+  psync_free(reply);
   //debug(D_NOTICE, "InstanceThread exitting.\n");
   return;
 };

pCloudCC/lib/pclsync/psynclib.c

@@ -1865,3 +1865,10 @@ int psync_setlanguage(const char *language, char **err){
   binparam params[]={P_STR("language", language)};
   return run_command("setlanguage", params, err);
 }
+
+char * psync_get_token()
+{
+  if (psync_my_auth[0])
+    return psync_strdup(psync_my_auth);
+  else return NULL;
+}

pCloudCC/lib/pclsync/psynclib.h

@@ -1157,7 +1157,7 @@ void psync_get_folder_ownerid(psync_folderid_t folderid, psync_userid_t* /*OUT*/
 /* Callback to be registered to be called from file manager extension.
  */
 
-typedef int (*poverlay_callback)(const char* path);
+typedef int (*poverlay_callback)(const char* path, void *rep);
 
 /* Registers file manager extension callback that will be called when packet with id equals to the give one had arrived from extension.
  * The id must be over or equal to 20 or -1 will be returned. There is a hard coded maximum of menu items on some OS-s so maximum of 15 ids are available.
@@ -1181,6 +1181,8 @@ void psync_update_cryptostatus();
 // Checks and creates new folder with write permissions on it and adds suffix to the name if necessary i.e. New Folder (1) etc..
 psync_folderid_t psync_check_and_create_folder (const char * path);
 
+char * psync_get_token();
+
 #ifdef __cplusplus
 }
 #endif

pCloudCC/lib/poverlay_linux/overlay_client.c

@@ -43,7 +43,17 @@ uint64_t length;
 char value[];
 } message;
 
-
+static void read_x_bytes(int socket, unsigned int x, void * buffer){
+  int bytesRead = 0;
+  int result;
+  while (bytesRead < x) {
+    result = read(socket, buffer + bytesRead, x - bytesRead);
+    if (result < 1 ) {
+      return;
+    }
+    bytesRead += result;
+  }
+}
 
 #if defined(P_OS_MACOS)
 uint32_t clport = 8989 ;
@@ -71,7 +81,7 @@ int QueryState( pCloud_FileState *state, char * path) {
   free (errm);
 return 0 ;
 }
-int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , char ** errm /*OUT*/ ) {
+int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , void * out /*OUT*/ ) {
   #if defined(P_OS_MACOS)
   struct sockaddr_in addr;
   #else
@@ -83,7 +93,8 @@ int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , char
   int mess_size = sizeof ( message )+path_size + 1 ;
   int bytes_writen = 0 ;
   char *curbuf = NULL ;
-  char buf[ POVERLAY_BUFSIZE ];
+  char *buf = NULL;
+  uint32_t bufflen=0;
   char sendbuf[mess_size];
   int bytes_read = 0 ;
   message *rep = NULL ;
@@ -111,8 +122,8 @@ int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , char
   }
   #else
   if ( (fd = socket(AF_UNIX, SOCK_STREAM, 0 )) == - 1 ) {
-    if (errm)
-      *errm = strndup( "Unable to create UNIX socket" , 27 );
+    if (out)
+      out = (void *)strndup( "Unable to create UNIX socket" , 27 );
     *ret = - 3 ;
     return - 3 ;
    }
@@ -121,8 +132,8 @@ int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , char
   strncpy(addr.sun_path, clsoc, sizeof (addr.sun_path)- 1 );
 
   if (connect(fd, ( struct sockaddr*)&addr,SUN_LEN(&addr)) == - 1 ) {
-    if (errm)
-     *errm = strndup( "Unable to connect to UNIX socket" , 32 );
+    if (out)
+     out = (void *)strndup( "Unable to connect to UNIX socket" , 32 );
     *ret = - 4 ;
     return - 4 ;
   }
@@ -140,28 +151,31 @@ int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , char
   }
   debug ( D_NOTICE , "QueryState bytes send[%d]\n" , bytes_writen);
   if (bytes_writen != mes-> length ) {
-    if (errm)
-      *errm = strndup ( "Communication error" , 19 );
+    if (out)
+      out = strndup ( "Communication error" , 19 );
     close(fd);
     *ret = - 5 ;
     return - 5 ;
   }
-
-  curbuf = buf;
-  while ( (rc= read (fd,curbuf,( POVERLAY_BUFSIZE - bytes_read))) > 0 ) {
-    bytes_read += rc;
-    curbuf = curbuf + rc;
-    if (bytes_read > 12 ){
-      rep = ( message *)buf;
-      if (rep-> length == bytes_read)
-        break ;
-    }
+  
+  
+  
+  read_x_bytes(fd, 4, &bufflen);
+  if (bufflen <= 0)
+  {
+    debug ( D_NOTICE , "Message size could not be read![%d]\n" , bufflen);
+    return -6;
   }
+  buf = (char *)malloc(bufflen);
   rep = ( message *)buf;
+  rep->length = bufflen;
+
+  read_x_bytes(fd, bufflen - 4, buf + 4);
+  
 
   *ret = rep-> type ;
-  if (errm)
-    *errm = strndup (rep-> value , rep-> length - sizeof ( message ));
+  if (out)
+    out = strndup (rep-> value , rep-> length - sizeof ( message ));
 
   close(fd);
 
@@ -192,6 +206,9 @@ int main ( int arc, char **argv ){
     printf( "Call 21 returned %d msg %s \n" , j, errm);
     SendCall( 22 , argv[i], &j, &errm);
     printf( "Call 22 returned %d msg %s \n" , j, errm);
+    
+    SendCall( 23 , argv[i], &j, &errm);
+    printf( "Call 22 returned %d msg %s \n" , j, errm);
   }
   return 0 ;
 }

pCloudCC/lib/poverlay_linux/overlay_client.h

@@ -27,7 +27,8 @@
 #ifndef OVERLAY_CLIENT_H
 #define OVERLAY_CLIENT_H
 
-#define P_OS_MACOS
+//#define P_OS_MACOS
+#define PCLOUD_TESTING
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,7 +43,7 @@ typedef enum _pCloud_FileState
 
 int QueryState(pCloud_FileState *state /*OUT*/, char* path /*IN*/);
 
-int SendCall(int id /*IN*/, const char* path /*IN*/, int* ret /*OUT*/, char** errm /*OUT*/);
+int SendCall( int id /*IN*/ ,const char * path /*IN*/ , int * ret /*OUT*/ , void * out /*OUT*/ );
 #ifdef __cplusplus
 }
 #endif

pCloudCC/main.cpp

@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
       std::cout << "Username option is required!!!"  << "\n";
       return 1;
     }
-    console_client::clibrary::pclsync_lib::get_lib().username_ = username;
+    console_client::clibrary::pclsync_lib::get_lib().set_username(username);
 
     if (passwordsw) {
       console_client::clibrary::pclsync_lib::get_lib().get_pass_from_console();
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
     if (crypto) {
       console_client::clibrary::pclsync_lib::get_lib().setup_crypto_ = true;
       if (vm.count("passascrypto"))
-        console_client::clibrary::pclsync_lib::get_lib().crypto_pass_ = password;
+        console_client::clibrary::pclsync_lib::get_lib().set_crypto_pass(password) ;
       else {
         std::cout << "Enter crypto password."  << "\n";
         console_client::clibrary::pclsync_lib::get_lib().get_cryptopass_from_console();
@@ -80,11 +80,11 @@ int main(int argc, char **argv) {
        console_client::clibrary::pclsync_lib::get_lib().setup_crypto_ = false;
 
     if (vm.count("mountpoint"))
-        console_client::clibrary::pclsync_lib::get_lib().mount_ = vm["mountpoint"].as<std::string>();
+        console_client::clibrary::pclsync_lib::get_lib().set_mount( vm["mountpoint"].as<std::string>());
 
     console_client::clibrary::pclsync_lib::get_lib().newuser_ = newuser;
-    console_client::clibrary::pclsync_lib::get_lib().save_pass_ = save_pass;
-    console_client::clibrary::pclsync_lib::get_lib().daemon_ = daemon;
+    console_client::clibrary::pclsync_lib::get_lib().set_savepass(save_pass);
+    console_client::clibrary::pclsync_lib::get_lib().set_daemon(daemon);
   }
   catch(std::exception& e) {
     std::cerr << "error: " << e.what() << "\n";
@@ -100,7 +100,7 @@ int main(int argc, char **argv) {
     else {
       if (commands)
         std::cout << "Option commnads/o  ignored."  << "\n";
-      if (!console_client::clibrary::pclsync_lib::init())
+      if (!console_client::clibrary::pclsync_lib::get_lib().init())
         sleep(360000);
     }