r2913 - in trunk/libmnetutil: include/libmnetutil source

[erik at minisip.org]

Author: erik
Date: 2006-11-17 17:25:52 +0100 (Fri, 17 Nov 2006)
New Revision: 2913

Modified:
   trunk/libmnetutil/include/libmnetutil/IP4Address.h
   trunk/libmnetutil/include/libmnetutil/IP6Address.h
   trunk/libmnetutil/include/libmnetutil/NetworkException.h
   trunk/libmnetutil/source/IP4Address.cxx
   trunk/libmnetutil/source/IP6Address.cxx
   trunk/libmnetutil/source/NetworkException.cxx
Log:

* libmnetutil: move code from .h -> .cxx



Modified: trunk/libmnetutil/include/libmnetutil/IP4Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP4Address.h	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/include/libmnetutil/IP4Address.h	2006-11-17 16:25:52 UTC (rev 2913)
@@ -54,7 +54,7 @@
 		virtual bool operator ==(const IP4Address &i4) const;
 		virtual bool operator ==(const IPAddress &i) const;
 		
-		virtual MRef<IPAddress *> clone()  const{ return new IP4Address(*this); };
+		virtual MRef<IPAddress *> clone() const;
 
 	private:
 		std::string ipaddr;

Modified: trunk/libmnetutil/include/libmnetutil/IP6Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP6Address.h	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/include/libmnetutil/IP6Address.h	2006-11-17 16:25:52 UTC (rev 2913)
@@ -50,7 +50,7 @@
 		virtual bool operator ==(const IP6Address &i6) const;
 		virtual bool operator ==(const IPAddress &i) const;
 
-		virtual MRef<IPAddress *> clone() const { return new IP6Address(*this); };
+		virtual MRef<IPAddress *> clone() const;
 
 	private:
 		std::string ipaddr;

Modified: trunk/libmnetutil/include/libmnetutil/NetworkException.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/NetworkException.h	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/include/libmnetutil/NetworkException.h	2006-11-17 16:25:52 UTC (rev 2913)
@@ -48,10 +48,7 @@
 	public:
 		HostNotFound( std::string host ):NetworkException(-1),host(host){};
 		virtual ~HostNotFound()throw() {}
-		virtual const char*what() {
-			msg = "Host "+host+" not found.";
-			return msg.c_str();
-		}
+		virtual const char*what();
 	private:
 		std::string host;
 		std::string msg;
@@ -59,10 +56,7 @@
 class LIBMNETUTIL_API UnknownAddressFamily : public NetworkException{
 public:
 	UnknownAddressFamily( int errorNumber );
-	virtual const char*what() {
-		msg = "Unknown address family: " + errorNumber;
-		return msg.c_str();
-	}
+	virtual const char*what();
 };
 
 class LIBMNETUTIL_API ResolvError : public NetworkException{
@@ -120,10 +114,7 @@
 	public:
 		TLSInitFailed();
 		virtual ~TLSInitFailed() throw(){}
-		virtual const char *what() {
-			msg = "TLS initialization failed.";
-			return msg.c_str();
-		};
+		virtual const char *what();
 	private:
 		std::string msg;
 };
@@ -132,11 +123,9 @@
 	public:
 		TLSContextInitFailed();
 		virtual ~TLSContextInitFailed() throw(){}
-		virtual const char*what() {
-			msg = "TLS context initialization failed.";
-			return msg.c_str();
-		};
+		virtual const char*what();
 	private:
 		std::string msg;
 };
 #endif
+

Modified: trunk/libmnetutil/source/IP4Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP4Address.cxx	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/source/IP4Address.cxx	2006-11-17 16:25:52 UTC (rev 2913)
@@ -141,6 +141,10 @@
 	delete sockaddress;
 }
 
+MRef<IPAddress *> IP4Address::clone() const{ 
+	return new IP4Address(*this); 
+}
+
 struct sockaddr * IP4Address::getSockaddrptr(int32_t port) const{
 	sockaddress->sin_port=hton16(port);
 	return (sockaddr *)sockaddress;

Modified: trunk/libmnetutil/source/IP6Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP6Address.cxx	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/source/IP6Address.cxx	2006-11-17 16:25:52 UTC (rev 2913)
@@ -151,6 +151,10 @@
 	delete sockaddress;
 }
 
+MRef<IPAddress *> IP6Address::clone() const { 
+	return new IP6Address(*this); 
+}
+
 struct sockaddr *IP6Address::getSockaddrptr(int32_t port) const{
 	sockaddress->sin6_port = htons( (unsigned short)port );
 	return (struct sockaddr *) sockaddress;

Modified: trunk/libmnetutil/source/NetworkException.cxx
===================================================================
--- trunk/libmnetutil/source/NetworkException.cxx	2006-11-17 16:25:32 UTC (rev 2912)
+++ trunk/libmnetutil/source/NetworkException.cxx	2006-11-17 16:25:52 UTC (rev 2913)
@@ -70,12 +70,35 @@
 }
 
 
+const char* HostNotFound::what() {
+	msg = "Host "+host+" not found.";
+	return msg.c_str();
+}
+
+
+const char* UnknownAddressFamily::what() {
+	msg = "Unknown address family: " + errorNumber;
+	return msg.c_str();
+}
+
+
 TLSInitFailed::TLSInitFailed():NetworkException(){
 }
 
 TLSContextInitFailed::TLSContextInitFailed():NetworkException(){
 }
 
+const char *TLSInitFailed::what() {
+	msg = "TLS initialization failed.";
+	return msg.c_str();
+};
+
+const char* TLSContextInitFailed::what() {
+	msg = "TLS context initialization failed.";
+	return msg.c_str();
+};
+
+
 TLSConnectFailed::TLSConnectFailed( int errorNumber, SSL * ssl ):ConnectFailed(errorNumber),ssl(ssl){};
 
 const char *TLSConnectFailed::what(){