From 90577824990919d56c22f7f1340e53fbcae4e2b3 Mon Sep 17 00:00:00 2001 From: BytesGalore Date: Wed, 15 Jul 2015 08:10:38 +0200 Subject: [PATCH] [SQUASH ME] added proper return values to sc_fib and fixed rebase mistakes --- sys/net/network_layer/sixlowpan/ip.c | 7 ++----- sys/shell/commands/sc_fib.c | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/net/network_layer/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c index 7ad3a10a609d2..32e559cd8f9dd 100644 --- a/sys/net/network_layer/sixlowpan/ip.c +++ b/sys/net/network_layer/sixlowpan/ip.c @@ -60,12 +60,9 @@ kernel_pid_t udp_packet_handler_pid = KERNEL_PID_UNDEF; kernel_pid_t tcp_packet_handler_pid = KERNEL_PID_UNDEF; static volatile kernel_pid_t _rpl_process_pid = KERNEL_PID_UNDEF; -<<<<<<< HEAD #ifndef FIB_COMPAT ipv6_addr_t *(*ip_get_next_hop)(ipv6_addr_t *); #endif -======= ->>>>>>> routing/rpl: adjusted RPL to use the FIB uint8_t (*ip_srh_indicator)(void); static ipv6_net_if_ext_t ipv6_net_if_ext[NET_IF_MAX]; @@ -550,7 +547,7 @@ void *ipv6_process(void *arg) continue; } - nce = ndp_get_ll_address(&nxt); + nce = ndp_get_ll_address(dest); /* copy received packet to send buffer */ memcpy(ipv6_get_buf_send(), ipv6_get_buf(), packet_length); @@ -564,7 +561,7 @@ void *ipv6_process(void *arg) else { /* XXX: this is wrong, but until ND does work correctly, * this is the only way (aka the old way)*/ - uint16_t raddr = nxt.uint16[7]; + uint16_t raddr = dest->uint16[7]; sixlowpan_lowpan_sendto(0, &raddr, 2, (uint8_t *) ipv6_get_buf_send(), packet_length); } diff --git a/sys/shell/commands/sc_fib.c b/sys/shell/commands/sc_fib.c index 55140f3c3b6ce..39844affecdf0 100644 --- a/sys/shell/commands/sc_fib.c +++ b/sys/shell/commands/sc_fib.c @@ -71,7 +71,7 @@ int _fib_route_handler(int argc, char **argv) /* e.g. fibroute right now dont care about the adress/protocol family */ if (argc == 1) { fib_print_routes(); - return; + return 0; } /* e.g. firoute [add|del] */ @@ -209,4 +209,5 @@ int _fib_route_handler(int argc, char **argv) } puts("\nunrecognized parameters.\nPlease enter fibroute [add|del] for more information."); + return 1; }