dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-27 04:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from darkrain42/unstable

Browse Source 
tcp: Initialize clnt->family in :accept()
This commit is contained in:
Diego Nehab 2012-07-31 22:02:10 -07:00
commit 5616f3a0ae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tcp.c
View File

@ -192,12 +192,14 @@ static int meth_accept(lua_State *L)
p_tcp clnt = (p_tcp) lua_newuserdata(L, sizeof(t_tcp)); p_tcp clnt = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
auxiliar_setclass(L, "tcp{client}", -1); auxiliar_setclass(L, "tcp{client}", -1);
/* initialize structure fields */ /* initialize structure fields */
memset(clnt, 0, sizeof(t_tcp));
socket_setnonblocking(&sock); socket_setnonblocking(&sock);
clnt->sock = sock; clnt->sock = sock;
io_init(&clnt->io, (p_send) socket_send, (p_recv) socket_recv, io_init(&clnt->io, (p_send) socket_send, (p_recv) socket_recv,
(p_error) socket_ioerror, &clnt->sock); (p_error) socket_ioerror, &clnt->sock);
timeout_init(&clnt->tm, -1, -1); timeout_init(&clnt->tm, -1, -1);
buffer_init(&clnt->buf, &clnt->io, &clnt->tm); buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
clnt->family = server->family;
return 1; return 1;
} else { } else {
lua_pushnil(L); lua_pushnil(L);
@ -354,6 +356,7 @@ static int tcp_create(lua_State *L, int family) {
if (!err) { if (!err) {
/* allocate tcp object */ /* allocate tcp object */
p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp)); p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
memset(tcp, 0, sizeof(t_tcp));
/* set its type as master object */ /* set its type as master object */
auxiliar_setclass(L, "tcp{master}", -1); auxiliar_setclass(L, "tcp{master}", -1);
/* initialize remaining structure fields */ /* initialize remaining structure fields */
@ -435,6 +438,7 @@ static int global_connect(lua_State *L) {
struct addrinfo bindhints, connecthints; struct addrinfo bindhints, connecthints;
const char *err = NULL; const char *err = NULL;
/* initialize tcp structure */ /* initialize tcp structure */
memset(tcp, 0, sizeof(t_tcp));
io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv, io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
(p_error) socket_ioerror, &tcp->sock); (p_error) socket_ioerror, &tcp->sock);
timeout_init(&tcp->tm, -1, -1); timeout_init(&tcp->tm, -1, -1);