ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-06 11:09:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't destroy the interface destination when bringing it down

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-08-28 16:48:55 +09:30
parent d2a88b8b2d
commit 7a4b1c3f19
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay_interface.c
View File

@ -58,7 +58,6 @@ overlay_interface_close(overlay_interface *interface){
link_interface_down(interface); link_interface_down(interface);
INFOF("Interface %s addr %s is down", INFOF("Interface %s addr %s is down",
interface->name, inet_ntoa(interface->address.sin_addr)); interface->name, inet_ntoa(interface->address.sin_addr));
set_destination_ref(&interface->destination, NULL);
unschedule(&interface->alarm); unschedule(&interface->alarm);
unwatch(&interface->alarm); unwatch(&interface->alarm);
close(interface->alarm.poll.fd); close(interface->alarm.poll.fd);
@ -377,7 +376,7 @@ overlay_interface_init(const char *name, struct in_addr src_addr, struct in_addr
interface->socket_type = ifconfig->socket_type; interface->socket_type = ifconfig->socket_type;
interface->uartbps = ifconfig->uartbps; interface->uartbps = ifconfig->uartbps;
interface->ctsrts = ifconfig->ctsrts; interface->ctsrts = ifconfig->ctsrts;
set_destination_ref(&interface->destination, NULL);
interface->destination = new_destination(interface, ifconfig->encapsulation); interface->destination = new_destination(interface, ifconfig->encapsulation);
/* Pick a reasonable default MTU. /* Pick a reasonable default MTU.
This will ultimately get tuned by the bandwidth and other properties of the interface */ This will ultimately get tuned by the bandwidth and other properties of the interface */
@ -910,7 +909,6 @@ overlay_broadcast_ensemble(struct network_destination *destination,
DEBUGF("Sending %d byte overlay frame on %s to %s",len,interface->name,inet_ntoa(destination->address.sin_addr)); DEBUGF("Sending %d byte overlay frame on %s to %s",len,interface->name,inet_ntoa(destination->address.sin_addr));
if(sendto(interface->alarm.poll.fd, if(sendto(interface->alarm.poll.fd,
bytes, len, 0, (struct sockaddr *)&destination->address, sizeof(destination->address)) != len){ bytes, len, 0, (struct sockaddr *)&destination->address, sizeof(destination->address)) != len){
int e=errno;
WHY_perror("sendto(c)"); WHY_perror("sendto(c)");
// close the interface if we had any error while sending broadcast packets, // close the interface if we had any error while sending broadcast packets,
// unicast packets should not bring the interface down // unicast packets should not bring the interface down