TSG-6547, sapp监听端口在fork之后没有关闭,导致无法及时重启.v4.2.36

3 files changed, 3 insertions, 3 deletions

diff --git a/src/packet_io/cycle_pkt_dump_through_write_offset.c b/src/packet_io/cycle_pkt_dump_through_write_offset.c
index 34ccb15..4e2bca4 100644
--- a/src/packet_io/cycle_pkt_dump_through_write_offset.c
+++ b/src/packet_io/cycle_pkt_dump_through_write_offset.c
@@ -1326,7 +1326,7 @@ static int cycle_pkt_dump_socket_init(void)
 	int i, opt;
 	struct sockaddr_in sockadd;
 	
-	pkt_dump_tcp_cmd_sd = socket(AF_INET, SOCK_STREAM, 0);
+	pkt_dump_tcp_cmd_sd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
 
 	opt = 1;
 	setsockopt(pkt_dump_tcp_cmd_sd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
diff --git a/src/packet_io/sendpacket.c b/src/packet_io/sendpacket.c
index 8861b00..e07e334 100644
--- a/src/packet_io/sendpacket.c
+++ b/src/packet_io/sendpacket.c
@@ -3371,7 +3371,7 @@ static int send_handle_init(int tot_thread_num)
 			sapp_log(30, ~0, ~0, "socket v4 error, %s\n", strerror(errno));
 			return -1;
 		}
-		g_send_handle[i].raw_udp_fd = socket(AF_INET, SOCK_DGRAM, 0);
+		g_send_handle[i].raw_udp_fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
 		if(g_send_handle[i].raw_udp_fd < 0){
 			sapp_log(30, ~0, ~0, "socket udp error, %s\n", strerror(errno));
 			return -1;
diff --git a/src/support/iknow/src/server/iknow_cmd_parser.c b/src/support/iknow/src/server/iknow_cmd_parser.c
index ac174e5..1f3a59d 100644
--- a/src/support/iknow/src/server/iknow_cmd_parser.c
+++ b/src/support/iknow/src/server/iknow_cmd_parser.c
@@ -748,7 +748,7 @@ iknow_handle iknow_create(const iknow_create_args_t *args, int args_len)
 		return NULL;

 	}

 	

-	listenfd = socket(AF_INET, SOCK_STREAM, 0);

+	listenfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);

 

 	bzero(&listen_addr, sizeof(listen_addr));

 	listen_addr.sin_family = AF_INET;