fix: Specifying the global namespace for bind and connect (#3007)

zhoukangsheng · web-flow · commit d5cdbe69a653 · 2025-06-25T15:38:49.000+08:00
diff --git a/src/butil/endpoint.cpp b/src/butil/endpoint.cpp
@@ -52,7 +52,7 @@ DEFINE_bool(reuse_uds_path, false, "remove unix domain socket file before listen
 __BEGIN_DECLS
 int BAIDU_WEAK bthread_connect(
     int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) {
-    return connect(sockfd, serv_addr, addrlen);
+    return ::connect(sockfd, serv_addr, addrlen);
 }
 
 int BAIDU_WEAK bthread_timed_connect(
@@ -577,7 +577,7 @@ int tcp_listen(EndPoint point) {
         ::unlink(((sockaddr_un*) &serv_addr)->sun_path);
     }
 
-    if (bind(sockfd, (struct sockaddr*)& serv_addr, serv_addr_size) != 0) {
+    if (::bind(sockfd, (struct sockaddr*)& serv_addr, serv_addr_size) != 0) {
         return -1;
     }
     if (listen(sockfd, 65535) != 0) {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ DEFINE_bool(reuse_uds_path, false, "remove unix domain socket file before listen`
`52`	`52`	`__BEGIN_DECLS`
`53`	`53`	`int BAIDU_WEAK bthread_connect(`
`54`	`54`	`int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) {`
`55`		`- return connect(sockfd, serv_addr, addrlen);`
	`55`	`+ return ::connect(sockfd, serv_addr, addrlen);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`int BAIDU_WEAK bthread_timed_connect(`
`@@ -577,7 +577,7 @@ int tcp_listen(EndPoint point) {`
`577`	`577`	`::unlink(((sockaddr_un*) &serv_addr)->sun_path);`
`578`	`578`	`}`
`579`	`579`
`580`		`- if (bind(sockfd, (struct sockaddr*)& serv_addr, serv_addr_size) != 0) {`
	`580`	`+ if (::bind(sockfd, (struct sockaddr*)& serv_addr, serv_addr_size) != 0) {`
`581`	`581`	`return -1;`
`582`	`582`	`}`
`583`	`583`	`if (listen(sockfd, 65535) != 0) {`