Add opername support to newserv, also add displaying of oper names in noperserv warni...

[irc/quakenet/newserv.git] / server / server.c

diff --git a/server/server.c b/server/server.c
index b2e9c60b60bd1145e11ac523cb987af6ccff4992..25f8ac8671475d5840dd28fa7cf77e710be1ad53 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -17,13 +17,20 @@
 #include <stdio.h>
 #include <string.h>
 
-MODULE_VERSION("$Id")
+MODULE_VERSION("");
 
 int findserver(const char *name);
 void completelink(int servernum);
 
 server serverlist[MAXSERVERS];
-int myhub;
+long myhub;
+
+const flag smodeflags[] = {
+   { 'h', SMODE_HUB },
+   { '6', SMODE_IPV6 },
+   { 's', SMODE_SERVICE },
+   { 'n', SMODE_OPERNAME },
+   { '\0', 0 } };
 
 void _init() {
   /* Initialise the server tree */
@@ -36,6 +43,8 @@ void _init() {
   serverlist[numerictolong(mynumeric->content,2)].description=getcopyconfigitem("irc","serverdescription","newserv",100);
   serverlist[numerictolong(mynumeric->content,2)].maxusernum=MAXLOCALUSER;
   serverlist[numerictolong(mynumeric->content,2)].linkstate=LS_LINKED;
+  /* remember to update the mode line in irc/irc.c */
+  serverlist[numerictolong(mynumeric->content,2)].flags=SMODE_SERVICE|SMODE_IPV6|SMODE_HUB|SMODE_OPERNAME;
   
   /* Register the protocol messages we handle */
   registerserverhandler("SERVER",&handleservermsg,8);
@@ -58,25 +67,26 @@ void _fini() {
   deregisterhook(HOOK_IRC_DISCON,&handledisconnect);
   
   for (i=0;i<MAXSERVERS;i++) {
-    if (serverlist[i].name!=NULL)
-      freesstring(serverlist[i].name);
+    freesstring(serverlist[i].name);
+    freesstring(serverlist[i].description);
   }
 }
 
 int handleservermsg(void *source, int cargc, char **cargv) {
-  int servernum;
+  long servernum;
   
   servernum=numerictolong(cargv[5],2);
   
   if (serverlist[servernum].name!=NULL) {
-    Error("server",ERR_ERROR,"New server %d already exists in servertable.",servernum);
+    Error("server",ERR_ERROR,"New server %ld already exists in servertable.",servernum);
     return CMD_ERROR;
   }
  
   serverlist[servernum].name=getsstring(cargv[0],HOSTLEN);
   serverlist[servernum].description=getsstring(cargv[cargc-1],REALLEN);
   serverlist[servernum].maxusernum=numerictolong(cargv[5]+2,3);
-  
+  setflags(&serverlist[servernum].flags,SMODE_ALL,cargv[6],smodeflags,REJECT_NONE);
+
   if (!strncmp((char *)source,"INIT",4)) {
     /* This is the initial server */
     myhub=servernum;
@@ -99,7 +109,7 @@ int handleservermsg(void *source, int cargc, char **cargv) {
 }
 
 int handleeobmsg(void *source, int cargc, char **argv) {
-  int servernum;
+  long servernum;
   
   servernum=numerictolong(source,2);
   completelink(servernum);
@@ -115,7 +125,7 @@ int handleeobmsg(void *source, int cargc, char **argv) {
 }
 
 int handlesquitmsg(void *source, int cargc, char **cargv) {
-  int servernum=findserver(cargv[0]);
+  long servernum=findserver(cargv[0]);
   if (servernum<0) {
     Error("server",ERR_WARNING,"Received SQUIT for unknown server %s\n",cargv[0]);
     return CMD_ERROR;
@@ -154,14 +164,15 @@ void completelink(int servernum) {
   
   /* This server is now fully linked. */
   serverlist[servernum].linkstate=LS_LINKED;
+  triggerhook(HOOK_SERVER_LINKED, (void *)(long)servernum);
   Error("server",ERR_DEBUG,"Setting link state on %s to LS_LINKED",serverlist[servernum].name->content);
 }  
 
-void deleteserver(int servernum) {
+void deleteserver(long servernum) {
   int i;
   
   if (serverlist[servernum].name==NULL) {
-    Error("server",ERR_WARNING,"Tried to remove server %d which doesn't exist.",servernum);
+    Error("server",ERR_WARNING,"Tried to remove server %ld which doesn't exist.",servernum);
     return;
   }