Changes for #217

Author: nkolban

cpp_utils/HttpServer.cpp

@@ -181,17 +181,16 @@ 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_sockServ.setPort(m_pHttpServer->m_portNumber);
-		m_pHttpServer->m_sockServ.setSSL(m_pHttpServer->m_useSSL);
-		m_pHttpServer->m_sockServ.start();
+		m_pHttpServer->m_socket.setSSL(m_pHttpServer->m_useSSL);
+		m_pHttpServer->m_socket.listen(m_pHttpServer->m_portNumber);
 		ESP_LOGD("HttpServerTask", "Listening on port %d", m_pHttpServer->getPort());
 		Socket clientSocket;
 		while(1) {   // Loop forever.
 
 			ESP_LOGD("HttpServerTask", "Waiting for new peer client");
-			Memory::checkIntegrity();
+			//Memory::checkIntegrity();
 			try {
-				clientSocket = m_pHttpServer->m_sockServ.waitForNewClient();   // Block waiting for a new external client connection.
+				clientSocket = m_pHttpServer->m_socket.accept();   // Block waiting for a new external client connection.
 			}
 			catch(std::exception &e) {
 				ESP_LOGE("HttpServerTask", "Caught an exception waiting for new client!");
@@ -353,7 +352,7 @@ void HttpServer::stop() {
 	// that is listening for incoming connections.  That will then shutdown all the other
 	// activities.
 	ESP_LOGD(LOG_TAG, ">> stop");
-	m_sockServ.stop();
+	m_socket.close();
 	ESP_LOGD(LOG_TAG, "<< stop");
 } // stop
 

cpp_utils/HttpServer.h

@@ -16,7 +16,7 @@
 #include "SockServ.h"
 #include "HttpRequest.h"
 #include "HttpResponse.h"
-#include "SockServ.h"
+//#include "SockServ.h"
 #include <regex>
 
 class HttpServerTask;
@@ -89,7 +89,8 @@ class HttpServer {
 	std::string              m_rootPath;           // Root path into the file system.
 	bool                     m_useSSL;             // Is this server listening on an HTTPS port?
 	bool                     m_directoryListing;   // Should we list directory content?
-	SockServ                 m_sockServ;           // Server socket.
+	//SockServ                 m_sockServ;           // Server socket.
+	Socket                   m_socket;
 }; // HttpServer
 
 #endif /* COMPONENTS_CPP_UTILS_HTTPSERVER_H_ */

cpp_utils/SockServ.cpp

@@ -65,7 +65,7 @@ SockServ::~SockServ() {
 	try {
 		while(1) {
 			ESP_LOGD(LOG_TAG, "Waiting on accept")
-			Socket tempSock = pSockServ->m_serverSocket.accept(pSockServ->getSSL());
+			Socket tempSock = pSockServ->m_serverSocket.accept();
 			if (!tempSock.isValid()) {
 				continue;
 			}

cpp_utils/Socket.cpp

@@ -56,14 +56,12 @@ Socket::~Socket() {
 /**
  * @brief Accept a new socket.
  */
-Socket Socket::accept(bool useSSL) {
+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, useSSL);
+	ESP_LOGD(LOG_TAG, ">> accept: Accepting on %s; sockFd: %d, using SSL: %d", addressToString(&addr).c_str(), m_sock, getSSL());
 
-	struct sockaddr_in clientAddress;
-	socklen_t clientAddressLength = sizeof(clientAddress);
-	int clientSockFD = ::lwip_accept_r(m_sock, (struct sockaddr *)&clientAddress, &clientAddressLength);
+	int clientSockFD = ::lwip_accept_r(m_sock, nullptr, nullptr);
 	if (clientSockFD == -1) {
 		SocketException se(errno);
 		ESP_LOGE(LOG_TAG, "accept(): %s, m_sock=%d", strerror(errno), m_sock);
@@ -73,7 +71,7 @@ Socket Socket::accept(bool useSSL) {
 	ESP_LOGD(LOG_TAG, " - accept: Received new client!: sockFd: %d", clientSockFD);
 	Socket newSocket;
 	newSocket.m_sock = clientSockFD;
-	if (useSSL) {
+	if (getSSL()) {
 		newSocket.setSSL(true);
 		newSocket.m_sslSock.fd = clientSockFD;
 		newSocket.sslHandshake();
@@ -252,7 +250,7 @@ bool Socket::isValid() {
 /**
  * @brief Create a listening socket.
  * @param [in] port The port number to listen upon.
- * @param [in] isDatagram True if we are listening on a datagram.
+ * @param [in] isDatagram True if we are listening on a datagram.  The default is false.
  */
 void Socket::listen(uint16_t port, bool isDatagram) {
 	ESP_LOGD(LOG_TAG, ">> listen: port: %d, isDatagram: %d", port, isDatagram);

cpp_utils/Socket.h

@@ -56,7 +56,7 @@ class Socket {
 	Socket();
 	virtual ~Socket();
 
-	Socket accept(bool useSSL=false);
+	Socket accept();
 	static std::string addressToString(struct sockaddr* addr);
 	void bind(uint16_t port, uint32_t address);
 	void close();
@@ -99,7 +99,7 @@ class SocketInputRecordStreambuf : public std::streambuf {
 	~SocketInputRecordStreambuf();
 	int_type underflow();
 private:
-	char *m_buffer;
+	char*   m_buffer;
 	Socket  m_socket;
 	size_t  m_dataLength;
 	size_t  m_bufferSize;