mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: sock: rename sock to sock_fd in sock_create_server_socket

Browse Source 
Renaming sock to sock_fd makes it more clear, that sock_create_server_socket
returns the fd of newly created server socket and then we check this fd.
As we heavily use "fd" variable name in all protocol implementations, let's
prefix this one with the name of its object file: sock.o.
This commit is contained in:
Valentine Krasnobaeva 2024-04-23 22:46:55 +02:00 committed by Willy Tarreau
parent 072686dafd
commit a0b5324cff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sock.c
View File

@ -204,7 +204,7 @@ struct connection *sock_accept_conn(struct listener *l, int *status)
int sock_create_server_socket(struct connection *conn)
{
const struct netns_entry *ns = NULL;
int sock;
int sock_fd;
#ifdef USE_NS
if (objt_server(conn->target)) {
@ -214,16 +214,16 @@ int sock_create_server_socket(struct connection *conn)
ns = __objt_server(conn->target)->netns;
}
#endif
sock = my_socketat(ns, conn->dst->ss_family, SOCK_STREAM, 0);
if (sock == -1)
sock_fd = my_socketat(ns, conn->dst->ss_family, SOCK_STREAM, 0);
if (sock_fd == -1)
goto end;
if (conn->flags & CO_FL_OPT_MARK)
sock_set_mark(sock, conn->mark);
sock_set_mark(sock_fd, conn->mark);
if (conn->flags & CO_FL_OPT_TOS)
sock_set_tos(sock, conn->dst, conn->tos);
sock_set_tos(sock_fd, conn->dst, conn->tos);
end:
return sock;
return sock_fd;
}
/* Enables receiving on receiver <rx> once already bound. */