Merge pull request nkolban#324 from Stormhand/master

nkolban · web-flow · commit 3ec8ea424848 · 2017-12-28T08:59:02.000-06:00
Add timeout related to issue nkolban#322
diff --git a/cpp_utils/HttpServer.cpp b/cpp_utils/HttpServer.cpp
@@ -28,6 +28,7 @@ static const char* LOG_TAG = "HttpServer";
 HttpServer::HttpServer() {
 	m_fileBufferSize = 4*1024;    // Default size of the file buffer.
 	m_portNumber = 80;            // The default port number.
+	m_clientTimeout = 5;            // The default timeout 5 seconds.
 	m_rootPath   = "";            // The default path.
 	m_useSSL     = false;         // Default SSL is no.
 	setDirectoryListing(false);   // Default directory listing is disabled.
@@ -159,6 +160,7 @@ class HttpServerTask: public Task {
 			//Memory::checkIntegrity();
 			try {
 				clientSocket = m_pHttpServer->m_socket.accept();   // Block waiting for a new external client connection.
+				clientSocket.setTimeout(m_pHttpServer->getClientTimeout());
 			}
 			catch(std::exception &e) {
 				ESP_LOGE("HttpServerTask", "Caught an exception waiting for new client!");
@@ -329,6 +331,22 @@ void HttpServer::listDirectory(std::string path, HttpResponse& response) {
 	response.close();
 } // listDirectory
 
+/**
+ * @brief Set different socket timeout for new connections.
+ * @param [in] use Set to true to enable directory listing.
+ */
+void HttpServer::setClientTimeout(uint32_t timeout) {
+	m_clientTimeout = timeout;
+}
+
+/**
+ * @brief Get current socket's timeout for new connections.
+ * @param [in] use Set to true to enable directory listing.
+ */
+uint32_t HttpServer::getClientTimeout() {
+	return m_clientTimeout;
+}
+
 /**
  * @brief Set whether or not we will list directories.
  * @param [in] use Set to true to enable directory listing.
diff --git a/cpp_utils/HttpServer.h b/cpp_utils/HttpServer.h
@@ -81,6 +81,8 @@ class HttpServer {
 	void        setDirectoryListing(bool use);             // Should we list the content of directories?
 	void        setFileBufferSize(size_t fileBufferSize);  // Set the size of the file buffer
 	void        setRootPath(std::string path);             // Set the root of the file system path.
+	void 		setClientTimeout(uint32_t timeout);			// Set client's socket timeout
+	uint32_t	getClientTimeout();							// Get client's socket timeout
 	void        start(uint16_t portNumber, bool useSSL=false);
 	void        stop();          // Stop a previously started server.
 
@@ -95,6 +97,7 @@ class HttpServer {
 	std::string              m_rootPath;           // Root path into the file system.
 	Socket                   m_socket;
 	bool                     m_useSSL;             // Is this server listening on an HTTPS port?
+	uint32_t				 m_clientTimeout;	   // Default Timeout
 }; // HttpServer
 
 #endif /* COMPONENTS_CPP_UTILS_HTTPSERVER_H_ */
diff --git a/cpp_utils/Socket.cpp b/cpp_utils/Socket.cpp
@@ -60,8 +60,10 @@ Socket Socket::accept() {
 	struct sockaddr addr;
 	getBind(&addr);
 	ESP_LOGD(LOG_TAG, ">> accept: Accepting on %s; sockFd: %d, using SSL: %d", addressToString(&addr).c_str(), m_sock, getSSL());
-
-	int clientSockFD = ::lwip_accept_r(m_sock, nullptr, nullptr);
+	struct sockaddr_in client_addr;
+	socklen_t sin_size;
+	int clientSockFD = ::lwip_accept_r(m_sock,  (struct sockaddr *)&client_addr, &sin_size);
+	printf("------> new connection client %s:%d\n", inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
 	if (clientSockFD == -1) {
 		SocketException se(errno);
 		ESP_LOGE(LOG_TAG, "accept(): %s, m_sock=%d", strerror(errno), m_sock);
@@ -272,6 +274,30 @@ bool Socket::operator <(const Socket& other) const {
 	return m_sock < other.m_sock;
 }
 
+int Socket::setSocketOption(int option, char* value, size_t len)
+{
+    int res = setsockopt(m_sock, SOL_SOCKET, option, value, len);
+    if(res < 0) {
+    	ESP_LOGE(LOG_TAG, "%X : %d", option, errno);
+    }
+    return res;
+}
+
+/**
+ * @brief Socket timeout.
+ * @param [in] seconds to wait.
+ */
+int Socket::setTimeout(uint32_t seconds)
+{
+    struct timeval tv;
+    tv.tv_sec = seconds;
+    tv.tv_usec = 0;
+    if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
+        return -1;
+    }
+    return setSocketOption(SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
+}
+
 
 std::string Socket::readToDelim(std::string delim) {
 	std::string ret;
diff --git a/cpp_utils/Socket.h b/cpp_utils/Socket.h
@@ -68,6 +68,8 @@ 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);
+	int  setTimeout(uint32_t seconds);
 	void getBind(struct sockaddr* pAddr);
 	int  getFD() const;
 	bool getSSL() const;
