Added ability to update routing table on the fly if a connection is lost

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 254723389d8e46df0777e8156f4b6d02d388bea8..f178a9f0b0d549e68f1b6d2826d6b135f761429a 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -6460,6 +6460,66 @@ void handle_J(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+void NetSendMyRoutingTable()
+{
+       // send out a line saying what is reachable to us.
+       // E.g. if A is linked to B C and D, send out:
+       // $ A B C D
+       // if its only linked to B and D send out:
+       // $ A B D
+       // if it has no links, dont even send out the line at all.
+       char buffer[MAXBUF];
+       sprintf(buffer,"$ %s",ServerName);
+       bool sendit = false;
+       for (int i = 0; i < 32; i++)
+       {
+               if (me[i] != NULL)
+               {
+                       for (int j = 0; j < me[i]->connectors.size(); j++)
+                       {
+                               if (me[i]->connectors[j].GetState() != STATE_DISCONNECTED)
+                               {
+                                       strncat(buffer," ",MAXBUF);
+                                       strncat(buffer,me[i]->connectors[j].GetServerName().c_str(),MAXBUF);
+                                       sendit = true;
+                               }
+                       }
+               }
+       }
+       if (sendit)
+               NetSendToAll(buffer);
+}
+
+void handle_dollar(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       log(DEBUG,"Storing routing table...");
+       char* sourceserver = strtok(params," ");
+       char* server = strtok(NULL," ");
+       for (int i = 0; i < 32; i++)
+       {
+               if (me[i] != NULL)
+               {
+                       for (int j = 0; j < me[i]->connectors.size(); j++)
+                       {
+                               if (!strcasecmp(me[i]->connectors[j].GetServerName().c_str(),sourceserver))
+                               {
+                                       me[i]->connectors[j].routes.clear();
+                                       log(DEBUG,"Found entry for source server.");
+                                       while (server)
+                                       {
+                                               // store each route
+                                               me[i]->connectors[j].routes.push_back(server);
+                                               log(DEBUG,"*** Stored route: %s -> %s -> %s",ServerName,sourceserver,server);
+                                               server = strtok(NULL," ");
+                                       }
+                                       return;
+                               }
+                       }
+               }
+       }
+       log(DEBUG,"Warning! routing table received from nonexistent server!");
+}
+
 
 void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,char* ipaddr,int port)
 {
@@ -6496,6 +6556,10 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case '+':
                        handle_plus(token,params,source,reply,udp_host);
                break;
+               // routing table
+               case '$':
+                       handle_dollar(token,params,source,reply,udp_host);
+               break;
                // R <server> <data>
                // redirect token, send all of <data> along to the given 
                // server as this server has been found to still have a route to it
@@ -6615,7 +6679,7 @@ 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);
-               
+                       NetSendMyRoutingTable();
                break;
                // anything else
                default:
@@ -6656,6 +6720,7 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                                        if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
                                                        {
                                                                me[j]->connectors[k].SetServerName(servername);
+                                                               NetSendMyRoutingTable();
                                                                return;
                                                        }
                                                }
@@ -6668,6 +6733,7 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                return;
                        }
                }
+               // bad cookie, bad bad! go sit in the corner!
                WriteOpers("Bad cookie from %s!",servername);
                return;
        }
@@ -6772,6 +6838,7 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                                                sprintf(buffer,"X 0");
                                                                serv->SendPacket(buffer,udp_host);
                                                                DoSync(me[j],udp_host);
+                                                               NetSendMyRoutingTable();
                                                                return;
                                                        }
                                                }
@@ -7059,10 +7126,6 @@ int InspIRCd(void)
                                        {
                                                strncpy(resolved,remotehost,MAXBUF);
                                        }
-                                       log(DEBUG," ");
-                                       log(DEBUG," ");
-                                       log(DEBUG,"Resolved: '%s'",resolved);
-                                       log(DEBUG," ");
                                        // add to this connections ircd_connector vector
                                        me[x]->AddIncoming(incomingSockfd,resolved,ntohs(client.sin_port));
                                }