X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FUN%2FUNAddressing.cc;h=2ae9b9565691ee74801b306a0c84e4a0a7d7ed0b;hb=01affde68cb93a334a2e6daabd2010b9a14b4553;hp=ce957e4b1f66c51ed9b5c1e445a2b8712bf175cb;hpb=4225a17d92c3692e6d3f96a8dd5cb432cd402e61;p=senf.git

diff --git a/Socket/Protocols/UN/UNAddressing.cc b/Socket/Protocols/UN/UNAddressing.cc
index ce957e4..2ae9b95 100644
--- a/Socket/Protocols/UN/UNAddressing.cc
+++ b/Socket/Protocols/UN/UNAddressing.cc
@@ -1,6 +1,7 @@
-// $Id$
-//
 // Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum NETwork research (NET)
+//     David Wagner <david.wagner@fokus.fraunhofer.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
@@ -27,34 +28,25 @@
 #include <stdio.h>
 #include <boost/operators.hpp>
 #include <boost/filesystem/path.hpp>
-#include "../../../Utils/SafeBool.hh"
-//#include "UNAddressing.mpp"
+
 #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());
+	sockAddr.sun_family = AF_UNIX;
+	strcpy(sockAddr.sun_path, p.string().c_str());
 }
 
-    prefix_ senf::UNSocketAddress fromString(std::string s)
-{
+prefix_ senf::UNSocketAddress fromString(std::string s) {
     return senf::UNSocketAddress::UNSocketAddress(boost::filesystem::path(s));
 }
 
-    prefix_ senf::UNSocketAddress fromPath(boost::filesystem::path p)
+prefix_ senf::UNSocketAddress fromPath(boost::filesystem::path p)
 {
     return senf::UNSocketAddress::UNSocketAddress(p);
 }
-    prefix_ std::string senf::UNSocketAddress::path()
+
+prefix_ std::string senf::UNSocketAddress::path()
         const
 {
     return std::string(sockAddr.sun_path);
@@ -64,7 +56,7 @@ prefix_ sockaddr_un senf::UNSocketAddress::sockaddr()
 {
     struct sockaddr_un out; 
     out.sun_family = sockAddr.sun_family;
-    strcpy(out.sun_path, sockAddr.sun_path);
+    strncpy(out.sun_path, sockAddr.sun_path, sizeof( out.sun_path));
     return out; 
 }
 
@@ -81,6 +73,7 @@ prefix_ sockaddr const  * senf::UNSocketAddress::sockaddr_p()
 }
 
 prefix_ unsigned senf::UNSocketAddress::sockaddr_len()
+	const
 {
     return sizeof(sockAddr);
 }