added more connectback handling

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@623 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2004-04-16 15:45:43 +00:00
parent 3cf5bf17ca
commit 50066dd948
2 changed files with 21 additions and 23 deletions

View File

@ -13,9 +13,9 @@ LeftChar=1
[Editor_1] [Editor_1]
Open=1 Open=1
Top=1 Top=1
CursorCol=11 CursorCol=1
CursorRow=6564 CursorRow=6878
TopLine=6517 TopLine=6830
LeftChar=1 LeftChar=1
[Editor_2] [Editor_2]
@ -109,9 +109,9 @@ LeftChar=1
[Editor_13] [Editor_13]
Open=1 Open=1
Top=0 Top=0
CursorCol=1 CursorCol=89
CursorRow=68 CursorRow=125
TopLine=22 TopLine=73
LeftChar=1 LeftChar=1
[Editor_14] [Editor_14]
@ -141,9 +141,9 @@ LeftChar=1
[Editor_17] [Editor_17]
Open=1 Open=1
Top=0 Top=0
CursorCol=30 CursorCol=20
CursorRow=126 CursorRow=128
TopLine=63 TopLine=64
LeftChar=1 LeftChar=1
[Editor_18] [Editor_18]
@ -197,10 +197,10 @@ LeftChar=1
[Editor_24] [Editor_24]
Open=1 Open=1
Top=0 Top=0
CursorCol=40 CursorCol=1
CursorRow=356 CursorRow=368
TopLine=303 TopLine=333
LeftChar=8 LeftChar=1
[Editor_25] [Editor_25]
Open=1 Open=1
Top=0 Top=0

View File

@ -6667,8 +6667,6 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
case 'Y': case 'Y':
nb_start = time(NULL); nb_start = time(NULL);
WriteOpers("Server %s is starting netburst.",udp_host); 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; break;
// ~ // ~
// Store authcookie // 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); WriteOpers("Server %s has completed netburst. (%d secs)",udp_host,time(NULL)-nb_start);
handle_F(token,params,source,reply,udp_host); handle_F(token,params,source,reply,udp_host);
nb_start = 0; 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; break;
// X <reserved> // X <reserved>
// Send netburst now // 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); WriteOpers("Sending my netburst to %s",udp_host);
DoSync(source,udp_host); DoSync(source,udp_host);
WriteOpers("Send of netburst to %s completed",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(); NetSendMyRoutingTable();
break; break;
// anything else // 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! // bad cookie, bad bad! go sit in the corner!
WriteOpers("Bad cookie from %s!",servername); WriteOpers("Bad cookie from %s!",servername);
DoSplit(servername);
return; return;
} }
else else