nsjail: make listenMode return int
authorRobert Swiecki <robert@swiecki.net>
Fri, 25 May 2018 23:24:58 +0000 (01:24 +0200)
committerRobert Swiecki <robert@swiecki.net>
Fri, 25 May 2018 23:24:58 +0000 (01:24 +0200)
nsjail.cc

index 20f3e5308ba5069ee02f12dc88a49e141f25931d..c1dd2f945a336b2698cf44616b33d7868782f63b 100644 (file)
--- a/nsjail.cc
+++ b/nsjail.cc
@@ -113,17 +113,17 @@ static bool setTimer(nsjconf_t* nsjconf) {
        return true;
 }
 
-static void listenMode(nsjconf_t* nsjconf) {
+static int listenMode(nsjconf_t* nsjconf) {
        int listenfd = net::getRecvSocket(nsjconf->bindhost.c_str(), nsjconf->port);
        if (listenfd == -1) {
-               return;
+               return 0;
        }
        for (;;) {
                if (sigFatal > 0) {
                        subproc::killAll(nsjconf);
                        logs::logStop(sigFatal);
                        close(listenfd);
-                       return;
+                       return 0;
                }
                if (showProc) {
                        showProc = false;
@@ -215,7 +215,7 @@ int main(int argc, char* argv[]) {
 
        int ret = 0;
        if (nsjconf->mode == MODE_LISTEN_TCP) {
-               nsjail::listenMode(nsjconf.get());
+               ret = nsjail::listenMode(nsjconf.get());
        } else {
                ret = nsjail::standaloneMode(nsjconf.get());
        }