r3479 - in trunk: libmcrypto/include/libmcrypto libmcrypto/include/libmcrypto/gnutls libmcrypto/include/libmcrypto/openssl libmcrypto/source/gnutls libmcrypto/source/openssl libmnetutil/include/libmnetutil libmnetutil/source
mikma at minisip.org
mikma at minisip.org
Sun Nov 18 10:19:39 CET 2007
Author: mikma
Date: 2007-11-18 10:19:38 +0100 (Sun, 18 Nov 2007)
New Revision: 3479
Modified:
trunk/libmcrypto/include/libmcrypto/TlsSocket.h
trunk/libmcrypto/include/libmcrypto/gnutls/TlsSocket.h
trunk/libmcrypto/include/libmcrypto/openssl/TlsSocket.h
trunk/libmcrypto/source/gnutls/TlsSocket.cxx
trunk/libmcrypto/source/openssl/TlsSocket.cxx
trunk/libmnetutil/include/libmnetutil/IP4Address.h
trunk/libmnetutil/include/libmnetutil/IP6Address.h
trunk/libmnetutil/include/libmnetutil/IPAddress.h
trunk/libmnetutil/include/libmnetutil/TCPSocket.h
trunk/libmnetutil/source/IP4Address.cxx
trunk/libmnetutil/source/IP6Address.cxx
trunk/libmnetutil/source/TCPSocket.cxx
Log:
Declare IPAddress in TCPSocket constructor constant.
Modified: trunk/libmcrypto/include/libmcrypto/TlsSocket.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/TlsSocket.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmcrypto/include/libmcrypto/TlsSocket.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -38,7 +38,7 @@
public:
virtual ~TLSSocket();
- static TLSSocket* connect( IPAddress &addr,
+ static TLSSocket* connect( const IPAddress &addr,
int32_t port,
MRef<Certificate *> cert=NULL,
MRef<CertificateSet *> cert_db=NULL,
Modified: trunk/libmcrypto/include/libmcrypto/gnutls/TlsSocket.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/gnutls/TlsSocket.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmcrypto/include/libmcrypto/gnutls/TlsSocket.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -42,7 +42,7 @@
class LIBMCRYPTO_API GnutlsSocket : public TLSSocket {
public:
- GnutlsSocket( IPAddress &addr, int32_t port,
+ GnutlsSocket( const IPAddress &addr, int32_t port,
MRef<GtlsCertificateSet *> cert_db=NULL,
MRef<GtlsCertificate *> cert=NULL);
Modified: trunk/libmcrypto/include/libmcrypto/openssl/TlsSocket.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/openssl/TlsSocket.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmcrypto/include/libmcrypto/openssl/TlsSocket.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -85,7 +85,8 @@
MRef<OsslCertificate *> cert = NULL,
MRef<OsslCertificateSet *> cert_db=NULL );
- OsslSocket( IPAddress &addr, int32_t port, void * &ssl_ctx,
+ OsslSocket( const IPAddress &addr, int32_t port,
+ void * &ssl_ctx,
MRef<OsslCertificate *> cert=NULL,
MRef<OsslCertificateSet *> cert_db=NULL );
Modified: trunk/libmcrypto/source/gnutls/TlsSocket.cxx
===================================================================
--- trunk/libmcrypto/source/gnutls/TlsSocket.cxx 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmcrypto/source/gnutls/TlsSocket.cxx 2007-11-18 09:19:38 UTC (rev 3479)
@@ -53,7 +53,7 @@
{
}
-TLSSocket* TLSSocket::connect( IPAddress &addr, int32_t port,
+TLSSocket* TLSSocket::connect( const IPAddress &addr, int32_t port,
MRef<Certificate *> cert,
MRef<CertificateSet *> cert_db,
string serverName )
@@ -107,7 +107,7 @@
}
#endif
-GnutlsSocket::GnutlsSocket(IPAddress &addr, int32_t port,
+GnutlsSocket::GnutlsSocket(const IPAddress &addr, int32_t port,
MRef<GtlsCertificateSet *> cert_db,
MRef<GtlsCertificate *> cert)
{
Modified: trunk/libmcrypto/source/openssl/TlsSocket.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsSocket.cxx 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmcrypto/source/openssl/TlsSocket.cxx 2007-11-18 09:19:38 UTC (rev 3479)
@@ -58,7 +58,7 @@
{
}
-TLSSocket* TLSSocket::connect( IPAddress &addr, int32_t port,
+TLSSocket* TLSSocket::connect( const IPAddress &addr, int32_t port,
MRef<Certificate *> cert,
MRef<CertificateSet *> cert_db,
string serverName )
@@ -109,7 +109,7 @@
}
-OsslSocket::OsslSocket( IPAddress &addr, int32_t port, void * &ssl_ctx_,
+OsslSocket::OsslSocket( const IPAddress &addr, int32_t port, void * &ssl_ctx_,
MRef<OsslCertificate *> cert,
MRef<OsslCertificateSet *> cert_db_ ){
MRef<TCPSocket*> tcp_sock = new TCPSocket( addr, port );
Modified: trunk/libmnetutil/include/libmnetutil/IP4Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP4Address.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/include/libmnetutil/IP4Address.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -46,7 +46,7 @@
virtual int32_t getPort() const;
virtual std::string getString() const;
- virtual void connect(Socket &socket, int32_t port);
+ virtual void connect(Socket &socket, int32_t port) const;
friend std::ostream& operator<<(std::ostream&, IP4Address &a);
friend Dbg& operator<<(Dbg&, IP4Address &a);
Modified: trunk/libmnetutil/include/libmnetutil/IP6Address.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IP6Address.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/include/libmnetutil/IP6Address.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -41,7 +41,7 @@
virtual int32_t getPort() const;
virtual std::string getString() const;
- virtual void connect(Socket &socket, int32_t port);
+ virtual void connect(Socket &socket, int32_t port) const;
friend std::ostream& operator<<(std::ostream&, const IP6Address &a);
virtual struct sockaddr *getSockaddrptr(int32_t port=0) const;
Modified: trunk/libmnetutil/include/libmnetutil/IPAddress.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/IPAddress.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/include/libmnetutil/IPAddress.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -56,7 +56,7 @@
virtual int32_t getPort() const=0;
virtual std::string getString() const=0;
- virtual void connect(Socket &s, int32_t port)=0;
+ virtual void connect(Socket &s, int32_t port) const=0;
virtual struct sockaddr* getSockaddrptr(int32_t port=0) const=0;
virtual int32_t getSockaddrLength() const=0;
Modified: trunk/libmnetutil/include/libmnetutil/TCPSocket.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/TCPSocket.h 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/include/libmnetutil/TCPSocket.h 2007-11-18 09:19:38 UTC (rev 3479)
@@ -34,7 +34,7 @@
TCPSocket(int32_t fd, sockaddr * addr, int32_t addr_len);
TCPSocket(std::string addr,int32_t port=0);
- TCPSocket(IPAddress &addr,int32_t port=0);
+ TCPSocket(const IPAddress &addr,int32_t port=0);
TCPSocket(TCPSocket &sock);
virtual ~TCPSocket();
@@ -51,7 +51,7 @@
friend std::ostream& operator<<(std::ostream&, TCPSocket&);
private:
- void initTCPSocket(IPAddress &ipaddress, int32_t port);
+ void initTCPSocket(const IPAddress &ipaddress, int32_t port);
};
TCPSocket& operator<<(TCPSocket& sock, std::string str);
Modified: trunk/libmnetutil/source/IP4Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP4Address.cxx 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/source/IP4Address.cxx 2007-11-18 09:19:38 UTC (rev 3479)
@@ -188,7 +188,7 @@
return ntoh16(sockaddress->sin_port);
}
-void IP4Address::connect(Socket &socket, int32_t port){
+void IP4Address::connect(Socket &socket, int32_t port) const{
unsigned char *ip;
unsigned long int ip_data;
Modified: trunk/libmnetutil/source/IP6Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP6Address.cxx 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/source/IP6Address.cxx 2007-11-18 09:19:38 UTC (rev 3479)
@@ -271,7 +271,7 @@
return ntoh16(sockaddress->sin6_port);
}
-void IP6Address::connect(Socket &socket, int32_t port){
+void IP6Address::connect(Socket &socket, int32_t port) const{
struct sockaddr_in6 sin;
memcpy(&sin, sockaddress, sizeof(sin));
sin.sin6_port = htons( (unsigned short)port );
Modified: trunk/libmnetutil/source/TCPSocket.cxx
===================================================================
--- trunk/libmnetutil/source/TCPSocket.cxx 2007-11-17 23:32:05 UTC (rev 3478)
+++ trunk/libmnetutil/source/TCPSocket.cxx 2007-11-18 09:19:38 UTC (rev 3479)
@@ -64,11 +64,11 @@
initTCPSocket( **tmp, port );
}
-TCPSocket::TCPSocket(IPAddress &ipaddress, int32_t port){
+TCPSocket::TCPSocket(const IPAddress &ipaddress, int32_t port){
initTCPSocket( ipaddress, port );
}
-void TCPSocket::initTCPSocket(IPAddress &ipaddress, int32_t port){
+void TCPSocket::initTCPSocket(const IPAddress &ipaddress, int32_t port){
peerAddress = ipaddress.clone();
peerPort = port;
More information about the Minisip-devel
mailing list