diff options
Diffstat (limited to 'src/inspircd.cpp')
| -rw-r--r-- | src/inspircd.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index ed8e4d24d..bc512cebd 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -6667,8 +6667,6 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve case 'Y': nb_start = time(NULL); WriteOpers("Server %s is starting netburst.",udp_host); - // now broadcast this new servers address out to all servers that are linked to us, - // except the newcomer. They'll all attempt to connect back to it. break; // ~ // Store authcookie @@ -6803,6 +6801,14 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve WriteOpers("Server %s has completed netburst. (%d secs)",udp_host,time(NULL)-nb_start); handle_F(token,params,source,reply,udp_host); nb_start = 0; + // now broadcast this new servers address out to all servers that are linked to us, + // except the newcomer. They'll all attempt to connect back to it. + snprintf(buffer,MAXBUF,"~ %d",authcookie); + source->SendPacket(buffer,udp_host); + // tell all the other servers to use this authcookie to connect back again + // got '+ test3.chatspike.net 7010 -2016508415' from test.chatspike.net + snprintf(buffer,MAXBUF,"+ %s %s %d %d",udp_host,ipaddr,port,authcookie); + NetSendToAllExcept(udp_host,buffer); break; // X <reserved> // Send netburst now @@ -6810,13 +6816,6 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve WriteOpers("Sending my netburst to %s",udp_host); DoSync(source,udp_host); WriteOpers("Send of netburst to %s completed",udp_host); - // give the server its authcookie. - snprintf(buffer,MAXBUF,"~ %d",authcookie); - source->SendPacket(buffer,udp_host); - // tell all the other servers to use this authcookie to connect back again - // got '+ test3.chatspike.net 7010 -2016508415' from test.chatspike.net - snprintf(buffer,MAXBUF,"+ %s %s %d %d",udp_host,ipaddr,port,authcookie); - NetSendToAllExcept(udp_host,buffer); NetSendMyRoutingTable(); break; // anything else @@ -6875,7 +6874,6 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv) } // bad cookie, bad bad! go sit in the corner! WriteOpers("Bad cookie from %s!",servername); - DoSplit(servername); return; } else |