mirror of
https://github.com/apache/nuttx.git
synced 2026-11-09 08:39:29 +08:00
Add a user interface to manage the routing table
This commit is contained in:
Gregory Nutt committed
1 parent
fee65851ca
commit
0ff3852b2f
13 files changed
+420
-43
No files matched your search
@@ -5695,4 +5695,7 @@
|
||||
the routing table (2013-10-2).
|
||||
* configs/spark: Add configuratino for the Spark Core. The
|
||||
initial check-in is basically the Maple Mini board (2013-10-2).
|
||||
* include/net/route.h and libc/net/lib_addroute.c and delroute.c:
|
||||
Add an application interface to manage the routing table
|
||||
(2013-10-2).
|
||||
|
||||
+48
-16
@@ -56,27 +56,16 @@
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
struct ifnet
|
||||
{
|
||||
uint16_t if_index; /* Interface number */
|
||||
uint16_t if_mtu; /* MTU of interface */
|
||||
struct sockaddr_in if_addr; /* Address of interface */
|
||||
struct sockaddr_in if_netmask; /* Netmask of if_addr */
|
||||
};
|
||||
|
||||
/* This structure describes the route information passed with the SIOCADDRT
|
||||
* and SIOCDELRT ioctl commands (see include/nuttx/net/ioctl.h).
|
||||
*/
|
||||
|
||||
struct ortentry
|
||||
struct rtentry
|
||||
{
|
||||
uint32_t rt_hash; /* To speed lookups */
|
||||
struct sockaddr rt_dst; /* Key */
|
||||
struct sockaddr rt_gateway; /* Value */
|
||||
uint16_t rt_flags; /* Up/down?, host/net */
|
||||
uint16_t rt_refcnt; /* Number of held references */
|
||||
uint32_t rt_use; /* Raw number of packets forwarded */
|
||||
struct ifnet *rt_ifp; /* The answer: interface to use */
|
||||
uint16_t rt_ifno; /* Interface number, e.g., the 0 in "eth0" */
|
||||
FAR struct sockaddr_storage *rt_target; /* Target address */
|
||||
FAR struct sockaddr_storage *rt_netmask; /* Network mask defining the sub-net */
|
||||
FAR struct sockaddr_storage *rt_gateway; /* Gateway address associated with the hop */
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
@@ -95,6 +84,49 @@ extern "C"
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Function: net_addroute
|
||||
*
|
||||
* Description:
|
||||
* Add a new route to the routing table. This is just a convenience
|
||||
* wrapper for the SIOCADDRT ioctl call.
|
||||
*
|
||||
* Parameters:
|
||||
* sockfd - Any socket descriptor
|
||||
* target - Target address (required)
|
||||
* netmask - Network mask defining the sub-net (required)
|
||||
* gateway - Gateway address associated with the hop (optional)
|
||||
* ifno - Interface number, e.g., the 0 in "eth0"
|
||||
*
|
||||
* Returned Value:
|
||||
* OK on success; -1 on failure with the errno variable set appropriately.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int addroute(int sockfd, FAR struct sockaddr_storage *target,
|
||||
FAR struct sockaddr_storage *netmask,
|
||||
FAR struct sockaddr_storage *gateway, int ifno);
|
||||
|
||||
/****************************************************************************
|
||||
* Function: net_delroute
|
||||
*
|
||||
* Description:
|
||||
* Add a new route to the routing table. This is just a convenience
|
||||
* wrapper for the SIOCADDRT ioctl call.
|
||||
*
|
||||
* Parameters:
|
||||
* sockfd - Any socket descriptor
|
||||
* target - Target address (required)
|
||||
* netmask - Network mask defining the sub-net (required)
|
||||
*
|
||||
* Returned Value:
|
||||
* OK on success; -1 on failure with the errno variable set appropriately.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int delroute(int sockfd, FAR struct sockaddr_storage *target,
|
||||
FAR struct sockaddr_storage *netmask);
|
||||
|
||||
#undef EXTERN
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
* include/nuttx/net/ioctl.h
|
||||
*
|
||||
* Copyright (C) 2007-2008, 2010-2012 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2007-2008, 2010-2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -92,7 +92,7 @@
|
||||
#define SIOCGIPMSFILTER _SIOC(0x0010) /* Retrieve source filter addresses */
|
||||
#define SIOCSIPMSFILTER _SIOC(0x0011) /* Set source filter content */
|
||||
|
||||
/* Routing table. Argument is a reference to struct ortentry in
|
||||
/* Routing table. Argument is a reference to struct rtentry as defined in
|
||||
* include/net/route.h
|
||||
*/
|
||||
|
||||
|
||||
+7
-1
@@ -1,7 +1,7 @@
|
||||
############################################################################
|
||||
# libc/net/Make.defs
|
||||
#
|
||||
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
||||
# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@@ -38,6 +38,12 @@
|
||||
CSRCS += lib_etherntoa.c lib_htons.c lib_htonl.c lib_inetaddr.c
|
||||
CSRCS += lib_inetntoa.c lib_inetntop.c lib_inetpton.c
|
||||
|
||||
# Routing table support
|
||||
|
||||
ifeq ($(CONFIG_NET_ROUTE),y)
|
||||
CSRCS += lib_addroute.c lib_delroute.c
|
||||
endif
|
||||
|
||||
# Add the net directory to the build
|
||||
|
||||
DEPPATH += --dep-path net
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
/***************************************************************************
|
||||
* libc/net/lib_addroute.c
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Compilation Switches
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Included Files
|
||||
***************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <stdint.h>
|
||||
#include <net/route.h>
|
||||
|
||||
/***************************************************************************
|
||||
* Global Functions
|
||||
***************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Function: net_addroute
|
||||
*
|
||||
* Description:
|
||||
* Add a new route to the routing table. This is just a convenience
|
||||
* wrapper for the SIOCADDRT ioctl call.
|
||||
*
|
||||
* Parameters:
|
||||
* sockfd - Any socket descriptor
|
||||
* target - Target address (required)
|
||||
* netmask - Network mask defining the sub-net (required)
|
||||
* gateway - Gateway address associated with the hop (optional)
|
||||
* ifno - Interface number, e.g., the 0 in "eth0"
|
||||
*
|
||||
* Returned Value:
|
||||
* OK on success; -1 on failure with the errno variable set appropriately.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int addroute(int sockfd, FAR struct sockaddr_storage *target,
|
||||
FAR struct sockaddr_storage *netmask,
|
||||
FAR struct sockaddr_storage *gateway, int ifno)
|
||||
{
|
||||
struct rtentry entry;
|
||||
|
||||
/* Set up the rtentry structure */
|
||||
|
||||
entry.rt_ifno = ifno; /* Interface number, e.g., the 0 in "eth0" */
|
||||
entry.rt_target = target; /* Target address */
|
||||
entry.rt_netmask = netmask; /* Network mask defining the sub-net */
|
||||
entry.rt_gateway = gateway; /* Gateway address associated with the hop */
|
||||
|
||||
/* Then perform the ioctl */
|
||||
|
||||
return ioctl(sockfd, SIOCADDRT, (unsigned long)((uintptr_t)&entry));
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
/***************************************************************************
|
||||
* libc/net/lib_delroute.c
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Compilation Switches
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Included Files
|
||||
***************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <stdint.h>
|
||||
#include <net/route.h>
|
||||
|
||||
/***************************************************************************
|
||||
* Global Functions
|
||||
***************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Function: net_delroute
|
||||
*
|
||||
* Description:
|
||||
* Add a new route to the routing table. This is just a convenience
|
||||
* wrapper for the SIOCADDRT ioctl call.
|
||||
*
|
||||
* Parameters:
|
||||
* sockfd - Any socket descriptor
|
||||
* target - Target address (required)
|
||||
* netmask - Network mask defining the sub-net (required)
|
||||
*
|
||||
* Returned Value:
|
||||
* OK on success; -1 on failure with the errno variable set appropriately.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int delroute(int sockfd, FAR struct sockaddr_storage *target,
|
||||
FAR struct sockaddr_storage *netmask)
|
||||
{
|
||||
struct rtentry entry;
|
||||
|
||||
/* Set up the rtentry structure */
|
||||
|
||||
entry.rt_target = target; /* Target address */
|
||||
entry.rt_netmask = netmask; /* Network mask defining the sub-net */
|
||||
|
||||
entry.rt_ifno = 0; /* (not used for deletion) */
|
||||
entry.rt_gateway = NULL; /* (not used for deletion) */
|
||||
|
||||
/* Then perform the ioctl */
|
||||
|
||||
return ioctl(sockfd, SIOCDELRT, (unsigned long)((uintptr_t)&entry));
|
||||
}
|
||||
+1
-1
@@ -308,7 +308,7 @@ config NET_ROUTE
|
||||
bool "Routing table suport"
|
||||
default n
|
||||
---help---
|
||||
Build in support for a routing table. See include/nuttx/net/route.h
|
||||
Build in support for a routing table. See include/net/route.h
|
||||
|
||||
config NET_MAXROUTES
|
||||
int "Routing table size"
|
||||
|
||||
+1
-2
@@ -43,9 +43,8 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <nuttx/net/route.h>
|
||||
|
||||
#include "net_internal.h"
|
||||
#include "net_route.h"
|
||||
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
|
||||
|
||||
|
||||
+1
-2
@@ -43,9 +43,8 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <nuttx/net/route.h>
|
||||
|
||||
#include "net_internal.h"
|
||||
#include "net_route.h"
|
||||
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
|
||||
|
||||
|
||||
+1
-2
@@ -43,9 +43,8 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <nuttx/net/route.h>
|
||||
|
||||
#include "net_internal.h"
|
||||
#include "net_route.h"
|
||||
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
|
||||
|
||||
|
||||
@@ -43,9 +43,9 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include <arch/irq.h>
|
||||
#include <nuttx/net/route.h>
|
||||
|
||||
#include "net_internal.h"
|
||||
#include "net_route.h"
|
||||
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* include/nuttx/net/route.h
|
||||
* net/net_route.h
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@@ -33,8 +33,8 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __INCLUDE_NUTTX_NET_ROUTE_H
|
||||
#define __INCLUDE_NUTTX_NET_ROUTE_H
|
||||
#ifndef __NET_NET_ROUTE_H
|
||||
#define __NET_NET_ROUTE_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
@@ -159,4 +159,4 @@ int net_foreachroute(route_handler_t handler, FAR void *arg);
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_NET_ROUTE */
|
||||
#endif /* __INCLUDE_NUTTX_NET_ROUTE_H */
|
||||
#endif /* __NET_NET_ROUTE_H */
|
||||
+173
-12
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user