debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bind address handling for connectTCP.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-15 23:17:14 +01:00
parent 0ca8f325c9
commit f3c84d497e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/vibe/core/net.d
View file

@ -150,7 +150,7 @@ TCPConnection connectTCP(NetworkAddress addr, NetworkAddress bind_address = anyA
return () @trusted { // scope return () @trusted { // scope
scope uaddr = new RefAddress(addr.sockAddr, addr.sockAddrLen); scope uaddr = new RefAddress(addr.sockAddr, addr.sockAddrLen);
scope baddr = new RefAddress(addr.sockAddr, addr.sockAddrLen); scope baddr = new RefAddress(bind_address.sockAddr, bind_address.sockAddrLen);
// FIXME: make this interruptible // FIXME: make this interruptible
auto result = asyncAwaitUninterruptible!(ConnectCallback, auto result = asyncAwaitUninterruptible!(ConnectCallback,
@ -192,6 +192,7 @@ NetworkAddress anyAddress()
Represents a network/socket address. Represents a network/socket address.
*/ */
struct NetworkAddress { struct NetworkAddress {
import std.algorithm.comparison : max;
import std.socket : Address; import std.socket : Address;
version (Windows) import core.sys.windows.winsock2; version (Windows) import core.sys.windows.winsock2;
@ -205,6 +206,9 @@ struct NetworkAddress {
sockaddr_in6 addr_ip6; sockaddr_in6 addr_ip6;
} }
enum socklen_t sockAddrMaxLen = max(addr.sizeof, addr_ip6.sizeof);
this(Address addr) this(Address addr)
@trusted @trusted
{ {
@ -261,7 +265,7 @@ struct NetworkAddress {
/** Size of the sockaddr struct that is returned by sockAddr(). /** Size of the sockaddr struct that is returned by sockAddr().
*/ */
@property int sockAddrLen() @property socklen_t sockAddrLen()
const pure nothrow { const pure nothrow {
switch (this.family) { switch (this.family) {
default: assert(false, "sockAddrLen() called for invalid address family."); default: assert(false, "sockAddrLen() called for invalid address family.");
@ -399,9 +403,11 @@ struct TCPConnection {
m_context.readBuffer.capacity = 4096; m_context.readBuffer.capacity = 4096;
try m_context.remoteAddress = NetworkAddress(remote_address); try m_context.remoteAddress = NetworkAddress(remote_address);
catch (Exception e) { logWarn("Failed to get remote address for TCP connection: %s", e.msg); } catch (Exception e) { logWarn("Failed to get remote address for TCP connection: %s", e.msg); }
scope laddr = new RefAddress(m_context.localAddress.sockAddr, m_context.localAddress.sockAddrLen); scope laddr = new RefAddress(m_context.localAddress.sockAddr, m_context.localAddress.sockAddrMaxLen);
if (!eventDriver.sockets.getLocalAddress(socket, laddr)) try {
logWarn("Failed to get local address for TCP connection."); enforce(eventDriver.sockets.getLocalAddress(socket, laddr), "Failed to query socket address.");
m_context.localAddress = NetworkAddress(laddr);
} catch (Exception e) { logWarn("Failed to get local address for TCP connection: %s", e.msg); }
} }
this(this) this(this)