Add bind address support for outgoing TCP connections.

This commit is contained in:
Sönke Ludwig 2016-11-02 20:22:54 +01:00
parent 35f5852d8f
commit d181a6730f
4 changed files with 14 additions and 9 deletions

View file

@ -78,7 +78,7 @@ interface EventDriverCore {
interface EventDriverSockets {
@safe: /*@nogc:*/ nothrow:
StreamSocketFD connectStream(scope Address peer_address, ConnectCallback on_connect);
StreamSocketFD connectStream(scope Address peer_address, scope Address bind_address, ConnectCallback on_connect);
StreamListenSocketFD listenStream(scope Address bind_address, AcceptCallback on_accept);
void waitForConnections(StreamListenSocketFD sock, AcceptCallback on_accept);
ConnectionState getConnectionState(StreamSocketFD sock);

View file

@ -78,7 +78,7 @@ final class LibasyncEventDriverCore : EventDriverCore {
final class LibasyncEventDriverSockets : EventDriverSockets {
@safe: /*@nogc:*/ nothrow:
override StreamSocketFD connectStream(scope Address peer_address, ConnectCallback on_connect)
override StreamSocketFD connectStream(scope Address peer_address, scope Address bind_address, ConnectCallback on_connect)
{
assert(false, "TODO!");
}

View file

@ -200,7 +200,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
this(Loop loop) { m_loop = loop; }
final override StreamSocketFD connectStream(scope Address address, ConnectCallback on_connect)
final override StreamSocketFD connectStream(scope Address address, scope Address bind_address, ConnectCallback on_connect)
{
auto sock = cast(StreamSocketFD)createSocket(address.addressFamily, SOCK_STREAM);
if (sock == -1) return StreamSocketFD.invalid;
@ -208,12 +208,17 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
void invalidateSocket() @nogc @trusted nothrow { closeSocket(sock); sock = StreamSocketFD.invalid; }
int bret;
() @trusted { // scope
scope bind_addr = new UnknownAddress;
bind_addr.name.sa_family = cast(ushort)address.addressFamily;
bind_addr.name.sa_data[] = 0;
bret = bind(sock, bind_addr.name, bind_addr.nameLen);
() @trusted { // scope + bind()
if (bind_address !is null) {
bret = bind(sock, bind_address.name, bind_address.nameLen);
} else {
scope bind_addr = new UnknownAddress;
bind_addr.name.sa_family = cast(ushort)address.addressFamily;
bind_addr.name.sa_data[] = 0;
bret = bind(sock, bind_addr.name, bind_addr.nameLen);
}
} ();
if (bret != 0) {
invalidateSocket();
on_connect(sock, ConnectStatus.bindFailure);

View file

@ -85,7 +85,7 @@ final class WinAPIEventDriverCore : EventDriverCore {
final class WinAPIEventDriverSockets : EventDriverSockets {
@safe: /*@nogc:*/ nothrow:
override StreamSocketFD connectStream(scope Address peer_address, ConnectCallback on_connect)
override StreamSocketFD connectStream(scope Address peer_address, scope Address bind_address, ConnectCallback on_connect)
{
assert(false, "TODO!");
}