From 50066dd948de5e7d8af71386a53f2b03e2352474 Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 16 Apr 2004 15:45:43 +0000 Subject: added more connectback handling git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@623 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/InspIRCd.layout | 26 +++++++++++++------------- src/inspircd.cpp | 18 ++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout index 99229762d..3390f94d4 100644 --- a/src/InspIRCd.layout +++ b/src/InspIRCd.layout @@ -13,9 +13,9 @@ LeftChar=1 [Editor_1] Open=1 Top=1 -CursorCol=11 -CursorRow=6564 -TopLine=6517 +CursorCol=1 +CursorRow=6878 +TopLine=6830 LeftChar=1 [Editor_2] @@ -109,9 +109,9 @@ LeftChar=1 [Editor_13] Open=1 Top=0 -CursorCol=1 -CursorRow=68 -TopLine=22 +CursorCol=89 +CursorRow=125 +TopLine=73 LeftChar=1 [Editor_14] @@ -141,9 +141,9 @@ LeftChar=1 [Editor_17] Open=1 Top=0 -CursorCol=30 -CursorRow=126 -TopLine=63 +CursorCol=20 +CursorRow=128 +TopLine=64 LeftChar=1 [Editor_18] @@ -197,10 +197,10 @@ LeftChar=1 [Editor_24] Open=1 Top=0 -CursorCol=40 -CursorRow=356 -TopLine=303 -LeftChar=8 +CursorCol=1 +CursorRow=368 +TopLine=333 +LeftChar=1 [Editor_25] Open=1 Top=0 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 // 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 -- cgit v1.2.3