Browse Source

net/fib: removed all ng prefixes from fib

dev/timer
Hauke Petersen 8 years ago
parent
commit
85fe67e629
  1. 4
      sys/Makefile.include
  2. 2
      sys/auto_init/auto_init.c
  3. 3
      sys/include/net/fib.h
  4. 5
      sys/include/net/fib/table.h
  5. 19
      sys/net/network_layer/fib/fib.c
  6. 2
      sys/net/network_layer/ng_ndp/ng_ndp.c
  7. 4
      sys/shell/commands/sc_fib.c
  8. 2
      tests/unittests/tests-fib/tests-fib.c

4
sys/Makefile.include

@ -24,10 +24,6 @@ ifneq (,$(filter oneway_malloc,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/oneway-malloc/include
endif
ifneq (,$(filter fib,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/net
endif
ifneq (,$(filter cpp11-compat,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/cpp11-compat/include
endif

2
sys/auto_init/auto_init.c

@ -86,7 +86,7 @@
#endif
#ifdef MODULE_FIB
#include "net/ng_fib.h"
#include "net/fib.h"
#endif
#define ENABLE_DEBUG (0)

3
sys/include/net/ng_fib.h → sys/include/net/fib.h

@ -15,7 +15,8 @@
*
* @file
* @brief Types and functions for FIB
* @author Martin Landsmann
*
* @author Martin Landsmann <martin.landsmann@haw-hamburg.de>
*/
#ifndef FIB_H_

5
sys/include/net/ng_fib/ng_fib_table.h → sys/include/net/fib/table.h

@ -7,14 +7,13 @@
*/
/**
* @brief forwarding table structs
* @ingroup net_fib
*
* @{
*
* @file
* @brief Types and functions for operating fib tables
* @author Martin Landsmann
*
* @author Martin Landsmann <martin.landsmann@haw-hamburg.de>
*/
#ifndef FIB_TABLE_H_

19
sys/net/network_layer/fib/fib.c

@ -1,17 +1,20 @@
/**
* FIB implementation
*
* Copyright (C) 2014 Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*
* @ingroup fib
*/
/**
* @ingroup net_fib
* @{
*
* @file
* @brief Functions to manage FIB entries
* @author Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
* @brief Functions to manage FIB entries
*
* @author Martin Landsmann <martin.landsmann@haw-hamburg.de>
*
* @}
*/
@ -27,8 +30,8 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
#include "ng_fib.h"
#include "ng_fib/ng_fib_table.h"
#include "net/fib.h"
#include "net/fib/table.h"
#ifdef MODULE_NG_IPV6_ADDR
#include "net/ng_ipv6/addr.h"

2
sys/net/network_layer/ng_ndp/ng_ndp.c

@ -29,7 +29,7 @@
#include "vtimer.h"
#include "net/ng_ndp.h"
#include "net/ng_fib.h"
#include "net/fib.h"
#define ENABLE_DEBUG (0)
#include "debug.h"

4
sys/shell/commands/sc_fib.c

@ -24,10 +24,10 @@
#include <stdlib.h>
#include "thread.h"
#include "inet_pton.h"
#include "ng_fib.h"
#ifdef MODULE_NG_NETIF
#include "ng_netif.h"
#include "net/ng_netif.h"
#endif
#include "net/fib.h"
#define INFO1_TXT "fibroute add <destination> via <next hop> [dev <device>]"
#define INFO2_TXT " [lifetime <lifetime>]"

2
tests/unittests/tests-fib/tests-fib.c

@ -16,7 +16,7 @@
#include "vtimer.h"
#include "thread.h"
#include "ng_fib.h"
#include "net/fib.h"
#include "universal_address.h"
/*

Loading…
Cancel
Save