ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 06:03:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up other references to interface in overlay_node_observation.

Browse Source 
Tidied up output format when reporting observed links.
This commit is contained in:
gardners 2011-09-13 02:59:48 +09:30
parent 0087d338f2
commit 0cb65c4a87
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mphlr.h
View File

@ -793,7 +793,7 @@ int overlay_abbreviate_lookup_sender_id();
int ob_dump(overlay_buffer *b,char *desc); int ob_dump(overlay_buffer *b,char *desc);
unsigned int ob_get_int(overlay_buffer *b,int offset); unsigned int ob_get_int(overlay_buffer *b,int offset);
char *overlay_render_sid(unsigned char *sid); char *overlay_render_sid(unsigned char *sid);
int overlay_route_record_link(long long now,unsigned char *to,unsigned char *via,unsigned int timestamp,int score,int interface,int gateways_en_route); int overlay_route_record_link(long long now,unsigned char *to,unsigned char *via,unsigned int timestamp,int score,int gateways_en_route);
int overlay_route_dump(); int overlay_route_dump();
int overlay_route_tick(); int overlay_route_tick();
int overlay_route_tick_neighbour(int neighbour_id,long long now); int overlay_route_tick_neighbour(int neighbour_id,long long now);

13
overlay_route.c
View File

@ -814,18 +814,19 @@ int overlay_route_saw_selfannounce_ack(int interface,overlay_frame *f,long long
// Call something like the following for each link // Call something like the following for each link
if (f->source_address_status==OA_RESOLVED) if (f->source_address_status==OA_RESOLVED)
overlay_route_record_link(now,f->source,f->source,timestamp,score,interface,0 /* no gateways in between */); overlay_route_record_link(now,f->source,f->source,timestamp,score,
0 /* no gateways in between */);
} }
return 0; return 0;
} }
int overlay_route_record_link(long long now,unsigned char *to,unsigned char *via,unsigned int timestamp,int score,int interface,int gateways_en_route) int overlay_route_record_link(long long now,unsigned char *to,unsigned char *via,unsigned int timestamp,int score,int gateways_en_route)
{ {
fprintf(stderr,"route_record_link(0x%llx,%s,", fprintf(stderr,"route_record_link(0x%llx,%s*,",
now,overlay_render_sid(to)); now,overlay_render_sid_prefix(to,7));
fprintf(stderr,"%s,0x%08x,%d,%d)\n", fprintf(stderr,"%s*,0x%08x,%d)\n",
overlay_render_sid(via),timestamp,score,interface); overlay_render_sid_prefix(via,7),timestamp,score);
overlay_node *n=overlay_route_find_node(to,1 /* create node if missing */); overlay_node *n=overlay_route_find_node(to,1 /* create node if missing */);
if (!n) return WHY("Could not find or create entry for node"); if (!n) return WHY("Could not find or create entry for node");