X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FReadWritePolicy.cti;h=618c2d3ffcb1dde0fb97bc1982e464ea679d9a0c;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=2c5976c35b638b743f9b58bbc65832bbb34a3f55;hpb=afa15c46e79de0f407d41fda78b6e8d08700caa8;p=senf.git

diff --git a/Socket/ReadWritePolicy.cti b/Socket/ReadWritePolicy.cti
index 2c5976c..618c2d3 100644
--- a/Socket/ReadWritePolicy.cti
+++ b/Socket/ReadWritePolicy.cti
@@ -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>
+// 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,51 +32,51 @@
 ///////////////////////////////cti.p///////////////////////////////////////
 
 #ifndef DOXYGEN
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::ReadablePolicy::
-readfrom(ClientSocketHandle<Policy> handle, char * buffer, unsigned size,
-         typename Policy::AddressingPolicy::Address & address,
-         typename IfCommunicationPolicyIs<Policy,UnconnectedCommunicationPolicy>::type *)
+readfrom(ClientSocketHandle<SPolicy> handle, char * buffer, unsigned size,
+         typename SPolicy::AddressingPolicy::Address & address,
+         typename IfCommunicationPolicyIs<SPolicy,UnconnectedCommunicationPolicy>::type *)
 {
-    return do_rcvfrom(handle, buffer, size, address.sockaddr_p(), address.sockaddr_len());
+    return do_readfrom(handle, buffer, size, address.sockaddr_p(), address.socklen());
 }
 #else
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::ReadablePolicy::
-readfrom(ClientSocketHandle<Policy> handle, char * buffer, unsigned size,
+readfrom(ClientSocketHandle<SPolicy> handle, char * buffer, unsigned size,
          typename Policy::AddressingPolicy::Address & address)
 {}
 #endif
 
 #ifndef DOXYGEN
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::WriteablePolicy::
-write(ClientSocketHandle<Policy> handle, char const * buffer, unsigned size,
-      typename IfCommunicationPolicyIs<Policy,ConnectedCommunicationPolicy>::type *)
+write(ClientSocketHandle<SPolicy> handle, char const * buffer, unsigned size,
+      typename IfCommunicationPolicyIs<SPolicy,ConnectedCommunicationPolicy>::type *)
 {
     return do_write(handle,buffer,size);
 }
 #else
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::WriteablePolicy::
-write(ClientSocketHandle<Policy> handle, char const * buffer, unsigned size)
+write(ClientSocketHandle<SPolicy> handle, char const * buffer, unsigned size)
 {}
 #endif
 
 #ifndef DOXYGEN
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::WriteablePolicy::
-writeto(ClientSocketHandle<Policy> handle,
-        typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
+writeto(ClientSocketHandle<SPolicy> handle,
+        typename boost::call_traits<typename SPolicy::AddressingPolicy::Address>::param_type addr,
         char const * buffer, unsigned size,
-        typename IfCommunicationPolicyIs<Policy,UnconnectedCommunicationPolicy>::type *)
+        typename IfCommunicationPolicyIs<SPolicy,UnconnectedCommunicationPolicy>::type *)
 {
-    return do_writeto(handle, buffer, size, addr.sockaddr_p(), addr.sockaddr_len());
+    return do_writeto(handle, buffer, size, addr.sockaddr_p(), addr.socklen());
 }
 #else
-template <class Policy>
+template <class SPolicy>
 prefix_ unsigned senf::WriteablePolicy::
-writeto(ClientSocketHandle<Policy> handle,
+writeto(ClientSocketHandle<SPolicy> handle,
         typename Policy::AddressingPolicy::Address const & addr,
         char const * buffer, unsigned size)
 {}