ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/src/ircd.c
(Generate patch)

Comparing ircd-hybrid-8/src/ircd.c (file contents):
Revision 1286 by michael, Sun Feb 5 15:20:03 2012 UTC vs.
Revision 1307 by michael, Sat Mar 24 09:33:33 2012 UTC

# Line 91 | Line 91 | int doremotd = 0;
91   * initialize_server_capabs
92   */
93   int default_server_capabs = 0;
94 –
95 – #ifdef HAVE_LIBCRYPTO
96 – int bio_spare_fd = -1;
97 – #endif
98 –
94   unsigned int splitmode;
95   unsigned int splitchecking;
96   unsigned int split_users;
# Line 325 | Line 320 | initialize_server_capabs(void)
320    add_capability("QS", CAP_QS, 1);
321    add_capability("EOB", CAP_EOB, 1);
322    add_capability("TS6", CAP_TS6, 0);
328 –  add_capability("ZIP", CAP_ZIP, 0);
323    add_capability("CLUSTER", CAP_CLUSTER, 1);
324    add_capability("SVS", CAP_SVS, 1);
325   #ifdef HALFOPS
# Line 446 | Line 440 | init_ssl(void)
440    {
441      const char *s;
442  
443 <    fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
443 >    fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
444              s = ERR_lib_error_string(ERR_get_error()));
445 <    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL context -- %s\n", s);
445 >    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
446    }
447  
448    SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
449    SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
450    SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
451  
452 <  bio_spare_fd = save_spare_fd("SSL private key validation");
452 >  if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
453 >  {
454 >    const char *s;
455 >
456 >    fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
457 >            s = ERR_lib_error_string(ERR_get_error()));
458 >    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
459 >  }
460 >
461 >  SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2);
462 >  SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
463 >  SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
464   #endif /* HAVE_LIBCRYPTO */
465   }
466  
# Line 470 | Line 475 | init_callbacks(void)
475   {
476    iorecv_cb = register_callback("iorecv", iorecv_default);
477    iosend_cb = register_callback("iosend", iosend_default);
473 –  iorecvctrl_cb = register_callback("iorecvctrl", NULL);
474 –  iosendctrl_cb = register_callback("iosendctrl", NULL);
478   }
479  
480   int
# Line 647 | Line 650 | main(int argc, char *argv[])
650    /* No, 'cause after a restart it would cause all sorts of nick collides */
651    eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
652  
650 –  eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
651 –
653    /* Setup the timeout check. I'll shift it later :)  -- adrian */
654    eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
655  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)