summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2012-11-29 14:16:12 +0100
committerDavid Sommerseth <davids@redhat.com>2012-11-29 21:47:57 +0100
commit28d9e57638d66fde792a53a3eb6391ddb8bb426f (patch)
tree6c5d1cfb17177c4f02f17d8c0c7ee05039c5d00e
parent9447858c38c5cf51265c7eab3445d7d5fb4f7bba (diff)
downloadopenvpn-28d9e57638d66fde792a53a3eb6391ddb8bb426f.tar.gz
openvpn-28d9e57638d66fde792a53a3eb6391ddb8bb426f.tar.xz
openvpn-28d9e57638d66fde792a53a3eb6391ddb8bb426f.zip
The get_default_gateway() function uses warn() instead of msg()
A report on #openvpn pointed out that in his setup three warnings appeard on the console when starting up. $ sudo /usr/local/etc/rc.d/openvpn restart Stopping openvpn. Waiting for PIDS: 33031. Starting openvpn. openvpn: writing to routing socket: No such process openvpn: writing to routing socket: No such process openvpn: writing to routing socket: No such process $ This setup is on FreeBSD using jails with strict access to the routing table. After looking at the code path, this error was found in the BSD sections for get_default_gateway(). But it was using the warn() call instead of msg(M_WARN|M_ERRNO, ...) which causes these warnings to go to stderr instead of the log file. The warning string is also slightly modified to better explain what fails. Reported-by: Thomas Steen Rasmussen <thomas@gibfest.dk> Tested-by: Thomas Steen Rasmussen <thomas@gibfest.dk> Signed-off-by: David Sommerseth <davids@redhat.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: 1354194972-5388-1-git-send-email-dazo@users.sourceforge.net URL: http://article.gmane.org/gmane.network.openvpn.devel/7149 (cherry picked from commit b3f19cc4bec6978a128f5af3ab22d8cfa954b064)
-rw-r--r--src/openvpn/route.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 8c3d0dc..dd69d8e 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -2701,7 +2701,7 @@ get_default_gateway (struct route_gateway_info *rgi)
if (write(s, (char *)&m_rtmsg, l) < 0)
{
- warn("writing to routing socket");
+ msg(M_WARN|M_ERRNO, "Could not retrieve default gateway from route socket:");
gc_free (&gc);
close(s);
return;
@@ -3067,7 +3067,7 @@ get_default_gateway (struct route_gateway_info *rgi)
if (write(s, (char *)&m_rtmsg, l) < 0)
{
- warn("writing to routing socket");
+ msg(M_WARN|M_ERRNO, "Could not retrieve default gateway from route socket:");
gc_free (&gc);
close(s);
return;