ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-30 16:13:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reinitialise an interface when it comes back up

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-02-15 16:01:04 +10:30
parent 748a2d8957
commit eeb7fb7f9b
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
overlay_interface.c
View File

@ -49,6 +49,7 @@ struct profile_total sock_any_stats;
static void overlay_interface_poll(struct sched_ent *alarm); static void overlay_interface_poll(struct sched_ent *alarm);
static void logServalPacket(int level, struct __sourceloc __whence, const char *message, const unsigned char *packet, size_t len); static void logServalPacket(int level, struct __sourceloc __whence, const char *message, const unsigned char *packet, size_t len);
static int re_init_socket(int interface_index);
#define DEBUG_packet_visualise(M,P,N) logServalPacket(LOG_LEVEL_DEBUG, __WHENCE__, (M), (P), (N)) #define DEBUG_packet_visualise(M,P,N) logServalPacket(LOG_LEVEL_DEBUG, __WHENCE__, (M), (P), (N))
@ -288,7 +289,7 @@ overlay_interface_init_socket(int interface_index)
interface->alarm.poll.fd = overlay_bind_socket(addr, sizeof(interface->broadcast_address), interface->name); interface->alarm.poll.fd = overlay_bind_socket(addr, sizeof(interface->broadcast_address), interface->name);
if (interface->alarm.poll.fd<0){ if (interface->alarm.poll.fd<0){
interface->state=INTERFACE_STATE_DOWN; interface->state=INTERFACE_STATE_DOWN;
return -1; return WHYF("Failed to bind interface %s", interface->name);
} }
if (config.debug.packetrx || config.debug.io) { if (config.debug.packetrx || config.debug.io) {
@ -303,6 +304,23 @@ overlay_interface_init_socket(int interface_index)
return 0; return 0;
} }
static int re_init_socket(int interface_index){
if (overlay_interface_init_socket(interface_index))
return -1;
overlay_interface *interface = &overlay_interfaces[interface_index];
// schedule the first tick asap
interface->alarm.alarm=gettime_ms();
interface->alarm.deadline=interface->alarm.alarm;
schedule(&interface->alarm);
interface->state=INTERFACE_STATE_UP;
INFOF("Interface %s addr %s:%d, is up",interface->name,
inet_ntoa(interface->address.sin_addr), ntohs(interface->address.sin_port));
directory_registration();
return 0;
}
static int static int
overlay_interface_init(const char *name, struct in_addr src_addr, struct in_addr netmask, struct in_addr broadcast, overlay_interface_init(const char *name, struct in_addr src_addr, struct in_addr netmask, struct in_addr broadcast,
const struct config_network_interface *ifconfig) const struct config_network_interface *ifconfig)
@ -883,7 +901,7 @@ overlay_interface_register(char *name,
// try to bring the interface back up again even if the address has changed // try to bring the interface back up again even if the address has changed
if (overlay_interfaces[i].state==INTERFACE_STATE_DOWN){ if (overlay_interfaces[i].state==INTERFACE_STATE_DOWN){
overlay_interfaces[i].address.sin_addr = addr; overlay_interfaces[i].address.sin_addr = addr;
overlay_interface_init_socket(i); re_init_socket(i);
} }
// we already know about this interface, and it's up so stop looking immediately // we already know about this interface, and it's up so stop looking immediately
@ -900,7 +918,7 @@ overlay_interface_register(char *name,
overlay_interfaces[found_interface].address.sin_addr = addr; overlay_interfaces[found_interface].address.sin_addr = addr;
overlay_interfaces[found_interface].broadcast_address.sin_addr = broadcast; overlay_interfaces[found_interface].broadcast_address.sin_addr = broadcast;
overlay_interfaces[found_interface].netmask = mask; overlay_interfaces[found_interface].netmask = mask;
return overlay_interface_init_socket(found_interface); return re_init_socket(found_interface);
} }
/* New interface, so register it */ /* New interface, so register it */

3
overlay_link.c
View File

@ -251,6 +251,9 @@ int overlay_send_probe(struct subscriber *peer, struct sockaddr_in addr, overlay
if (!interface) if (!interface)
return WHY("I don't know which interface to use"); return WHY("I don't know which interface to use");
if (interface->state!=INTERFACE_STATE_UP)
return WHY("I can't send a probe if the interface is down.");
// never send unicast probes over a stream interface // never send unicast probes over a stream interface
if (interface->socket_type==SOCK_STREAM) if (interface->socket_type==SOCK_STREAM)
return 0; return 0;