/[monit]/monit/ssl.c
ViewVC logotype

Diff of /monit/ssl.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by chopp, Thu Jul 3 11:43:32 2003 UTC revision 1.21 by chopp, Fri Aug 1 11:39:25 2003 UTC
# Line 524  int delete_ssl_socket(ssl_connection *ss Line 524  int delete_ssl_socket(ssl_connection *ss
524    if((ssl->ctx != NULL) && (! ssl->accepted)) {    if((ssl->ctx != NULL) && (! ssl->accepted)) {
525    
526      SSL_CTX_free(ssl->ctx);      SSL_CTX_free(ssl->ctx);
527        ssl->ctx=NULL;
528        
529      } else {
530    
531        ssl->ctx=NULL;
532            
533    }    }
534    
535    free(ssl);    free(ssl);
536    
537      ssl=NULL;
538    
539    return TRUE;    return TRUE;
540    
541  #else  #else
# Line 761  int cleanup_ssl_server_socket(ssl_server Line 768  int cleanup_ssl_server_socket(ssl_server
768      ssl_server->ssl_conn_list=ssl_server->ssl_conn_list->next;      ssl_server->ssl_conn_list=ssl_server->ssl_conn_list->next;
769            
770      close_accepted_ssl_socket(ssl_server, ssl);      close_accepted_ssl_socket(ssl_server, ssl);
     delete_ssl_socket(ssl);  
771            
772    }    }
773    
# Line 784  int cleanup_ssl_server_socket(ssl_server Line 790  int cleanup_ssl_server_socket(ssl_server
790  int delete_ssl_server_socket(ssl_server_connection *ssl_server) {  int delete_ssl_server_socket(ssl_server_connection *ssl_server) {
791    
792  #ifdef HAVE_OPENSSL  #ifdef HAVE_OPENSSL
793      
794    if(ssl_server==NULL) {    if(ssl_server==NULL) {
795    
796      return FALSE;      return FALSE;
# Line 800  int delete_ssl_server_socket(ssl_server_ Line 806  int delete_ssl_server_socket(ssl_server_
806    }    }
807    
808    free(ssl_server);    free(ssl_server);
809      ssl_server=NULL;
810    
811    return TRUE;    return TRUE;
812    
# Line 902  int close_accepted_ssl_socket(ssl_server Line 909  int close_accepted_ssl_socket(ssl_server
909    
910    }    }
911    
912    if (close(ssl->socket) < 0) {    // BIO_flush(ssl->socket_bio);
913      
914      if (! delete_accepted_ssl_socket(ssl_server,  ssl)) {
915    
916      return_value= FALSE;      return_value= FALSE;
917    
918    }    }
919    
920    if (! delete_accepted_ssl_socket(ssl_server,  ssl)) {    if (close(ssl->socket) < 0) {
921    
922      return_value= FALSE;      return_value= FALSE;
923    
# Line 1150  ssl_connection *accept_ssl_socket(ssl_se Line 1159  ssl_connection *accept_ssl_socket(ssl_se
1159  int send_ssl_socket(ssl_connection *ssl, void *buffer, int len) {  int send_ssl_socket(ssl_connection *ssl, void *buffer, int len) {
1160    
1161  #ifdef HAVE_OPENSSL  #ifdef HAVE_OPENSSL
1162    int ssl_error;    int ssl_error= 0;
1163    time_t ssl_time= time(NULL);    time_t ssl_time= time(NULL);
1164      
1165    ASSERT(ssl);    ASSERT(ssl);
1166    
1167      while((ssl->ctx != NULL) &&
1168    while((ssl_error= SSL_write (ssl->handler, (void *) buffer, len))  < 0) {          (ssl_error= SSL_write (ssl->handler, (void *) buffer, len))  < 0) {
1169    
1170      if((time(NULL)-ssl_time) > SSL_TIMEOUT) {      if((time(NULL)-ssl_time) > SSL_TIMEOUT) {
1171    

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26