diff options
Diffstat (limited to 'src/daemon/signals.c')
-rw-r--r-- | src/daemon/signals.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/daemon/signals.c b/src/daemon/signals.c index b455838..c5b4563 100644 --- a/src/daemon/signals.c +++ b/src/daemon/signals.c @@ -150,7 +150,7 @@ const char *signal_get_long_name( int sig ) { } } -static error_t vsignal_install_ignore( int sig, va_list ap ) { +static wolf_error_t vsignal_install_ignore( int sig, va_list ap ) { struct sigaction sa; char errbuf[1024]; @@ -166,7 +166,7 @@ install_ignore_again: sig, errbuf, errno ); - return ERR_PROGRAMMING; + return WOLF_ERR_PROGRAMMING; } LOG( log_DEBUG, "Ignoring signal handler for signal '%s' (%s)", signal_get_long_name( sig ), @@ -174,7 +174,7 @@ install_ignore_again: sig = va_arg( ap, int ); if( sig > 0 ) goto install_ignore_again; - return OK; + return WOLF_OK; } /* some signals we should not ignore, like SIGPIPE or SIGC(H)LD, because @@ -185,7 +185,7 @@ static void empty_handler( int sig ) { UNUSED( sig ); } -static error_t vsignal_install_empty( int sig, va_list ap ) { +static wolf_error_t vsignal_install_empty( int sig, va_list ap ) { struct sigaction sa; char errbuf[1024]; @@ -201,7 +201,7 @@ install_empty_again: sig, errbuf, errno ); - return ERR_PROGRAMMING; + return WOLF_ERR_PROGRAMMING; } LOG( log_DEBUG, "Installed empty signal handler for signal '%s' (%s)", signal_get_long_name( sig ), @@ -209,7 +209,7 @@ install_empty_again: sig = va_arg( ap, int ); if( sig > 0 ) goto install_empty_again; - return OK; + return WOLF_OK; } static void fatal_handler( int sig ) { @@ -232,7 +232,7 @@ static void fatal_handler( int sig ) { kill( getpid( ), sig ); } -static error_t vsignal_install_func( signal_func_t func, int sig, va_list ap ) { +static wolf_error_t vsignal_install_func( signal_func_t func, int sig, va_list ap ) { struct sigaction sa; char errbuf[1024]; @@ -249,7 +249,7 @@ install_func_again: sig, errbuf, errno ); - return ERR_PROGRAMMING; + return WOLF_ERR_PROGRAMMING; } LOG( log_DEBUG, "Installed signal handler for signal '%s' (%s)", signal_get_long_name( sig ), @@ -257,12 +257,12 @@ install_func_again: sig = va_arg( ap, int ); if( sig > 0 ) goto install_func_again; - return OK; + return WOLF_OK; } -error_t signal_install_func( signal_func_t func, int sig, ... ) { +wolf_error_t signal_install_func( signal_func_t func, int sig, ... ) { va_list ap; - error_t error; + wolf_error_t error; va_start( ap, sig ); error = vsignal_install_func( func, sig, ap ); va_end( ap ); @@ -270,9 +270,9 @@ error_t signal_install_func( signal_func_t func, int sig, ... ) { } #define INSTALL_SIGNAL( MODE ) \ -error_t signal_install_##MODE( int sig, ... ) { \ +wolf_error_t signal_install_##MODE( int sig, ... ) { \ va_list ap; \ - error_t error; \ + wolf_error_t error; \ va_start( ap, sig ); \ error = vsignal_install_##MODE( sig, ap ); \ va_end( ap ); \ @@ -283,9 +283,9 @@ INSTALL_SIGNAL( ignore ) INSTALL_SIGNAL( empty ) #define INSTALL_SIGNAL_FUNC( MODE, FUNC ) \ -error_t signal_install_##MODE( int sig, ... ) { \ +wolf_error_t signal_install_##MODE( int sig, ... ) { \ va_list ap; \ - error_t error; \ + wolf_error_t error; \ va_start( ap, sig ); \ error = vsignal_install_func( FUNC, sig, ap ); \ va_end( ap ); \ @@ -309,13 +309,13 @@ static void notify_handler( int sig ) { INSTALL_SIGNAL_FUNC( notify, notify_handler ) INSTALL_SIGNAL_FUNC( notify_parent, notify_parent_handler ) -error_t signal_initialize( void ) { +wolf_error_t signal_initialize( void ) { int res; char errbuf[1024]; if( daemon_signal_pipe[0] != -1 || daemon_signal_pipe[1] != -1 ) { - return ERR_INVALID_STATE; + return WOLF_ERR_INVALID_STATE; } res = pipe( daemon_signal_pipe ); @@ -323,11 +323,11 @@ error_t signal_initialize( void ) { (void)strerror_r( errno, errbuf, 1024 ); LOG( log_EMERG, "Unable to create signal pipe: %s (%d)", errbuf, errno ); - return ERR_INTERNAL; + return WOLF_ERR_INTERNAL; } LOG( log_DEBUG, "Created signal pipe (%d,%d)", daemon_signal_pipe[0], daemon_signal_pipe[1] ); - return OK; + return WOLF_OK; } void signal_terminate( void ) { @@ -335,7 +335,7 @@ void signal_terminate( void ) { (void)close( daemon_signal_pipe[1] ); } -int signal_suspend( int timeout, error_t *error ) { +int signal_suspend( int timeout, wolf_error_t *error ) { struct timeval tv; fd_set fds; ssize_t res; @@ -343,7 +343,7 @@ int signal_suspend( int timeout, error_t *error ) { char errbuf[1024]; if( daemon_signal_pipe[0] == -1 ) { - *error = ERR_INVALID_STATE; + *error = WOLF_ERR_INVALID_STATE; return -1; } @@ -360,7 +360,7 @@ signal_select_again: break; case 0: /* timeout */ - *error = ERR_TIMEOUT; + *error = WOLF_ERR_TIMEOUT; return 0; case -1: /* error */ @@ -370,7 +370,7 @@ signal_select_again: (void)strerror_r( errno, errbuf, 1024 ); LOG( log_EMERG, "Error in select when waiting for signal from pipe: %s (%d)", errbuf, errno ); - *error = ERR_INTERNAL; + *error = WOLF_ERR_INTERNAL; return -1; } @@ -383,21 +383,21 @@ signal_select_again: (void)strerror_r( errno, errbuf, 1024 ); LOG( log_EMERG, "Error while reading a signal from the pipe: %s (%d)", errbuf, errno ); - *error = ERR_INTERNAL; + *error = WOLF_ERR_INTERNAL; return -1; default: /* unexpected result on atomic read */ LOG( log_EMERG, "Unexpected error in read: result is %d", res ); - *error = ERR_PROGRAMMING; + *error = WOLF_ERR_PROGRAMMING; return -1; } - *error = OK; + *error = WOLF_OK; return sig; } -error_t signal_install_handlers_parent( void ) { - error_t error; +wolf_error_t signal_install_handlers_parent( void ) { + wolf_error_t error; /* signals to ignore */ if( ( error = signal_install_ignore( @@ -429,7 +429,7 @@ error_t signal_install_handlers_parent( void ) { SIGHUP, SIGUSR1, SIGUSR2, - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; /* signals for empty handlers */ if( ( error = signal_install_empty( @@ -445,7 +445,7 @@ error_t signal_install_handlers_parent( void ) { #endif #endif #endif - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; /* fatal signal handlers, make sure the parent can read the * signal and clean up @@ -469,14 +469,14 @@ error_t signal_install_handlers_parent( void ) { SIGSYS, #endif SIGALRM, /* we don't use it, but maybe a plugin */ - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; - return OK; + return WOLF_OK; } -error_t signal_install_handlers_daemon( void ) { - error_t error; +wolf_error_t signal_install_handlers_daemon( void ) { + wolf_error_t error; /* signals to ignore */ if( ( error = signal_install_ignore( @@ -503,7 +503,7 @@ error_t signal_install_handlers_daemon( void ) { #if defined( SIGPWR ) SIGPWR, #endif - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; /* signals for empty handlers */ if( ( error = signal_install_empty( @@ -519,7 +519,7 @@ error_t signal_install_handlers_daemon( void ) { #endif #endif #endif - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; /* fatal signal handlers, log the exception and continue with * default behaviour of the system @@ -543,7 +543,7 @@ error_t signal_install_handlers_daemon( void ) { SIGSYS, #endif SIGALRM, /* we don't use it, but maybe a plugin */ - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; /* notify the following signals to the main loop */ if( ( error = signal_install_notify( @@ -552,8 +552,8 @@ error_t signal_install_handlers_daemon( void ) { SIGHUP, SIGUSR1, SIGUSR2, - 0 ) ) != OK ) return error; + 0 ) ) != WOLF_OK ) return error; - return OK; + return WOLF_OK; } |