Fix #433: box.session functions don't work properly

src/box/lua/session.cc

@@ -117,7 +117,7 @@ lbox_session_exists(struct lua_State *L)
 		luaL_error(L, "session.exists(sid): bad arguments");
 
 	uint32_t sid = luaL_checkint(L, -1);
-	lua_pushnumber(L, session_exists(sid));
+	lua_pushboolean(L, session_find(sid) != NULL);
 	return 1;
 }
 
@@ -131,7 +131,10 @@ lbox_session_fd(struct lua_State *L)
 		luaL_error(L, "session.fd(sid): bad arguments");
 
 	uint32_t sid = luaL_checkint(L, -1);
-	lua_pushnumber(L, session_fd(sid));
+	struct session *session = session_find(sid);
+	if (session == NULL)
+		luaL_error(L, "session.fd(): session does not exit");
+	lua_pushinteger(L, session->fd);
 	return 1;
 }
 
@@ -145,10 +148,21 @@ lbox_session_peer(struct lua_State *L)
 	if (lua_gettop(L) > 1)
 		luaL_error(L, "session.peer(sid): bad arguments");
 
-	uint32_t sid = lua_gettop(L) == 1 ?
-		luaL_checkint(L, -1) : session()->id;
+	int fd;
+	if (lua_gettop(L) == 1) {
+		struct session *session = session_find(luaL_checkint(L, 1));
+		if (session == NULL)
+			luaL_error(L, "session.peer(): session does not exit");
+		fd = session->fd;
+	} else {
+		fd = session()->fd;
+	}
+
+	if (fd < 0) {
+		lua_pushnil(L); /* no associated peer */
+		return 1;
+	}
 
-	int fd = session_fd(sid);
 	struct sockaddr_storage addr;
 	socklen_t addrlen = sizeof(addr);
 	sio_getpeername(fd, (struct sockaddr *)&addr, &addrlen);

src/box/session.cc

@@ -131,15 +131,14 @@ session_destroy(struct session *session)
 	mempool_free(&session_pool, session);
 }
 
-int
-session_fd(uint32_t sid)
+struct session *
+session_find(uint32_t sid)
 {
 	mh_int_t k = mh_i32ptr_find(session_registry, sid, NULL);
 	if (k == mh_end(session_registry))
-		return -1;
-	struct session *session = (struct session *)
+		return NULL;
+	return (struct session *)
 		mh_i32ptr_node(session_registry, k)->val;
-	return session->fd;
 }
 
 void

src/box/session.h

@@ -92,21 +92,10 @@ void
 session_destroy(struct session *);
 
 /**
- * Return a file descriptor
- * associated with a session, or -1 if the
- * session doesn't exist.
+ * Find a session by id.
  */
-int
-session_fd(uint32_t sid);
-
-/**
- * Check whether a session exists or not.
- */
-static inline bool
-session_exists(uint32_t sid)
-{
-	return session_fd(sid) >= 0;
-}
+struct session *
+session_find(uint32_t sid);
 
 /** Set session auth token and user id. */
 static inline void

test/box/session.result

@@ -12,7 +12,11 @@ space:create_index('primary', { type = 'hash' })
 ...
 session.exists(session.id())
 ---
-- 0
+- true
+...
+session.peer(session.id())
+---
+- null
 ...
 session.exists()
 ---
@@ -24,7 +28,7 @@ session.exists(1, 2, 3)
 ...
 session.exists(1234567890)
 ---
-- 0
+- false
 ...
 -- check session.id()
 session.id() > 0

test/box/session.test.lua

@@ -5,6 +5,7 @@ space = box.schema.create_space('tweedledum')
 space:create_index('primary', { type = 'hash' })
 
 session.exists(session.id())
+session.peer(session.id())
 session.exists()
 session.exists(1, 2, 3)
 session.exists(1234567890)