Fixes for #355

Author: nkolban

cpp_utils/HttpServer.cpp

@@ -131,7 +131,7 @@ class HttpServerTask: public Task {
 	void run(void* data) {
 		m_pHttpServer = (HttpServer*)data;             // The passed in data is an instance of an HttpServer.
 		m_pHttpServer->m_socket.setSSL(m_pHttpServer->m_useSSL);
-		m_pHttpServer->m_socket.listen(m_pHttpServer->m_portNumber);
+		m_pHttpServer->m_socket.listen(m_pHttpServer->m_portNumber, false /* is datagram */, true /* Allow address reuse */);
 		ESP_LOGD("HttpServerTask", "Listening on port %d", m_pHttpServer->getPort());
 		Socket clientSocket;
 		while(1) {   // Loop forever.

cpp_utils/Socket.cpp

@@ -259,9 +259,10 @@ bool Socket::isValid() {
  * @param [in] isDatagram True if we are listening on a datagram.  The default is false.
  * @return Returns 0 on success.
  */
-int Socket::listen(uint16_t port, bool isDatagram) {
+int Socket::listen(uint16_t port, bool isDatagram, bool reuseAddress) {
 	ESP_LOGD(LOG_TAG, ">> listen: port: %d, isDatagram: %d", port, isDatagram);
 	createSocket(isDatagram);
+	setReuseAddress(reuseAddress);
 	int rc = bind(port, 0);
 	if (rc != 0) {
 		ESP_LOGE(LOG_TAG, "<< listen: Error in bind: %s", strerror(errno));
@@ -285,14 +286,19 @@ bool Socket::operator <(const Socket& other) const {
 	return m_sock < other.m_sock;
 }
 
-int Socket::setSocketOption(int option, char* value, size_t len)
+
+/**
+ * @brief Set the socket option.
+ */
+int Socket::setSocketOption(int option, void* value, size_t len)
 {
-    int res = setsockopt(m_sock, SOL_SOCKET, option, value, len);
+    int res = ::setsockopt(m_sock, SOL_SOCKET, option, value, len);
     if(res < 0) {
     	ESP_LOGE(LOG_TAG, "%X : %d", option, errno);
     }
     return res;
-}
+} // setSocketOption
+
 
 /**
  * @brief Socket timeout.
@@ -479,6 +485,18 @@ void Socket::sendTo(const uint8_t* data, size_t length, struct sockaddr* pAddr)
 } // sendTo
 
 
+/**
+ * @brief Flag the socket address as re-usable.
+ * @param [in] value True to mark the address as re-usable, false otherwise.
+ */
+void Socket::setReuseAddress(bool value) {
+	ESP_LOGD(LOG_TAG, ">> setReuseAddress: %d", value);
+	int val = value?1:0;
+	setSocketOption(SO_REUSEADDR, &val, sizeof(val));
+	ESP_LOGD(LOG_TAG, "<< setReuseAddress");
+} // setReuseAddress
+
+
 /**
  * @brief Flag the socket as using SSL
  * @param [in] sslValue True if we wish to use SSL.
@@ -651,3 +669,5 @@ SocketInputRecordStreambuf::int_type SocketInputRecordStreambuf::underflow() {
 SocketException::SocketException(int myErrno) {
 	m_errno = myErrno;
 }
+
+

cpp_utils/Socket.h

@@ -68,13 +68,14 @@ class Socket {
 	int  connect(struct in_addr address, uint16_t port);
 	int  connect(char* address, uint16_t port);
 	int  createSocket(bool isDatagram = false);
-	int  setSocketOption(int option, char* value, size_t len);
+	void setReuseAddress(bool value);
+	int  setSocketOption(int option, void* value, size_t len);
 	int  setTimeout(uint32_t seconds);
 	void getBind(struct sockaddr* pAddr);
 	int  getFD() const;
 	bool getSSL() const;
 	bool isValid();
-	int  listen(uint16_t port, bool isDatagram=false);
+	int  listen(uint16_t port, bool isDatagram=false, bool reuseAddress=false);
 	bool operator<(const Socket& other) const;
 	std::string readToDelim(std::string delim);
 	size_t  receive(uint8_t* data, size_t length, bool exact=false);