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

closer to working.

Browse Source 
POLLOUT seems to get stuck once triggered.
This commit is contained in:
gardners 2013-02-05 15:26:40 +10:30 committed by Jeremy Lakeman
parent 7f0a22408a
commit e20cfdb59d
3 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay_packetformats.c
View File

@ -187,7 +187,7 @@ int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, s
the source having received the frame from elsewhere.
*/
if (recvaddr->sa_family!=AF_INET)
if (recvaddr&&recvaddr->sa_family!=AF_INET)
RETURN(WHYF("Unexpected protocol family %d",recvaddr->sa_family));
struct overlay_frame f;

60
overlay_packetradio.c
View File

@ -50,7 +50,7 @@ int overlay_rx_packet_complete(overlay_interface *interface)
{
if (interface->recv_offset) {
// dispatch received packet
if (packetOkOverlay(interface, interface->buffer, interface->recv_offset, -1,
if (packetOkOverlay(interface, interface->rxbuffer, interface->recv_offset, -1,
NULL,0)) {
if (config.debug.packetradio)
WARN("Corrupted or unsupported packet from packet radio interface");
@ -67,7 +67,7 @@ int overlay_rx_packet_append_byte(overlay_interface *interface,unsigned char byt
||interface->recv_offset>=OVERLAY_INTERFACE_RX_BUFFER_SIZE)
interface->recv_offset=0;
interface->buffer[interface->recv_offset++]=byte;
interface->rxbuffer[interface->recv_offset++]=byte;
if (interface->recv_offset==OVERLAY_INTERFACE_RX_BUFFER_SIZE) {
// packet fills buffer. Who knows, we might be able to decode what we
// have of it.
@ -80,8 +80,35 @@ int overlay_rx_packet_append_byte(overlay_interface *interface,unsigned char byt
void overlay_packetradio_poll(struct sched_ent *alarm)
{
DEBUGF("here, events=0x%x, revents=0x%x",alarm->poll.events,alarm->poll.revents);
overlay_interface *interface = (overlay_interface *)alarm;
{
if (interface->tx_bytes_pending>0) {
int written=write(alarm->poll.fd,interface->txbuffer,
interface->tx_bytes_pending);
if (config.debug.packetradio) DEBUGF("Trying to write %d bytes",
interface->tx_bytes_pending);
if (written>0) {
interface->tx_bytes_pending-=written;
bcopy(&interface->txbuffer[written],&interface->txbuffer[0],
interface->tx_bytes_pending);
if (config.debug.packetradio) DEBUGF("Wrote %d bytes (%d left pending)",
written,interface->tx_bytes_pending);
} else {
if (config.debug.packetradio) DEBUGF("Failed to write any data");
}
alarm->poll.revents&=~POLLOUT;
if (interface->tx_bytes_pending>0) {
// more to write, so keep POLLOUT flag
} else {
// nothing more to write, so clear POLLOUT flag
alarm->poll.events&=~POLLOUT;
}
}
}
if (alarm->poll.revents==0){
if (interface->state==INTERFACE_STATE_UP && interface->tick_ms>0){
@ -90,6 +117,7 @@ void overlay_packetradio_poll(struct sched_ent *alarm)
overlay_route_queue_advertisements(interface);
alarm->alarm=now+interface->tick_ms;
alarm->deadline=alarm->alarm+interface->tick_ms/2;
unschedule(alarm);
schedule(alarm);
}
@ -104,8 +132,9 @@ void overlay_packetradio_poll(struct sched_ent *alarm)
{
unsigned char buffer[OVERLAY_INTERFACE_RX_BUFFER_SIZE];
ssize_t nread = read(alarm->poll.fd, buffer, OVERLAY_INTERFACE_RX_BUFFER_SIZE);
DEBUGF("Reading from packet radio interface (r=%d, errno=%d)",nread,errno);
if (nread == -1){
WHY_perror("read");
// WHY_perror("read");
return;
}
if (nread>0) {
@ -180,6 +209,11 @@ int overlay_packetradio_tx_packet(int interface_number,
if (config.debug.packetradio) WHYF("Not sending over-size packet");
return -1;
}
if (overlay_interfaces[interface_number].tx_bytes_pending) {
if (config.debug.packetradio)
WHYF("Dropping packet due to congestion");
return -1;
}
/* Encode packet with SLIP escaping.
XXX - Add error correction here also */
@ -205,7 +239,25 @@ int overlay_packetradio_tx_packet(int interface_number,
}
buffer[out_len++]=SLIP_END;
DEBUGF("Encoded length is %d",out_len);
if (config.debug.packetradio) DEBUGF("Encoded length is %d",out_len);
int written=write(overlay_interfaces[interface_number].alarm.poll.fd,
buffer,out_len);
if (config.debug.packetradio)
DEBUGF("Wrote %d of %d bytes",written,out_len);
if (written<out_len) {
int deferred=out_len-written;
if (deferred>OVERLAY_INTERFACE_TX_BUFFER_SIZE)
deferred=OVERLAY_INTERFACE_TX_BUFFER_SIZE;
bcopy(&buffer[written],overlay_interfaces[interface_number].txbuffer,deferred);
overlay_interfaces[interface_number].tx_bytes_pending=deferred;
overlay_interfaces[interface_number].alarm.poll.events|=POLLOUT;
watch(&overlay_interfaces[interface_number].alarm);
if (config.debug.packetradio)
DEBUGF("Buffered %d bytes for transmission",deferred);
}
return 0;
}

7
serval.h
View File

@ -354,13 +354,18 @@ extern int overlayMode;
// This effectively sets the MRU for packet radio interfaces
// where we have to buffer packets on the receive side
#define OVERLAY_INTERFACE_RX_BUFFER_SIZE 2048
// TX buffer must handle FEC encoded and encapsulated data, so needs to be
// larger.
#define OVERLAY_INTERFACE_TX_BUFFER_SIZE (2+2048*2)
typedef struct overlay_interface {
struct sched_ent alarm;
char name[256];
unsigned char buffer[OVERLAY_INTERFACE_RX_BUFFER_SIZE];
unsigned char rxbuffer[OVERLAY_INTERFACE_RX_BUFFER_SIZE];
int recv_offset; /* either dummy file offset or number of bytes in RX buffer
for packet radio interfaces */
unsigned char txbuffer[OVERLAY_INTERFACE_RX_BUFFER_SIZE];
int tx_bytes_pending;
char decoder_state; // decoder state for packet radio interfaces
int fileP; // non-zero for dummy and packet radio serial interfaces
char drop_broadcasts;