X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=1a728ddafc5dcec061bc58f05c84dc9c4b63f2e7;hb=37d39868e7eed7ff3c8420dec0e3e82caa7cd868;hp=f870a3ed1957e654c4892c6d22ad705dcf3a37c0;hpb=bcc7f5e4fc170c7feaad561d13e3fb6b4e6dd798;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index f870a3ed..1a728dda 100644 --- a/src/main.c +++ b/src/main.c @@ -1,69 +1,59 @@ /* * Copyright (C) 2015 "IoT.bzh" * Author "Fulup Ar Foll" + * Author José Bollo * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -/* - * File: main.c - * Author: "Fulup Ar Foll" - * - * Created on 05 December 2015, 15:38 - */ - -#include "local-def.h" - -#include +#define _GNU_SOURCE +#include +#include +#include #include #include -#include -#include +#include +#include #include #include -#define AFB_VERSION "0.1" - -static sigjmp_buf exitPoint; // context save for set/longjmp +#include "afb-plugin.h" -/*---------------------------------------------------------- - | printversion - | print version and copyright - +--------------------------------------------------------- */ - static void printVersion (void) { - - fprintf (stderr,"\n----------------------------------------- \n"); - fprintf (stderr,"| AFB [Application Framework Binder] version=%s |\n", AFB_VERSION); - fprintf (stderr,"----------------------------------------- \n"); - fprintf (stderr,"| Copyright(C) 2016 /IoT.bzh [fulup -at- iot.bzh]\n"); - fprintf (stderr,"| AFB comes with ABSOLUTELY NO WARRANTY.\n"); - fprintf (stderr,"| Licence [what ever makes you happy] until you fix bugs by yourself :)\n\n"); - exit (0); - } // end printVersion +#include "local-def.h" +#include "afb-hswitch.h" +#include "afb-api-so.h" +#include "afb-hsrv.h" +#include "afb-hreq.h" +#include "session.h" +#include "verbose.h" +#include "utils-upoll.h" + +#if !defined(PLUGIN_INSTALL_DIR) +#error "you should define PLUGIN_INSTALL_DIR" +#endif +#define AFB_VERSION "0.1" // Define command line option #define SET_VERBOSE 1 #define SET_BACKGROUND 2 #define SET_FORGROUND 3 -#define SET_FAKE_MOD 4 #define SET_TCP_PORT 5 #define SET_ROOT_DIR 6 #define SET_ROOT_BASE 7 #define SET_ROOT_API 8 -#define SET_ROOT_ALIAS 9 +#define SET_ALIAS 9 #define SET_CACHE_TIMEOUT 10 #define SET_SESSION_DIR 11 @@ -79,6 +69,8 @@ static sigjmp_buf exitPoint; // context save for set/longjmp #define SET_MODE 18 #define SET_READYFD 19 +static struct afb_hsrv *start(AFB_config * config); + // Command line structure hold cli --command + help text typedef struct { int val; // command number within application @@ -99,11 +91,11 @@ static AFB_options cliOptions [] = { {SET_ROOT_DIR ,1,"rootdir" , "HTTP Root Directory [default $HOME/.AFB]"}, {SET_ROOT_BASE ,1,"rootbase" , "Angular Base Root URL [default /opa]"}, {SET_ROOT_API ,1,"rootapi" , "HTML Root API URL [default /api]"}, - {SET_ROOT_ALIAS ,1,"alias" , "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, + {SET_ALIAS ,1,"alias" , "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, {SET_APITIMEOUT ,1,"apitimeout" , "Plugin API timeout in seconds [default 10]"}, {SET_CNTXTIMEOUT ,1,"cntxtimeout" , "Client Session Context Timeout [default 900]"}, - {SET_CACHE_TIMEOUT ,1,"cache-eol" , "Client cache end of live [default 3600s]"}, + {SET_CACHE_TIMEOUT,1,"cache-eol" , "Client cache end of live [default 3600s]"}, {SET_SESSION_DIR ,1,"sessiondir" , "Sessions file path [default rootdir/sessions]"}, @@ -119,91 +111,81 @@ static AFB_options cliOptions [] = { }; static AFB_aliasdir aliasdir[MAX_ALIAS]; -static int aliascount=0; +static int aliascount = 0; + + +/*---------------------------------------------------------- + | printversion + | print version and copyright + +--------------------------------------------------------- */ +static void printVersion (void) +{ + fprintf (stderr,"\n----------------------------------------- \n"); + fprintf (stderr,"| AFB [Application Framework Binder] version=%s |\n", AFB_VERSION); + fprintf (stderr,"----------------------------------------- \n"); + fprintf (stderr,"| Copyright(C) 2016 /IoT.bzh [fulup -at- iot.bzh]\n"); + fprintf (stderr,"| AFB comes with ABSOLUTELY NO WARRANTY.\n"); + fprintf (stderr,"| Licence Apache 2\n\n"); + exit (0); +} // load config from disk and merge with CLI option -static AFB_error config_set_default (AFB_session * session) +static void config_set_default (AFB_config * config) { - static char cacheTimeout [10]; - // default HTTP port - if (session->config->httpdPort == 0) session->config->httpdPort=1234; + if (config->httpdPort == 0) + config->httpdPort = 1234; // default Plugin API timeout - if (session->config->apiTimeout == 0) session->config->apiTimeout=DEFLT_API_TIMEOUT; + if (config->apiTimeout == 0) + config->apiTimeout = DEFLT_API_TIMEOUT; // default AUTH_TOKEN - if (session->config->token == NULL) session->config->token= DEFLT_AUTH_TOKEN; + if (config->token == NULL) + config->token = DEFLT_AUTH_TOKEN; // cache timeout default one hour - if (session->config->cacheTimeout == 0) session->config->cacheTimeout=DEFLT_CACHE_TIMEOUT; + if (config->cacheTimeout == 0) + config->cacheTimeout = DEFLT_CACHE_TIMEOUT; // cache timeout default one hour - if (session->config->cntxTimeout == 0) session->config->cntxTimeout=DEFLT_CNTX_TIMEOUT; - - if (session->config->rootdir == NULL) { - session->config->rootdir = getenv("AFBDIR"); - if (session->config->rootdir == NULL) { - session->config->rootdir = malloc (512); - strncpy (session->config->rootdir, getenv("HOME"),512); - strncat (session->config->rootdir, "/.AFB",512); + if (config->cntxTimeout == 0) + config->cntxTimeout = DEFLT_CNTX_TIMEOUT; + + if (config->rootdir == NULL) { + config->rootdir = getenv("AFBDIR"); + if (config->rootdir == NULL) { + config->rootdir = malloc (512); + strncpy (config->rootdir, getenv("HOME"),512); + strncat (config->rootdir, "/.AFB",512); } // if directory does not exist createit - mkdir (session->config->rootdir, O_RDWR | S_IRWXU | S_IRGRP); + mkdir (config->rootdir, O_RDWR | S_IRWXU | S_IRGRP); } // if no Angular/HTML5 rootbase let's try '/' as default - if (session->config->rootbase == NULL) { - session->config->rootbase = "/opa"; - } + if (config->rootbase == NULL) + config->rootbase = "/opa"; - if (session->config->rootapi == NULL) { - session->config->rootapi = "/api"; - } + if (config->rootapi == NULL) + config->rootapi = "/api"; - if (session->config->ldpaths == NULL) { - session->config->ldpaths = PLUGIN_INSTALL_DIR; - } + if (config->ldpaths == NULL) + config->ldpaths = PLUGIN_INSTALL_DIR; // if no session dir create a default path from rootdir - if (session->config->sessiondir == NULL) { - session->config->sessiondir = malloc (512); - strncpy (session->config->sessiondir, session->config->rootdir, 512); - strncat (session->config->sessiondir, "/sessions",512); + if (config->sessiondir == NULL) { + config->sessiondir = malloc (512); + strncpy (config->sessiondir, config->rootdir, 512); + strncat (config->sessiondir, "/sessions",512); } // if no config dir create a default path from sessiondir - if (session->config->console == NULL) { - session->config->console = malloc (512); - strncpy (session->config->console, session->config->sessiondir, 512); - strncat (session->config->console, "/AFB-console.out",512); + if (config->console == NULL) { + config->console = malloc (512); + strncpy (config->console, config->sessiondir, 512); + strncat (config->console, "/AFB-console.out",512); } - - // cacheTimeout is an integer but HTTPd wants it as a string - snprintf (cacheTimeout, sizeof (cacheTimeout),"%d", session->config->cacheTimeout); - session->cacheTimeout = cacheTimeout; // httpd uses cacheTimeout string version - - return AFB_SUCCESS; -} - - - -/*---------------------------------------------------------- - | timeout signalQuit - | - +--------------------------------------------------------- */ -void signalQuit (int signum) { - - sigset_t sigset; - - // unlock timeout signal to allow a new signal to come - sigemptyset (&sigset); - sigaddset (&sigset, SIGABRT); - sigprocmask (SIG_UNBLOCK, &sigset, 0); - - fprintf (stderr, "%s ERR:Received signal quit\n",configTime()); - syslog (LOG_ERR, "Daemon got kill3 & quit [please report bug]"); - longjmp (exitPoint, signum); } @@ -231,46 +213,6 @@ void signalQuit (int signum) { fprintf (stderr,"Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/plugins:/usr/lib64/agl/plugins\n", name); } // end printHelp -/*---------------------------------------------------------- - | closeSession - | try to close everything before leaving - +--------------------------------------------------------- */ -static void closeSession (AFB_session *session) { - - -} - -/*---------------------------------------------------------- - | listenLoop - | Main listening HTTP loop - +--------------------------------------------------------- */ -static void listenLoop (AFB_session *session) { - AFB_error err; - - if (signal (SIGABRT, signalQuit) == SIG_ERR) { - fprintf (stderr, "%s ERR: main fail to install Signal handler\n", configTime()); - return; - } - - // ------ Start httpd server - if (session->config->httpdPort > 0) { - - err = httpdStart (session); - if (err != AFB_SUCCESS) return; - - if (session->readyfd != 0) { - static const char readystr[] = "READY=1"; - write(session->readyfd, readystr, sizeof(readystr) - 1); - close(session->readyfd); - } - - // infinite loop - httpdLoop(session); - - fprintf (stderr, "hoops returned from infinite loop [report bug]\n"); - } -} - /*--------------------------------------------------------- | main | Parse option and launch action @@ -313,7 +255,7 @@ static void parse_arguments(int argc, char *argv[], AFB_session *session) switch (optc) { case SET_VERBOSE: - verbose = 1; + verbosity++; break; case SET_TCP_PORT: @@ -334,22 +276,22 @@ static void parse_arguments(int argc, char *argv[], AFB_session *session) case SET_ROOT_DIR: if (optarg == 0) goto needValueForOption; session->config->rootdir = optarg; - if (verbose) fprintf(stderr, "Forcing Rootdir=%s\n",session->config->rootdir); + if (verbosity) fprintf(stderr, "Forcing Rootdir=%s\n",session->config->rootdir); break; case SET_ROOT_BASE: if (optarg == 0) goto needValueForOption; session->config->rootbase = optarg; - if (verbose) fprintf(stderr, "Forcing Rootbase=%s\n",session->config->rootbase); + if (verbosity) fprintf(stderr, "Forcing Rootbase=%s\n",session->config->rootbase); break; case SET_ROOT_API: if (optarg == 0) goto needValueForOption; session->config->rootapi = optarg; - if (verbose) fprintf(stderr, "Forcing Rootapi=%s\n",session->config->rootapi); + if (verbosity) fprintf(stderr, "Forcing Rootapi=%s\n",session->config->rootapi); break; - case SET_ROOT_ALIAS: + case SET_ALIAS: if (optarg == 0) goto needValueForOption; if (aliascount < MAX_ALIAS) { aliasdir[aliascount].url = strsep(&optarg,":"); @@ -358,7 +300,7 @@ static void parse_arguments(int argc, char *argv[], AFB_session *session) } else { aliasdir[aliascount].path = optarg; aliasdir[aliascount].len = strlen(aliasdir[aliascount].url); - if (verbose) fprintf(stderr, "Alias url=%s path=%s\n", aliasdir[aliascount].url, aliasdir[aliascount].path); + if (verbosity) fprintf(stderr, "Alias url=%s path=%s\n", aliasdir[aliascount].url, aliasdir[aliascount].path); aliascount++; } } else { @@ -386,14 +328,9 @@ static void parse_arguments(int argc, char *argv[], AFB_session *session) if (!sscanf (optarg, "%d", &session->config->cacheTimeout)) goto notAnInteger; break; - case SET_FAKE_MOD: - if (optarg != 0) goto noValueForOption; - session->fakemod = 1; - break; - case SET_FORGROUND: if (optarg != 0) goto noValueForOption; - session->foreground = 1; + session->background = 0; break; case SET_BACKGROUND: @@ -427,8 +364,7 @@ static void parse_arguments(int argc, char *argv[], AFB_session *session) } free(gnuOptions); - // if exist merge config file with CLI arguments - config_set_default (session); + config_set_default (session->config); return; @@ -453,6 +389,105 @@ badMode: exit (1); } +/*---------------------------------------------------------- + | closeSession + | try to close everything before leaving + +--------------------------------------------------------- */ +static void closeSession (int status, void *data) { + /* AFB_session *session = data; */ +} + +/*---------------------------------------------------------- + | timeout signalQuit + +--------------------------------------------------------- */ +void signalQuit (int signum) +{ + fprintf(stderr, "Terminating signal received %s\n", strsignal(signum)); + exit(1); +} + + +/*---------------------------------------------------------- + | Error signals + | + +--------------------------------------------------------- */ +__thread sigjmp_buf *error_handler; +static void signalError(int signum) +{ + sigset_t sigset; + + // unlock signal to allow a new signal to come + if (error_handler != NULL) { + sigemptyset(&sigset); + sigaddset(&sigset, signum); + sigprocmask(SIG_UNBLOCK, &sigset, 0); + longjmp(*error_handler, signum); + } + if (signum == SIGALRM) + return; + fprintf(stderr, "Unmonitored signal received %s\n", strsignal(signum)); + exit(2); +} + +static void install_error_handlers() +{ + int i, signals[] = { SIGALRM, SIGSEGV, SIGFPE, 0 }; + + for (i = 0; signals[i] != 0; i++) { + if (signal(signals[i], signalError) == SIG_ERR) { + fprintf(stderr, "Signal handler error\n"); + exit(1); + } + } +} + +/*---------------------------------------------------------- + | daemonize + | set the process in background + +--------------------------------------------------------- */ +static void daemonize(AFB_session *session) +{ + int consoleFD; + int pid; + + // open /dev/console to redirect output messAFBes + consoleFD = open(session->config->console, O_WRONLY | O_APPEND | O_CREAT , 0640); + if (consoleFD < 0) { + fprintf (stderr,"\nERR: AFB-daemon cannot open /dev/console (use --foreground)\n\n"); + exit (1); + } + + // fork process when running background mode + pid = fork (); + + // if fail nothing much to do + if (pid == -1) { + fprintf (stderr,"\nERR: AFB-daemon Failed to fork son process\n\n"); + exit (1); + } + + // if in father process, just leave + if (pid != 0) _exit (0); + + // son process get all data in standalone mode + fprintf (stderr, "\nAFB: background mode [pid:%d console:%s]\n", getpid(),session->config->console); + + // redirect default I/O on console + close (2); dup(consoleFD); // redirect stderr + close (1); dup(consoleFD); // redirect stdout + close (0); // no need for stdin + close (consoleFD); + +#if 0 + setsid(); // allow father process to fully exit + sleep (2); // allow main to leave and release port +#endif + + fprintf (stderr, "----------------------------\n"); + fprintf (stderr, "INF: main background pid=%d\n", getpid()); + fflush (stderr); +} + /*--------------------------------------------------------- | main | Parse option and launch action @@ -460,140 +495,135 @@ badMode: int main(int argc, char *argv[]) { AFB_session *session; - int consoleFD; - int pid, status; + struct afb_hsrv *hsrv; + + // open syslog if ever needed + openlog("afb-daemon", 0, LOG_DAEMON); // ------------- Build session handler & init config ------- session = calloc (1, sizeof (AFB_session)); session->config = calloc (1, sizeof (AFB_config)); - parse_arguments(argc, argv, session); - initPlugins(session); + on_exit(closeSession, session); + parse_arguments(argc, argv, session); // ------------------ sanity check ---------------------------------------- - if ((session->background) && (session->foreground)) { - fprintf (stderr, "%s ERR: cannot select foreground & background at the same time\n",configTime()); + if (session->config->httpdPort <= 0) { + fprintf (stderr, "ERR: no port is defined\n"); exit (1); } - // ------------------ Some useful default values ------------------------- - if ((session->background == 0) && (session->foreground == 0)) session->foreground=1; - - // open syslog if ever needed - openlog("AFB-log", 0, LOG_DAEMON); + if (session->config->ldpaths) + afb_api_so_add_pathset(session->config->ldpaths); - // ------------------ clean exit on CTR-C signal ------------------------ - if (signal (SIGINT, signalQuit) == SIG_ERR) { - fprintf (stderr, "%s Quit Signal received.",configTime()); - return 1; + ctxStoreInit(CTX_NBCLIENTS, session->config->cntxTimeout, session->config->token); + if (!afb_hreq_init_cookie(session->config->httpdPort, session->config->rootapi, DEFLT_CNTX_TIMEOUT)) { + fprintf (stderr, "ERR: initialisation of cookies failed\n"); + exit (1); } - // save exitPoint context when returning from longjmp closeSession and exit - status = setjmp (exitPoint); // return !+ when coming from longjmp - if (status != 0) { - if (verbose) printf ("INF: main returning from longjump after signal [%d]\n", status); - closeSession (session); - goto exitOnSignal; + install_error_handlers(); + + // ------------------ clean exit on CTR-C signal ------------------------ + if (signal (SIGINT, signalQuit) == SIG_ERR || signal (SIGABRT, signalQuit) == SIG_ERR) { + fprintf (stderr, "ERR: main fail to install Signal handler\n"); + return 1; } // let's run this program with a low priority - status=nice (20); + nice (20); // ------------------ Finaly Process Commands ----------------------------- - // let's not take the risk to run as ROOT - //if (getuid() == 0) goto errorNoRoot; - - // check session dir and create if it does not exist - if (sessionCheckdir (session) != AFB_SUCCESS) goto errSessiondir; - if (verbose) fprintf (stderr, "AFB: notice Init config done\n"); + // let's not take the risk to run as ROOT + //if (getuid() == 0) goto errorNoRoot; + if (verbosity) fprintf (stderr, "AFB: notice Init config done\n"); - - // ---- run in foreground mode -------------------- - if (session->foreground) { - - if (verbose) fprintf (stderr,"AFB: notice Foreground mode\n"); - - // enter listening loop in foreground - listenLoop(session); - goto exitInitLoop; - } // end foreground - - - // --------- run in background mode ----------- + // --------- run ----------- if (session->background) { + // --------- in background mode ----------- + if (verbosity) fprintf (stderr, "AFB: Entering background mode\n"); + daemonize(session); + } else { + // ---- in foreground mode -------------------- + if (verbosity) fprintf (stderr,"AFB: notice Foreground mode\n"); - // if (status != 0) goto errorCommand; - if (verbose) printf ("AFB: Entering background mode\n"); - - // open /dev/console to redirect output messAFBes - consoleFD = open(session->config->console, O_WRONLY | O_APPEND | O_CREAT , 0640); - if (consoleFD < 0) goto errConsole; + } - // fork process when running background mode - pid = fork (); + hsrv = start (session->config); + if (hsrv == NULL) + exit(1); - // son process get all data in standalone mode - if (pid == 0) { + if (session->readyfd != 0) { + static const char readystr[] = "READY=1"; + write(session->readyfd, readystr, sizeof(readystr) - 1); + close(session->readyfd); + } - printf ("\nAFB: background mode [pid:%d console:%s]\n", getpid(),session->config->console); + // infinite loop + for(;;) + upoll_wait(30000); - // redirect default I/O on console - close (2); status=dup(consoleFD); // redirect stderr - close (1); status=dup(consoleFD); // redirect stdout - close (0); // no need for stdin - close (consoleFD); + if (verbosity) + fprintf (stderr, "hoops returned from infinite loop [report bug]\n"); - setsid(); // allow father process to fully exit - sleep (2); // allow main to leave and release port + return 0; +} - fprintf (stderr, "----------------------------\n"); - fprintf (stderr, "%s INF: main background pid=%d\n", configTime(), getpid()); - fflush (stderr); +static int init(struct afb_hsrv *hsrv, AFB_config * config) +{ + int idx; - // if everything look OK then look forever - syslog (LOG_ERR, "AFB: Entering infinite loop in background mode"); + if (!afb_hsrv_add_handler(hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20)) + return 0; - // should normally never return from this loop - listenLoop(session); - syslog (LOG_ERR, "AFB: FAIL background infinite loop exited check [%s]\n", session->config->console); + if (!afb_hsrv_add_handler(hsrv, config->rootapi, afb_hswitch_apis, NULL, 10)) + return 0; - goto exitInitLoop; - } + for (idx = 0; config->aliasdir[idx].url != NULL; idx++) + if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, config->aliasdir[idx].path, 0)) + return 0; - // if fail nothing much to do - if (pid == -1) goto errorFork; + if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10)) + return 0; - // we are in father process, we don't need this one - _exit (0); + if (!afb_hsrv_add_handler(hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20)) + return 0; - } // end background-foreground + return 1; +} -normalExit: - closeSession (session); // try to close everything before leaving - if (verbose) printf ("\n---- Application Framework Binder Normal End ------\n"); - exit(0); +static struct afb_hsrv *start(AFB_config * config) +{ + int rc; + struct afb_hsrv *hsrv; -// ------------- Fatal ERROR display error and quit ------------- -errorFork: - fprintf (stderr,"\nERR: AFB-daemon Failed to fork son process\n\n"); - exit (1); + hsrv = afb_hsrv_create(); + if (hsrv == NULL) { + fprintf(stderr, "memory allocation failure\n"); + return NULL; + } -exitOnSignal: - fprintf (stderr,"\n%s INF: AFB-daemon pid=%d received exit signal (Hopefully crtl-C or --kill-previous !!!)\n\n" - ,configTime(), getpid()); - exit (1); + if (!afb_hsrv_set_cache_timeout(hsrv, config->cacheTimeout) + || !init(hsrv, config)) { + fprintf (stderr, "Error: initialisation of httpd failed"); + afb_hsrv_put(hsrv); + return NULL; + } -errConsole: - fprintf (stderr,"\nERR: AFB-daemon cannot open /dev/console (use --foreground)\n\n"); - exit (1); + if (verbosity) { + fprintf (stderr, "AFB:notice Waiting port=%d rootdir=%s\n", config->httpdPort, config->rootdir); + fprintf (stderr, "AFB:notice Browser URL= http:/*localhost:%d\n", config->httpdPort); + } -errSessiondir: - fprintf (stderr,"\nERR: AFB-daemon cannot read/write session dir\n\n"); - exit (1); + rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15); + if (!rc) { + fprintf (stderr, "Error: starting of httpd failed"); + afb_hsrv_put(hsrv); + return NULL; + } -exitInitLoop: - exit (1); + return hsrv; }