Hi, On Wed, Dec 28, 2016 at 02:07:21PM +0100, Christian Hesse wrote: > @@ -73,6 +77,21 @@ tunnel_point_to_point(struct context *c) > return; > } > > +#ifdef ENABLE_SYSTEMD > + /* In non-TLS configuration we wait for the remote peer to connect > + * before issuing "Initialization Sequence Completed". So prevent to > + * time out by telling systemd service manager we are ready for now. > + * Status will be "Non-TLS mode, ready for now. Waiting for peer..." > + * and changes once the remote peer connects. */ > + if (c->options.tls_client == false > + && c->options.tls_server == false) > + { > + sd_notifyf(0, "READY=1\n" > + "STATUS=Non-TLS mode, ready for now. Waiting for > peer...\n" > + "MAINPID=%lu", (unsigned long) getpid()); > + } > +#endif
We definitely need a better approach than "litter ENABLE_SYSTEMD all over the code". (Also, this is the wrong check anyway. p2p mode can go along with TLS just fine - what you need to check for is --server or --client, which is something else than --tls-server / --tls-client) gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel