Add ListenPort to netdev config and ensure that Endpoint is not present if not specified

1 files changed, 8 insertions, 2 deletions

diff --git a/src/wg2sd.cpp b/src/wg2sd.cpp
index 2571908..23c6546 100644
--- a/src/wg2sd.cpp
+++ b/src/wg2sd.cpp
@@ -307,6 +307,10 @@ namespace wg2sd {
 
 		netdev << private_keyfile << "\n";
 
+		if(cfg.intf.listen_port.has_value()) {
+			netdev << "ListenPort = " << cfg.intf.listen_port.value() << "\n";
+		}
+
 		if(cfg.intf.should_create_routes and cfg.intf.table != 0) {
 			netdev << "RouteTable = ";
 
@@ -333,10 +337,12 @@ namespace wg2sd {
 
 		for(Peer const & peer : cfg.peers) {
 			netdev << "[WireGuardPeer]\n";
-
-			netdev << "Endpoint = " << peer.endpoint << "\n";
 			netdev << "PublicKey = " << peer.public_key << "\n";
 
+			if(!peer.endpoint.empty()) {
+				netdev << "Endpoint = " << peer.endpoint << "\n";
+			}
+
 			if(!peer.preshared_key.empty()) {
 				std::string filename = hashed_keyfile_name(peer.preshared_key);