From 8639fee50452ac51c9963e7cb51e82989efbb5f1 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 11 Jan 2018 19:27:48 +0100 Subject: [PATCH] Remove UDDSocket class This class is not used anymore in osmo-trx, so we can safely remove it. Change-Id: I67f90aa3d6a2a5e92292436d10928e0705c8f8ff --- CommonLibs/Sockets.cpp | 47 -------------------------------- CommonLibs/Sockets.h | 20 -------------- tests/CommonLibs/SocketsTest.cpp | 29 +------------------- 3 files changed, 1 insertion(+), 95 deletions(-) diff --git a/CommonLibs/Sockets.cpp b/CommonLibs/Sockets.cpp index 11e96ddc..ce8e3d59 100644 --- a/CommonLibs/Sockets.cpp +++ b/CommonLibs/Sockets.cpp @@ -284,51 +284,4 @@ unsigned short UDPSocket::port() const return ntohs(name.sin_port); } - - - - -UDDSocket::UDDSocket(const char* localPath, const char* remotePath) - :DatagramSocket() -{ - if (localPath!=NULL) open(localPath); - if (remotePath!=NULL) destination(remotePath); -} - - - -void UDDSocket::open(const char* localPath) -{ - // create - mSocketFD = socket(AF_UNIX,SOCK_DGRAM,0); - if (mSocketFD<0) { - perror("socket() failed"); - throw SocketError(); - } - - // bind - struct sockaddr_un address; - size_t length = sizeof(address); - bzero(&address,length); - address.sun_family = AF_UNIX; - strcpy(address.sun_path,localPath); - unlink(localPath); - if (bind(mSocketFD,(struct sockaddr*)&address,length)<0) { - perror("bind() failed"); - throw SocketError(); - } -} - - - -void UDDSocket::destination(const char* remotePath) -{ - struct sockaddr_un* unAddr = (struct sockaddr_un*)mDestination; - unAddr->sun_family = AF_UNIX; - strcpy(unAddr->sun_path,remotePath); -} - - - - // vim:ts=4:sw=4 diff --git a/CommonLibs/Sockets.h b/CommonLibs/Sockets.h index 83128431..71b8b22f 100644 --- a/CommonLibs/Sockets.h +++ b/CommonLibs/Sockets.h @@ -166,26 +166,6 @@ public: }; - -/** Unix Domain Datagram Socket */ -class UDDSocket : public DatagramSocket { - -public: - - UDDSocket(const char* localPath=NULL, const char* remotePath=NULL); - - void destination(const char* remotePath); - - void open(const char* localPath); - - /** Give the return address of the most recently received packet. */ - const struct sockaddr_un* source() const { return (const struct sockaddr_un*)mSource; } - - size_t addressSize() const { return sizeof(struct sockaddr_un); } - -}; - - #endif diff --git a/tests/CommonLibs/SocketsTest.cpp b/tests/CommonLibs/SocketsTest.cpp index b51587d5..235b8f3b 100644 --- a/tests/CommonLibs/SocketsTest.cpp +++ b/tests/CommonLibs/SocketsTest.cpp @@ -53,38 +53,13 @@ void *testReaderIP(void *) return NULL; } - - -void *testReaderUnix(void *) -{ - UDDSocket readSocket("testDestination"); - readSocket.nonblocking(); - int rc = 0; - while (rc0) { - CERR("read: " << buf); - rc++; - } else { - sleep(2); - } - } - return NULL; -} - - int main(int argc, char * argv[] ) { Thread readerThreadIP; readerThreadIP.start(testReaderIP,NULL); - Thread readerThreadUnix; - readerThreadUnix.start(testReaderUnix,NULL); UDPSocket socket1("127.0.0.1", 5061, "127.0.0.1", 5934); - UDDSocket socket1U("testSource","testDestination"); CERR("socket1: " << socket1.port()); @@ -93,12 +68,10 @@ int main(int argc, char * argv[] ) for (int i=0; i