From b9d2515704ac83cacd88d0a73ecba30323df0b2d Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Mon, 1 Jul 2019 19:03:49 +0200
Subject: Transceiver: replace UDPSocket with libosmocore socket API

We have a good socket API in libosmocore, let's drop osmo-trx socket API
and use libosmocore's one instead of maintaining the two of them.

Change-Id: Ib19856a3e0a7607f63436c4a80b1381a3f318764
---
 tests/CommonLibs/Makefile.am     |   6 ---
 tests/CommonLibs/SocketsTest.cpp | 101 ---------------------------------------
 tests/CommonLibs/SocketsTest.ok  |   1 -
 tests/testsuite.at               |   6 ---
 4 files changed, 114 deletions(-)
 delete mode 100644 tests/CommonLibs/SocketsTest.cpp
 delete mode 100644 tests/CommonLibs/SocketsTest.ok

(limited to 'tests')

diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am
index 2a9a021..26b49e2 100644
--- a/tests/CommonLibs/Makefile.am
+++ b/tests/CommonLibs/Makefile.am
@@ -6,7 +6,6 @@ AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
 EXTRA_DIST = BitVectorTest.ok \
              PRBSTest.ok \
              InterthreadTest.ok \
-             SocketsTest.ok \
              TimevalTest.ok \
              VectorTest.ok \
              LogTest.ok \
@@ -16,7 +15,6 @@ noinst_PROGRAMS = \
 	BitVectorTest \
 	PRBSTest \
 	InterthreadTest \
-	SocketsTest \
 	TimevalTest \
 	VectorTest \
 	LogTest
@@ -30,10 +28,6 @@ InterthreadTest_SOURCES = InterthreadTest.cpp
 InterthreadTest_LDADD = $(COMMON_LA)
 InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS)
 
-SocketsTest_SOURCES = SocketsTest.cpp
-SocketsTest_LDADD = $(COMMON_LA)
-SocketsTest_LDFLAGS = -lpthread $(AM_LDFLAGS)
-
 TimevalTest_SOURCES = TimevalTest.cpp
 TimevalTest_LDADD = $(COMMON_LA)
 
diff --git a/tests/CommonLibs/SocketsTest.cpp b/tests/CommonLibs/SocketsTest.cpp
deleted file mode 100644
index e4eef54..0000000
--- a/tests/CommonLibs/SocketsTest.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* Copyright 2008 Free Software Foundation, Inc.
-*
-*
-* This software is distributed under the terms of the GNU Affero Public License.
-* See the COPYING file in the main directory for details.
-*
-* This use of this software may be subject to additional restrictions.
-* See the LEGAL file in the main directory for details.
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-
-
-#include "Sockets.h"
-#include "Threads.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-static const int gNumToSend = 10;
-
-static void sigalarm_handler(int foo)
-{
-	printf("FAIL: test did not run successfully\n");
-	exit(EXIT_FAILURE);
-}
-
-void *testReaderIP(void *param)
-{
-	UDPSocket *readSocket = (UDPSocket *)param;
-	readSocket->nonblocking();
-	int rc = 0;
-	while (rc<gNumToSend) {
-		char buf[MAX_UDP_LENGTH+1] = { 0 };
-		int count = readSocket->read(buf, MAX_UDP_LENGTH);
-		if (count>0) {
-			buf[count] = 0;
-			CERR("read: " << buf);
-			rc++;
-		} else {
-			sleep(2);
-		}
-	}
-	return NULL;
-}
-
-int main(int argc, char * argv[] )
-{
-  int count;
-
-  if (signal(SIGALRM, sigalarm_handler) == SIG_ERR) {
-    perror("signal");
-    exit(EXIT_FAILURE);
-  }
-
-  /* If the test takes longer than 2*gNumToSend seconds, abort it */
-  alarm(2* gNumToSend);
-
-  UDPSocket readSocket("127.0.0.1", 0);
-  UDPSocket socket1("127.0.0.1", 0, "localhost", readSocket.port());
-
-  CERR("socket1: " << socket1.port() << ", readSocket: " << readSocket.port());
-
-  Thread readerThreadIP;
-  readerThreadIP.start(testReaderIP, &readSocket);
-
-  // give the readers time to open
-  sleep(1);
-
-  for (int i=0; i<gNumToSend; i++) {
-    CERR("write");
-    count = socket1.write("Hello IP land");
-    if (count < 0) {
-      COUT("FAIL: write");
-      exit(EXIT_FAILURE);
-    }
-    sleep(1);
-  }
-
-  readerThreadIP.join();
-
-  printf("Done\n");
-}
-
-// vim: ts=4 sw=4
diff --git a/tests/CommonLibs/SocketsTest.ok b/tests/CommonLibs/SocketsTest.ok
deleted file mode 100644
index a965a70..0000000
--- a/tests/CommonLibs/SocketsTest.ok
+++ /dev/null
@@ -1 +0,0 @@
-Done
diff --git a/tests/testsuite.at b/tests/testsuite.at
index f83ac65..0ac870d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -32,12 +32,6 @@ cat $abs_srcdir/CommonLibs/PRBSTest.ok > expout
 AT_CHECK([$abs_top_builddir/tests/CommonLibs/PRBSTest], [], [expout], [])
 AT_CLEANUP
 
-AT_SETUP([SocketsTest])
-AT_KEYWORDS([SocketsTest])
-cat $abs_srcdir/CommonLibs/SocketsTest.ok > expout
-AT_CHECK([$abs_top_builddir/tests/CommonLibs/SocketsTest], [], [expout], [ignore])
-AT_CLEANUP
-
 AT_SETUP([TimevalTest])
 AT_KEYWORDS([TimevalTest])
 cat $abs_srcdir/CommonLibs/TimevalTest.ok > expout
-- 
cgit v1.2.3