ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-08 19:44:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update unicast addresses if they change

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-09-14 11:42:58 +09:30
parent 9f35395b2c
commit a73b9ee7f7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
overlay_address.c
View File

@ -59,7 +59,7 @@ static unsigned char get_nibble(const unsigned char *sid, int pos){
return byte&0xF;
}
// find a subscriber struct from a subscriber id
// find a subscriber struct from a whole or abbreviated subscriber id
// TODO find abreviated sid's
struct subscriber *find_subscriber(const unsigned char *sid, int len, int create){
struct tree_node *ptr = &root;
@ -194,21 +194,22 @@ int subscriber_is_reachable(struct subscriber *subscriber){
// mark the subscriber as reachable via reply unicast packet
int reachable_unicast(struct subscriber *subscriber, overlay_interface *interface, struct in_addr addr, int port){
if (subscriber->reachable!=REACHABLE_NONE)
if (subscriber->reachable!=REACHABLE_NONE && subscriber->reachable!=REACHABLE_UNICAST)
return WHYF("Subscriber %s is already reachable", alloca_tohex_sid(subscriber->sid));
if (subscriber->node)
return WHYF("Subscriber %s is already known for overlay routing", alloca_tohex_sid(subscriber->sid));
// may be used in tests
if (subscriber->reachable==REACHABLE_NONE)
DEBUGF("ADD DIRECT ROUTE TO %s via %s:%d", alloca_tohex_sid(subscriber->sid), inet_ntoa(addr), port);
subscriber->interface = interface;
subscriber->reachable = REACHABLE_UNICAST;
subscriber->address.sin_family = AF_INET;
subscriber->address.sin_addr = addr;
subscriber->address.sin_port = htons(port);
// may be used in tests
DEBUGF("ADD DIRECT ROUTE TO %s via %s:%d", alloca_tohex_sid(subscriber->sid), inet_ntoa(addr), port);
/* Pre-emptively check if we have their sas in memory, or send a request */
keyring_find_sas_public(keyring, subscriber->sid);
return 0;

6
overlay_packetformats.c
View File

@ -271,9 +271,9 @@ int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, s
// HACK, change to packet transmitter when packet format includes that.
if (f.type!=OF_TYPE_SELFANNOUNCE &&
f.source->reachable == REACHABLE_NONE &&
!f.source->node &&
!interface->fileP &&
(f.source->reachable == REACHABLE_NONE || f.source->reachable == REACHABLE_UNICAST)&&
(!f.source->node) &&
(!interface->fileP) &&
recvaddr->sa_family==AF_INET){
struct sockaddr_in *addr=(struct sockaddr_in *)recvaddr;