Add SO_REUSEADDR option to ofxTCPManager and ofxTCPServer. (#5011)

openframeworks · Oct 12, 2019 · d5678cd · d5678cd
1 parent 7c06a8f
commit d5678cd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/addons/ofxNetwork/src/ofxTCPManager.cpp b/addons/ofxNetwork/src/ofxTCPManager.cpp
@@ -145,7 +145,7 @@ bool ofxTCPManager::Listen(int iMaxConnections)
 	return ret;
 }
 
-bool ofxTCPManager::Bind(unsigned short usPort)
+bool ofxTCPManager::Bind(unsigned short usPort, bool bReuse)
 {
 	struct sockaddr_in local;
 	memset(&local, 0, sizeof(sockaddr_in));
@@ -155,6 +155,14 @@ bool ofxTCPManager::Bind(unsigned short usPort)
 	//Port MUST be in Network Byte Order
 	local.sin_port = htons(usPort);
 
+	if (bReuse) {
+		int enable = 1;
+		if (setsockopt(m_hSocket,SOL_SOCKET,SO_REUSEADDR,&enable,sizeof(int)) < 0){
+			ofxNetworkCheckError();
+			return false;
+		}
+	}
+
 	if (::bind(m_hSocket,(struct sockaddr*)&local,sizeof(local))){
 		ofxNetworkCheckError();
 		return false;

diff --git a/addons/ofxNetwork/src/ofxTCPManager.h b/addons/ofxNetwork/src/ofxTCPManager.h
@@ -176,7 +176,7 @@ class ofxTCPManager
 	bool Create();
 	bool Listen(int iMaxConnections);
 	bool Connect(const char *pAddrStr, unsigned short usPort);
-	bool Bind(unsigned short usPort);
+	bool Bind(unsigned short usPort, bool bReuse = false);
 	bool Accept(ofxTCPManager& sock);
 	//sends the data, but it is not guaranteed that really all data will be sent
 	int  Send(const char* pBuff, const int iSize);

diff --git a/addons/ofxNetwork/src/ofxTCPServer.cpp b/addons/ofxNetwork/src/ofxTCPServer.cpp
@@ -39,7 +39,7 @@ bool ofxTCPServer::setup(const ofxTCPSettings &settings){
 		ofLogError("ofxTCPServer") << "setup(): couldn't create server";
 		return false;
 	}
-	if( !TCPServer.Bind(settings.port) ){
+	if( !TCPServer.Bind(settings.port, settings.reuse) ){
 		ofLogError("ofxTCPServer") << "setup(): couldn't bind to port " << settings.port;
 		return false;
 	}

diff --git a/addons/ofxNetwork/src/ofxTCPSettings.h b/addons/ofxNetwork/src/ofxTCPSettings.h
@@ -13,6 +13,7 @@ class ofxTCPSettings {
 	std::string address;
 	int port;
 	bool blocking = false;
+	bool reuse = false;
 
 	std::string messageDelimiter = "[/TCP]";
 

diff --git a/examples/communication/networkTcpServerExample/src/ofApp.cpp b/examples/communication/networkTcpServerExample/src/ofApp.cpp
@@ -11,6 +11,7 @@ void ofApp::setup(){
 
 	// set other options
 	//settings.blocking = false;
+	//settings.reuse = true;
 	//settings.messageDelimiter = "\n";
 
 	TCP.setup(settings);