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

Remove buggy NetworkAddress.toUnknownAddress.

Browse source 
UnknownAddress is not large enough to hold either IPv6 or UDS addresses.
This commit is contained in:
Sönke Ludwig 2017-01-30 11:40:11 +01:00
parent d2629ef053
commit ac811ba501
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,8 @@ TCPListener listenTCP(ushort port, TCPConnectionDelegate connection_callback, st
StreamListenOptions sopts = StreamListenOptions.defaults; StreamListenOptions sopts = StreamListenOptions.defaults;
if (options & TCPListenOptions.reusePort) if (options & TCPListenOptions.reusePort)
sopts |= StreamListenOptions.reusePort; sopts |= StreamListenOptions.reusePort;
auto sock = eventDriver.sockets.listenStream(addr.toUnknownAddress, sopts, scope addrc = new RefAddress(addr.sockAddr, addr.sockAddrLen);
auto sock = eventDriver.sockets.listenStream(addrc, sopts,
(StreamListenSocketFD ls, StreamSocketFD s, scope RefAddress addr) @safe nothrow { (StreamListenSocketFD ls, StreamSocketFD s, scope RefAddress addr) @safe nothrow {
import vibe.core.core : runTask; import vibe.core.core : runTask;
auto conn = TCPConnection(s, addr); auto conn = TCPConnection(s, addr);
@ -386,18 +387,6 @@ struct NetworkAddress {
} }
} }
UnknownAddress toUnknownAddress()
const nothrow {
auto ret = new UnknownAddress;
toUnknownAddress(ret);
return ret;
}
void toUnknownAddress(scope UnknownAddress addr)
const nothrow {
*addr.name = *this.sockAddr;
}
version(Have_libev) {} version(Have_libev) {}
else { else {
unittest { unittest {
@ -699,7 +688,8 @@ struct UDPConnection {
private this(ref NetworkAddress bind_address) private this(ref NetworkAddress bind_address)
{ {
m_socket = eventDriver.sockets.createDatagramSocket(bind_address.toUnknownAddress(), null); scope baddr = new RefAddress(bind_address.sockAddr, bind_address.sockAddrLen);
m_socket = eventDriver.sockets.createDatagramSocket(baddr, null);
enforce(m_socket != DatagramSocketFD.invalid, "Failed to create datagram socket."); enforce(m_socket != DatagramSocketFD.invalid, "Failed to create datagram socket.");
m_context = () @trusted { return &eventDriver.core.userData!Context(m_socket); } (); m_context = () @trusted { return &eventDriver.core.userData!Context(m_socket); } ();
m_context.localAddress = bind_address; m_context.localAddress = bind_address;