diff options
Diffstat (limited to 'src/tcp.c')
-rw-r--r-- | src/tcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -40,7 +40,7 @@ static int meth_setfd(lua_State *L); | |||
40 | static int meth_dirty(lua_State *L); | 40 | static int meth_dirty(lua_State *L); |
41 | 41 | ||
42 | /* tcp object methods */ | 42 | /* tcp object methods */ |
43 | static luaL_reg tcp[] = { | 43 | static luaL_reg tcp_methods[] = { |
44 | {"__gc", meth_close}, | 44 | {"__gc", meth_close}, |
45 | {"__tostring", auxiliar_tostring}, | 45 | {"__tostring", auxiliar_tostring}, |
46 | {"accept", meth_accept}, | 46 | {"accept", meth_accept}, |
@@ -88,9 +88,9 @@ static luaL_reg func[] = { | |||
88 | int tcp_open(lua_State *L) | 88 | int tcp_open(lua_State *L) |
89 | { | 89 | { |
90 | /* create classes */ | 90 | /* create classes */ |
91 | auxiliar_newclass(L, "tcp{master}", tcp); | 91 | auxiliar_newclass(L, "tcp{master}", tcp_methods); |
92 | auxiliar_newclass(L, "tcp{client}", tcp); | 92 | auxiliar_newclass(L, "tcp{client}", tcp_methods); |
93 | auxiliar_newclass(L, "tcp{server}", tcp); | 93 | auxiliar_newclass(L, "tcp{server}", tcp_methods); |
94 | /* create class groups */ | 94 | /* create class groups */ |
95 | auxiliar_add2group(L, "tcp{master}", "tcp{any}"); | 95 | auxiliar_add2group(L, "tcp{master}", "tcp{any}"); |
96 | auxiliar_add2group(L, "tcp{client}", "tcp{any}"); | 96 | auxiliar_add2group(L, "tcp{client}", "tcp{any}"); |
@@ -359,7 +359,7 @@ static const char *trybind6(const char *localaddr, const char *localserv, | |||
359 | for (iterator = resolved; iterator; iterator = iterator->ai_next) { | 359 | for (iterator = resolved; iterator; iterator = iterator->ai_next) { |
360 | /* create a new socket each time because parameters | 360 | /* create a new socket each time because parameters |
361 | * may have changed */ | 361 | * may have changed */ |
362 | const char *err = socket_strerror(socket_create(&tcp->sock, | 362 | err = socket_strerror(socket_create(&tcp->sock, |
363 | iterator->ai_family, iterator->ai_socktype, | 363 | iterator->ai_family, iterator->ai_socktype, |
364 | iterator->ai_protocol)); | 364 | iterator->ai_protocol)); |
365 | /* if failed to create socket, bail out */ | 365 | /* if failed to create socket, bail out */ |
@@ -445,7 +445,7 @@ static const char *tryconnect6(const char *remoteaddr, const char *remoteserv, | |||
445 | p_timeout tm = timeout_markstart(&tcp->tm); | 445 | p_timeout tm = timeout_markstart(&tcp->tm); |
446 | /* create new socket if one wasn't created by the bind stage */ | 446 | /* create new socket if one wasn't created by the bind stage */ |
447 | if (tcp->sock == SOCKET_INVALID) { | 447 | if (tcp->sock == SOCKET_INVALID) { |
448 | const char *err = socket_strerror(socket_create(&tcp->sock, | 448 | err = socket_strerror(socket_create(&tcp->sock, |
449 | iterator->ai_family, iterator->ai_socktype, | 449 | iterator->ai_family, iterator->ai_socktype, |
450 | iterator->ai_protocol)); | 450 | iterator->ai_protocol)); |
451 | if (err != NULL) { | 451 | if (err != NULL) { |