From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 26 Mar 2020 07:55:36 +0000 (+0100)
Subject: charon-nm: Allow using fixed source ports
X-Git-Tag: 5.8.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c98164f60f82967dd003b5d08652df70edb29a4;p=thirdparty%2Fstrongswan.git

charon-nm: Allow using fixed source ports

This could be useful in cases a client behind a NAT has to be made reachable
via port forwarding.

Closes strongswan/strongswan#166.
---

diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
index 0134f5a71d..1aa975efb6 100644
--- a/src/charon-nm/charon-nm.c
+++ b/src/charon-nm/charon-nm.c
@@ -196,9 +196,9 @@ int main(int argc, char *argv[])
 							   "charon-nm.syslog.daemon.default", 1));
 	charon->load_loggers(charon);
 
-	/* use random ports to avoid conflicts with regular charon */
-	lib->settings->set_int(lib->settings, "charon-nm.port", 0);
-	lib->settings->set_int(lib->settings, "charon-nm.port_nat_t", 0);
+	/* default to random ports to avoid conflicts with regular charon */
+	lib->settings->set_default_str(lib->settings, "charon-nm.port", "0");
+	lib->settings->set_default_str(lib->settings, "charon-nm.port_nat_t", "0");
 
 	DBG1(DBG_DMN, "Starting charon NetworkManager backend (strongSwan "VERSION")");
 	if (lib->integrity)