From 5fdcd6bc13b7ac45d003ed15b68c32703b988ecd Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Tue, 21 Feb 2012 14:42:05 +0100 Subject: [PATCH] Fixed typo, added option to run without slip connection --- examples/ipv6/native-border-router/slip-dev.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/ipv6/native-border-router/slip-dev.c b/examples/ipv6/native-border-router/slip-dev.c index ead06c6ae..6075b4121 100644 --- a/examples/ipv6/native-border-router/slip-dev.c +++ b/examples/ipv6/native-border-router/slip-dev.c @@ -376,8 +376,9 @@ write_to_serial(int outfd, const uint8_t *inbuf, int len) void write_to_slip(const uint8_t *buf, int len) { - /* printf("Packet to SLIP: %d\n", len); */ - write_to_serial(slipfd, buf, len); + if(slipfd > 0) { + write_to_serial(slipfd, buf, len); + } } /*---------------------------------------------------------------------------*/ static void @@ -460,12 +461,16 @@ slip_init(void) if(slip_config_port == NULL) { 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) { err(1, "can't connect to ``%s:%s''", slip_config_host, slip_config_port); } } 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); if(slipfd == -1) { err(1, "can't open siodev ``/dev/%s''", slip_config_siodev);