Don't close socket on Communicator error

[libs/net.git] / source / sockaddr.cpp

diff --git a/source/sockaddr.cpp b/source/sockaddr.cpp
index 26c77b643df8b4ae9b8180ddd1c38145f71dcc65..f6123ca38c685e9b3631593bdd9e89b4de248587 100644 (file)
--- a/source/sockaddr.cpp
+++ b/source/sockaddr.cpp
@@ -1,22 +1,12 @@
-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008, 2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "inet.h"
 #include "inet6.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Net {
 
-unsigned SockAddr::fill_sockaddr(sockaddr_storage &sa) const
-{
-       return fill_sockaddr(reinterpret_cast<sockaddr &>(sa));
-}
-
 SockAddr *SockAddr::create(const sockaddr_storage &sa)
 {
        switch(sa.ss_family)
@@ -26,9 +16,14 @@ SockAddr *SockAddr::create(const sockaddr_storage &sa)
        case AF_INET6:
                return new Inet6Addr(reinterpret_cast<const sockaddr_in6 &>(sa));
        default:
-               throw InvalidParameterValue("Unknown address family");
+               throw invalid_argument("SockAddr::create");
        }
 }
 
+unsigned SockAddr::fill_sockaddr(sockaddr_storage &sa) const
+{
+       return fill_sockaddr(reinterpret_cast<sockaddr &>(sa));
+}
+
 } // namespace Net
 } // namespace Msp