From 9a41c78ad7f3307b001b8d4b89f3ed79ec898217 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 26 Dec 2010 23:35:18 +0000
Subject: better output at tcp_listen

git-svn-id: https://svn.spreadspace.org/gcsd/trunk@82 ac14a137-c7f1-4531-abe0-07747231d213
---
 src/l_tcp.c                | 5 ++---
 src/modules/tcp_listen.lua | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/l_tcp.c b/src/l_tcp.c
index 1a4da9f..da452d4 100644
--- a/src/l_tcp.c
+++ b/src/l_tcp.c
@@ -107,6 +107,7 @@ static int init_listener(tcp_endpoint_t* end)
     if(ls) free(ls);
     return -1;
   }
+  free(ls);
 
   ret = listen(fd, 0);
   if(ret) {
@@ -115,9 +116,6 @@ static int init_listener(tcp_endpoint_t* end)
     return -1;
   }
 
-  log_printf(NOTICE, "tcp: listening on: %s", ls ? ls:"(null)");
-  if(ls) free(ls);
-
   return fd;
 }
 
@@ -163,6 +161,7 @@ static int l_tcp_server(lua_State *L)
     int fd = init_listener(end);
     if(fd < 0) {
       freeaddrinfo(res);
+          // TODO: better error handling (no lua error)
       luaL_error(L, "tcp: Error at server init");
     }
 
diff --git a/src/modules/tcp_listen.lua b/src/modules/tcp_listen.lua
index 2adfe0f..77a7e26 100644
--- a/src/modules/tcp_listen.lua
+++ b/src/modules/tcp_listen.lua
@@ -50,6 +50,8 @@ function tcp_listen:new(config, runtype)
 
    inst.listeners = tcp.server(config.addr, config.port, config.resolv_type)
    for _, l in ipairs(inst.listeners) do
+      log.printf(log.NOTICE, "%s: listening on %s", inst.name, tcp.endtostring(l.local_end))
+
       function l:read()
          local new_client, addr = tcp.accept(self.fd)
          if(not new_client) then
-- 
cgit v1.2.3