Merge chanserv-live into default.

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

diff --git a/server/server.c b/server/server.c
index c2135d1ea4b044aa98142dcc67aaa346b8599228..9ba31e114748d39585a9d7cb87ef912caf3b29b6 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));
@@ -35,7 +42,10 @@ void _init() {
   serverlist[numerictolong(mynumeric->content,2)].name=getsstring(myserver->content,HOSTLEN);
   serverlist[numerictolong(mynumeric->content,2)].description=getcopyconfigitem("irc","serverdescription","newserv",100);
   serverlist[numerictolong(mynumeric->content,2)].maxusernum=MAXLOCALUSER;
+  serverlist[numerictolong(mynumeric->content,2)].ts=getnettime();
   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 +68,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,11 +86,19 @@ 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);
-  
+  serverlist[servernum].ts=strtoull(cargv[3], NULL, 10);
+  serverlist[servernum].marker=0;
+  setflags(&serverlist[servernum].flags,SMODE_ALL,cargv[6],smodeflags,REJECT_NONE);
+
   if (!strncmp((char *)source,"INIT",4)) {
     /* This is the initial server */
     myhub=servernum;
     serverlist[servernum].parent=numerictolong(mynumeric->content,2);
+    triggerhook(HOOK_IRC_SENDBURSTSERVERS,NULL);
+    triggerhook(HOOK_IRC_SENDBURSTNICKS,NULL);
+    triggerhook(HOOK_IRC_SENDBURSTBURSTS,NULL);
+    irc_send("%s EB",mynumeric->content);
+    triggerhook(HOOK_IRC_CONNECTED,NULL);
   } else {
     serverlist[servernum].parent=numerictolong(source,2);
   }    
@@ -122,7 +140,7 @@ int handlesquitmsg(void *source, int cargc, char **cargv) {
   }
   if (servernum==myhub) {
     Error("server",ERR_WARNING,"Rejected by our hub: %s",cargv[cargc-1]);
-    irc_disconnected();
+    irc_disconnected(0);
     return CMD_OK;
   }
   deleteserver(servernum);
@@ -197,3 +215,18 @@ int findserver(const char *name) {
   return -1;
 }
 
+unsigned int nextservermarker(void) {
+  int i;
+  static unsigned int servermarker=0;
+
+  servermarker++;
+  if (!servermarker) {
+    /* If we wrapped to zero, zap the marker on all hosts */
+    for (i=0;i<MAXSERVERS;i++)
+      serverlist[i].marker=0;
+    servermarker++;
+  }
+
+  return servermarker;
+}
+