Socket/Protocols/INet: BUGFIX: Fix SOL_IP to SOL_IPV6 in INet6MulticastSocketProtocol

[senf.git] / Socket / Protocols / UN / UNAddressing.cc

diff --git a/Socket/Protocols/UN/UNAddressing.cc b/Socket/Protocols/UN/UNAddressing.cc
index 4af13c0..8eab74b 100644 (file)
--- a/Socket/Protocols/UN/UNAddressing.cc
+++ b/Socket/Protocols/UN/UNAddressing.cc
@@ -1,7 +1,9 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum NETwork research (NET)
-//     David Wagner <david.wagner@fokus.fraunhofer.de>
+// $Id$
+//
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     David Wagner <dw6@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
@@ -25,8 +27,7 @@
 //#include "UNAddressing.ih"
 
 // Custom includes
-#include <stdio.h>
-#include <boost/operators.hpp>
+
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -34,18 +35,13 @@
 prefix_ senf::UNSocketAddress::UNSocketAddress()
 {}
 
-prefix_ senf::UNSocketAddress::UNSocketAddress(std::string p)
+prefix_ senf::UNSocketAddress::UNSocketAddress(std::string const & path)
 {
     clear();
-    ::strncpy(addr_.sun_path, p.c_str(), sizeof(addr_.sun_path));
+    ::strncpy(addr_.sun_path, path.c_str(), sizeof(addr_.sun_path));
     addr_.sun_path[sizeof(addr_.sun_path)-1] = 0;
 }
 
-prefix_ senf::UNSocketAddress fromString(std::string s) 
-{
-    return senf::UNSocketAddress::UNSocketAddress(s);
-}
-
 prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other)
     const
 {
@@ -53,7 +49,7 @@ prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other)
 }
 
 prefix_ std::string senf::UNSocketAddress::path()
-        const
+    const
 {
     return std::string(addr_.sun_path);
 }
@@ -75,19 +71,19 @@ prefix_ sockaddr * senf::UNSocketAddress::sockaddr_p()
     return reinterpret_cast <struct sockaddr  *> (&addr_); 
 }
 
-prefix_ sockaddr const  * senf::UNSocketAddress::sockaddr_p()
+prefix_ sockaddr const * senf::UNSocketAddress::sockaddr_p()
     const
 {
     return reinterpret_cast <struct sockaddr const  *> (&addr_); 
 }
 
 prefix_ unsigned senf::UNSocketAddress::sockaddr_len()
-       const
+    const
 {
     return sizeof(addr_);
 }
 
-prefix_ std::ostream & operator<<(std::ostream & os,
+prefix_ std::ostream & senf::operator<<(std::ostream & os,
                                   senf::UNSocketAddress::UNSocketAddress const & addr)
 {
     os << addr.path();