X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FConnectedUDPSocketHandle.cc;h=4842f83a1035a18c7b3b372e6805fc42d7e004b6;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=a3560689490623ad21900a809d68ea6fa1199f0e;hpb=81ffa1c459b96dd44472bcef37e1e373934ee138;p=senf.git

diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc b/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc
index a356068..4842f83 100644
--- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc
+++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc
@@ -1,9 +1,9 @@
-// $Id: ConnectedUDPSocketHandle.cc 357 2007-07-26 22:48:39Z g0dil $
+// $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "ConnectedUDPSocketHandle.mpp"
 #define prefix_
@@ -46,8 +46,8 @@ prefix_ void senf::ConnectedUDPv4SocketProtocol::init_client()
 {
     int sock = ::socket(PF_INET,SOCK_DGRAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void
@@ -55,13 +55,7 @@ senf::ConnectedUDPv4SocketProtocol::init_client(INet4SocketAddress const & addre
     const
 {
     init_client();
-    connect(address);
-}
-
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::ConnectedUDPv4SocketProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new ConnectedUDPv4SocketProtocol());
+    clientHandle().connect(address);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -72,8 +66,8 @@ prefix_ void senf::ConnectedUDPv6SocketProtocol::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,13 +75,7 @@ senf::ConnectedUDPv6SocketProtocol::init_client(INet6SocketAddress const & addre
     const
 {
     init_client();
-    connect(address);
-}
-
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::ConnectedUDPv6SocketProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new ConnectedUDPv6SocketProtocol());
+    clientHandle().connect(address);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////