ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-05-02 16:52:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't kill the interface for unreachable unicast peers

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-11-12 14:41:14 +10:30
parent b04564b6c9
commit 93ee6b3fc8
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
overlay_interface.c
View File

@ -59,6 +59,7 @@ struct profile_total sock_any_stats;
struct outgoing_packet{ struct outgoing_packet{
overlay_interface *interface; overlay_interface *interface;
int i; int i;
struct subscriber *unicast_subscriber;
int unicast; int unicast;
int add_advertisements; int add_advertisements;
struct sockaddr_in dest; struct sockaddr_in dest;
@ -769,24 +770,17 @@ overlay_broadcast_ensemble(int interface_number,
DEBUGF("Sending %d byte overlay frame on %s to %s",len,interface->name,inet_ntoa(recipientaddr->sin_addr)); DEBUGF("Sending %d byte overlay frame on %s to %s",len,interface->name,inet_ntoa(recipientaddr->sin_addr));
if(sendto(interface->alarm.poll.fd, if(sendto(interface->alarm.poll.fd,
bytes, len, 0, (struct sockaddr *)recipientaddr, sizeof(struct sockaddr_in)) != len){ bytes, len, 0, (struct sockaddr *)recipientaddr, sizeof(struct sockaddr_in)) != len){
int e=errno;
WHY_perror("sendto(c)"); WHY_perror("sendto(c)");
overlay_interface_close(interface); // only close the interface on some kinds of errors
if (e==ENETDOWN || e==EINVAL)
overlay_interface_close(interface);
return -1; return -1;
} }
return 0; return 0;
} }
} }
/* This function is called to return old non-overlay requests back out the
interface they came in. */
int overlay_sendto(struct sockaddr_in *recipientaddr,unsigned char *bytes,int len)
{
if (debug&DEBUG_PACKETTX) DEBUGF("Sending %d bytes",len);
if (overlay_broadcast_ensemble(overlay_last_interface_number,recipientaddr,bytes,len) == -1)
return -1;
return len;
}
/* Register the interface, or update the existing interface registration */ /* Register the interface, or update the existing interface registration */
int int
overlay_interface_register(char *name, overlay_interface_register(char *name,
@ -1133,6 +1127,7 @@ overlay_stuff_packet(struct outgoing_packet *packet, overlay_txqueue *queue, tim
}else{ }else{
overlay_init_packet(packet, next_hop->interface, 0); overlay_init_packet(packet, next_hop->interface, 0);
if (next_hop->reachable==REACHABLE_UNICAST){ if (next_hop->reachable==REACHABLE_UNICAST){
packet->unicast_subscriber = next_hop;
packet->dest = next_hop->address; packet->dest = next_hop->address;
packet->unicast=1; packet->unicast=1;
} }
@ -1234,7 +1229,12 @@ overlay_fill_send_packet(struct outgoing_packet *packet, time_ms_t now) {
if (debug&DEBUG_PACKETCONSTRUCTION) if (debug&DEBUG_PACKETCONSTRUCTION)
dump("assembled packet",&packet->buffer->bytes[0],packet->buffer->position); dump("assembled packet",&packet->buffer->bytes[0],packet->buffer->position);
overlay_broadcast_ensemble(packet->i, &packet->dest, packet->buffer->bytes, packet->buffer->position); if (overlay_broadcast_ensemble(packet->i, &packet->dest, packet->buffer->bytes, packet->buffer->position)){
// sendto failed. We probably don't have a valid route
if (packet->unicast_subscriber){
set_reachable(packet->unicast_subscriber, REACHABLE_NONE);
}
}
} }
ob_free(packet->buffer); ob_free(packet->buffer);
overlay_address_clear(); overlay_address_clear();

1
serval.h
View File

@ -476,7 +476,6 @@ time_ms_t overlay_time_until_next_tick();
int overlay_add_selfannouncement(); int overlay_add_selfannouncement();
int overlay_frame_append_payload(overlay_interface *interface, struct overlay_frame *p, struct subscriber *next_hop, struct overlay_buffer *b); int overlay_frame_append_payload(overlay_interface *interface, struct overlay_frame *p, struct subscriber *next_hop, struct overlay_buffer *b);
int overlay_interface_args(const char *arg); int overlay_interface_args(const char *arg);
int overlay_sendto(struct sockaddr_in *recipientaddr,unsigned char *bytes,int len);
int overlay_rhizome_add_advertisements(int interface_number,struct overlay_buffer *e); int overlay_rhizome_add_advertisements(int interface_number,struct overlay_buffer *e);
int overlay_add_local_identity(unsigned char *s); int overlay_add_local_identity(unsigned char *s);
void overlay_update_queue_schedule(overlay_txqueue *queue, struct overlay_frame *frame); void overlay_update_queue_schedule(overlay_txqueue *queue, struct overlay_frame *frame);