Changeset 5848

Timestamp:

07/23/08 16:09:04 (4 months ago)

Author:

rbertholon

Message:

still debbugging...

Location:

trunk/centstorage

Files:

• ChangeLog (modified) (1 diff)
• modules/recup_perf_datas/connection.c (modified) (4 diffs)
• modules/recup_perf_datas/connection.h (modified) (1 diff)
• modules/recup_perf_datas/connection_SSL.c (modified) (3 diffs)
• modules/recup_perf_datas/connection_SSL.h (modified) (1 diff)
• modules/recup_perf_datas/recup_perf_datas.c (modified) (3 diffs)

trunk/centstorage/ChangeLog

@@ -10 +10 @@
 switch SSL/no SSL, etc)
 * fixed a f*****g segfault
+* removing some useless files from the svn
 
 ??? - 07/22/2008

trunk/centstorage/modules/recup_perf_datas/connection.c

@@ -652 +652 @@
     }
 
+  tmp = first_client;
   if (tmp)
     for (next = tmp->next; next; )
@@ -657 +658 @@
         if (next->use_ssl == 0)
           {
-            SHUT_FD(tmp->socket);
-            free(tmp->addr);
+            SHUT_FD(next->socket);
+            free(next->addr);
             tmp->next = next->next;
             free(next);
@@ -686 +687 @@
     {
       free(first_client->addr);
-      SSL_shutdown(tmp->ssl);
-      close(tmp->socket);
-      SSL_free(tmp->ssl);
-      SSL_CTX_free(tmp->ctx);
+      SSL_shutdown(first_client->ssl);
+      close(first_client->socket);
+      SSL_free(first_client->ssl);
+      SSL_CTX_free(first_client->ctx);
       tmp = first_client->next;
       free(first_client);
@@ -695 +696 @@
     }
 
-  for (next = tmp->next; next; )
-    {
-      if (next->use_ssl == 1)
-        {
-          SSL_shutdown(tmp->ssl);
-          close(tmp->socket);
-          SSL_free(tmp->ssl);
-          SSL_CTX_free(tmp->ctx);
-          free(tmp->addr);
-          tmp->next = next->next;
-          free(next);
-          next = tmp->next;
-        }
-      else
-        {
-          tmp = tmp->next;
-          next = next->next;
-        }
-    }
+  tmp = first_client;
+  if (tmp)
+    for (next = tmp->next; next; )
+      {
+        if (next->use_ssl == 1)
+          {
+            SSL_shutdown(next->ssl);
+            close(next->socket);
+            SSL_free(next->ssl);
+            SSL_CTX_free(next->ctx);
+            free(next->addr);
+            tmp->next = next->next;
+            free(next);
+            next = tmp->next;
+          }
+        else
+          {
+            tmp = tmp->next;
+            next = next->next;
+          }
+      }
   if (log)
     logger(" [module %s] %s.", MOD_NAME, SSL_CL_DISCONNECTED);

trunk/centstorage/modules/recup_perf_datas/connection.h

@@ -84 +84 @@
 
 /* shutdown and then close the file descriptor */
-#define SHUT_FD(fd) { shutdown(fd, SHUT_RD);    \
+#define SHUT_FD(fd) { shutdown(fd, SHUT_RDWR);  \
                       if (close(fd) == -1)      \
                         perror("Error closing socket: "); }

trunk/centstorage/modules/recup_perf_datas/connection_SSL.c

@@ -84 +84 @@
   if (tmp->reload)
     {
-      printf("reopen\n");
       SSL_library_init(); /* load encryption & hash algorithms for SSL (always return 1) */
       SSL_load_error_strings(); /* load the error strings for good error reporting */
@@ -452 +451 @@
   /* copy the variable defined in the struct confSSL in "local" to avoid using a mutex
    when accessing them */
-  printf("addr:%d\n", confSSL);
   (*checkCl) = confSSL->checkCl;
 
@@ -513 +511 @@
         logger(" [module %s] %s.[ERROR]", MOD_NAME, SSL_BINDING_ERROR);
 
-      fprintf(stderr, "%s.\n", SSL_BINDING_ERROR);
+      fprintf(stderr, "reopen_SSL_connection: %s.\n", SSL_BINDING_ERROR);
       perror("Reason");
       LOCK_MUTEX(&SSL_mutex);

trunk/centstorage/modules/recup_perf_datas/connection_SSL.h

@@ -35 +35 @@
 #define SSL_SOCKET_ERROR "Cannot open socket for secure connection"
 #define SSL_SOCKET_ERROR_LOG "Cannot open socket for SSL"
-#define SSL_BINDING_ERROR "** Cannot bind socket. Exiting thread **"
+#define SSL_BINDING_ERROR "** Cannot bind secure socket. Exiting thread **"
 #define SSL_LISTEN_ERROR "** Error on listen. Exiting thread **"
 #define SSL_ACCEPT_ERROR "** Error on accept for SSL connection **"

trunk/centstorage/modules/recup_perf_datas/recup_perf_datas.c

@@ -381 +381 @@
       UNLOCK_MUTEX(&SSL_mutex);
     }
-  flagStopSSL = 2;
+  //  flagStopSSL = 2;
 
   if (saveSSL == NO)
@@ -419 +419 @@
       if (confModule->SSL == NO)
         {
+          cleanSSL(log);
           LOCK_MUTEX(&SSL_mutex);
           flagStopSSL = 1;
@@ -431 +432 @@
           free(arg);
           cleanNoSSL(log);
+          printf("change mode:%d\n", confModule->socket);
+
           close(confModule->socket);
+
           /* stop SSL thread  */
-          LOCK_MUTEX(&SSL_mutex);
+          LOCK_MUTEX(&SSL_conf_mutex);
           flagStopSSL = 1;
-          UNLOCK_MUTEX(&SSL_mutex);
+          UNLOCK_MUTEX(&SSL_conf_mutex);
+
           if (pthread_join(threadSSL_id, NULL))
-            pthread_exit(NULL);
+            {
+              fprintf(stderr, "Cannot perform pthread_join().\n");
+              pthread_exit(NULL);
+            }
           if (saveSSLPort != confSSL->SSLPort)
             {