[Solidircd-CVS] solidircd-stable/src s_bsd.c,1.7,1.8

[Gabriel B. <sh...@us...>]

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19258/src

Modified Files:
	s_bsd.c 
Log Message:
file clean up.

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_bsd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** s_bsd.c	7 Jan 2006 22:13:26 -0000	1.7
--- s_bsd.c	13 Feb 2006 20:48:40 -0000	1.8
***************
*** 19,23 ****
   */
  
! /* $Id$ */
  
  #include "struct.h"
--- 19,23 ----
   */
  
! 
  
  #include "struct.h"
***************
*** 178,182 ****
      char *host;
      int err;
!     socklen_t len = sizeof(err);
      extern char *strerror();
  
--- 178,182 ----
      char *host;
      int err;
! 	socklen_t len = sizeof(err);
      extern char *strerror();
  
***************
*** 214,218 ****
      char *host;
      int err;
!     socklen_t len = sizeof(err);
      extern char *strerror();
  
--- 214,218 ----
      char *host;
      int err;
! 	socklen_t len = sizeof(err);
      extern char *strerror();
  
***************
*** 277,284 ****
      struct sockaddr_in server;
      int ad[4];
!     socklen_t len = sizeof(server);
      char ipname[20];
  
- 
      memset(&lstn, 0, sizeof(aListener));
      ad[0] = ad[1] = ad[2] = ad[3] = 0;
--- 277,283 ----
      struct sockaddr_in server;
      int ad[4];
! 	socklen_t len = sizeof(server);
      char ipname[20];
  
      memset(&lstn, 0, sizeof(aListener));
      ad[0] = ad[1] = ad[2] = ad[3] = 0;
***************
*** 968,972 ****
  static void set_sock_opts(int fd, aClient * cptr)
  {
!     socklen_t opt;
      
  #ifdef SO_REUSEADDR
--- 967,971 ----
  static void set_sock_opts(int fd, aClient * cptr)
  {
!      socklen_t opt;
      
  #ifdef SO_REUSEADDR
***************
*** 1136,1140 ****
  {
      int errtmp = errno, err = 0;
!     socklen_t len = sizeof(err);
      
  #ifdef  SO_ERROR
--- 1135,1139 ----
  {
      int errtmp = errno, err = 0;
! 	socklen_t len = sizeof(err);
      
  #ifdef  SO_ERROR
***************
*** 1256,1260 ****
      lptr->ccount++;
      lptr->clients++;
! 	Count.unknown++;
      add_fd(fd, FDT_CLIENT, acptr);
      local[fd] = acptr;
--- 1255,1259 ----
      lptr->ccount++;
      lptr->clients++;
!     Count.unknown++;
      add_fd(fd, FDT_CLIENT, acptr);
      local[fd] = acptr;
***************
*** 1264,1282 ****
          highest_fd = fd;
  
!     
! 
!     acptr->lstn = lptr;
!     add_client_to_list(acptr);
! #ifdef HAVE_SSL
!   if (!IsSSL (acptr))
!   {
! #endif
! 		/* sockets inherit the options of their parents.. do we need these? */
      set_non_blocking(acptr->fd, acptr);
      set_sock_opts(acptr->fd, acptr);
  
! #ifdef HAVE_SSL
!   }
! #endif
  
      ban = check_userbanned(acptr, UBAN_IP|UBAN_CIDR4|UBAN_WILDUSER, 0);
--- 1263,1272 ----
          highest_fd = fd;
  
!     /* sockets inherit the options of their parents.. do we need these? */
      set_non_blocking(acptr->fd, acptr);
      set_sock_opts(acptr->fd, acptr);
  
!     acptr->lstn = lptr;
!     add_client_to_list(acptr);
  
      ban = check_userbanned(acptr, UBAN_IP|UBAN_CIDR4|UBAN_WILDUSER, 0);
***************
*** 1313,1327 ****
  
  #ifdef SHOW_HEADERS
! #ifdef HAVE_SSL
!   if (!IsSSL (acptr))
!   {
!    
! #endif
! 	 sendto_one(acptr, REPORT_DO_DNS);
! 
! #ifdef HAVE_SSL
!   }
  #endif
- 
      lin.flags = ASYNC_CLIENT;
      lin.value.cptr = acptr;
--- 1303,1308 ----
  
  #ifdef SHOW_HEADERS
!     sendto_one(acptr, REPORT_DO_DNS);
  #endif
      lin.flags = ASYNC_CLIENT;
      lin.value.cptr = acptr;
***************
*** 1332,1347 ****
  #ifdef SHOW_HEADERS
      else
- 	 {
- #ifdef HAVE_SSL
-     if (!IsSSL (acptr))
-     {
- #endif
          sendto_one(acptr, REPORT_FIN_DNSC);
- 
- #ifdef HAVE_SSL
-     }
- #endif
-   }
- #endif
  #endif
      nextdnscheck = 1;
--- 1313,1317 ----
***************
*** 1354,1359 ****
      if (IsSSL(lptr))
      {
- 
-        extern SSL_CTX *CTX_Server;
          acptr->ssl = NULL;
          /* If for some reason we fail to create a new SSL object, 
--- 1324,1327 ----
***************
*** 1362,1366 ****
          {
              sendto_realops_lev(DEBUG_LEV, "SSL_new() object failed [client %s]", acptr->sockhost); 
- 			fprintf(stderr, "SSL creation of new SSL object failed [client %s]\n", acptr->sockhost );
              ircstp->is_ref++;
              acptr->fd = -2;
--- 1330,1333 ----
***************
*** 1468,1472 ****
      {
          errno = 0;
! 
  #ifdef HAVE_SSL
  #if defined ( MAXBUFFERS )
--- 1435,1439 ----
      {
          errno = 0;
!     
  #ifdef HAVE_SSL
  #if defined ( MAXBUFFERS )
***************
*** 1653,1658 ****
  int readwrite_client(aClient *cptr, int isread, int iswrite)
  {
- 
- 
      /*
       * NOTE
--- 1620,1623 ----
***************
*** 1663,1667 ****
       */
  
- 
  #ifdef HAVE_SSL
      if (cptr->ssl != NULL && IsSSL(cptr) && !SSL_is_init_finished(cptr->ssl))
--- 1628,1631 ----
***************
*** 1672,1678 ****
      }
  #endif
! 	
! 	
! 	if(iswrite)
      {
          if (IsConnecting(cptr) && completed_connection(cptr))
--- 1636,1641 ----
      }
  #endif
! 
!     if(iswrite)
      {
          if (IsConnecting(cptr) && completed_connection(cptr))
***************
*** 2035,2046 ****
                      del_queries((char *) cptr);
  #ifdef SHOW_HEADERS
- #ifdef HAVE_SSL
-                     if (!IsSSL (cptr))
-                      {
- #endif
                      sendto_one(cptr, REPORT_FIN_DNS);
- #ifdef HAVE_SSL
-                        }
- #endif
  #endif
                      ClearDNS(cptr);
--- 1998,2002 ----
***************
*** 2078,2082 ****
  }
  
- 
  u_long
  memcount_s_bsd(MCs_bsd *mc)
--- 2034,2037 ----
***************
*** 2108,2109 ****
--- 2063,2065 ----
      return mc->total.m;
  }
+