[Cleanup] Remove unused Socket::getMyAddress and Socket::getMyEndpoint functions.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3930 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/network/Socket.h b/common/network/Socket.h
index b93da2ef0d2a1b519e9356f6215188dee32cedc0..378a9006dad95a75940a36f0d083d0f2a28e3497 100644 (file)
--- a/common/network/Socket.h
+++ b/common/network/Socket.h
@@ -50,9 +50,7 @@ namespace network {
     bool isShutdown() const {return isShutdown_;}
 
     // information about this end of the socket
-    virtual char* getMyAddress() = 0; // a string e.g. "192.168.0.1"
     virtual int getMyPort() = 0;
-    virtual char* getMyEndpoint() = 0; // <address>::<port>
 
     // information about the remote end of the socket
     virtual char* getPeerAddress() = 0; // a string e.g. "192.168.0.1"

diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 93cdceb29936e79da09eaee294be5a338007b0f6..e2b61a83650c2eff614ceb5f3671e733064a9c53 100644 (file)
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -228,36 +228,10 @@ TcpSocket::~TcpSocket() {
     closesocket(getFd());
 }
 
-char* TcpSocket::getMyAddress() {
-  struct sockaddr_in  info;
-  struct in_addr    addr;
-  socklen_t info_size = sizeof(info);
-
-  getsockname(getFd(), (struct sockaddr *)&info, &info_size);
-  memcpy(&addr, &info.sin_addr, sizeof(addr));
-
-  char* name = inet_ntoa(addr);
-  if (name) {
-    return rfb::strDup(name);
-  } else {
-    return rfb::strDup("");
-  }
-}
-
 int TcpSocket::getMyPort() {
   return getSockPort(getFd());
 }
 
-char* TcpSocket::getMyEndpoint() {
-  rfb::CharArray address; address.buf = getMyAddress();
-  int port = getMyPort();
-
-  int buflen = strlen(address.buf) + 32;
-  char* buffer = new char[buflen];
-  sprintf(buffer, "%s::%d", address.buf, port);
-  return buffer;
-}
-
 char* TcpSocket::getPeerAddress() {
   struct sockaddr_in  info;
   struct in_addr    addr;

diff --git a/common/network/TcpSocket.h b/common/network/TcpSocket.h
index 774c6e135b7e7a89967933d9178b966ac7198233..00ccf78a54b3e2f63a6bd712e5125b018e81683c 100644 (file)
--- a/common/network/TcpSocket.h
+++ b/common/network/TcpSocket.h
@@ -46,9 +46,7 @@ namespace network {
     TcpSocket(const char *name, int port);
     virtual ~TcpSocket();
 
-    virtual char* getMyAddress();
     virtual int getMyPort();
-    virtual char* getMyEndpoint();
 
     virtual char* getPeerAddress();
     virtual int getPeerPort();