/[svn]/ircd-hybrid/branches/8.2.x/modules/core/m_server.c
ViewVC logotype

Diff of /ircd-hybrid/branches/8.2.x/modules/core/m_server.c

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

revision 4609 by michael, Sun Aug 31 08:04:58 2014 UTC revision 4610 by michael, Tue Sep 2 08:35:19 2014 UTC
# Line 262  server_estab(struct Client *client_p) Line 262  server_estab(struct Client *client_p)
262      if (client_p != local_server_list.head->data || local_server_list.head->next)      if (client_p != local_server_list.head->data || local_server_list.head->next)
263      {      {
264        ++ServerStats.is_ref;        ++ServerStats.is_ref;
265        sendto_one(client_p, "ERROR :I'm a leaf not a hub");        exit_client(client_p, "I'm a leaf not a hub");
       exit_client(client_p, "I'm a leaf");  
266        return;        return;
267      }      }
268    }    }
# Line 458  mr_server(struct Client *source_p, int p Line 457  mr_server(struct Client *source_p, int p
457    
458    if (EmptyString(parv[3]))    if (EmptyString(parv[3]))
459    {    {
460      sendto_one(source_p, "ERROR :No servername");      exit_client(source_p, "No server description supplied");
     exit_client(source_p, "Wrong number of args");  
461      return 0;      return 0;
462    }    }
463    
# Line 500  mr_server(struct Client *source_p, int p Line 498  mr_server(struct Client *source_p, int p
498      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
499                           "Link %s introduced server with bogus server ID %s",                           "Link %s introduced server with bogus server ID %s",
500                           get_client_name(source_p, MASK_IP), source_p->id);                           get_client_name(source_p, MASK_IP), source_p->id);
     sendto_one(source_p, "ERROR :Bogus server ID introduced");  
501      exit_client(source_p, "Bogus server ID introduced");      exit_client(source_p, "Bogus server ID introduced");
502      return 0;      return 0;
503    }    }
# Line 522  mr_server(struct Client *source_p, int p Line 519  mr_server(struct Client *source_p, int p
519             "servername %s", get_client_name(source_p, MASK_IP), name);             "servername %s", get_client_name(source_p, MASK_IP), name);
520        }        }
521    
522        exit_client(source_p, "No connect{} block.");        exit_client(source_p, "No connect {} block.");
523        return 0;        return 0;
524        /* NOT REACHED */        /* NOT REACHED */
525        break;        break;
# Line 585  mr_server(struct Client *source_p, int p Line 582  mr_server(struct Client *source_p, int p
582      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
583                           "Attempt to re-introduce server %s from %s",                           "Attempt to re-introduce server %s from %s",
584                           name, get_client_name(source_p, MASK_IP));                           name, get_client_name(source_p, MASK_IP));
     sendto_one(source_p, "ERROR :Server already exists.");  
585      exit_client(source_p, "Server already exists");      exit_client(source_p, "Server already exists");
586      return 0;      return 0;
587    }    }
# Line 600  mr_server(struct Client *source_p, int p Line 596  mr_server(struct Client *source_p, int p
596                           "Attempt to re-introduce server %s SID %s from %s",                           "Attempt to re-introduce server %s SID %s from %s",
597                           name, source_p->id,                           name, source_p->id,
598                           get_client_name(source_p, MASK_IP));                           get_client_name(source_p, MASK_IP));
     sendto_one(source_p, "ERROR :Server ID already exists.");  
599      exit_client(source_p, "Server ID already exists");      exit_client(source_p, "Server ID already exists");
600      return 0;      return 0;
601    }    }
# Line 646  ms_sid(struct Client *source_p, int parc Line 641  ms_sid(struct Client *source_p, int parc
641    
642    if (EmptyString(parv[4]))    if (EmptyString(parv[4]))
643    {    {
644      sendto_one(client_p, "ERROR :No servername");      exit_client(client_p, "No server description supplied");
645      return 0;      return 0;
646    }    }
647    
# Line 658  ms_sid(struct Client *source_p, int parc Line 653  ms_sid(struct Client *source_p, int parc
653      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
654                           "Link %s introduced server with bogus server name %s",                           "Link %s introduced server with bogus server name %s",
655                           get_client_name(client_p, MASK_IP), parv[1]);                           get_client_name(client_p, MASK_IP), parv[1]);
     sendto_one(client_p, "ERROR :Bogus server name introduced");  
656      exit_client(client_p, "Bogus server name introduced");      exit_client(client_p, "Bogus server name introduced");
657      return 0;      return 0;
658    }    }
# Line 671  ms_sid(struct Client *source_p, int parc Line 665  ms_sid(struct Client *source_p, int parc
665      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
666                           "Link %s introduced server with bogus server ID %s",                           "Link %s introduced server with bogus server ID %s",
667                           get_client_name(client_p, MASK_IP), parv[3]);                           get_client_name(client_p, MASK_IP), parv[3]);
     sendto_one(client_p, "ERROR :Bogus server ID introduced");  
668      exit_client(client_p, "Bogus server ID introduced");      exit_client(client_p, "Bogus server ID introduced");
669      return 0;      return 0;
670    }    }
# Line 679  ms_sid(struct Client *source_p, int parc Line 672  ms_sid(struct Client *source_p, int parc
672    /* collision on SID? */    /* collision on SID? */
673    if ((target_p = hash_find_id(parv[3])))    if ((target_p = hash_find_id(parv[3])))
674    {    {
     sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);  
675      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
676                           "Link %s cancelled, SID %s already exists",                           "Link %s cancelled, server ID %s already exists",
677                           get_client_name(client_p, SHOW_IP), parv[3]);                           get_client_name(client_p, SHOW_IP), parv[3]);
678      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
679                           "Link %s cancelled, SID %s already exists",                           "Link %s cancelled, server ID %s already exists",
680                           client_p->name, parv[3]);                           client_p->name, parv[3]);
681      exit_client(client_p, "SID Exists");      exit_client(client_p, "Link cancelled, server ID already exists");
682      return 0;      return 0;
683    }    }
684    
685    /* collision on name? */    /* collision on name? */
686    if ((target_p = hash_find_server(parv[1])))    if ((target_p = hash_find_server(parv[1])))
687    {    {
     sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);  
688      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
689                           "Link %s cancelled, server %s already exists",                           "Link %s cancelled, server %s already exists",
690                           get_client_name(client_p, SHOW_IP), parv[1]);                           get_client_name(client_p, SHOW_IP), parv[1]);
691      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
692                           "Link %s cancelled, server %s already exists",                           "Link %s cancelled, server %s already exists",
693                           client_p->name, parv[1]);                           client_p->name, parv[1]);
694      exit_client(client_p, "Server Exists");      exit_client(client_p, "Server exists");
695      return 0;      return 0;
696    }    }
697    
# Line 782  ms_sid(struct Client *source_p, int parc Line 773  ms_sid(struct Client *source_p, int parc
773      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,      sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
774                           "Link %s introduced leafed server %s.",                           "Link %s introduced leafed server %s.",
775                           get_client_name(client_p, MASK_IP), parv[1]);                           get_client_name(client_p, MASK_IP), parv[1]);
776      exit_client(client_p, "Leafed Server.");      exit_client(client_p, "Leafed server.");
777      return 0;      return 0;
778    }    }
779    

Legend:
Removed from v.4609  
changed lines
  Added in v.4610

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