Merged revisions 570-575,577-578 via svnmerge from

[senf.git] / Socket / Protocols / INet / UDPSocketHandle.cc

diff --git a/Socket/Protocols/INet/UDPSocketHandle.cc b/Socket/Protocols/INet/UDPSocketHandle.cc
index 525e531..9079f81 100644 (file)
--- a/Socket/Protocols/INet/UDPSocketHandle.cc
+++ b/Socket/Protocols/INet/UDPSocketHandle.cc
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "UDPSocketHandle.mpp"
 #define prefix_
@@ -46,16 +46,16 @@ prefix_ void senf::UDPv4SocketProtocol::init_client()
 {
     int sock = ::socket(PF_INET,SOCK_DGRAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void
-senf::UDPv4SocketProtocol::init_client(INet4Address const & address)
+senf::UDPv4SocketProtocol::init_client(INet4SocketAddress const & address)
     const
 {
     init_client();
-    connect(address);
+    bind(address);
 }
 
 prefix_ std::auto_ptr<senf::SocketProtocol> senf::UDPv4SocketProtocol::clone()
@@ -72,8 +72,8 @@ prefix_ void senf::UDPv6SocketProtocol::init_client()
 {
     int sock = ::socket(PF_INET6,SOCK_DGRAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void
@@ -81,7 +81,7 @@ senf::UDPv6SocketProtocol::init_client(INet6SocketAddress const & address)
     const
 {
     init_client();
-    connect(address);
+    bind(address);
 }
 
 prefix_ std::auto_ptr<senf::SocketProtocol> senf::UDPv6SocketProtocol::clone()