X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FUN%2FUNAddressing.cc;h=bcf16410c4cdd425fc0ed2fc294766a815dca03d;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=abc278f374d98a5b3e3269c9e6897e39f72b603c;hpb=0de6c83e2769c7deb2ed3c57d7b26e8cb3fcca04;p=senf.git

diff --git a/Socket/Protocols/UN/UNAddressing.cc b/Socket/Protocols/UN/UNAddressing.cc
index abc278f..bcf1641 100644
--- a/Socket/Protocols/UN/UNAddressing.cc
+++ b/Socket/Protocols/UN/UNAddressing.cc
@@ -1,6 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2007 
+// 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
@@ -24,73 +27,20 @@
 //#include "UNAddressing.ih"
 
 // Custom includes
-#include <stdio.h>
-#include <boost/operators.hpp>
-#include <boost/filesystem/path.hpp>
-#include "../../../Utils/SafeBool.hh"
-//#include "UNAddressing.mpp"
+#include "../AddressExceptions.hh"
+
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
-prefix_ senf::UNSocketAddress::UNSocketAddress(boost::filesystem::path p)
-{
-    chdir(p.branch_path().string().c_str());
-//Check if the unix domain socket already exists...
-    if(!remove(p.leaf().c_str()))
-	printf("File already existed and therefore was deleted!\n");
-    else
-	printf("File not found, will be created.\n");
-    fflush(stdout);
-
-    sockAddr.sun_family = AF_UNIX; 
-    strcpy(sockAddr.sun_path, p.string().c_str());
-}
-
-    prefix_ senf::UNSocketAddress fromString(std::string s)
-{
-    return senf::UNSocketAddress::UNSocketAddress(boost::filesystem::path(s));
-}
-
-    prefix_ senf::UNSocketAddress fromPath(boost::filesystem::path p)
-{
-    return senf::UNSocketAddress::UNSocketAddress(p);
-}
-    prefix_ std::string senf::UNSocketAddress::path()
-{
-    return std::string(sockAddr.sun_path);
-}
 
-prefix_ sockaddr_un senf::UNSocketAddress::sockaddr()
+prefix_ void senf::UNSocketAddress::path(std::string const & path)
 {
-    struct sockaddr_un out; 
-    out.sun_family = sockAddr.sun_family;
-    strcpy(out.sun_path, sockAddr.sun_path);
-    return out; 
+    if (path.size() > sizeof(sockaddr_un)-sizeof(short)-1)
+        throw AddressSyntaxException() << "UNSocketAddress path too long: " << path;
+    socklen(path.size()+sizeof(short));
+    memcpy(addr_.sun_path, path.c_str(), socklen()-sizeof(short));
+    addr_.sun_path[socklen()-sizeof(short)+1] = 0;
 }
 
-prefix_ sockaddr * senf::UNSocketAddress::sockaddr_p()
-{
-    return reinterpret_cast <struct sockaddr  *> (&sockAddr); 
-}
-
-
-prefix_ sockaddr const  * senf::UNSocketAddress::sockaddr_p()
-    const
-{
-    return reinterpret_cast <struct sockaddr const  *> (&sockAddr); 
-}
-
-prefix_ unsigned senf::UNSocketAddress::sockaddr_len()
-    const
-{
-    return sizeof(sockAddr);
-}
-
-prefix_ std::ostream & operator<<(std::ostream & os, senf::UNSocketAddress::UNSocketAddress const & addr){
-    os << addr.path();
-    return os;
-}
-
-
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "UNAddressing.mpp"