Merge.

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

diff --git a/server/server.c b/server/server.c
index 592122fe62a7ea889b60b38bed75b76f42e3cd37..4d818e98049dcf000ebc731a1ed60bdbf2717d03 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -44,7 +44,7 @@ void _init() {
   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;
+  serverlist[numerictolong(mynumeric->content,2)].flags=SMODE_SERVICE|SMODE_IPV6|SMODE_HUB|SMODE_OPERNAME;
   
   /* Register the protocol messages we handle */
   registerserverhandler("SERVER",&handleservermsg,8);
@@ -85,12 +85,18 @@ 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].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);
   }    
@@ -207,3 +213,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;
+}
+