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

fixed problems with interface ticking on packetradio interfaces.

Browse Source 
still crashes and burns.
This commit is contained in:
gardners 2013-02-05 06:41:29 +10:30 committed by Jeremy Lakeman
parent a4bfdc6c75
commit b70aa9b8c6
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
overlay_interface.c
View File

@ -466,6 +466,14 @@ overlay_interface_init(const char *name, struct in_addr src_addr, struct in_addr
if (config.debug.packetradio)
DEBUGF("Watching file descriptor #%d for packet radio interface",
interface->alarm.poll.fd);
if (interface->tick_ms>0){
// run the first tick asap
interface->alarm.alarm=gettime_ms();
interface->alarm.deadline=interface->alarm.alarm+10;
schedule(&interface->alarm);
}
}
interface->state=INTERFACE_STATE_UP;

23
overlay_packetradio.c
View File

@ -82,7 +82,20 @@ int overlay_rx_packet_append_byte(overlay_interface *interface,unsigned char byt
void overlay_packetradio_poll(struct sched_ent *alarm)
{
overlay_interface *interface = (overlay_interface *)alarm;
time_ms_t now = gettime_ms();
if (alarm->poll.revents==0){
if (interface->state==INTERFACE_STATE_UP && interface->tick_ms>0){
// tick the interface
time_ms_t now = gettime_ms();
overlay_route_queue_advertisements(interface);
alarm->alarm=now+interface->tick_ms;
alarm->deadline=alarm->alarm+interface->tick_ms/2;
schedule(alarm);
}
return;
}
// Read data from the serial port
// We will almost certainly support more than one type of packet radio
@ -156,14 +169,6 @@ void overlay_packetradio_poll(struct sched_ent *alarm)
}
break;
}
// tick the interface
if (interface->tick_ms>0 &&
(interface->last_tick_ms == -1 || now >= interface->last_tick_ms + interface->tick_ms)) {
// tick the interface
overlay_route_queue_advertisements(interface);
interface->last_tick_ms=now;
}
watch(alarm);