deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1269 from tadodotcom/tmp-uip-fallback-iface

Browse source 
More flexibility for the fallback interface
This commit is contained in:
Simon Duquennoy 2015-10-20 11:33:14 +02:00
commit 2daa3d7377
10 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/ipv6/native-border-router/tun-bridge.c
View file

@ -222,13 +222,15 @@ tun_init()
}
/*---------------------------------------------------------------------------*/
void
static int
tun_output(uint8_t *data, int len)
{
/* fprintf(stderr, "*** Writing to tun...%d\n", len); */
if(write(tunfd, data, len) != len) {
err(1, "serial_to_tun: write");
return -1;
}
return 0;
}
/*---------------------------------------------------------------------------*/
int
@ -246,13 +248,14 @@ init(void)
{
}
/*---------------------------------------------------------------------------*/
static void
static int
output(void)
{
PRINTF("SUT: %u\n", uip_len);
if(uip_len > 0) {
tun_output(&uip_buf[UIP_LLH_LEN], uip_len);
return tun_output(&uip_buf[UIP_LLH_LEN], uip_len);
}
return 0;
}

3
examples/ipv6/rpl-border-router/slip-bridge.c
View file

@ -100,7 +100,7 @@ init(void)
slip_set_input_callback(slip_input_callback);
}
/*---------------------------------------------------------------------------*/
static void
static int
output(void)
{
if(uip_ipaddr_cmp(&last_sender, &UIP_IP_BUF->srcipaddr)) {
@ -115,6 +115,7 @@ output(void)
// PRINTF("SUT: %u\n", uip_len);
slip_send();
}
return 0;
}
/*---------------------------------------------------------------------------*/