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

Fixed typo, added option to run without slip connection

Browse source
This commit is contained in:
Niclas Finne 2012-02-21 14:42:05 +01:00
parent aa67ad67cc
commit 5fdcd6bc13
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/ipv6/native-border-router/slip-dev.c
View file

@ -376,8 +376,9 @@ write_to_serial(int outfd, const uint8_t *inbuf, int len)
void void
write_to_slip(const uint8_t *buf, int len) write_to_slip(const uint8_t *buf, int len)
{ {
/* printf("Packet to SLIP: %d\n", len); */ if(slipfd > 0) {
write_to_serial(slipfd, buf, len); write_to_serial(slipfd, buf, len);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
@ -460,12 +461,16 @@ slip_init(void)
if(slip_config_port == NULL) { if(slip_config_port == NULL) {
slip_config_port = "60001"; slip_config_port = "60001";
} }
slipfd = connect_to_server(slip_config_siodev, slip_config_port); slipfd = connect_to_server(slip_config_host, slip_config_port);
if(slipfd == -1) { if(slipfd == -1) {
err(1, "can't connect to ``%s:%s''", slip_config_host, slip_config_port); err(1, "can't connect to ``%s:%s''", slip_config_host, slip_config_port);
} }
} else if(slip_config_siodev != NULL) { } else if(slip_config_siodev != NULL) {
if(strcmp(slip_config_siodev, "null") == 0) {
/* Disable slip */
return;
}
slipfd = devopen(slip_config_siodev, O_RDWR | O_NONBLOCK); slipfd = devopen(slip_config_siodev, O_RDWR | O_NONBLOCK);
if(slipfd == -1) { if(slipfd == -1) {
err(1, "can't open siodev ``/dev/%s''", slip_config_siodev); err(1, "can't open siodev ``/dev/%s''", slip_config_siodev);