aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CommonLibs/Sockets.cpp47
-rw-r--r--CommonLibs/Sockets.h20
-rw-r--r--tests/CommonLibs/SocketsTest.cpp29
3 files changed, 1 insertions, 95 deletions
diff --git a/CommonLibs/Sockets.cpp b/CommonLibs/Sockets.cpp
index 11e96dd..ce8e3d5 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 8312843..71b8b22 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 b51587d..235b8f3 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 (rc<gNumToSend) {
- char buf[MAX_UDP_LENGTH+1];
- buf[MAX_UDP_LENGTH] = '\0';
- int count = readSocket.read(buf, MAX_UDP_LENGTH);
- if (count>0) {
- 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<gNumToSend; i++) {
socket1.write("Hello IP land");
- socket1U.write("Hello Unix domain");
- sleep(1);
+ sleep(1);
}
readerThreadIP.join();
- readerThreadUnix.join();
printf("Done\n");
}