broadcast beta

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: libptsocket
-# Generated by qmake (2.01a) (Qt 4.8.2) on: mer. janv. 1 15:51:32 2014
+# Generated by qmake (2.01a) (Qt 4.8.2) on: jeu. janv. 2 15:45:44 2014
 # Project:  libptsocket.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -o Makefile libptsocket.pro
@@ -30,10 +30,10 @@ SUBTARGETS    =  \
 
 ptsocket//$(MAKEFILE): 
 	@$(CHK_DIR_EXISTS) ptsocket/ || $(MKDIR) ptsocket/ 
-	cd ptsocket/ && $(QMAKE) /pxeroot/root/share/libptsocket/ptsocket/ptsocket.pro -o $(MAKEFILE)
+	cd ptsocket/ && $(QMAKE) /home/robin/libptsocket/ptsocket/ptsocket.pro -o $(MAKEFILE)
 sub-ptsocket-qmake_all:  FORCE
 	@$(CHK_DIR_EXISTS) ptsocket/ || $(MKDIR) ptsocket/ 
-	cd ptsocket/ && $(QMAKE) /pxeroot/root/share/libptsocket/ptsocket/ptsocket.pro -o $(MAKEFILE)
+	cd ptsocket/ && $(QMAKE) /home/robin/libptsocket/ptsocket/ptsocket.pro -o $(MAKEFILE)
 sub-ptsocket: ptsocket//$(MAKEFILE) FORCE
 	cd ptsocket/ && $(MAKE) -f $(MAKEFILE)
 sub-ptsocket-make_default: ptsocket//$(MAKEFILE) FORCE
@@ -52,10 +52,10 @@ sub-ptsocket-uninstall_subtargets: ptsocket//$(MAKEFILE) FORCE
 	cd ptsocket/ && $(MAKE) -f $(MAKEFILE) uninstall
 tests//$(MAKEFILE): 
 	@$(CHK_DIR_EXISTS) tests/ || $(MKDIR) tests/ 
-	cd tests/ && $(QMAKE) /pxeroot/root/share/libptsocket/tests/tests.pro -o $(MAKEFILE)
+	cd tests/ && $(QMAKE) /home/robin/libptsocket/tests/tests.pro -o $(MAKEFILE)
 sub-tests-qmake_all:  FORCE
 	@$(CHK_DIR_EXISTS) tests/ || $(MKDIR) tests/ 
-	cd tests/ && $(QMAKE) /pxeroot/root/share/libptsocket/tests/tests.pro -o $(MAKEFILE)
+	cd tests/ && $(QMAKE) /home/robin/libptsocket/tests/tests.pro -o $(MAKEFILE)
 sub-tests: tests//$(MAKEFILE) FORCE
 	cd tests/ && $(MAKE) -f $(MAKEFILE)
 sub-tests-make_default: tests//$(MAKEFILE) FORCE

commons.pri

@@ -1 +1 @@
-#DEFINES += PT_DEBUG
+DEFINES += PT_DEBUG

ptsocket/Makefile

@@ -1,6 +1,6 @@
 #############################################################################
-# Makefile for building: libptsocket.so.1.0.0
-# Generated by qmake (2.01a) (Qt 4.8.2) on: mer. janv. 1 15:51:37 2014
+# Makefile for building: libptsocket.so.1.5.0
+# Generated by qmake (2.01a) (Qt 4.8.2) on: jeu. janv. 2 15:46:29 2014
 # Project:  ptsocket.pro
 # Template: lib
 # Command: /usr/bin/qmake -o Makefile ptsocket.pro
@@ -10,7 +10,7 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_WEBKIT -DLIBPTSOCKET_LIBRARY -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES       = -DQT_WEBKIT -DPT_DEBUG -DLIBPTSOCKET_LIBRARY -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
 CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4 -I.
@@ -44,12 +44,16 @@ OBJECTS_DIR   = ./
 ####### Files
 
 SOURCES       = ptsocket.cpp \
-		ptserver.cpp moc_ptsocket.cpp \
-		moc_ptserver.cpp
+		ptserver.cpp \
+		broadcast.cpp moc_ptsocket.cpp \
+		moc_ptserver.cpp \
+		moc_broadcast.cpp
 OBJECTS       = ptsocket.o \
 		ptserver.o \
+		broadcast.o \
 		moc_ptsocket.o \
-		moc_ptserver.o
+		moc_ptserver.o \
+		moc_broadcast.o
 DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
 		/usr/share/qt4/mkspecs/common/gcc-base.conf \
@@ -79,12 +83,12 @@ DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
 		ptsocket.pro
 QMAKE_TARGET  = ptsocket
 DESTDIR       = 
-TARGET        = libptsocket.so.1.0.0
+TARGET        = libptsocket.so.1.5.0
 TARGETA       = libptsocket.a
-TARGETD       = libptsocket.so.1.0.0
+TARGETD       = libptsocket.so.1.5.0
 TARGET0       = libptsocket.so
 TARGET1       = libptsocket.so.1
-TARGET2       = libptsocket.so.1.0
+TARGET2       = libptsocket.so.1.5
 
 first: all
 ####### Implicit rules
@@ -186,8 +190,8 @@ qmake:  FORCE
 	@$(QMAKE) -o Makefile ptsocket.pro
 
 dist: 
-	@$(CHK_DIR_EXISTS) .tmp/ptsocket1.0.0 || $(MKDIR) .tmp/ptsocket1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ptsocket1.0.0/ && $(COPY_FILE) --parents ptsocket.h libptsocket_global.h ptserver.h .tmp/ptsocket1.0.0/ && $(COPY_FILE) --parents ptsocket.cpp ptserver.cpp .tmp/ptsocket1.0.0/ && (cd `dirname .tmp/ptsocket1.0.0` && $(TAR) ptsocket1.0.0.tar ptsocket1.0.0 && $(COMPRESS) ptsocket1.0.0.tar) && $(MOVE) `dirname .tmp/ptsocket1.0.0`/ptsocket1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ptsocket1.0.0
+	@$(CHK_DIR_EXISTS) .tmp/ptsocket1.5.0 || $(MKDIR) .tmp/ptsocket1.5.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ptsocket1.5.0/ && $(COPY_FILE) --parents ptsocket.h libptsocket_global.h ptserver.h broadcast.h .tmp/ptsocket1.5.0/ && $(COPY_FILE) --parents ptsocket.cpp ptserver.cpp broadcast.cpp .tmp/ptsocket1.5.0/ && (cd `dirname .tmp/ptsocket1.5.0` && $(TAR) ptsocket1.5.0.tar ptsocket1.5.0 && $(COMPRESS) ptsocket1.5.0.tar) && $(MOVE) `dirname .tmp/ptsocket1.5.0`/ptsocket1.5.0.tar.gz . && $(DEL_FILE) -r .tmp/ptsocket1.5.0
 
 
 clean:compiler_clean 
@@ -209,9 +213,9 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_ptsocket.cpp moc_ptserver.cpp
+compiler_moc_header_make_all: moc_ptsocket.cpp moc_ptserver.cpp moc_broadcast.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_ptsocket.cpp moc_ptserver.cpp
+	-$(DEL_FILE) moc_ptsocket.cpp moc_ptserver.cpp moc_broadcast.cpp
 moc_ptsocket.cpp: libptsocket_global.h \
 		ptsocket.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) ptsocket.h -o moc_ptsocket.cpp
@@ -221,6 +225,11 @@ moc_ptserver.cpp: libptsocket_global.h \
 		ptserver.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) ptserver.h -o moc_ptserver.cpp
 
+moc_broadcast.cpp: ptsocket.h \
+		libptsocket_global.h \
+		broadcast.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) broadcast.h -o moc_broadcast.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -249,25 +258,35 @@ ptserver.o: ptserver.cpp ptserver.h \
 		ptsocket.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ptserver.o ptserver.cpp
 
+broadcast.o: broadcast.cpp broadcast.h \
+		ptsocket.h \
+		libptsocket_global.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o broadcast.o broadcast.cpp
+
 moc_ptsocket.o: moc_ptsocket.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ptsocket.o moc_ptsocket.cpp
 
 moc_ptserver.o: moc_ptserver.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ptserver.o moc_ptserver.cpp
 
+moc_broadcast.o: moc_broadcast.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_broadcast.o moc_broadcast.cpp
+
 ####### Install
 
 install_headers: first FORCE
 	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/ptsocket/ || $(MKDIR) $(INSTALL_ROOT)/usr/include/ptsocket/ 
-	-$(INSTALL_FILE) /pxeroot/root/share/libptsocket/ptsocket/ptsocket.h $(INSTALL_ROOT)/usr/include/ptsocket/
-	-$(INSTALL_FILE) /pxeroot/root/share/libptsocket/ptsocket/libptsocket_global.h $(INSTALL_ROOT)/usr/include/ptsocket/
-	-$(INSTALL_FILE) /pxeroot/root/share/libptsocket/ptsocket/ptserver.h $(INSTALL_ROOT)/usr/include/ptsocket/
+	-$(INSTALL_FILE) /home/robin/libptsocket/ptsocket/ptsocket.h $(INSTALL_ROOT)/usr/include/ptsocket/
+	-$(INSTALL_FILE) /home/robin/libptsocket/ptsocket/libptsocket_global.h $(INSTALL_ROOT)/usr/include/ptsocket/
+	-$(INSTALL_FILE) /home/robin/libptsocket/ptsocket/ptserver.h $(INSTALL_ROOT)/usr/include/ptsocket/
+	-$(INSTALL_FILE) /home/robin/libptsocket/ptsocket/broadcast.h $(INSTALL_ROOT)/usr/include/ptsocket/
 
 
 uninstall_headers:  FORCE
 	-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/ptsocket/ptsocket.h 
 	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/ptsocket/libptsocket_global.h 
-	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/ptsocket/ptserver.h
+	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/ptsocket/ptserver.h 
+	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/ptsocket/broadcast.h
 	-$(DEL_DIR) $(INSTALL_ROOT)/usr/include/ptsocket/ 
 
 

ptsocket/broadcast.cpp

@@ -0,0 +1,103 @@
+#include "broadcast.h"
+
+Broadcast::Broadcast(bool isServer, QObject* p) : QObject(p)
+{
+	m_isServer = isServer;
+	m_server = new QUdpSocket(this);
+	connect(m_server, SIGNAL(readyRead()), this, SLOT(readyRead()));
+	connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(clearData()));
+	connect(&m_bcTimer, SIGNAL(timeout()), this, SLOT(broadcastClient()));
+	m_timeoutTimer.setSingleShot(true);
+	m_bcTimer.setSingleShot(true);
+	setTimeout(2500);
+	setBroadcastInterval(5000);
+}
+
+QString Broadcast::getError() const
+{
+	return m_server->errorString();
+}
+
+bool Broadcast::isServer() const
+{
+	return m_isServer;
+}
+
+QByteArray Broadcast::clientData()
+{
+	return PTSocket::handshakeData() + "bcastc";
+}
+
+QByteArray Broadcast::serverData()
+{
+	return PTSocket::handshakeData() + "bcasts";
+}
+
+void Broadcast::setTimeout(int t)
+{
+	if(m_timeoutTimer.isActive())
+		m_timeoutTimer.start(t);
+	else
+		m_timeoutTimer.setInterval(t);
+}
+
+void Broadcast::setBroadcastInterval(int t)
+{
+	if(m_bcTimer.isActive())
+		m_bcTimer.start(t);
+	else
+		m_bcTimer.setInterval(t);
+}
+
+bool Broadcast::start(int port, int r, QHostAddress ad)
+{
+	m_remotePort = r;
+	bool ok = m_server->bind(ad, port);
+	if(m_isServer)
+		m_server->writeDatagram(serverData(), QHostAddress::Broadcast, m_remotePort);
+	else
+		broadcastClient();
+	return ok;
+}
+
+void Broadcast::broadcastClient()
+{
+	m_server->writeDatagram(clientData(), QHostAddress::Broadcast, m_remotePort);
+//	m_bcTimer.start();
+}
+
+void Broadcast::readyRead()
+{
+	while(m_server->hasPendingDatagrams())
+	{
+		QByteArray data;
+		data.resize(m_server->pendingDatagramSize());
+		QHostAddress host;
+		quint16 port = 0;
+		m_server->readDatagram(data.data(), data.size(), &host, &port);
+		BcClient client(host.toIPv4Address(), port);
+		m_data[client].append(data);
+		if(m_isServer)
+		{
+			if(m_data[client].size() < clientData().size())
+				continue;
+			if(m_data[client] == clientData())
+				m_server->writeDatagram(serverData(), QHostAddress(client.first), m_remotePort);
+			m_data.remove(client);
+		}
+		else
+		{
+			if(m_data[client].size() < serverData().size())
+				continue;
+			if(m_data[client] == serverData())
+				emit serverDiscovered(QHostAddress(client.first), client.second);
+			m_data.remove(client);
+		}
+	}
+	m_timeoutTimer.start();
+}
+
+void Broadcast::clearData()
+{
+	m_data.clear();
+}

ptsocket/broadcast.h

@@ -0,0 +1,43 @@
+#ifndef BROADCAST_H
+#define BROADCAST_H
+
+#include <QUdpSocket>
+#include <QPair>
+#include "ptsocket.h"
+#include "libptsocket_global.h"
+
+typedef QPair<quint32, quint16> BcClient;
+
+class LIBPTSOCKETSHARED_EXPORT Broadcast : public QObject
+{
+	Q_OBJECT
+public:
+	Broadcast(bool isServer, QObject* p = 0);
+	bool isServer() const;
+	QString getError() const;
+	static QByteArray clientData();
+	static QByteArray serverData();
+
+signals:
+	void serverDiscovered(QHostAddress, quint16);
+
+public slots:
+	void setTimeout(int t);
+	void setBroadcastInterval(int i);
+	bool start(int port, int r, QHostAddress ad = QHostAddress::Any);
+	void broadcastClient();
+
+private slots:
+	void readyRead();
+	void clearData();
+
+private:
+	QUdpSocket* m_server;
+	bool m_isServer;
+	QTimer m_timeoutTimer;
+	QTimer m_bcTimer;
+	QMap<BcClient, QByteArray> m_data;
+	int m_remotePort;
+};
+
+#endif

ptsocket/ptsocket.cpp

@@ -12,7 +12,11 @@ PTSocket::PTSocket(QObject* p) : QTcpSocket(p)
     m_timeoutTimer.setSingleShot(true);
     setTimeout(5000);
     m_pingTimer.setSingleShot(true);
+#ifdef PT_DEBUG
     setPingInterval(1000 * 7);
+#else
+    setPingInterval(1000 * 60);
+#endif
     m_state = Disconnected;
     m_isServerSide = false;
     connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(m_timedout()));

ptsocket/ptsocket.pro

@@ -5,8 +5,8 @@ TARGET = ptsocket
 TEMPLATE = lib
 DEFINES += LIBPTSOCKET_LIBRARY
 
-SOURCES += ptsocket.cpp ptserver.cpp
-HEADERS += ptsocket.h libptsocket_global.h ptserver.h
+SOURCES += ptsocket.cpp ptserver.cpp broadcast.cpp
+HEADERS += ptsocket.h libptsocket_global.h ptserver.h broadcast.h
 
 unix:!symbian {
     maemo5 {
@@ -19,3 +19,5 @@ unix:!symbian {
     }
     INSTALLS += target
 }
+
+VERSION = 1.5.0

tests/Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: tests
-# Generated by qmake (2.01a) (Qt 4.8.2) on: mer. janv. 1 15:51:37 2014
+# Generated by qmake (2.01a) (Qt 4.8.2) on: jeu. janv. 2 15:46:24 2014
 # Project:  tests.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile tests.pro
@@ -10,13 +10,13 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_WEBKIT -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES       = -DQT_WEBKIT -DPT_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -m64 -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -m64 -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4 -I../ptsocket -I.
 LINK          = g++
 LFLAGS        = -m64
-LIBS          = $(SUBLIBS)  -L/usr/lib/x86_64-linux-gnu -L/pxeroot/root/share/libptsocket/tests/../ptsocket/ -lptsocket -lQtNetwork -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib/x86_64-linux-gnu -L/home/robin/libptsocket/tests/../ptsocket/ -lptsocket -lQtNetwork -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -44,10 +44,14 @@ OBJECTS_DIR   = ./
 ####### Files
 
 SOURCES       = main.cpp \
-		test.cpp moc_test.cpp
+		test.cpp \
+		bctest.cpp moc_test.cpp \
+		moc_bctest.cpp
 OBJECTS       = main.o \
 		test.o \
-		moc_test.o
+		bctest.o \
+		moc_test.o \
+		moc_bctest.o
 DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
 		/usr/share/qt4/mkspecs/common/gcc-base.conf \
@@ -169,7 +173,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) .tmp/tests1.0.0 || $(MKDIR) .tmp/tests1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tests1.0.0/ && $(COPY_FILE) --parents test.h .tmp/tests1.0.0/ && $(COPY_FILE) --parents main.cpp test.cpp .tmp/tests1.0.0/ && (cd `dirname .tmp/tests1.0.0` && $(TAR) tests1.0.0.tar tests1.0.0 && $(COMPRESS) tests1.0.0.tar) && $(MOVE) `dirname .tmp/tests1.0.0`/tests1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tests1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tests1.0.0/ && $(COPY_FILE) --parents test.h bctest.h .tmp/tests1.0.0/ && $(COPY_FILE) --parents main.cpp test.cpp bctest.cpp .tmp/tests1.0.0/ && (cd `dirname .tmp/tests1.0.0` && $(TAR) tests1.0.0.tar tests1.0.0 && $(COMPRESS) tests1.0.0.tar) && $(MOVE) `dirname .tmp/tests1.0.0`/tests1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tests1.0.0
 
 
 clean:compiler_clean 
@@ -190,15 +194,21 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_test.cpp
+compiler_moc_header_make_all: moc_test.cpp moc_bctest.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_test.cpp
+	-$(DEL_FILE) moc_test.cpp moc_bctest.cpp
 moc_test.cpp: ../ptsocket/ptserver.h \
 		../ptsocket/libptsocket_global.h \
 		../ptsocket/ptsocket.h \
 		test.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) test.h -o moc_test.cpp
 
+moc_bctest.cpp: ../ptsocket/broadcast.h \
+		../ptsocket/ptsocket.h \
+		../ptsocket/libptsocket_global.h \
+		bctest.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) bctest.h -o moc_bctest.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -221,7 +231,9 @@ compiler_clean: compiler_moc_header_clean
 main.o: main.cpp test.h \
 		../ptsocket/ptserver.h \
 		../ptsocket/libptsocket_global.h \
-		../ptsocket/ptsocket.h
+		../ptsocket/ptsocket.h \
+		bctest.h \
+		../ptsocket/broadcast.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
 
 test.o: test.cpp test.h \
@@ -230,9 +242,18 @@ test.o: test.cpp test.h \
 		../ptsocket/ptsocket.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o test.o test.cpp
 
+bctest.o: bctest.cpp bctest.h \
+		../ptsocket/broadcast.h \
+		../ptsocket/ptsocket.h \
+		../ptsocket/libptsocket_global.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o bctest.o bctest.cpp
+
 moc_test.o: moc_test.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_test.o moc_test.cpp
 
+moc_bctest.o: moc_bctest.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_bctest.o moc_bctest.cpp
+
 ####### Install
 
 install:   FORCE

tests/main.cpp

@@ -1,13 +1,50 @@
 #include <QCoreApplication>
+#include <QStringList>
+#include <iostream>
 
 #include "test.h"
+#include "bctest.h"
 
 int main(int argc, char *argv[])
 {
+#ifdef PT_DEBUG
+	std::cout<<"Debug mode"<<std::endl;
+#else
+	std::cout<<"Release mode"<<std::endl;
+#warning PTSocket is not in debug mode
+#endif
+
 	QCoreApplication a(argc, argv);
-    Test t;
-    t.testListen(6950);
-    t.test0IntConvert();
-	
+	bool pt = false, bc = false;
+	if(qApp->arguments().size() >= 2)
+	{
+		if(qApp->arguments().at(1) == "-bc")
+			bc = true;
+		else if(qApp->arguments().at(1) == "-pt")
+			pt = true;
+		else
+		{
+			std::cout<<"Usage: tests -bc|-pt"<<std::endl;
+			return 1;
+		}
+	}
+	else
+	{
+		std::cout<<"Usage: tests -bc|-pt"<<std::endl;
+		return 1;
+	}
+
+	BcTest bct;
+	Test t;
+	if(bc)
+	{
+		bct.test();
+	}
+	else if(pt)
+	{
+		t.testListen(6950);
+		t.test0IntConvert();
+	}
+
 	return a.exec();
 }

tests/test.cpp

@@ -2,12 +2,6 @@
 
 Test::Test(QObject *parent) : QObject(parent)
 {
-#ifdef PT_DEBUG
-    qDebug()<<"Debug mode";
-#else
-    qDebug()<<"Release mode";
-#warning PTSocket is not in debug mode
-#endif
     m_serv = new PTServer(this);
     m_timeoutTimer.setSingleShot(true);
     connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(timedout()));

tests/tests.pro

@@ -7,8 +7,8 @@ CONFIG -= app_bundle
 CONFIG += debug
 include(../commons.pri)
 
-SOURCES += main.cpp test.cpp
-HEADERS += test.h
+SOURCES += main.cpp test.cpp bctest.cpp
+HEADERS += test.h bctest.h
 
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../ptsocket/release/ -lptsocket
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../ptsocket/debug/ -lptsocket
@@ -16,4 +16,3 @@ else:unix:!macx: LIBS += -L$$OUT_PWD/../ptsocket/ -lptsocket
 
 INCLUDEPATH += $$PWD/../ptsocket
 DEPENDPATH += $$PWD/../ptsocket
-