Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2883 from neheb/patch-1

Browse source 
address: Replace ualarm with setitimer
This commit is contained in:
Jo-Philipp Wich 2019-07-26 12:37:24 +02:00 committed by GitHub
commit acba2fe997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/luci-lib-nixio/src/address.c
View file

@ -24,6 +24,7 @@
#ifdef __linux__
#include <sys/time.h>
#include <signal.h>
#include <setjmp.h>
#include <unistd.h>
@ -287,6 +288,7 @@ static int nixio_getnameinfo(lua_State *L) {
const char *family = luaL_optstring(L, 2, NULL);
#ifdef __linux__
const struct itimerval t = { {timeout * 1000 * 1000, 0} , {0, 0} };
struct sigaction sa_new, sa_old;
int timeout = luaL_optnumber(L, 3, 0);
if (timeout > 0 && timeout < 1000)
@ -308,7 +310,7 @@ static int nixio_getnameinfo(lua_State *L) {
return 3;
}
ualarm(timeout * 1000, 0);
setitimer(ITIMER_REAL, &t, NULL);
}
#endif
@ -339,7 +341,7 @@ static int nixio_getnameinfo(lua_State *L) {
#ifdef __linux__
if (timeout > 0 && timeout < 1000)
{
ualarm(0, 0);
alarm(0);
sigaction(SIGALRM, &sa_old, NULL);
}
#endif