Added client-ip to NAT config
PATCH 1/1 Added client-ip to NAT config
Hello guys,
A couple years ago I submitted this patch which allows the user to set the 'client-ip' as a convenient way to use the leased IP address received from OpenVPN server in NAT configuration. For example:
client-nat snat client-ip 255.255.255.255 172.20.1.15
, where 'client-ip' string is replaced with the leased IP address received from OpenVPN server.
At that time, it was NACKED due to the fact that I was using both client-ip and localhost strings. So, it's changed now and I'd like to re-submit it again for appreciation.
Thanks
Gava
--------------------------------------------------------------------------------------------------------------------------------------
From cb56f9bd4acaf28a2af256eead009310d8ba063f Mon Sep 17 00:00:00 2001
From: Rafael Gava de Oliveira <[email protected]...>
Date: Sat, 12 Sep 2020 19:27:25 -0300
Subject: [PATCH] Allows the usage of the string 'client-ip' in the client-nat network configuration in a way that is not necessary to inform the IP address beforehand. Openvpn will set dynamically the received IP from DHCP.
Example:
client-nat snat client-ip 255.255.255.255 172.20.1.15
Replaces the 'client-ip' string with the DHCP address received from the openvpn server.
---
src/openvpn/clinat.c | 45 ++++++++++++++++++++++++++++++++++++++++----- src/openvpn/clinat.h | 2 ++ src/openvpn/init.c | 2 ++ src/openvpn/options.c | 2 +- 4 files changed, 45 insertions(+), 6 deletions(-)
mode change 100644 => 100755 src/openvpn/clinat.c
src/openvpn/clinat.c +9 -5
@@ -128,12 +128,16 @@ add_client_nat_to_option_list(struct client_nat_option_list *dest,msg (msglevel,"client-nat: type must be 'snat' or 'dnat'" );return ; } - - e.network =getaddr (0 , network,0 , &ok,NULL ); -if (!ok) +if (network && !strcmp (network,"client-ip" )) { -msg (msglevel,"client-nat: bad network: %s" , network); -return ; + e.network =0xFFFFFFFF ; + }else { + e.network =getaddr (0 , network,0 , &ok,NULL ); +if (!ok) + { +msg (msglevel,"client-nat: bad network: %s" , network); +return ; + } } e.netmask =getaddr (0 , netmask,0 , &ok,NULL );if (!ok)
@@ -276,3 +280,34 @@ client_nat_transform(const struct client_nat_option_list *list, } }
}
+
+/*
+* Replaces the client-ip token with the IP received from OpenVPN Server +*/
+bool
+update_client_ip_nat(struct client_nat_option_list *dest, in_addr_t local_ip) +{
+ int i;
+ bool ret = false;
+
+ if (!dest)
+ return ret;
+
+ for (i=0; i <= dest->n; i++)
+ {
+ struct client_nat_entry *nat_entry = &dest->entries[i];
+ if (nat_entry && nat_entry->network == 0xFFFFFFFF)
+ {
+ struct in_addr addr;
+
+ nat_entry->network = ntohl(local_ip);
+ addr.s_addr = nat_entry->network;
+ char *dot_ip = inet_ntoa(addr);+
+ msg (M_INFO, "Updating NAT table client-ip to: %s", dot_ip);
+ ret = true;
+ }
+ }
+
+ return ret;
+}
src/openvpn/clinat.h +2 -0
@@ -64,4 +64,6 @@ void client_nat_transform(const struct client_nat_option_list *list,struct buffer *ipbuf, const int direction); +bool update_client_ip_nat (struct client_nat_option_list *dest,in_addr_t local_ip); +
#endif /* if !defined(CLINAT_H) */
src/openvpn/init.c +2 -0
@@ -1920,6 +1920,8 @@ do_open_tun(struct context *c) SET_MTU_TUN | SET_MTU_UPPER_BOUND); } +update_client_ip_nat (c->options.client_nat, c->c1.tuntap->local); + ret = true; static_context = c;
#ifndef TARGET_ANDROID
src/openvpn/options.c +1 -1
@@ -231,7 +231,7 @@ static const char usage_message[] =" ICMPv6 host unreachable messages on the client.\n" " (Server) Instead of forwarding IPv6 packets send\n" " ICMPv6 host unreachable packets to the client.\n" -"--client-nat snat|dnat network netmask alias : on client add 1-to-1 NAT rule.\n" +"--client-nat snat|dnat network|'client-ip' netmask alias : on client add 1-to-1 NAT rule.\n" "--push-peer-info : (client only) push client info to server.\n" "--setenv name value : Set a custom environmental variable to pass to script.\n" "--setenv FORWARD_COMPATIBLE 1 : Relax config file syntax checking to allow\n"
--
2.7.4
Hi,
Quoted 1 line · Rafael Gava de Oliveira via Openvpn-devel
A couple years ago I submitted this patch which allows the user to set the 'client-ip' as a convenient way to use the leased IP address received from OpenVPN server in NAT configuration. For example:
We now have two submissions for this - are they any different?
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Ops, sorry. It's the same. I thought it was not sent to the group. :-)
BR
Gava
Quoted 26 lines · Gert Doering
Hi,
Quoted 1 line · Rafael Gava de Oliveira via Openvpn-devel
A couple years ago I submitted this patch which allows the user to set
the 'client-ip' as a convenient way to use the leased IP address received from OpenVPN server in NAT configuration. For example:
We now have two submissions for this - are they any different?
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
MistressGert Doering - Munich, Germany
[email protected]...
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel