nixio: Finetuning of TLS-support

[project/luci.git] / libs / nixio / src / tls-context.c

diff --git a/libs/nixio/src/tls-context.c b/libs/nixio/src/tls-context.c
index ff3feeb..c555176 100644 (file)
--- a/libs/nixio/src/tls-context.c
+++ b/libs/nixio/src/tls-context.c
@@ -74,6 +74,7 @@ static int nixio_tls_ctx_create(lua_State *L) {
        SSL_CTX *ctx = nixio__checktlsctx(L);
        int fd = nixio__checkfd(L, 2);
 
+       lua_createtable(L, 0, 3);
        nixio_tls_sock *sock = lua_newuserdata(L, sizeof(nixio_tls_sock));
        if (!sock) {
                return luaL_error(L, "out of memory");
@@ -82,7 +83,8 @@ static int nixio_tls_ctx_create(lua_State *L) {
 
        /* create userdata */
        luaL_getmetatable(L, NIXIO_TLS_SOCK_META);
-       lua_setmetatable(L, -2);
+       lua_pushvalue(L, -1);
+       lua_setmetatable(L, -3);
 
        sock->socket = SSL_new(ctx);
        if (!sock->socket) {
@@ -93,6 +95,16 @@ static int nixio_tls_ctx_create(lua_State *L) {
                return nixio__tls_perror(L, 0);
        }
 
+       /* save context and socket to prevent GC from collecting them */
+       lua_setmetatable(L, -3);
+       lua_setfield(L, -2, "connection");
+
+       lua_pushvalue(L, 1);
+       lua_setfield(L, -2, "context");
+
+       lua_pushvalue(L, 2);
+       lua_setfield(L, -2, "socket");
+
        return 1;
 }