Cc update lib

README.md

@@ -12,11 +12,11 @@ Also requires
 [CMake](https://cmake.org/) build system.  
 
 On Ubuntu you can run the following command:  
-> sudo apt-get install cmake zlib1g-dev libboost-system-dev libboost-program-options-dev libpthread-stubs0-dev libfuse-dev libudev-dev 
+> sudo apt-get install cmake zlib1g-dev libboost-system-dev libboost-program-options-dev libpthread-stubs0-dev libfuse-dev libudev-dev
 
 ## Build steps
 
-> sudo apt-get install cmake zlib1g-dev libboost-system-dev libboost-program-options-dev libpthread-stubs0-dev libfuse-dev libudev-dev git  
+> sudo apt-get install cmake zlib1g-dev libboost-system-dev libboost-program-options-dev libpthread-stubs0-dev libfuse-dev libudev-dev fuse build-essential git
 > mkdir console-client   
 > git clone https://github.com/pcloudcom/console-client.git ./console-client/  
 > cd ./console-client/pCloudCC/   
@@ -31,7 +31,7 @@ On Ubuntu you can run the following command:
 > cmake .    
 > make      
 > sudo make install     
-> ldconfig     
+> sudo ldconfig     
 > pcloudcc -u username -p       
 
 ## Usage
@@ -91,13 +91,17 @@ Or starting the daemon with -o. Test unlocking and locking crypto if you have su
 
 - Quit the client. Congratulations, your pcloud console client works properly.  You can now add “pcloudcc -u [email protected] -d” command in you startup scripts  and thous mount the file system on startup.  
 
+**Notice that stopping daemon will break pending background transfers!**
+
+Current version of `pcloudcc` doesn't support command to check if threre are pending transfers.
+Locally cached files are located under `~/.pcloud/Cache` dir. When there is only one file `~/.pcloud/Cache/cached` (ususally big sized) this mean that transfers are completed.
 
 ## Debian
 To create a debian package form the source use:  
 > debuild -i -us -uc -b  
 
 ## Pre-built packages
-- Ubunutu 18.04 64 bit
+- Ubuntu 18.04 64 bit
   [pcloudcc_2.1.0-1_amd64_ubuntu.18.04.deb](https://my.pcloud.com/publink/show?code=XZvLyi7Zsz7t1H0aYIFiawL4LSgN3uxLBUJX)
 - Debian 9.9 64 bit
   [pcloudcc_2.1.0-1_amd64_debian.9.9.deb](https://my.pcloud.com/publink/show?code=XZYVyi7ZseHyB89XXK0lVAdyy0AwQYl7osU7)
@@ -107,9 +111,9 @@ To create a debian package form the source use:
 ## Older pre-built packages
 - Binary package 64 bit
   [pcloudcc_2.0.1-1_amd64.deb](https://my.pcloud.com/publink/show?code=XZv1aQ7ZkEd1Vr0gj3hTteoDtujd481o7amk)
-- Ubunutu 17.10 64 bit
+- Ubuntu 17.10 64 bit
   [pcloudcc_2.0.1-1_amd64_ubuntu.17.10.deb](https://my.pcloud.com/publink/show?code=XZFeaQ7ZH1nHUfK4MLzGdeCvmmJywBUFANyy)
-- Ubunutu 14.04 64 bit
+- Ubuntu 14.04 64 bit
   [pcloudcc_2.0.1-1_amd64_ubuntu.14.04.deb](https://my.pcloud.com/publink/show?code=XZSeaQ7ZFPq1g8oowJXyXap7KKzTtSKoACHy)
 
 

pCloudCC/CMakeLists.txt

@@ -54,7 +54,7 @@ target_link_libraries(sqlite3 z dl)
 
 add_library(pcloudcc_lib SHARED pclsync_lib_c.cpp pclsync_lib.cpp control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c )
 
-target_link_libraries(pcloudcc_lib ${PCLSYNC_PATH}/libpsynclib.a  ${MBEDTLS_PATH}/library/libmbedtls.a fuse pthread sqlite3
+target_link_libraries(pcloudcc_lib ${PCLSYNC_PATH}/psynclib.a  ${MBEDTLS_PATH}/library/libmbedtls.a fuse pthread sqlite3 udev
 )
 
 add_executable(pcloudcc main.cpp)

pCloudCC/lib/pclsync/Makefile

@@ -1,16 +1,22 @@
-#CC=cc
+CC=gcc
 AR=ar rcu
 RANLIB=ranlib
 #USESSL=openssl
 USESSL=mbed
 
+#CFLAGS=-Wall -Wpointer-arith -O2 -g -mtune=core2
+CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2 -I../sqlite -DP_ELECTRON -fPIC
+
 #CFLAGS=-Wall -Wpointer-arith -O2 -g -fsanitize=address -mtune=core2
-CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -fPIC
+#CFLAGS=-Wall -Wpointer-arith -O2 -g -fsanitize=address -mtune=core2 -I../sqlite
+#CFLAGS=-Wall -Wpointer-arith -Os -g -mtune=core2 -I../sqlite -pg
+#CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2 -I../sqlite/ -fPIC
+#CFLAGS=-Wall -Wpointer-arith -O2 -g -mtune=core2 -I../sqlite -pg -m32 -D_FILE_OFFSET_BITS=64
 #CFLAGS=-O2 -g -pg
 #CFLAGS=-Wall -Wpointer-arith -O2 -g -mtune=core2 -I../../psync32/zlib -I../../psync32/sqlite -m32 -D_FILE_OFFSET_BITS=64
 
-#CMAKE whants lib extension 
-LIB_A=libpsynclib.a 
+LIB_A=psynclib.a
+#LIB_A=libpsynclib.a
 
 
 ifeq ($(OS),Windows_NT)
@@ -23,7 +29,7 @@ else
     UNAME_S := $(shell uname -s)
     UNAME_V := $(shell uname -v)
     ifeq ($(UNAME_S),Linux)
-        CFLAGS += -DP_OS_LINUX -I../sqlite
+        CFLAGS += -DP_OS_LINUX -D_FILE_OFFSET_BITS=64
             ifneq (,$(findstring Debian,$(UNAME_V)))
                 CFLAGS += -DP_OS_DEBIAN
             endif
@@ -41,7 +47,7 @@ OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o
      psyncer.o ptasks.o psettings.o pnetlibs.o pcache.o pscanner.o plist.o plocalscan.o plocalnotify.o pp2p.o\
      pcrypto.o pssl.o pfileops.o ptree.o ppassword.o prunratelimit.o pmemlock.o pnotifications.o pexternalstatus.o publiclinks.o\
      pbusinessaccount.o pcontacts.o poverlay.o poverlay_lin.o poverlay_mac.o poverlay_win.o pcompression.o pasyncnet.o ppathstatus.o\
-     pdevice_monitor.o
+     pdevice_monitor.o ptools.o
 
 OBJFS=pfs.o ppagecache.o pfsfolder.o pfstasks.o pfsupload.o pintervaltree.o pfsxattr.o pcloudcrypto.o pfscrypto.o pcrc32c.o pfsstatic.o plocks.o
 
@@ -72,6 +78,9 @@ fs: $(OBJ) $(OBJFS)
 	$(AR) $(LIB_A) $(OBJ) $(OBJFS)
 	$(RANLIB) $(LIB_A)
 
+debugfs: fs
+	CFLAGS += -DDEBUG_LEVEL=${DEBUG}
+
 cli: fs
 	$(CC) $(CFLAGS) -o cli cli.c $(LIB_A) $(LDFLAGS)
 

pCloudCC/lib/pclsync/gitcommit.h

@@ -1,8 +1,8 @@
 #ifndef _GITCOMMIT_H
 #define _GITCOMMIT_H
 
-#define GIT_PREV_COMMIT_ID "6339ebce20a8b853dd78b80e075ab25e1f413f73"
-#define GIT_PREV_COMMIT_DATE "2018-03-15 15:36:43 +0200"
-#define GIT_COMMIT_DATE "2018-03-26 18:43:25 +0300"
+#define GIT_PREV_COMMIT_ID "a449ee9ac09ecbd9411d5a911aac26a0deacb4d9"
+#define GIT_PREV_COMMIT_DATE "2021-03-11 13:21:49 +0200"
+#define GIT_COMMIT_DATE "2021-03-11 13:23:14 +0200"
 
 #endif

pCloudCC/lib/pclsync/papi.c

@@ -105,20 +105,21 @@ static uint32_t connfailures=0;
 psync_socket *psync_api_connect(const char *hostname, int usessl){
   static time_t notuntil=0;
   psync_socket *ret;
-  if (psync_timer_time()>notuntil){
-    ret=psync_socket_connect(hostname, usessl?PSYNC_API_PORT_SSL:PSYNC_API_PORT, usessl);
+  const char *userapi = psync_setting_get_string(_PS(api_server));
+  if (psync_timer_time()>notuntil || !userapi){
+    ret = psync_socket_connect(hostname, usessl ? PSYNC_API_PORT_SSL : PSYNC_API_PORT, usessl);
     if (ret)
       return ret;
-    if (!strcmp(hostname, PSYNC_API_HOST))
+    if (!userapi || !strcmp(hostname, userapi))
       return NULL;
-    ret=psync_socket_connect(PSYNC_API_HOST, usessl?PSYNC_API_PORT_SSL:PSYNC_API_PORT, usessl);
+    ret=psync_socket_connect(userapi, usessl ? PSYNC_API_PORT_SSL : PSYNC_API_PORT, usessl);
     if (ret) {
-      debug(D_NOTICE, "failed to connect to %s, but was able to connect to %s", hostname, PSYNC_API_HOST);
-      notuntil=psync_timer_time()+1800;
+      debug(D_NOTICE, "failed to connect to %s, but was able to connect to %s", hostname, userapi);
+      notuntil = psync_timer_time() + 1800;
     }
     return ret;
   }
-  return psync_socket_connect(PSYNC_API_HOST, usessl?PSYNC_API_PORT_SSL:PSYNC_API_PORT, usessl);
+  return psync_socket_connect(userapi, usessl ? PSYNC_API_PORT_SSL : PSYNC_API_PORT, usessl);
 }
 
 void psync_api_conn_fail_inc(){
@@ -383,15 +384,21 @@ binresult *get_result(psync_socket *sock){
   unsigned char *data;
   binresult *res;
   uint32_t ressize;
-  if (unlikely_log(psync_socket_readall(sock, &ressize, sizeof(uint32_t))!=sizeof(uint32_t)))
+
+  if (unlikely_log(psync_socket_readall(sock, &ressize, sizeof(uint32_t)) != sizeof(uint32_t))) {
     return NULL;
+  }
+
   data=(unsigned char *)psync_malloc(ressize);
+
   if (unlikely_log(psync_socket_readall(sock, data, ressize)!=ressize)){
     psync_free(data);
     return NULL;
   }
+
   res=parse_result(data, ressize);
   psync_free(data);
+
   return res;
 }
 
@@ -464,13 +471,18 @@ unsigned char *do_prepare_command(const char *command, size_t cmdlen, const binp
   plen=cmdlen+2;
   if (datalen!=-1)
     plen+=sizeof(uint64_t);
-  for (i=0; i<paramcnt; i++)
-    if (params[i].paramtype==PARAM_STR)
-      plen+=params[i].paramnamelen+params[i].opts+5; /* 1byte type+paramnamelen, nbytes paramnamelen, 4byte strlen, nbytes str */
-    else if (params[i].paramtype==PARAM_NUM)
-      plen+=params[i].paramnamelen+1+sizeof(uint64_t);
-    else if (params[i].paramtype==PARAM_BOOL)
-      plen+=params[i].paramnamelen+2;
+
+  for (i = 0; i < paramcnt; i++) {
+    if (params[i].paramtype == PARAM_STR) {
+      plen += params[i].paramnamelen + params[i].opts + 5; /* 1byte type+paramnamelen, nbytes paramnamelen, 4byte strlen, nbytes str */
+    }
+    else if (params[i].paramtype == PARAM_NUM) {
+      plen += params[i].paramnamelen + 1 + sizeof(uint64_t);
+    } 
+    else if (params[i].paramtype == PARAM_BOOL) {
+      plen += params[i].paramnamelen + 2;
+    }
+  }
   if (unlikely_log(plen>0xffff))
     return NULL;
   sdata=data=(unsigned char *)psync_malloc(plen+2+additionalalloc);
@@ -511,9 +523,13 @@ unsigned char *do_prepare_command(const char *command, size_t cmdlen, const binp
 binresult *do_send_command(psync_socket *sock, const char *command, size_t cmdlen, const binparam *params, size_t paramcnt, int64_t datalen, int readres){
   unsigned char *sdata;
   size_t plen;
+
   sdata=do_prepare_command(command, cmdlen, params, paramcnt, datalen, 0, &plen);
-  if (!sdata)
+
+  if (!sdata) {
     return NULL;
+  }
+
   if (readres&2){
     if (unlikely_log(psync_socket_writeall_thread(sock, sdata, plen)!=plen)){
       psync_free(sdata);
@@ -527,36 +543,15 @@ binresult *do_send_command(psync_socket *sock, const char *command, size_t cmdle
     }
   }
   psync_free(sdata);
-  if (readres&1)
+  if (readres&1){
     return get_result(sock);
-  else
+  } else {
     return PTR_OK;
+  }
 }
 
-const binresult *psync_do_find_result(const binresult *res, const char *name, uint32_t type, const char *file, const char *function, int unsigned line){
+void psync_do_dump_binresult(const binresult *res, const char *file, const char *function, int unsigned line){
   uint32_t i;
-  if (unlikely(!res || res->type!=PARAM_HASH)){
-    if (D_CRITICAL<=DEBUG_LEVEL){
-      const char *nm="NULL";
-      if (res)
-        nm=type_names[res->type];
-      psync_debug(file, function, line, D_CRITICAL, "expecting hash as first parameter, got %s", nm);
-    }
-    return empty_types[type];
-  }
-  for (i=0; i<res->length; i++)
-    if (!strcmp(res->hash[i].key, name)){
-      if (likely(res->hash[i].value->type==type))
-        return res->hash[i].value;
-      else{
-        if (D_CRITICAL<=DEBUG_LEVEL)
-          psync_debug(file, function, line, D_CRITICAL, "type error for key %s, expected %s got %s", name, type_names[type], type_names[res->hash[i].value->type]);
-        return empty_types[type];
-      }
-    }
-  if (D_CRITICAL<=DEBUG_LEVEL)
-    psync_debug(file, function, line, D_CRITICAL, "could not find key %s", name);
-#if IS_DEBUG
   psync_debug(file, function, line, D_NOTICE, "dumping existing fields of the hash");
   for (i=0; i<res->length; i++)
     switch (res->hash[i].value->type){
@@ -582,6 +577,34 @@ const binresult *psync_do_find_result(const binresult *res, const char *name, ui
         psync_debug(file, function, line, D_NOTICE, "  %s=!unknown type %u", res->hash[i].key, (unsigned)res->hash[i].value->type);
         break;
     }
+}
+
+const binresult *psync_do_find_result(const binresult *res, const char *name, uint32_t type, const char *file, const char *function, int unsigned line){
+  uint32_t i;
+  if (unlikely(!res || res->type!=PARAM_HASH)){
+    if (D_CRITICAL<=DEBUG_LEVEL){
+      const char *nm="NULL";
+      if (res){
+        nm=type_names[res->type];
+      }
+      psync_debug(file, function, line, D_CRITICAL, "expecting hash as first parameter, got %s", nm);
+    }
+    return empty_types[type];
+  }
+  for (i=0; i<res->length; i++)
+    if (!strcmp(res->hash[i].key, name)){
+      if (likely(res->hash[i].value->type==type))
+        return res->hash[i].value;
+      else{
+        if (D_CRITICAL<=DEBUG_LEVEL)
+          psync_debug(file, function, line, D_CRITICAL, "type error for key %s, expected %s got %s", name, type_names[type], type_names[res->hash[i].value->type]);
+        return empty_types[type];
+      }
+    }
+  if (D_CRITICAL<=DEBUG_LEVEL)
+    psync_debug(file, function, line, D_CRITICAL, "could not find key %s", name);
+#if IS_DEBUG
+  psync_do_dump_binresult(res, file, function, line);
 #endif
   return empty_types[type];
 }
@@ -609,3 +632,20 @@ const binresult *psync_do_check_result(const binresult *res, const char *name, u
     }
   return NULL;
 }
+
+const binresult *psync_do_get_result(const binresult *res, const char *name, const char *file, const char *function, int unsigned line){
+  uint32_t i;
+  if (unlikely(!res || res->type!=PARAM_HASH)){
+    if (D_CRITICAL<=DEBUG_LEVEL){
+      const char *nm="NULL";
+      if (res)
+        nm=type_names[res->type];
+      psync_debug(file, function, line, D_CRITICAL, "expecting hash as first parameter, got %s", nm);
+    }
+    return NULL;
+  }
+  for (i=0; i<res->length; i++)
+    if (!strcmp(res->hash[i].key, name))
+      return res->hash[i].value;
+  return NULL;
+}

pCloudCC/lib/pclsync/papi.h

@@ -102,6 +102,8 @@ typedef struct {
 
 #define psync_find_result(res, name, type) psync_do_find_result(res, name, type, __FILE__, __FUNCTION__, __LINE__)
 #define psync_check_result(res, name, type) psync_do_check_result(res, name, type, __FILE__, __FUNCTION__, __LINE__)
+#define psync_get_result(res, name) psync_do_get_result(res, name, __FILE__, __FUNCTION__, __LINE__)
+#define psync_dump_result(res) psync_do_dump_binresult(res, __FILE__, __FUNCTION__, __LINE__)
 
 psync_socket *psync_api_connect(const char *hostname, int usessl);
 void psync_api_conn_fail_inc();
@@ -116,5 +118,6 @@ unsigned char *do_prepare_command(const char *command, size_t cmdlen, const binp
 binresult *do_send_command(psync_socket *sock, const char *command, size_t cmdlen, const binparam *params, size_t paramcnt, int64_t datalen, int readres) PSYNC_NONNULL(1, 2);
 const binresult *psync_do_find_result(const binresult *res, const char *name, uint32_t type, const char *file, const char *function, int unsigned line) PSYNC_NONNULL(2) PSYNC_PURE;
 const binresult *psync_do_check_result(const binresult *res, const char *name, uint32_t type, const char *file, const char *function, int unsigned line)  PSYNC_NONNULL(2) PSYNC_PURE;
-
+const binresult *psync_do_get_result(const binresult *res, const char *name, const char *file, const char *function, int unsigned line) PSYNC_NONNULL(2) PSYNC_PURE;
+void psync_do_dump_binresult(const binresult *res, const char *file, const char *function, int unsigned line);
 #endif

pCloudCC/lib/pclsync/pbusinessaccount.c

@@ -66,8 +66,6 @@ static void init_param_num(binparam* t, const char *name, uint64_t val) {
 static int handle_result(const binresult *bres, uint64_t result, char **err)
 {
   const char *errorret = 0;
-
-
   errorret = psync_find_result(bres, "error", PARAM_STR)->str;
   if(strlen(errorret) == 0)
     errorret = psync_find_result(bres, "message", PARAM_STR)->str;