X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FReadWritePolicy.cc;h=9ca08ad84c27a9a7f3dc075288465959cc8492c0;hb=6927c87144ca23845065e3c23e37c75f5f059cf3;hp=4f772e454237004cb21fdf0e0cb115f7023968fb;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Socket/ReadWritePolicy.cc b/Socket/ReadWritePolicy.cc
index 4f772e4..9ca08ad 100644
--- a/Socket/ReadWritePolicy.cc
+++ b/Socket/ReadWritePolicy.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// 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
@@ -20,7 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief ReadPolicy and WritePolicy non-inline non-template implementation
+ */
 
 #include "ReadWritePolicy.hh"
 //#include "ReadWritePolicy.ih"
@@ -36,7 +38,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ unsigned satcom::lib::ReadablePolicy::read(FileHandle handle, char * buffer,
+prefix_ unsigned senf::ReadablePolicy::read(FileHandle handle, char * buffer,
                                                    unsigned size)
 {
     int rv = -1;
@@ -51,19 +53,19 @@ prefix_ unsigned satcom::lib::ReadablePolicy::read(FileHandle handle, char * buf
                 rv = 0;
                 break;
             default:
-                throw SystemException(errno);
+                SENF_THROW_SYSTEM_EXCEPTION("");
             }
     } while (rv<0);
     return rv;
 }
 
-prefix_ unsigned satcom::lib::ReadablePolicy::do_readfrom(FileHandle handle, char * buffer,
+prefix_ unsigned senf::ReadablePolicy::do_readfrom(FileHandle handle, char * buffer,
                                                           unsigned size,
-                                                          struct ::sockaddr * addr, socklen_t len)
+                                                          struct ::sockaddr * addr, socklen_t * len)
 {
     int rv = -1;
     do {
-        rv = ::recvfrom(handle.fd(),buffer, size, 0, addr, &len);
+        rv = ::recvfrom(handle.fd(),buffer, size, 0, addr, len);
         if (rv < 0)
             switch (errno) {
             case EINTR:
@@ -72,13 +74,13 @@ prefix_ unsigned satcom::lib::ReadablePolicy::do_readfrom(FileHandle handle, cha
                 rv = 0;
                 break;
             default:
-                throw SystemException(errno);
+                SENF_THROW_SYSTEM_EXCEPTION("");
             }
     } while (rv<0);
     return rv;
 }
 
-prefix_ unsigned satcom::lib::WriteablePolicy::do_write(FileHandle handle, char const * buffer,
+prefix_ unsigned senf::WriteablePolicy::do_write(FileHandle handle, char const * buffer,
                                                         unsigned size)
 {
     int rv = -1;
@@ -89,18 +91,24 @@ prefix_ unsigned satcom::lib::WriteablePolicy::do_write(FileHandle handle, char
             case EINTR:
                 break;
             case EAGAIN:
+            case ECONNREFUSED:
+                // Writing to a UDP socket seems return this error code if a corresponding ICMP
+                // error code has been received before (at least on linux). This is inconsistent
+                // since I cannot rely on getting ECONNREFUSED. I therefore ignore this error. TCP
+                // sockets will return this error on connect() and not on write(). Therefore we can
+                // unconditionally ignore this error here.
                 rv = 0;
                 break;
             default:
-                throw SystemException(errno);
+                SENF_THROW_SYSTEM_EXCEPTION("");
             }
     } while (rv<0);
     return rv;
 }
 
-prefix_ unsigned satcom::lib::WriteablePolicy::do_writeto(FileHandle handle,
+prefix_ unsigned senf::WriteablePolicy::do_writeto(FileHandle handle,
                                                           char const * buffer, unsigned size,
-                                                          struct sockaddr * addr, socklen_t len)
+                                                          struct sockaddr const * addr, socklen_t len)
 {
     int rv = -1;
     do {
@@ -113,12 +121,12 @@ prefix_ unsigned satcom::lib::WriteablePolicy::do_writeto(FileHandle handle,
                 rv = 0;
                 break;
             default:
-                throw SystemException(errno);
+                SENF_THROW_SYSTEM_EXCEPTION("");
             }
     } while (rv<0);
     return rv;
 }
-    
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "ReadWritePolicy.mpp"
@@ -126,5 +134,10 @@ prefix_ unsigned satcom::lib::WriteablePolicy::do_writeto(FileHandle handle,
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: