From d3a77f38d4073e6238d634863856c996038096b1 Mon Sep 17 00:00:00 2001 From: lingel <2894340009@qq.com> Date: Fri, 24 May 2024 13:59:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E5=A4=9A=E7=BA=BF=E7=A8=8B=E8=AE=A9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E8=83=BD=E5=A4=9F=E5=90=91=E5=A4=9A=E4=B8=AA=E7=BD=91?= =?UTF-8?q?=E5=85=B3=E5=BB=BA=E7=AB=8B=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connecter_controler.cpp | 0 .../connecter_gateway.cpp | 0 .../interface_cpptovue.cpp | 0 .../message_handler.cpp | 0 src/controller_ubuntu/connecter_controler.cpp | 72 ++++++++++++++++ src/controller_ubuntu/connecter_gateway.cpp | 86 +++++++++++++++++++ 6 files changed, 158 insertions(+) rename src/{controler => controler_windows}/connecter_controler.cpp (100%) rename src/{controler => controler_windows}/connecter_gateway.cpp (100%) rename src/{controler => controler_windows}/interface_cpptovue.cpp (100%) rename src/{controler => controler_windows}/message_handler.cpp (100%) create mode 100644 src/controller_ubuntu/connecter_controler.cpp create mode 100644 src/controller_ubuntu/connecter_gateway.cpp diff --git a/src/controler/connecter_controler.cpp b/src/controler_windows/connecter_controler.cpp similarity index 100% rename from src/controler/connecter_controler.cpp rename to src/controler_windows/connecter_controler.cpp diff --git a/src/controler/connecter_gateway.cpp b/src/controler_windows/connecter_gateway.cpp similarity index 100% rename from src/controler/connecter_gateway.cpp rename to src/controler_windows/connecter_gateway.cpp diff --git a/src/controler/interface_cpptovue.cpp b/src/controler_windows/interface_cpptovue.cpp similarity index 100% rename from src/controler/interface_cpptovue.cpp rename to src/controler_windows/interface_cpptovue.cpp diff --git a/src/controler/message_handler.cpp b/src/controler_windows/message_handler.cpp similarity index 100% rename from src/controler/message_handler.cpp rename to src/controler_windows/message_handler.cpp diff --git a/src/controller_ubuntu/connecter_controler.cpp b/src/controller_ubuntu/connecter_controler.cpp new file mode 100644 index 0000000..39496fd --- /dev/null +++ b/src/controller_ubuntu/connecter_controler.cpp @@ -0,0 +1,72 @@ +#include +#include +#include +#include +#include +#include +#include + +#define BUFFER_SIZE 1024 + +void connect_to_gateway(const std::string& ip, int port) { + int sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock == -1) { + std::cerr << "Could not create socket" << std::endl; + return; + } + + struct sockaddr_in server_addr; + server_addr.sin_family = AF_INET; + server_addr.sin_port = htons(port); + + if (inet_aton(ip.c_str(), &server_addr.sin_addr) == 0) { + std::cerr << "Invalid IP address" << std::endl; + close(sock); + return; + } + + if (connect(sock, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { + std::cerr << "Connection to the server failed" << std::endl; + close(sock); + return; + } + + std::cout << "Connected to gateway at " << ip << ":" << port << std::endl; + + char buffer[BUFFER_SIZE]; + // 发送测试消息 + std::string message = "Hello, Gateway!"; + if (send(sock, message.c_str(), message.size(), 0) < 0) { + std::cerr << "Send failed" << std::endl; + close(sock); + return; + } + + // 接收网关响应 + int nbytes = recv(sock, buffer, BUFFER_SIZE, 0); + if (nbytes < 0) { + std::cerr << "Recv failed" << std::endl; + } else if (nbytes == 0) { + std::cout << "Gateway disconnected" << std::endl; + } else { + std::cout << "Gateway said: " << buffer << std::endl; + } + + close(sock); +} + +int main() { + std::string ip; + int port; + + std::cout << "Enter the gateway IP address: "; + std::cin >> ip; + std::cout << "Enter the gateway port: "; + std::cin >> port; + + // 多线程连接网关 + std::thread client_thread(&connect_to_gateway, ip, port); + client_thread.join(); // 等待连接完成 + + return 0; +} \ No newline at end of file diff --git a/src/controller_ubuntu/connecter_gateway.cpp b/src/controller_ubuntu/connecter_gateway.cpp new file mode 100644 index 0000000..b6ba4d7 --- /dev/null +++ b/src/controller_ubuntu/connecter_gateway.cpp @@ -0,0 +1,86 @@ +#include +#include +#include +#include +#include +#include +#include + +#define PORT 8080 +#define MAX_CLIENTS 5 +#define BUFFER_SIZE 1024 + +// 声明 handle_client 函数 +void handle_client(int client_socket); + +int main() { + int server_fd, new_socket; + struct sockaddr_in server_addr, client_addr; + socklen_t client_len = sizeof(client_addr); + char buffer[BUFFER_SIZE]; + int opt = 1; + + // 创建套接字 + server_fd = socket(AF_INET, SOCK_STREAM, 0); + if (server_fd < 0) { + perror("socket creation failed"); + exit(EXIT_FAILURE); + } + + // 设置选项，允许重用地址 + if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) { + perror("setsockopt failed"); + exit(EXIT_FAILURE); + } + + server_addr.sin_family = AF_INET; + server_addr.sin_addr.s_addr = INADDR_ANY; + server_addr.sin_port = htons(PORT); + + // 绑定 + if (bind(server_fd, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { + perror("bind failed"); + exit(EXIT_FAILURE); + } + + // 监听 + if (listen(server_fd, MAX_CLIENTS) < 0) { + perror("listen failed"); + exit(EXIT_FAILURE); + } + + std::cout << "Server listening on port " << PORT << std::endl; + + while (true) { + client_len = sizeof(client_addr); + new_socket = accept(server_fd, (struct sockaddr *)&client_addr, &client_len); + if (new_socket < 0) { + perror("accept failed"); + exit(EXIT_FAILURE); + } + + std::cout << "New client connected from " << inet_ntoa(client_addr.sin_addr) << " port " << ntohs(client_addr.sin_port) << std::endl; + + // 创建并启动线程处理客户端 + std::thread(handle_client, new_socket).detach(); + } + + close(server_fd); + return 0; +} + +// 定义 handle_client 函数 +void handle_client(int client_socket) { + while (true) { + char buffer[BUFFER_SIZE]; + memset(buffer, 0, BUFFER_SIZE); // 清空缓冲区 + int nbytes = read(client_socket, buffer, BUFFER_SIZE); + if (nbytes <= 0) { + std::cout << "Client disconnected." << std::endl; + close(client_socket); + break; + } + std::cout << "Received message from client: " << buffer << std::endl; + // 这里可以添加更多的处理逻辑 + } +} \ No newline at end of file -- 2.34.1 From f1e94afb24f6ca3ffe595d5e9b2f2132bd0d29dc Mon Sep 17 00:00:00 2001 From: lingel <2894340009@qq.com> Date: Fri, 24 May 2024 14:42:45 +0800 Subject: [PATCH 2/3] update --- src/controller_ubuntu/connecter_controler.cpp | 113 ++++++++++++------ 1 file changed, 78 insertions(+), 35 deletions(-) diff --git a/src/controller_ubuntu/connecter_controler.cpp b/src/controller_ubuntu/connecter_controler.cpp index 39496fd..7d1a2f9 100644 --- a/src/controller_ubuntu/connecter_controler.cpp +++ b/src/controller_ubuntu/connecter_controler.cpp @@ -1,6 +1,8 @@ #include -#include #include +#include +#include +#include #include #include #include @@ -8,65 +10,106 @@ #define BUFFER_SIZE 1024 -void connect_to_gateway(const std::string& ip, int port) { +std::vector threads; // 存储所有连接线程 +std::map sockets; // 存储套接字 +std::mutex sockets_mutex; // 用于同步访问 sockets + +// 维护连接的函数 +void KeepConnection(int sock) { + char buffer[BUFFER_SIZE]; + int nbytes; + while (true) { + nbytes = recv(sock, buffer, BUFFER_SIZE, 0); + if (nbytes <= 0) { + std::cout << "Gateway disconnected" << std::endl; + break; + } + std::cout << "Received from gateway (Socket " << sock << "): " << buffer << std::endl; + // 可以添加更多的处理逻辑 + } + + { + std::lock_guard lock(sockets_mutex); + sockets.erase(sock); // 从集合中移除套接字 + } + close(sock); +} + +// 连接到网关的函数 +void ConnectToGateway(const std::string& ip, int port) { int sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock == -1) { - std::cerr << "Could not create socket" << std::endl; + if (sock < 0) { + perror("Could not create socket"); return; } struct sockaddr_in server_addr; server_addr.sin_family = AF_INET; server_addr.sin_port = htons(port); - - if (inet_aton(ip.c_str(), &server_addr.sin_addr) == 0) { - std::cerr << "Invalid IP address" << std::endl; + if (inet_pton(AF_INET, ip.c_str(), &server_addr.sin_addr) <= 0) { + perror("Invalid address"); close(sock); return; } if (connect(sock, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { - std::cerr << "Connection to the server failed" << std::endl; + perror("Connection to the server failed"); close(sock); return; } - std::cout << "Connected to gateway at " << ip << ":" << port << std::endl; - - char buffer[BUFFER_SIZE]; - // 发送测试消息 - std::string message = "Hello, Gateway!"; - if (send(sock, message.c_str(), message.size(), 0) < 0) { - std::cerr << "Send failed" << std::endl; - close(sock); - return; + { + std::lock_guard lock(sockets_mutex); + sockets[sock] = 1; // 将套接字添加到集合中 } - // 接收网关响应 - int nbytes = recv(sock, buffer, BUFFER_SIZE, 0); - if (nbytes < 0) { - std::cerr << "Recv failed" << std::endl; - } else if (nbytes == 0) { - std::cout << "Gateway disconnected" << std::endl; - } else { - std::cout << "Gateway said: " << buffer << std::endl; - } + std::cout << "Connected to gateway at " << ip << ":" << port << " (Socket " << sock << ")" << std::endl; - close(sock); + // 在新线程中维护连接 + threads.emplace_back(KeepConnection, sock); } + int main() { - std::string ip; + std::string command, ip; int port; + bool connecting = false; + + while (true) { + std::cout << "Enter command (connect/exitconnect/exit): "; + std::cin >> command; - std::cout << "Enter the gateway IP address: "; - std::cin >> ip; - std::cout << "Enter the gateway port: "; - std::cin >> port; + if (command == "connect") { + connecting = true; + std::cout << "Enter the gateway IP address: "; + std::cin >> ip; + std::cout << "Enter the gateway port: "; + std::cin >> port; + ConnectToGateway(ip, port); + } else if (command == "exitconnect") { + connecting = false; + std::cout << "Exiting connect mode." << std::endl; + } else if (command == "exit") { + if (connecting) { + // 等待所有连接线程结束 + for (auto& thread : threads) { + thread.join(); + } + // 清空线程向量 + threads.clear(); + } + std::cout << "Exiting program." << std::endl; + break; + } else { + std::cout << "Unknown command" << std::endl; + } + } - // 多线程连接网关 - std::thread client_thread(&connect_to_gateway, ip, port); - client_thread.join(); // 等待连接完成 + // 关闭所有套接字 + for (auto& sock_pair : sockets) { + close(sock_pair.first); + } + sockets.clear(); return 0; } \ No newline at end of file -- 2.34.1 From ad162979c7cfe02c8c9e333c5dd5f55593a2b5a4 Mon Sep 17 00:00:00 2001 From: lingel <2894340009@qq.com> Date: Fri, 24 May 2024 16:20:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86controller?= =?UTF-8?q?=E4=B8=ADhttp=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84=E5=BB=BA?= =?UTF-8?q?=E7=AB=8B=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AD=A5=E6=98=AF=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E8=AE=A9=E5=89=8D=E7=AB=AF=E9=80=9A=E8=BF=87=E8=BF=99?= =?UTF-8?q?=E4=B8=AAhttp=E6=9C=8D=E5=8A=A1=E6=9D=A5=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E7=9A=84=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8Acontroller=E5=AF=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controller_ubuntu/connecter_controler.cpp | 211 ++++++++++++++++-- 1 file changed, 192 insertions(+), 19 deletions(-) diff --git a/src/controller_ubuntu/connecter_controler.cpp b/src/controller_ubuntu/connecter_controler.cpp index 7d1a2f9..6b0d54c 100644 --- a/src/controller_ubuntu/connecter_controler.cpp +++ b/src/controller_ubuntu/connecter_controler.cpp @@ -3,29 +3,33 @@ #include #include #include +#include #include #include #include #include +#include #define BUFFER_SIZE 1024 +#define HTTP_SERVER_PORT 8080 std::vector threads; // 存储所有连接线程 std::map sockets; // 存储套接字 std::mutex sockets_mutex; // 用于同步访问 sockets +std::atomic exit_flag(false); // 原子退出标志 + // 维护连接的函数 void KeepConnection(int sock) { char buffer[BUFFER_SIZE]; int nbytes; - while (true) { + while (!exit_flag) { nbytes = recv(sock, buffer, BUFFER_SIZE, 0); if (nbytes <= 0) { std::cout << "Gateway disconnected" << std::endl; break; } std::cout << "Received from gateway (Socket " << sock << "): " << buffer << std::endl; - // 可以添加更多的处理逻辑 } { @@ -34,7 +38,6 @@ void KeepConnection(int sock) { } close(sock); } - // 连接到网关的函数 void ConnectToGateway(const std::string& ip, int port) { int sock = socket(AF_INET, SOCK_STREAM, 0); @@ -69,47 +72,217 @@ void ConnectToGateway(const std::string& ip, int port) { threads.emplace_back(KeepConnection, sock); } +// 处理HTTP请求的函数 +void HandleHttpRequest(int client_socket) { + char buffer[BUFFER_SIZE]; + int bytes_read = recv(client_socket, buffer, sizeof(buffer), 0); + if (bytes_read <= 0) { + close(client_socket); + return; + } + + // 简单解析HTTP请求 + std::string http_request(buffer, bytes_read); + std::string ip; + int port; + + // 寻找IP和端口号 + auto host_pos = http_request.find("Host: "); + if (host_pos != std::string::npos) { + auto start = host_pos + std::string("Host: ").size(); + ip = http_request.substr(start, http_request.find("\r\n", start) - start); + } + + auto content_length_pos = http_request.find("Content-Length:"); + if (content_length_pos != std::string::npos) { + auto start = content_length_pos + std::string("Content-Length: ").size(); + int length = std::stoi(http_request.substr(start, http_request.find("\r\n", start) - start)); + if (length > 0) { + char* content = new char[length]; + bytes_read = recv(client_socket, content, length, 0); + if (bytes_read > 0) { + // 解析JSON内容（假设前端发送的是JSON格式） + // 这里需要添加JSON解析逻辑来提取IP和端口 + // 示例：{"ip":"192.168.1.1","port":8080} + // 可以使用第三方库如nlohmann/json来解析JSON + + // 假设解析后得到ip和port + // ConnectToGateway(ip, port); + + delete[] content; + } + } + } + + // 发送HTTP响应 + std::string response = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"; + send(client_socket, response.c_str(), response.size(), 0); + close(client_socket); +} + +// 启动HTTP服务器的函数 +void StartHttpServer() { + int http_server_socket = socket(AF_INET, SOCK_STREAM, 0); + if (http_server_socket < 0) { + perror("Could not create HTTP server socket"); + return; + } + + int opt = 1; + if (setsockopt(http_server_socket, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) { + perror("Setsockopt failed"); + close(http_server_socket); + return; + } + + struct sockaddr_in server_addr; + server_addr.sin_family = AF_INET; + server_addr.sin_addr.s_addr = INADDR_ANY; + server_addr.sin_port = htons(HTTP_SERVER_PORT); + + if (bind(http_server_socket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { + perror("Bind failed"); + close(http_server_socket); + return; + } + + if (listen(http_server_socket, 5) < 0) { + perror("Listen failed"); + close(http_server_socket); + return; + } + + std::cout << "HTTP server listening on port " << HTTP_SERVER_PORT << std::endl; + + while (!exit_flag) { + int client_socket = accept(http_server_socket, NULL, NULL); + if (client_socket < 0) { + perror("Accept failed"); + continue; + } + + threads.emplace_back(HandleHttpRequest, client_socket); + } + + close(http_server_socket); +} int main() { + // threads.emplace_back(StartHttpServer); + + // std::string command, ip; + // int port; + // bool in_connect_mode = false; + // std::cout << "Enter command (connect/exit): "; + // while (true) { + + // if (in_connect_mode) + // { + // std::cout << "continue connect or not ? (y or n) "; + // std::cin >> command; + // if(command=="y"){ + // std::cout << "Enter the gateway IP address: "; + // std::cin >> ip; + // std::cout << "Enter the gateway port: "; + // std::cin >> port; + // ConnectToGateway(ip, port); + // } + // else { + // in_connect_mode = false; // 退出连接模式 + // std::cout << "Exiting connect mode." << std::endl; + // } + // } + // else{ + // std::cout << "Enter command (connect/exit): "; + // std::cin>>command; + // if (command == "connect") { + // if (in_connect_mode) { + // std::cout << "Already in connect mode." << std::endl; + // continue; + // } + // in_connect_mode = true; // 进入连接模式 + // std::cout << "Enter the gateway IP address: "; + // std::cin >> ip; + // std::cout << "Enter the gateway port: "; + // std::cin >> port; + // ConnectToGateway(ip, port); + // } else if (command == "exit") { + // exit_flag = true; // 设置退出标志 + // std::cout << "Exiting program." << std::endl; + // // 关闭所有套接字 + // for (auto& sock_pair : sockets) { + // shutdown(sock_pair.first, SHUT_RDWR); // 关闭套接字的发送和接收 + // close(sock_pair.first); + // } + // sockets.clear(); + // std::cout << "sockets.clear" << std::endl; + // // 等待所有线程结束 + // for (auto& thread : threads) { + // if (thread.joinable()) { + // thread.join(); + // } + // } + // threads.clear(); + // break; // 退出主循环 + // } else { + // std::cout << "Unknown command" << std::endl; + // } + // } + // } + // std::cout<<"out"<> command; if (command == "connect") { - connecting = true; + if (in_connect_mode) { + std::cout << "Already in connect mode." << std::endl; + continue; + } + in_connect_mode = true; std::cout << "Enter the gateway IP address: "; std::cin >> ip; std::cout << "Enter the gateway port: "; std::cin >> port; ConnectToGateway(ip, port); - } else if (command == "exitconnect") { - connecting = false; - std::cout << "Exiting connect mode." << std::endl; } else if (command == "exit") { - if (connecting) { - // 等待所有连接线程结束 - for (auto& thread : threads) { - thread.join(); - } - // 清空线程向量 - threads.clear(); - } - std::cout << "Exiting program." << std::endl; - break; + break; // 接收到退出命令，退出主循环 } else { std::cout << "Unknown command" << std::endl; } } + // 设置退出标志 + exit_flag = true; + + // 强制结束HTTP服务器线程 + if (http_server_thread.joinable()) { + http_server_thread.join(); + } + // 关闭所有套接字 for (auto& sock_pair : sockets) { + shutdown(sock_pair.first, SHUT_RDWR); close(sock_pair.first); } sockets.clear(); + // 等待所有工作线程结束 + for (auto& thread : threads) { + if (thread.joinable()) { + thread.join(); + } + } + threads.clear(); + + std::cout << "Exited program." << std::endl; return 0; + } \ No newline at end of file -- 2.34.1