clean sockets cache on diff exception

Author: virco

pdiff.c

@@ -43,6 +43,7 @@
 #include "pfs.h"
 #include "pnotifications.h"
 #include "pnetlibs.h"
+#include "pcache.h"
 #include "pbusinessaccount.h"
 #include "publiclinks.h"
 #include "pcontacts.h"
@@ -2026,8 +2027,10 @@ static void handle_exception(psync_socket **sock, subscribed_ids *ids, char ex){
   else if (ex=='e'){
     binparam diffparams[]={P_STR("id", "ignore")};
     if (!send_command_no_res(*sock, "nop", diffparams) || psync_select_in(&(*sock)->sock, 1, PSYNC_SOCK_TIMEOUT_ON_EXCEPTION*1000)!=0){
+      const char *prefixes[]={"API:", "HTTP"};
       debug(D_NOTICE, "reconnecting diff");
       psync_socket_close_bad(*sock);
+      psync_cache_clean_starting_with_one_of(prefixes, ARRAY_SIZE(prefixes));
       *sock=get_connected_socket();
       psync_set_status(PSTATUS_TYPE_ONLINE, PSTATUS_ONLINE_ONLINE);
       psync_syncer_check_delayed_syncs();
@@ -2217,10 +2220,10 @@ static void psync_diff_thread(){
   const binresult *entries;
   uint64_t newdiffid, result;
   psync_socket_t exceptionsock, socks[2];
-  subscribed_ids ids = {0,0,0,0};
-  int sel,ret = 0;
+  subscribed_ids ids = {0, 0, 0, 0};
+  int sel, ret=0;
   char ex;
-  char *err = NULL;
+  char *err=NULL;
   psync_set_status(PSTATUS_TYPE_ONLINE, PSTATUS_ONLINE_CONNECTING);
   psync_send_status_update();
 restart:

pnetlibs.c

@@ -875,7 +875,7 @@ psync_http_socket *psync_http_connect(const char *host, const char *path, uint64
   char ch, lch;
   char cachekey[256];
   usessl=psync_setting_get_bool(_PS(usessl));
-  cl=snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", usessl, host)+1;
+  cl=snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", usessl, host)+1;
   cachekey[sizeof(cachekey)-1]=0;
   sock=(psync_socket *)psync_cache_get(cachekey);
   if (!sock){
@@ -1067,7 +1067,7 @@ static void connect_cache_thread(void *ptr){
   else{
     if (sock){
       char cachekey[256];
-      snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", node->usessl, node->host);
+      snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", node->usessl, node->host);
       cachekey[sizeof(cachekey)-1]=0;
       psync_cache_add(cachekey, sock, 25, (psync_cache_free_callback)psync_socket_close_download, PSYNC_MAX_IDLE_HTTP_CONNS);
     }
@@ -1224,7 +1224,7 @@ psync_http_socket *psync_http_connect_multihost(const binresult *hosts, const ch
   usessl=psync_setting_get_bool(_PS(usessl));
   sock=NULL;
   for (i=0; i<hosts->length; i++){
-    cl=snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", usessl, hosts->array[i]->str)+1;
+    cl=snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", usessl, hosts->array[i]->str)+1;
     cachekey[sizeof(cachekey)-1]=0;
     sock=(psync_socket *)psync_cache_get(cachekey);
     if (sock){
@@ -1242,7 +1242,7 @@ psync_http_socket *psync_http_connect_multihost(const binresult *hosts, const ch
   if (!sock){
     for (i=0; i<hosts->length; i++)
       if ((sock=connect_cache_wait_for_http_connection(hosts->array[i]->str, usessl))){
-        cl=snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", usessl, hosts->array[i]->str)+1;
+        cl=snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", usessl, hosts->array[i]->str)+1;
         cachekey[sizeof(cachekey)-1]=0;
         *host=hosts->array[i]->str;
         break;
@@ -1251,7 +1251,7 @@ psync_http_socket *psync_http_connect_multihost(const binresult *hosts, const ch
       for (i=0; i<hosts->length; i++){
         sock=psync_socket_connect(hosts->array[i]->str, usessl?443:80, usessl);
         if (sock){
-          cl=snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", usessl, hosts->array[i]->str)+1;
+          cl=snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", usessl, hosts->array[i]->str)+1;
           cachekey[sizeof(cachekey)-1]=0;
           *host=hosts->array[i]->str;
           break;
@@ -1284,7 +1284,7 @@ psync_http_socket *psync_http_connect_multihost_from_cache(const binresult *host
   usessl=psync_setting_get_bool(_PS(usessl));
   sock=NULL;
   for (i=0; i<hosts->length; i++){
-    cl=snprintf(cachekey, sizeof(cachekey)-1, "HT%d-%s", usessl, hosts->array[i]->str)+1;
+    cl=snprintf(cachekey, sizeof(cachekey)-1, "HTTP%d-%s", usessl, hosts->array[i]->str)+1;
     cachekey[sizeof(cachekey)-1]=0;
     sock=(psync_socket *)psync_cache_get(cachekey);
     if (sock){