Rename close function to not clash with linux network close

FujiNetWIFI · Jan 23, 2024 · 0c777cc · 0c777cc
1 parent 9438035
commit 0c777cc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/lib/bus/iwm/Connection.h b/lib/bus/iwm/Connection.h
@@ -17,7 +17,7 @@ class Connection
   virtual void send_data(const std::vector<uint8_t> &data) = 0;
 
   virtual void create_read_channel() = 0;
-  virtual void close() = 0;
+  virtual void close_connection() = 0;
 
   bool is_connected() const { return is_connected_; }
   void set_is_connected(const bool is_connected) { is_connected_ = is_connected; }

diff --git a/lib/bus/iwm/TCPConnection.cpp b/lib/bus/iwm/TCPConnection.cpp
@@ -24,7 +24,7 @@
 // #include "Log.h"
 #include "SLIP.h"
 
-void TCPConnection::close()
+void TCPConnection::close_connection()
 {
   if (socket_ != 0)
   {

diff --git a/lib/bus/iwm/TCPConnection.h b/lib/bus/iwm/TCPConnection.h
@@ -11,7 +11,7 @@ class TCPConnection : public Connection, public std::enable_shared_from_this<TCP
 
 	virtual void send_data(const std::vector<uint8_t>& data) override;
 	virtual void create_read_channel() override;
-	virtual void close() override;
+	virtual void close_connection() override;
 
 	int get_socket() const { return socket_; }
 	void set_socket(int socket) { this->socket_ = socket; }

diff --git a/lib/bus/iwm/iwm_slip.cpp b/lib/bus/iwm/iwm_slip.cpp
@@ -26,13 +26,8 @@
 #else
   #include <arpa/inet.h>
   #include <errno.h>
- #include <sys/socket.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
+  #include <netinet/in.h>
   #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
   #include <unistd.h>
   #define CLOSE_SOCKET close
   #define SHUTDOWN_SOCKET(s) shutdown(s, SHUT_WR)