/*
* Learn topology from path fields
*/
-void network_learn_topology(char *node, char *path, NetMap **the_netmap, int *netmap_changed) {
+static void network_learn_topology(char *node, char *path, NetMap **the_netmap, int *netmap_changed)
+{
char nexthop[256];
NetMap *nmptr;
nmptr->lastcontact = time(NULL);
extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
nmptr->next = *the_netmap;
- the_netmap = &nmptr;
+ *the_netmap = nmptr;
(*netmap_changed) ++;
}
/*
* Batch up and send all outbound traffic from the current room
*/
-void network_spoolout_room(char *room_to_spool,
+void network_spoolout_room(RoomProcList *room_to_spool,
char *working_ignetcfg,
NetMap *the_netmap)
{
* Normally this should never happen, but once in a while maybe a room gets
* queued for networking and then deleted before it can happen.
*/
- if (CtdlGetRoom(&CC->room, room_to_spool) != 0) {
- syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
+ if (CtdlGetRoom(&CC->room, room_to_spool->name) != 0) {
+ syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name);
return;
}
while (d = readdir(dp), d != NULL) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
- ptr = strchr(d->d_name, '@');
- if (d != NULL)
- continue;
+
snprintf(filename,
sizeof filename,
"%s/%s",
if (!threading)
{
create_spool_dirs();
- CtdlRegisterCleanupHook(destroy_network_queue_room);
+//////todo CtdlRegisterCleanupHook(destroy_network_queue_room);
}
return "network_spool";
}