net.server_epoll: Graceful handling of registering already added socket

2 files changed, 15 insertions, 2 deletions

diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index e0189179..fc939675 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -25,7 +25,10 @@ local inet = require "util.net";
 local inet_pton = inet.pton;
 local _SOCKETINVALID = socket._SOCKETINVALID or -1;
 
-local poll = assert(require "util.poll".new());
+local poller = require "util.poll"
+local EEXIST = poller.EEXIST;
+
+local poll = assert(poller.new());
 
 local _ENV = nil;
 -- luacheck: std none
@@ -269,6 +272,10 @@ function interface:add(r, w)
 	if w == nil then w = self._wantwrite; end
 	local ok, err, errno = poll:add(fd, r, w);
 	if not ok then
+		if errno == EEXIST then
+			log("debug", "%s already registered!", self);
+			return self:set(r, w); -- So try to change its flags
+		end
 		log("error", "Could not register %s: %s(%d)", self, err, errno);
 		return ok, err;
 	end
diff --git a/util-src/poll.c b/util-src/poll.c
index 7fd28524..58f29041 100644
--- a/util-src/poll.c
+++ b/util-src/poll.c
@@ -452,10 +452,16 @@ int luaopen_util_poll(lua_State *L) {
 #endif
 	}
 
-	lua_createtable(L, 0, 1);
+	lua_createtable(L, 0, 2);
 	{
 		lua_pushcfunction(L, Lnew);
 		lua_setfield(L, -2, "new");
+
+#define push_errno(named_error) lua_pushinteger(L, named_error);\
+		lua_setfield(L, -2, #named_error);
+
+		push_errno(EEXIST);
+
 	}
 	return 1;
 }