2013-10-02 02:55:20 +02:00
|
|
|
/****************************************************************************
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
* net/route/net_del_ramroute.c
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
2021-02-19 12:45:37 +01:00
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
|
|
* this work for additional information regarding copyright ownership. The
|
|
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
|
|
* "License"); you may not use this file except in compliance with the
|
|
|
|
* License. You may obtain a copy of the License at
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
2021-02-19 12:45:37 +01:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
2021-02-19 12:45:37 +01:00
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
|
|
* License for the specific language governing permissions and limitations
|
|
|
|
* under the License.
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
* Included Files
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
|
|
|
|
#include <stdint.h>
|
2013-10-02 03:13:06 +02:00
|
|
|
#include <string.h>
|
2013-10-02 02:55:20 +02:00
|
|
|
#include <errno.h>
|
2017-08-11 00:18:06 +02:00
|
|
|
#include <debug.h>
|
2013-10-02 02:55:20 +02:00
|
|
|
|
2017-08-11 00:18:06 +02:00
|
|
|
#include <arpa/inet.h>
|
2014-07-05 03:13:08 +02:00
|
|
|
#include <nuttx/net/ip.h>
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#include "route/ramroute.h"
|
2014-06-26 21:02:08 +02:00
|
|
|
#include "route/route.h"
|
2013-10-02 02:55:20 +02:00
|
|
|
|
2017-09-28 17:23:03 +02:00
|
|
|
#if defined(CONFIG_ROUTE_IPv4_RAMROUTE) || defined(CONFIG_ROUTE_IPv6_RAMROUTE)
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
/****************************************************************************
|
2020-01-13 21:26:04 +01:00
|
|
|
* Private Types
|
2013-10-02 02:55:20 +02:00
|
|
|
****************************************************************************/
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv4_RAMROUTE
|
2017-09-29 16:33:36 +02:00
|
|
|
struct route_match_ipv4_s
|
2013-10-02 02:55:20 +02:00
|
|
|
{
|
2017-08-11 00:18:06 +02:00
|
|
|
FAR struct net_route_ipv4_s *prev; /* Predecessor in the list */
|
2017-09-29 16:33:36 +02:00
|
|
|
in_addr_t target; /* The target IP address to match */
|
|
|
|
in_addr_t netmask; /* The network mask to match */
|
2013-10-02 02:55:20 +02:00
|
|
|
};
|
2015-05-13 15:22:02 +02:00
|
|
|
#endif
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv6_RAMROUTE
|
2015-05-13 15:22:02 +02:00
|
|
|
struct route_match_ipv6_s
|
|
|
|
{
|
|
|
|
FAR struct net_route_ipv6_s *prev; /* Predecessor in the list */
|
|
|
|
net_ipv6addr_t target; /* The target IP address to match */
|
|
|
|
net_ipv6addr_t netmask; /* The network mask to match */
|
|
|
|
};
|
|
|
|
#endif
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
* Private Functions
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
/****************************************************************************
|
2017-08-11 00:18:06 +02:00
|
|
|
* Name: net_match_ipv4
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Return 1 if the route is available
|
|
|
|
*
|
2018-03-13 16:52:27 +01:00
|
|
|
* Input Parameters:
|
2013-10-02 02:55:20 +02:00
|
|
|
* route - The next route to examine
|
|
|
|
* arg - The match values (cast to void*)
|
|
|
|
*
|
|
|
|
* Returned Value:
|
|
|
|
* 0 if the entry is not a match; 1 if the entry matched and was cleared.
|
|
|
|
*
|
|
|
|
****************************************************************************/
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv4_RAMROUTE
|
2017-08-11 00:18:06 +02:00
|
|
|
static int net_match_ipv4(FAR struct net_route_ipv4_s *route, FAR void *arg)
|
2013-10-02 02:55:20 +02:00
|
|
|
{
|
2021-02-19 15:01:46 +01:00
|
|
|
FAR struct route_match_ipv4_s *match =
|
|
|
|
(FAR struct route_match_ipv4_s *)arg;
|
2013-10-02 02:55:20 +02:00
|
|
|
|
2013-10-05 20:05:51 +02:00
|
|
|
/* To match, the masked target address must be the same, and the masks
|
|
|
|
* must be the same.
|
2013-10-02 02:55:20 +02:00
|
|
|
*/
|
|
|
|
|
2017-08-11 00:18:06 +02:00
|
|
|
net_ipv4_dumproute("Comparing", route);
|
|
|
|
ninfo("With:\n");
|
|
|
|
ninfo(" target=%08lx netmask=%08lx\n",
|
2022-01-18 08:38:00 +01:00
|
|
|
HTONL(match->target), HTONL(match->netmask));
|
2017-08-11 00:18:06 +02:00
|
|
|
|
2015-01-16 20:01:08 +01:00
|
|
|
if (net_ipv4addr_maskcmp(route->target, match->target, match->netmask) &&
|
|
|
|
net_ipv4addr_cmp(route->netmask, match->netmask))
|
2013-10-02 02:55:20 +02:00
|
|
|
{
|
2013-10-05 20:05:51 +02:00
|
|
|
/* They match.. Remove the entry from the routing table */
|
|
|
|
|
|
|
|
if (match->prev)
|
|
|
|
{
|
2021-02-19 15:01:46 +01:00
|
|
|
ramroute_ipv4_remafter(
|
|
|
|
(FAR struct net_route_ipv4_entry_s *)match->prev,
|
|
|
|
&g_ipv4_routes);
|
2013-10-05 20:05:51 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-01-02 17:49:34 +01:00
|
|
|
ramroute_ipv4_remfirst(&g_ipv4_routes);
|
2013-10-05 20:05:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* And free the routing table entry by adding it to the free list */
|
|
|
|
|
2017-08-10 17:14:31 +02:00
|
|
|
net_freeroute_ipv4(route);
|
2013-10-05 20:05:51 +02:00
|
|
|
|
|
|
|
/* Return a non-zero value to terminate the traversal */
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2013-10-05 20:05:51 +02:00
|
|
|
/* Next time we are here, this will be the previous entry */
|
|
|
|
|
|
|
|
match->prev = route;
|
2013-10-02 02:55:20 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2015-05-13 15:22:02 +02:00
|
|
|
#endif
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv6_RAMROUTE
|
2021-02-19 15:01:46 +01:00
|
|
|
static int net_match_ipv6(
|
|
|
|
FAR struct net_route_ipv6_s *route, FAR void *arg)
|
2015-05-13 15:22:02 +02:00
|
|
|
{
|
2021-02-19 15:01:46 +01:00
|
|
|
FAR struct route_match_ipv6_s *match =
|
|
|
|
(FAR struct route_match_ipv6_s *)arg;
|
2015-05-13 15:22:02 +02:00
|
|
|
|
|
|
|
/* To match, the masked target address must be the same, and the masks
|
|
|
|
* must be the same.
|
|
|
|
*/
|
|
|
|
|
2017-08-11 00:18:06 +02:00
|
|
|
net_ipv6_dumproute("Comparing", route);
|
|
|
|
ninfo("With:\n");
|
|
|
|
ninfo(" target: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
2022-01-18 08:38:00 +01:00
|
|
|
HTONS(match->target[0]), HTONS(match->target[1]),
|
|
|
|
HTONS(match->target[2]), HTONS(match->target[3]),
|
|
|
|
HTONS(match->target[4]), HTONS(match->target[5]),
|
|
|
|
HTONS(match->target[6]), HTONS(match->target[7]));
|
2017-08-11 00:18:06 +02:00
|
|
|
ninfo(" netmask: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
2022-01-18 08:38:00 +01:00
|
|
|
HTONS(match->netmask[0]), HTONS(match->netmask[1]),
|
|
|
|
HTONS(match->netmask[2]), HTONS(match->netmask[3]),
|
|
|
|
HTONS(match->netmask[4]), HTONS(match->netmask[5]),
|
|
|
|
HTONS(match->netmask[6]), HTONS(match->netmask[7]));
|
2017-08-11 00:18:06 +02:00
|
|
|
|
2015-05-13 15:22:02 +02:00
|
|
|
if (net_ipv6addr_maskcmp(route->target, match->target, match->netmask) &&
|
|
|
|
net_ipv6addr_cmp(route->netmask, match->netmask))
|
|
|
|
{
|
|
|
|
/* They match.. Remove the entry from the routing table */
|
|
|
|
|
|
|
|
if (match->prev)
|
|
|
|
{
|
2021-02-19 15:01:46 +01:00
|
|
|
ramroute_ipv6_remafter(
|
|
|
|
(FAR struct net_route_ipv6_entry_s *)match->prev,
|
|
|
|
&g_ipv6_routes);
|
2015-05-13 15:22:02 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-01-02 17:49:34 +01:00
|
|
|
ramroute_ipv6_remfirst(&g_ipv6_routes);
|
2015-05-13 15:22:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* And free the routing table entry by adding it to the free list */
|
|
|
|
|
|
|
|
net_freeroute_ipv6(route);
|
|
|
|
|
|
|
|
/* Return a non-zero value to terminate the traversal */
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next time we are here, this will be the previous entry */
|
|
|
|
|
|
|
|
match->prev = route;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
* Public Functions
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
/****************************************************************************
|
2017-08-10 17:14:31 +02:00
|
|
|
* Name: net_delroute_ipv4 and net_delroute_ipv6
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
|
|
|
* Description:
|
2013-10-02 03:13:06 +02:00
|
|
|
* Remove an existing route from the routing table
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
2018-03-13 16:52:27 +01:00
|
|
|
* Input Parameters:
|
2013-10-02 02:55:20 +02:00
|
|
|
*
|
|
|
|
* Returned Value:
|
|
|
|
* OK on success; Negated errno on failure.
|
|
|
|
*
|
|
|
|
****************************************************************************/
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv4_RAMROUTE
|
2017-08-10 17:14:31 +02:00
|
|
|
int net_delroute_ipv4(in_addr_t target, in_addr_t netmask)
|
2013-10-02 02:55:20 +02:00
|
|
|
{
|
2017-09-29 16:33:36 +02:00
|
|
|
struct route_match_ipv4_s match;
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
/* Set up the comparison structure */
|
|
|
|
|
2013-10-05 20:05:51 +02:00
|
|
|
match.prev = NULL;
|
2015-01-16 20:01:08 +01:00
|
|
|
net_ipv4addr_copy(match.target, target);
|
|
|
|
net_ipv4addr_copy(match.netmask, netmask);
|
2013-10-02 02:55:20 +02:00
|
|
|
|
|
|
|
/* Then remove the entry from the routing table */
|
|
|
|
|
2017-08-11 00:18:06 +02:00
|
|
|
return net_foreachroute_ipv4(net_match_ipv4, &match) ? OK : -ENOENT;
|
2013-10-02 02:55:20 +02:00
|
|
|
}
|
2015-05-13 15:22:02 +02:00
|
|
|
#endif
|
|
|
|
|
Addes support for read-only routing tables. Prior to this change, routing tables were only support in RAM and had to be initialized with explicit logic to add the necessary routes to the routing table. With this change, routes may be defined in the pre-initialized, read-only routing table provided by the board-specific logic
This would be particularly useful, for example, in the case where there is only a single network adaptor and you want all output packets to go to the single adaptor in all cases. So for that behavior you could add a read-only routing table to the board-specific long that contains a single entry, the default route: 0.0.0.0/0.
Squashed commit of the following:
net/route: RAM and ROM routing tables build correctly in all IPv4 and IPv6 configurations.
net/route: Verify IPv6 ROM route build; Make number of ROM routes a variable, not a configuration item.
net/route: Add initial support for ROM-base, read-only routing tables.
net/route: Adjust and generalize some structures, rename some functions, and add configuration and build support that will eventually support read-only routing tables.
net/route: Some initial though experiments on use of a fixe, read-only routing table
2017-09-28 17:04:31 +02:00
|
|
|
#ifdef CONFIG_ROUTE_IPv6_RAMROUTE
|
2015-05-13 15:22:02 +02:00
|
|
|
int net_delroute_ipv6(net_ipv6addr_t target, net_ipv6addr_t netmask)
|
|
|
|
{
|
|
|
|
struct route_match_ipv6_s match;
|
|
|
|
|
|
|
|
/* Set up the comparison structure */
|
|
|
|
|
|
|
|
match.prev = NULL;
|
|
|
|
net_ipv6addr_copy(match.target, target);
|
|
|
|
net_ipv6addr_copy(match.netmask, netmask);
|
|
|
|
|
|
|
|
/* Then remove the entry from the routing table */
|
|
|
|
|
|
|
|
return net_foreachroute_ipv6(net_match_ipv6, &match) ? OK : -ENOENT;
|
|
|
|
}
|
|
|
|
#endif
|
2013-10-02 02:55:20 +02:00
|
|
|
|
2017-09-28 17:23:03 +02:00
|
|
|
#endif /* CONFIG_ROUTE_IPv4_RAMROUTE || CONFIG_ROUTE_IPv6_RAMROUTE */
|