Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 11:26:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/ipfwd: Support ICMP error reply when forwarding IPv4

Browse Source 
Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng
2022-11-14 16:50:21 +08:00
committed by Xiang Xiao
parent da6ab79d65
commit f416fd86bb
3 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/nat/ipv4_nat.c
+6 -17
View File
@@ -76,20 +76,6 @@
# define L4_MAXHDRLEN ICMP_HDRLEN
#endif
/****************************************************************************
* Private Types
****************************************************************************/
/* NAT IP/Port manipulate type, to indicate whether to manipulate source or
* destination IP/Port in a packet.
*/
enum nat_manip_type_e
{
NAT_MANIP_SRC,
NAT_MANIP_DST
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
@@ -790,6 +776,7 @@ int ipv4_nat_inbound(FAR struct net_driver_s *dev,
* Input Parameters:
* dev - The device on which the packet will be sent.
* ipv4 - Points to the IPv4 header to be filled into dev->d_buf later.
* manip_type - Whether local IP/Port is in source or destination.
*
* Returned Value:
* Zero is returned if NAT is successfully applied, or is not enabled for
@@ -799,20 +786,22 @@ int ipv4_nat_inbound(FAR struct net_driver_s *dev,
****************************************************************************/
int ipv4_nat_outbound(FAR struct net_driver_s *dev,
FAR struct ipv4_hdr_s *ipv4)
FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type)
{
/* We only process packets targeting at NAT device but not targeting at the
* address assigned to the device.
*/
if (IFF_IS_NAT(dev->d_flags) &&
!net_ipv4addr_hdrcmp(ipv4->srcipaddr, &dev->d_ipaddr) &&
!net_ipv4addr_hdrcmp(ipv4->destipaddr, &dev->d_ipaddr))
{
/* TODO: Skip broadcast? */
FAR struct ipv4_nat_entry *entry =
ipv4_nat_outbound_internal(dev, ipv4, NAT_MANIP_SRC);
if (!entry)
ipv4_nat_outbound_internal(dev, ipv4, manip_type);
if (manip_type == NAT_MANIP_SRC && !entry)
{
/* Outbound entry creation failed, should have entry. */
net/nat/nat.h
+13 -1
View File
@@ -71,6 +71,16 @@ struct ipv4_nat_entry
uint32_t expire_time; /* The expiration time of this entry. */
};
/* NAT IP/Port manipulate type, to indicate whether to manipulate source or
* destination IP/Port in a packet.
*/
enum nat_manip_type_e
{
NAT_MANIP_SRC,
NAT_MANIP_DST
};
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
@@ -147,6 +157,7 @@ int ipv4_nat_inbound(FAR struct net_driver_s *dev,
* Input Parameters:
* dev - The device on which the packet will be sent.
* ipv4 - Points to the IPv4 header to be filled into dev->d_buf later.
* manip_type - Whether local IP/Port is in source or destination.
*
* Returned Value:
* Zero is returned if NAT is successfully applied, or is not enabled for
@@ -156,7 +167,8 @@ int ipv4_nat_inbound(FAR struct net_driver_s *dev,
****************************************************************************/
int ipv4_nat_outbound(FAR struct net_driver_s *dev,
FAR struct ipv4_hdr_s *ipv4);
FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type);
/****************************************************************************
* Name: ipv4_nat_port_inuse