/[svn]/branches/newio/src/s_serv.c
ViewVC logotype

Diff of /branches/newio/src/s_serv.c

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

revision 2414 by michael, Sat Jul 20 20:22:09 2013 UTC revision 2415 by michael, Sun Jul 21 14:33:22 2013 UTC
# Line 291  try_connections(struct Event *ev) Line 291  try_connections(struct Event *ev)
291        continue;        continue;
292    
293      /* Do we need to postpone this connection further? */      /* Do we need to postpone this connection further? */
294      hold = aconf->until > CurrentTime;      hold = conf->until > CurrentTime;
295    
296      /* Update next possible connection check time. */      /* Update next possible connection check time. */
297      if (hold && next > aconf->until)      if (hold && next > conf->until)
298        next = aconf->until;        next = conf->until;
299    
300      if (hold || done || hash_find_server(conf->name) ||      if (hold || done || hash_find_server(conf->name) ||
301          !(conf->class->ref_count < conf->class->max_total))          !(conf->class->ref_count < conf->class->max_total))
# Line 305  try_connections(struct Event *ev) Line 305  try_connections(struct Event *ev)
305      dlinkAddTail(conf, &conf->node, &server_items);      dlinkAddTail(conf, &conf->node, &server_items);
306    
307      /* Activate the connection itself. */      /* Activate the connection itself. */
308      if (connect_server(aconf, 0))      if (connect_server(conf, 0))
309      {      {
310        if (ConfigServerHide.hide_server_ips)        if (ConfigServerHide.hide_server_ips)
311          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
# Line 764  server_estab(struct Client *client_p) Line 764  server_estab(struct Client *client_p)
764      AddFlag(client_p, FLAGS_SERVICE);      AddFlag(client_p, FLAGS_SERVICE);
765    
766    /* Show the real host/IP to admins */    /* Show the real host/IP to admins */
767    #ifdef XXX___
768  #ifdef HAVE_LIBCRYPTO  #ifdef HAVE_LIBCRYPTO
769    if (client_p->localClient->fd.ssl)    if (client_p->localClient->fd.ssl)
770    {    {
# Line 791  server_estab(struct Client *client_p) Line 792  server_estab(struct Client *client_p)
792    }    }
793    else    else
794  #endif  #endif
795    #endif
796    {    {
797      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
798                           "Link with %s established: (Capabilities: %s)",                           "Link with %s established: (Capabilities: %s)",

Legend:
Removed from v.2414  
changed lines
  Added in v.2415

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28