1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: lua: avoid directly calling getsockname/getpeername()

Browse Source 
We already have per-protocol functions for this, and they already
take care of properly setting the CO_FL_ADDR_*_SET flags.
This commit is contained in:
Willy Tarreau 2016-11-16 17:00:14 +01:00
parent d4d0a23ca4
commit a71f642b62
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hlua.c
View File

@ -10,8 +10,6 @@
* *
*/ */
#include <sys/socket.h>
#include <ctype.h> #include <ctype.h>
#include <setjmp.h> #include <setjmp.h>
@ -27,13 +25,13 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <types/connection.h>
#include <types/hlua.h> #include <types/hlua.h>
#include <types/proxy.h> #include <types/proxy.h>
#include <proto/arg.h> #include <proto/arg.h>
#include <proto/applet.h> #include <proto/applet.h>
#include <proto/channel.h> #include <proto/channel.h>
#include <proto/connection.h>
#include <proto/hdr_idx.h> #include <proto/hdr_idx.h>
#include <proto/hlua.h> #include <proto/hlua.h>
#include <proto/hlua_fcn.h> #include <proto/hlua_fcn.h>
@ -2083,14 +2081,11 @@ __LJMP static int hlua_socket_getpeername(struct lua_State *L)
return 1; return 1;
} }
conn_get_to_addr(conn);
if (!(conn->flags & CO_FL_ADDR_TO_SET)) { if (!(conn->flags & CO_FL_ADDR_TO_SET)) {
unsigned int salen = sizeof(conn->addr.to);
if (getpeername(conn->t.sock.fd, (struct sockaddr *)&conn->addr.to, &salen) == -1) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} }
conn->flags |= CO_FL_ADDR_TO_SET;
}
return MAY_LJMP(hlua_socket_info(L, &conn->addr.to)); return MAY_LJMP(hlua_socket_info(L, &conn->addr.to));
} }
@ -2117,14 +2112,11 @@ static int hlua_socket_getsockname(struct lua_State *L)
return 1; return 1;
} }
conn_get_from_addr(conn);
if (!(conn->flags & CO_FL_ADDR_FROM_SET)) { if (!(conn->flags & CO_FL_ADDR_FROM_SET)) {
unsigned int salen = sizeof(conn->addr.from);
if (getsockname(conn->t.sock.fd, (struct sockaddr *)&conn->addr.from, &salen) == -1) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} }
conn->flags |= CO_FL_ADDR_FROM_SET;
}
return hlua_socket_info(L, &conn->addr.from); return hlua_socket_info(L, &conn->addr.from);
} }