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 852cc40f4b537b3e3d0405a5f809a899d30cf949..25f8ac8671475d5840dd28fa7cf77e710be1ad53 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -25,6 +25,13 @@ void completelink(int servernum);
 server serverlist[MAXSERVERS];
 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 */
   memset(serverlist,0,MAXSERVERS*sizeof(server));
@@ -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,8 +67,8 @@ 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);
   }
 }
 
@@ -76,7 +85,8 @@ int handleservermsg(void *source, int cargc, char **cargv) {
   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;
@@ -154,7 +164,7 @@ void completelink(int servernum) {
   
   /* This server is now fully linked. */
   serverlist[servernum].linkstate=LS_LINKED;
-  triggerhook(HOOK_SERVER_LINKED, (void *)servernum);
+  triggerhook(HOOK_SERVER_LINKED, (void *)(long)servernum);
   Error("server",ERR_DEBUG,"Setting link state on %s to LS_LINKED",serverlist[servernum].name->content);
 }