@@ -2105,7 +2105,7 @@
{
man->connection.sd_top = create_socket_tcp(man->settings.local);
socket_bind(man->connection.sd_top, man->settings.local, man->settings.local->ai_family,
- "MANAGEMENT", false);
+ "MANAGEMENT", false, M_FATAL);
}
/*
@@ -268,12 +268,13 @@
{
if (sock->socks_proxy && sock->info.proto == PROTO_UDP)
{
- socket_bind(sock->ctrl_sd, sock->info.lsa->bind_local, sock->info.af, "SOCKS", false);
+ socket_bind(sock->ctrl_sd, sock->info.lsa->bind_local, sock->info.af, "SOCKS", false,
+ M_FATAL);
}
else
{
socket_bind(sock->sd, sock->info.lsa->bind_local, sock->info.af, "TCP/UDP",
- sock->info.bind_ipv6_only);
+ sock->info.bind_ipv6_only, M_FATAL);
}
}
}
@@ -319,9 +320,11 @@
}
socket_apply_options(sd, sbs, mark, bind_dev);
- if (bind_addr)
+ if (bind_addr
+ && !socket_bind(sd, bind_addr, af, "TCP/UDP", bind_ipv6_only, optional ? D_LOW : M_FATAL))
{
- socket_bind(sd, bind_addr, af, "TCP/UDP", bind_ipv6_only);
+ openvpn_close_socket(sd);
+ return SOCKET_UNDEFINED;
}
return sd;
}
@@ -556,9 +559,9 @@
return new_sd;
}
-void
+bool
socket_bind(socket_descriptor_t sd, const struct addrinfo *local, int ai_family,
- const char *prefix, bool ipv6only)
+ const char *prefix, bool ipv6only, msglvl_t msglevel)
{
struct gc_arena gc = gc_new();
@@ -582,8 +585,10 @@
}
if (!cur)
{
- msg(M_FATAL, "%s: Socket bind failed: Addr to bind has no %s record", prefix,
+ msg(msglevel, "%s: Socket bind failed: Addr to bind has no %s record", prefix,
addr_family_name(ai_family));
+ gc_free(&gc);
+ return false;
}
if (ai_family == AF_INET6)
@@ -598,10 +603,13 @@
}
if (openvpn_bind(sd, cur->ai_addr, cur->ai_addrlen))
{
- msg(M_FATAL | M_ERRNO, "%s: Socket bind failed on local address %s", prefix,
- print_sockaddr_ex(local->ai_addr, ":", PS_SHOW_PORT, &gc));
+ msg(msglevel | M_ERRNO, "%s: Socket bind failed on local address %s", prefix,
+ print_sockaddr_ex(cur->ai_addr, ":", PS_SHOW_PORT, &gc));
+ gc_free(&gc);
+ return false;
}
gc_free(&gc);
+ return true;
}
int
@@ -337,8 +337,15 @@
struct link_socket *link_socket_new(void);
-void socket_bind(socket_descriptor_t sd, const struct addrinfo *local, int af_family,
- const char *prefix, bool ipv6only);
+/**
+ * Bind @p sd to the first @p af_family address of @p local. A failure is
+ * reported at @p msglevel, so a caller that can do without the bind passes a
+ * non-fatal level and checks the result.
+ *
+ * @return whether the socket was bound
+ */
+bool socket_bind(socket_descriptor_t sd, const struct addrinfo *local, int af_family,
+ const char *prefix, bool ipv6only, msglvl_t msglevel);
int openvpn_connect(socket_descriptor_t sd, const struct sockaddr *remote, int connect_timeout,
volatile int *signal_received);
@@ -392,9 +399,9 @@
* Create a UDP socket for @p af set up the way a link socket is: --sndbuf/--rcvbuf,
* --mark, --bind-dev and, when @p bind_addr is given, the local bind (IPV6_V6ONLY
* per @p bind_ipv6_only). Shared by create_socket() and the --server-probe sockets,
- * so a probe socket is the connection socket it may become. A failed bind is
- * fatal; with @p optional a socket the host cannot create is not, so
- * --server-probe can skip that address family (SOCKET_UNDEFINED is returned).
+ * so a probe socket is the connection socket it may become. With @p optional a
+ * socket the host cannot create or bind is not fatal, so --server-probe can skip
+ * that address family (SOCKET_UNDEFINED is returned).
*/
socket_descriptor_t create_socket_udp_configured(sa_family_t af, unsigned int sockflags,
const struct socket_buffer_size *sbs, int mark,