* routes. If route entry doesn't exist for a specific destination, server
* uses primary route (default route).
*/
-/*
- * $Id$
- * $Log$
- * Revision 1.4 2000/07/12 05:59:41 priikone
- * Major rewrite of ID Cache system. Support added for the new
- * ID cache system. Major rewrite of ID List stuff on server. All
- * SilcXXXList's are now called SilcXXXEntry's and they are pointers
- * by default. A lot rewritten ID list functions.
- *
- * Revision 1.3 2000/07/05 06:14:01 priikone
- * Global costemic changes.
- *
- * Revision 1.2 2000/07/04 08:30:24 priikone
- * Added silc_server_get_route to return communication object
- * for fastest route.
- *
- * Revision 1.1.1.1 2000/06/27 11:36:56 priikone
- * Imported from internal CVS/Added Log headers.
- *
- *
- */
+/* XXX Adding two ID's with same IP number replaces the old entry thus
+ gives wrong route. Thus, now disabled until figured out a better way
+ to do this or when removed the whole thing. This could be removed
+ because entry->router->connection gives always the most optimal route
+ for the ID anyway (unless new routes (faster perhaps) are established
+ after receiving this ID, this we don't know however). */
+/* $Id$ */
#include "serverincludes.h"
#include "server_internal.h"
/* Adds new route to the route cache. The argument `index' is the
index value generated by silc_server_route_hash. */
-void silc_server_route_add(unsigned int index, unsigned int dest,
+void silc_server_route_add(SilcUInt32 index, unsigned int dest,
SilcServerEntry router)
{
silc_route_cache[index].dest = dest;
/* Checksk whether destination has a specific router. Returns the
router data if found, NULL otherwise. */
-SilcServerEntry silc_server_route_check(unsigned int dest,
- unsigned short port)
+SilcServerEntry silc_server_route_check(SilcUInt32 dest,
+ SilcUInt16 port)
{
- unsigned int index;
+ SilcUInt32 index;
index = silc_server_route_hash(dest, port);
If we are normal server then this just returns our primary route. If
we are router we will do route lookup. */
-SilcSocketConnection silc_server_get_route(SilcServer server, void *id,
+SilcSocketConnection silc_server_route_get(SilcServer server, void *id,
SilcIdType id_type)
{
- unsigned int dest = 0;
- unsigned short port = 0;
- SilcServerEntry router = NULL;
-
- if (server->server_type == SILC_SERVER)
- return (SilcSocketConnection)server->id_entry->router->connection;
-
- switch(id_type) {
- case SILC_ID_CLIENT:
- dest = ((SilcClientID *)id)->ip.s_addr;
- port = server->id->port;
- break;
- case SILC_ID_SERVER:
- dest = ((SilcServerID *)id)->ip.s_addr;
- port = ((SilcServerID *)id)->port;
- break;
- case SILC_ID_CHANNEL:
- dest = ((SilcChannelID *)id)->ip.s_addr;
- port = ((SilcChannelID *)id)->port;
- break;
- default:
- return NULL;
+ if (server->server_type == SILC_ROUTER) {
+ SilcUInt32 dest = 0;
+ SilcUInt16 port = 0;
+ SilcServerEntry router = NULL;
+#if 0
+
+ switch(id_type) {
+ case SILC_ID_CLIENT:
+ dest = ((SilcClientID *)id)->ip.s_addr;
+ port = server->id->port;
+ break;
+ case SILC_ID_SERVER:
+ dest = ((SilcServerID *)id)->ip.s_addr;
+ port = ((SilcServerID *)id)->port;
+ break;
+ case SILC_ID_CHANNEL:
+ dest = ((SilcChannelID *)id)->ip.s_addr;
+ port = ((SilcChannelID *)id)->port;
+ break;
+ default:
+ return NULL;
+ }
+
+#endif
+
+ router = silc_server_route_check(dest, port);
+ if (!router)
+ return (SilcSocketConnection)server->id_entry->router->connection;
+
+ return (SilcSocketConnection)router->connection;
}
- router = silc_server_route_check(dest, port);
- if (!router)
- return (SilcSocketConnection)server->id_entry->router->connection;
-
- return (SilcSocketConnection)router->connection;
+ return (SilcSocketConnection)server->id_entry->router->connection;
}