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/branches/8.2.x/src/ircd.c (file contents):
Revision 4160 by michael, Thu Jul 3 18:25:36 2014 UTC vs.
Revision 4320 by michael, Fri Aug 1 16:49:16 2014 UTC

# Line 260 | Line 260 | io_loop(void)
260   static void
261   initialize_global_set_options(void)
262   {
263 –  memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
264 –
263    GlobalSetOptions.autoconn  = 1;
264    GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
265    GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
# Line 286 | Line 284 | initialize_global_set_options(void)
284    }
285  
286    GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
289 –  /* End of global set options */
287   }
288  
289   /* initialize_server_capabs()
# Line 433 | Line 430 | ssl_init(void)
430      ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
431    }
432  
433 <  SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
433 >  SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
434    SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
435    SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
436                       always_accept_verify_cb);
# Line 461 | Line 458 | ssl_init(void)
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|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
461 >  SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
462    SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
463    SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
464                       always_accept_verify_cb);
# Line 544 | Line 541 | main(int argc, char *argv[])
541    init_isupport();
542    dbuf_init();
543    hash_init();
544 <  init_ip_hash_table();      /* client host ip hash table */
544 >  ipcache_init();
545    init_host_hash();          /* Host-hashtable. */
546    client_init();
547    class_init();
# Line 601 | Line 598 | main(int argc, char *argv[])
598    hash_add_id(&me);
599    hash_add_client(&me);
600  
601 <  /* add ourselves to global_serv_list */
605 <  dlinkAdd(&me, make_dlink_node(), &global_serv_list);
601 >  dlinkAdd(&me, make_dlink_node(), &global_server_list);
602  
603    load_kline_database();
604    load_dline_database();

Diff Legend

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