RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-03 16:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: lua: switch to conn->dst for a connection's target address

Browse Source 
This one will soon need a dynamic allocation, though this will be
temporary as ideally the address will be placed on the stream and no
connection will be allocated anymore.
This commit is contained in:
Willy Tarreau 2019-07-17 14:49:44 +02:00
parent 085a1513ad
commit 9da9a6fdca
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hlua.c
View File

@ -2264,7 +2264,7 @@ __LJMP static int hlua_socket_getpeername(struct lua_State *L)
return 1;
}
ret = MAY_LJMP(hlua_socket_info(L, &conn->addr.to));
ret = MAY_LJMP(hlua_socket_info(L, conn->dst));
xref_unlock(&socket->xref, peer);
return ret;
}
@ -2313,7 +2313,7 @@ static int hlua_socket_getsockname(struct lua_State *L)
return 1;
}
ret = hlua_socket_info(L, &conn->addr.from);
ret = hlua_socket_info(L, conn->src);
xref_unlock(&socket->xref, peer);
return ret;
}
@ -2460,22 +2460,24 @@ __LJMP static int hlua_socket_connect(struct lua_State *L)
xref_unlock(&socket->xref, peer);
WILL_LJMP(luaL_error(L, "connect: port ranges not supported : address '%s'", ip));
}
memcpy(&conn->addr.to, addr, sizeof(struct sockaddr_storage));
/* FIXME WTA: dst address allocation needed here! */
memcpy(conn->dst, addr, sizeof(struct sockaddr_storage));
/* Set port. */
if (low == 0) {
if (conn->addr.to.ss_family == AF_INET) {
if (conn->dst->ss_family == AF_INET) {
if (port == -1) {
xref_unlock(&socket->xref, peer);
WILL_LJMP(luaL_error(L, "connect: port missing"));
}
((struct sockaddr_in *)&conn->addr.to)->sin_port = htons(port);
} else if (conn->addr.to.ss_family == AF_INET6) {
((struct sockaddr_in *)conn->dst)->sin_port = htons(port);
} else if (conn->dst->ss_family == AF_INET6) {
if (port == -1) {
xref_unlock(&socket->xref, peer);
WILL_LJMP(luaL_error(L, "connect: port missing"));
}
((struct sockaddr_in6 *)&conn->addr.to)->sin6_port = htons(port);
((struct sockaddr_in6 *)conn->dst)->sin6_port = htons(port);
}
}