Fixed Headers

Peter M. Groen
1 parent 48b4c725
Showing 25 changed files with 89 additions and 854 deletions
include/socket-cpp/acceptor.h
include/socket-cpp/socket.h
include/socket-cpp/stream_socket.h
include/socket-cpp/tcp6_acceptor.h
include/socket-cpp/tcp6_connector.h
include/socket-cpp/tcp6_socket.h
include/socket-cpp/tcp_acceptor.h
include/socket-cpp/tcp_connector.h
include/socket-cpp/tcp_socket.h
include/socket-cpp/udp_socket.h
include/socket-cpp/unix_acceptor.h
include/socket-cpp/unix_connector.h
include/socket-cpp/unix_dgram_socket.h
include/socket-cpp/unix_stream_socket.h
src/acceptor.cpp
src/connector.cpp
src/datagram_socket.cpp
src/exception.cpp
src/inet6_address.cpp
src/inet_address.cpp
@@ -60,13 +60,15 @@ public:
 	acceptor(const sock_address& addr, int queSize=DFLT_QUE_SIZE) {
 		open(addr, queSize);
 	}
-	/**
+
+    /**
 	 * Move constructor.
 	 * Creates an acceptor by moving the other acceptor to this one.
 	 * @param acc Another acceptor
 	 */
 	acceptor(acceptor&& acc) : base(std::move(acc)) {}
-	/**
+
+    /**
 	 * Creates an unbound acceptor socket with an open OS socket handle.
 	 * An application would need to manually bind and listen to this
 	 * acceptor to get incoming connections.
@@ -74,7 +76,8 @@ public:
 	 * @return An open, but unbound acceptor socket.
 	 */
 	static acceptor create(int domain);
-	/**
+
+    /**
 	 * Move assignment.
 	 * @param rhs The other socket to move into this one.
 	 * @return A reference to this object.
@@ -83,7 +86,8 @@ public:
 		base::operator=(std::move(rhs));
 		return *this;
 	}
-	/**
+
+    /**
 	 * Sets the socket listening on the address to which it is bound.
 	 * @param queSize The listener queue size.
 	 * @return @em true on success, @em false on error
@@ -91,7 +95,8 @@ public:
 	bool listen(int queSize=DFLT_QUE_SIZE) {
 		return check_ret_bool(::listen(handle(), queSize));
 	};
-	/**
+
+    /**
 	 * Opens the acceptor socket, binds it to the specified address, and starts
 	 * listening.
 	 * @param addr The address to which this server should be bound.
@@ -102,7 +107,8 @@ public:
 	 * @return @em true on success, @em false on error
 	 */
 	bool open(const sock_address& addr, int queSize=DFLT_QUE_SIZE, bool reuseSock=true);
-	/**
+
+    /**
 	 * Accepts an incoming TCP connection and gets the address of the client.
 	 * @param clientAddr Pointer to the variable that will get the
 	 *  				 address of a client when it connects.
-/**
- * @file socket.h
- *
- * Classes for TCP & UDP socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date December 2014
- */
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
+#pragma once 
-#ifndef __sockpp_socket_h
-#define __sockpp_socket_h
-
-#include "sockpp/sock_address.h"
+#include "socket-cpp/sock_address.h"
 #include <chrono>
 #include <string>
 #include <tuple>
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+namespace osdev {
+namespace components {
+namespace socket-cpp {
 #if !defined(SOCKPP_SOCKET_T_DEFINED)
 	typedef int socket_t;				///< The OS socket handle
@@ -488,8 +441,6 @@ public:
 	bool close();
 };
-/////////////////////////////////////////////////////////////////////////////
-
 /**
  * RAII class to initialize and then shut down the library.
  * A single object of this class can be declared before any other classes in
@@ -507,9 +458,6 @@ public:
 	~socket_initializer() { socket::destroy(); }
 };
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-}
-
-#endif		// __sockpp_socket_h
-
+}   // End namespace socket-cpp
+}   // End namespace components
+}   // End namespace osdev
-/**
- * @file stream_socket.h
- *
- * Classes for stream sockets.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date December 2014
- */
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2017 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_stream_socket_h
-#define __sockpp_stream_socket_h
+#pragma once 
-#include "sockpp/socket.h"
+#include "socket-cpp/socket.h"
 #include <vector>
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+namespace osdev {
+namespace components {
+namespace socket-cpp {
 /**
  * Base class for streaming sockets, such as TCP and Unix Domain.
@@ -324,9 +277,7 @@ public:
 	addr_t peer_address() const { return addr_t(socket::peer_address()); }
 };
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-}
-
-#endif		// __sockpp_socket_h
+}   // End namespace socket-cpp
+}   // End namespace components
+}   // End namespace osdev
-/// @file tcp6_acceptor.h
-///
-/// Class for a TCP v6 server to accept incoming connections.
-///
-/// @author	Frank Pagliughi
-///	@author	SoRo Systems, Inc.
-///	@author	www.sorosys.com
-///
-/// @date	May 2019
+#pragma once
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
+#include "socket-cpp/acceptor.h"
+#include "socket-cpp/tcp6_socket.h"
-#ifndef __sockpp_tcp6_acceptor_h
-#define __sockpp_tcp6_acceptor_h
-
-#include "sockpp/acceptor.h"
-#include "sockpp/tcp6_socket.h"
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+namespace osdev {
+namespace components {
+namespace socket-cpp {
 /// Class for creating a TCP v6 server.
 /// Objects of this class bind and listen on TCP ports for incoming
@@ -61,9 +16,6 @@ namespace sockpp {
 using tcp6_acceptor = acceptor_tmpl<tcp6_socket>;
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-};
-
-#endif		// __sockpp_tcp_acceptor_h
-
+}   // End namespace socket-cpp
+}   // End namespace components
+}   // End namespace osdev
-/**
- * @file tcp6_connector.h
- *
- * Class for creating client-side TCP connections
- *
- * @author	Frank Pagliughi
- * @author	SoRo Systems, Inc.
- * @author  www.sorosys.com
- *
- * @date	May 2019
- */
+#pragma once 
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
+#include "socket-cpp/connector.h"
+#include "socket-cpp/tcp6_socket.h"
-
-#ifndef __sockpp_tcp6_connector_h
-#define __sockpp_tcp6_connector_h
-
-#include "sockpp/connector.h"
-#include "sockpp/tcp6_socket.h"
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+namespace osdev {
+namespace components {
+namespace socket-cpp {
 /** IPv6 active, connector (client) socket. */
 using tcp6_connector = connector_tmpl<tcp6_socket>;
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-}
-
-#endif		// __sockpp_tcp6_connector_h
+}   // End namespace socket-cpp
+}   // End namespace components
+}   // End namespace osdev
-/**
- * @file tcp6_socket.h
- *
- * Class (typedef) for IPv6 TCP socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date August 2019
- */
+#pragma once
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
+#include "socket-cpp/stream_socket.h"
+#include "socket-cpp/inet6_address.h"
-#ifndef __sockpp_tcp6_socket_h
-#define __sockpp_tcp6_socket_h
-
-#include "sockpp/stream_socket.h"
-#include "sockpp/inet6_address.h"
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+namespace osdev {
+namespace components {
+namespace socket-cpp {
 /** IPv6 streaming TCP socket */
 using tcp6_socket = stream_socket_tmpl<inet6_address>;
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-}
-
-#endif		// __sockpp_tcp6_socket_h
-
+}   // End namespace socket-cpp
+}   // End namespace components
+}   // End namespace osdev
-/// @file tcp_acceptor.h
-///
-/// Class for a TCP server to accept incoming connections.
-///
-/// @author	Frank Pagliughi
-///	@author	SoRo Systems, Inc.
-///	@author	www.sorosys.com
-///
-/// @date	December 2014
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
 #ifndef __sockpp_tcp_acceptor_h
 #define __sockpp_tcp_acceptor_h
-/**
- * @file tcp_connector.h
- *
- * Class for creating client-side TCP connections
- *
- * @author	Frank Pagliughi
- * @author	SoRo Systems, Inc.
- * @author  www.sorosys.com
- *
- * @date	December 2014
- */
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
 #ifndef __sockpp_tcp_connector_h
-/**
- * @file tcp_socket.h
- *
- * Class (typedef) for IPv4 TCP socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date August 2019
- */
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
 #ifndef __sockpp_tcp_socket_h
 #define __sockpp_tcp_socket_h
-/**
- * @file udp_socket.h
- *
- * Class (typedef) for UDP v4 socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date August 2019
- */
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_udp_socket_h
-#define __sockpp_udp_socket_h
 #include "sockpp/datagram_socket.h"
 #include "sockpp/inet_address.h"
-/// @file unix_acceptor.h
-///
-/// Class for a TCP server to accept incoming connections.
-///
-/// @author	Frank Pagliughi
-///	@author	SoRo Systems, Inc.
-///	@author	www.sorosys.com
-///
-/// @date	December 2014
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2017 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_unix_acceptor_h
-#define __sockpp_unix_acceptor_h
 #include "sockpp/acceptor.h"
 #include "sockpp/unix_stream_socket.h"
-/**
- * @file unix_connector.h
- *
- * Class for creating client-side UNIX-domain socket connections.
- *
- * @author	Frank Pagliughi
- * @author	SoRo Systems, Inc.
- * @author  www.sorosys.com
- *
- * @date	December 2018
- */
-
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2017 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_unix_connector_h
-#define __sockpp_unix_connector_h
 #include "sockpp/connector.h"
 #include "sockpp/unix_stream_socket.h"
-/**
- * @file unix_dgram_socket.h
- *
- * Class (typedef) for Unix-domain UDP socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date August 2019
- */
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_unix_dgram_socket_h
-#define __sockpp_unix_dgram_socket_h
 #include "sockpp/datagram_socket.h"
 #include "sockpp/unix_address.h"
-/**
- * @file unix_stream_socket.h
- *
- * Class (typedef) for Unix-domain streaming socket.
- *
- * @author Frank Pagliughi
- * @author SoRo Systems, Inc.
- * @author www.sorosys.com
- *
- * @date August 2019
- */
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2019 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#ifndef __sockpp_unix_stream_socket_h
-#define __sockpp_unix_stream_socket_h
 #include "sockpp/stream_socket.h"
 #include "sockpp/unix_address.h"
 #include <cstring>
-#include "sockpp/acceptor.h"
+#include "socket-cpp/acceptor.h"
 using namespace std;
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+using namespace osdev::components::socket-cpp;
 acceptor acceptor::create(int domain)
 {
@@ -68,7 +65,4 @@ stream_socket acceptor::accept(sock_address* clientAddr /*=nullptr*/)
 	return stream_socket(s);
 }
-/////////////////////////////////////////////////////////////////////////////
-// end namespace sockpp
-}
-#include "sockpp/connector.h"
+#include "socket-cpp/connector.h"
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
-bool connector::connect(const sock_address& addr)
+bool connector::connect( const sock_address& addr )
 {
     sa_family_t domain = addr.family();
 	socket_t h = create_handle(domain);
@@ -19,5 +19,3 @@ bool connector::connect(const sock_address&amp; addr)
 	return true;
 }
-}
-
-#include "sockpp/datagram_socket.h"
-#include "sockpp/exception.h"
+#include "socket-cpp/datagram_socket.h"
+#include "socket-cpp/exception.h"
 #include <algorithm>
 using namespace std::chrono;
-
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
 datagram_socket::datagram_socket(const sock_address& addr)
 {
@@ -33,6 +32,3 @@ ssize_t datagram_socket::recv_from(void* buf, size_t n, int flags,
     #endif
 }
-
-}
-
-#include "sockpp/exception.h"
-#include "sockpp/platform.h"
+#include "socket-cpp/exception.h"
+#include "socket-cpp/platform.h"
 #include <cstring>
 // Used to explicitly ignore the returned value of a function call.
 #define ignore_result(x) if (x) {}
 using namespace std;
-
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
 sys_error::sys_error(int err) : runtime_error(error_str(err)), errno_(err)
 {
@@ -46,5 +45,3 @@ getaddrinfo_error::getaddrinfo_error(int err, const string&amp; hostname)
 {
 }
-}
-
-#include "sockpp/inet6_address.h"
-#include "sockpp/exception.h"
+#include "socket-cpp/inet6_address.h"
+#include "socket-cpp/exception.h"
 using namespace std;
-
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
 bool inet6_address::is_set() const
 {
@@ -76,5 +75,3 @@ ostream&amp; operator&lt;&lt;(ostream&amp; os, const inet6_address&amp; addr)
 	return os;
 }
-}
-
-#include "sockpp/inet_address.h"
-#include "sockpp/exception.h"
+#include "socket-cpp/inet_address.h"
+#include "socket-cpp/exception.h"
 using namespace std;
-
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
 bool inet_address::is_set() const
 {
@@ -72,4 +71,3 @@ ostream&amp; operator&lt;&lt;(ostream&amp; os, const inet_address&amp; addr)
 	return os;
 }
-}
-// can_address.cpp
-//
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2021 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#include "sockpp/can_address.h"
-#include "sockpp/socket.h"
+#include "socket-cpp/can_address.h"
+#include "socket-cpp/socket.h"
 #include <cstring>
 #include <stdexcept>
 #include <sys/ioctl.h>
 #include <net/if.h>
 using namespace std;
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+using namespace osdev::components::socket-cpp;
 constexpr sa_family_t can_address::ADDRESS_FAMILY;
@@ -90,15 +51,9 @@ string can_address::iface() const
 	return string(iface ? iface : "unknown");
 }
-
-// --------------------------------------------------------------------------
-
 ostream& operator<<(ostream& os, const can_address& addr)
 {
 	os << "can:" << addr.iface();
 	return os;
 }
-/////////////////////////////////////////////////////////////////////////////
-// End namespace sockpp
-}
-// can_socket.cpp
-//
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2021 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#include "sockpp/can_socket.h"
-#include "sockpp/socket.h"
+#include "socket-cpp/can_socket.h"
+#include "socket-cpp/socket.h"
 #include <sys/ioctl.h>
 using namespace std;
 using namespace std::chrono;
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+using namespace osdev::components::socket-cpp;
 can_socket::can_socket(const can_address& addr)
 {
-	socket_t h = create_handle(SOCK_RAW, CAN_RAW);
+	socket_t socketHandle = create_handle( SOCK_RAW, CAN_RAW );
-	if (check_socket_bool(h)) {
-		reset(h);
-		bind(addr);
+	if ( check_socket_bool( socketHandle ) ) 
+    {
+		reset( socketHandle );
+		bind( addr );
 	}
 }
@@ -87,6 +49,3 @@ ssize_t can_socket::recv_from(can_frame *frame, int flags,
 								flags, p, &len));
 }
-/////////////////////////////////////////////////////////////////////////////
-// End namespace sockpp
-}
-#include "sockpp/socket.h"
-#include "sockpp/exception.h"
+#include "socket-cpp/socket.h"
+#include "socket-cpp/exception.h"
 #include <algorithm>
 #include <cstring>
 #include <fcntl.h>
@@ -8,8 +8,7 @@
 #define ignore_result(x) if (x) {}
 using namespace std::chrono;
-
-namespace sockpp {
+using namespace osdev::components::socket-cpp;
 timeval to_timeval(const microseconds& dur)
 {
@@ -227,5 +226,3 @@ bool socket::close()
 	return true;
 }
-}
-
@@ -4,8 +4,7 @@
 #include <memory>
 using namespace std::chrono;
-
-namespace socket-cpp {
+using namespace osdev::components::socket-cpp;
 stream_socket stream_socket::create(int domain, int protocol /*=0*/)
 {
@@ -148,5 +147,3 @@ bool stream_socket::write_timeout(const microseconds&amp; to)
 	return set_option(SOL_SOCKET, SO_SNDTIMEO, tv);
 }
-}
-
-// unix_address.cpp
-//
-// --------------------------------------------------------------------------
-// This file is part of the "sockpp" C++ socket library.
-//
-// Copyright (c) 2014-2017 Frank Pagliughi
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// --------------------------------------------------------------------------
-
-#include "sockpp/unix_address.h"
+#include "socket-cpp/unix_address.h"
 #include <cstring>
 #include <stdexcept>
 using namespace std;
-
-namespace sockpp {
-
-/////////////////////////////////////////////////////////////////////////////
+using namespace osdev::components::socket-cpp;
 constexpr sa_family_t unix_address::ADDRESS_FAMILY;
 constexpr size_t unix_address::MAX_PATH_NAME;
@@ -74,6 +35,3 @@ ostream&amp; operator&lt;&lt;(ostream&amp; os, const unix_address&amp; addr)
 	return os;
 }
-/////////////////////////////////////////////////////////////////////////////
-// End namespace sockpp
-}