r2820 - in trunk/libmnetutil: include/libmnetutil source

[mikma at minisip.org]

Author: mikma
Date: 2006-10-05 21:56:12 +0200 (Thu, 05 Oct 2006)
New Revision: 2820

Modified:
   trunk/libmnetutil/include/libmnetutil/DatagramSocket.h
   trunk/libmnetutil/include/libmnetutil/IP4Address.h
   trunk/libmnetutil/include/libmnetutil/IP6Address.h
   trunk/libmnetutil/include/libmnetutil/IPAddress.h
   trunk/libmnetutil/include/libmnetutil/UDPSocket.h
   trunk/libmnetutil/source/IP4Address.cxx
   trunk/libmnetutil/source/IPAddress.cxx
   trunk/libmnetutil/source/UDPSocket.cxx
Log:
Declare some methods in IPAddress const

Modified: trunk/libmnetutil/include/libmnetutil/DatagramSocket.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/DatagramSocket.h	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/include/libmnetutil/DatagramSocket.h	2006-10-05 19:56:12 UTC (rev 2820)
@@ -36,7 +36,7 @@
 
 		virtual std::string getMemObjectType() = 0;
 
-		virtual int32_t sendTo(IPAddress &to_addr, int32_t port, const void *msg, int32_t len) = 0;
+		virtual int32_t sendTo(const IPAddress &to_addr, int32_t port, const void *msg, int32_t len) = 0;
 		
 		virtual int32_t recvFrom(void *buf, int32_t len, MRef<IPAddress *>& from, int &port) = 0;
 		

Modified: trunk/libmnetutil/include/libmnetutil/IP4Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP4Address.h	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/include/libmnetutil/IP4Address.h	2006-10-05 19:56:12 UTC (rev 2820)
@@ -43,13 +43,13 @@
 
 		uint32_t getBinaryIP();
 
-		virtual int32_t getPort();
-		virtual std::string getString();
+		virtual int32_t getPort() const;
+		virtual std::string getString() const;
 		virtual void connect(Socket &socket, int32_t port);
 		friend std::ostream& operator<<(std::ostream&, IP4Address &a);
 
-		virtual struct sockaddr * getSockaddrptr(int32_t port=0);
-		virtual int32_t getSockaddrLength();
+		virtual struct sockaddr * getSockaddrptr(int32_t port=0) const;
+		virtual int32_t getSockaddrLength() const;
 
 		virtual bool operator ==(const IP4Address &i4) const;
 		virtual bool operator ==(const IPAddress &i) const;

Modified: trunk/libmnetutil/include/libmnetutil/IP6Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP6Address.h	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/include/libmnetutil/IP6Address.h	2006-10-05 19:56:12 UTC (rev 2820)
@@ -39,13 +39,13 @@
 		IP6Address(struct sockaddr_in6 *);
 		~IP6Address();
 
-		virtual int32_t getPort();
-		virtual std::string getString();
+		virtual int32_t getPort() const;
+		virtual std::string getString() const;
 		virtual void connect(Socket &socket, int32_t port);
 		friend std::ostream& operator<<(std::ostream&, IP6Address &a);
 
-		virtual struct sockaddr *getSockaddrptr(int32_t port=0);
-		virtual int32_t getSockaddrLength();
+		virtual struct sockaddr *getSockaddrptr(int32_t port=0) const;
+		virtual int32_t getSockaddrLength() const;
 
 		virtual bool operator ==(const IP6Address &i6) const;
 		virtual bool operator ==(const IPAddress &i) const;

Modified: trunk/libmnetutil/include/libmnetutil/IPAddress.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IPAddress.h	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/include/libmnetutil/IPAddress.h	2006-10-05 19:56:12 UTC (rev 2820)
@@ -49,17 +49,17 @@
 	public:
 		virtual ~IPAddress();
 
-		int32_t getType() { return type; };
+		int32_t getType() const { return type; };
 
-		int getAddressFamily();
-		int getProtocolFamily();
-		virtual int32_t getPort()=0;
-		virtual std::string getString()=0;
+		int getAddressFamily() const;
+		int getProtocolFamily() const;
+		virtual int32_t getPort() const=0;
+		virtual std::string getString() const=0;
 
 		virtual void connect(Socket &s, int32_t port)=0;
 
-		virtual struct sockaddr* getSockaddrptr(int32_t port=0)=0;
-		virtual int32_t getSockaddrLength()=0;
+		virtual struct sockaddr* getSockaddrptr(int32_t port=0) const=0;
+		virtual int32_t getSockaddrLength() const=0;
 
 		virtual bool operator ==(const IPAddress &i) const =0;
 		virtual MRef<IPAddress *> clone() const =0;

Modified: trunk/libmnetutil/include/libmnetutil/UDPSocket.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/UDPSocket.h	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/include/libmnetutil/UDPSocket.h	2006-10-05 19:56:12 UTC (rev 2820)
@@ -40,7 +40,7 @@
 
 		virtual std::string getMemObjectType(){return "UDPSocket";}
 
-		int32_t sendTo(IPAddress &to_addr, int32_t port, const void *msg, int32_t len);
+		int32_t sendTo(const IPAddress &to_addr, int32_t port, const void *msg, int32_t len);
 		
 		int32_t recvFrom(void *buf, int32_t len, MRef<IPAddress *>& from, int32_t &port);
 		

Modified: trunk/libmnetutil/source/IP4Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP4Address.cxx	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/source/IP4Address.cxx	2006-10-05 19:56:12 UTC (rev 2820)
@@ -141,20 +141,20 @@
 	delete sockaddress;
 }
 
-struct sockaddr * IP4Address::getSockaddrptr(int32_t port){
+struct sockaddr * IP4Address::getSockaddrptr(int32_t port) const{
 	sockaddress->sin_port=hton16(port);
 	return (sockaddr *)sockaddress;
 }
 
-int32_t IP4Address::getSockaddrLength(){
+int32_t IP4Address::getSockaddrLength() const{
 	return sizeof(struct sockaddr_in);
 }
 
-string IP4Address::getString(){
+string IP4Address::getString() const{
 	return ipaddr;
 }
 
-int32_t IP4Address::getPort()
+int32_t IP4Address::getPort() const
 {
 	return ntoh16(sockaddress->sin_port);
 }

Modified: trunk/libmnetutil/source/IPAddress.cxx
===================================================================
--- trunk/libmnetutil/source/IPAddress.cxx	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/source/IPAddress.cxx	2006-10-05 19:56:12 UTC (rev 2820)
@@ -37,7 +37,7 @@
 
 }
 
-int IPAddress::getAddressFamily(){
+int IPAddress::getAddressFamily() const{
 	return address_family;
 }
 
@@ -45,7 +45,7 @@
 	address_family=af;
 }
 
-int IPAddress::getProtocolFamily(){
+int IPAddress::getProtocolFamily() const{
 	return protocol_family;
 }
 

Modified: trunk/libmnetutil/source/UDPSocket.cxx
===================================================================
--- trunk/libmnetutil/source/UDPSocket.cxx	2006-10-05 18:26:19 UTC (rev 2819)
+++ trunk/libmnetutil/source/UDPSocket.cxx	2006-10-05 19:56:12 UTC (rev 2820)
@@ -123,7 +123,7 @@
 
 }
 
-int32_t UDPSocket::sendTo(IPAddress &to_addr, int32_t port, const void *msg, int32_t len){
+int32_t UDPSocket::sendTo(const IPAddress &to_addr, int32_t port, const void *msg, int32_t len){
 	if (use_ipv6 && ( to_addr.getType() != IP_ADDRESS_TYPE_V6)){
 		cerr << "Error: trying to send to IPv4 address using IPv6 socket" << endl;
 		throw SendFailed( errno );