d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sigpause() -> sigsuspend()

Browse Source 
sigblock() -> sigprocmask()
This commit is contained in:
Brian Somers 2001-09-13 10:03:30 +00:00
parent d9dc3116bf
commit ed1e8460bd
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/ppp/lcp.c
View File

@ -968,13 +968,16 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type,
if (lcp->want_magic) {
/* Validate magic number */
if (magic == lcp->want_magic) {
sigset_t emptyset;
log_Printf(LogLCP, "Magic is same (%08lx) - %d times\n",
(u_long)magic, ++lcp->LcpFailedMagic);
lcp->want_magic = GenerateMagic();
memcpy(dec->nakend, cp, 6);
dec->nakend += 6;
ualarm(TICKUNIT * (4 + 4 * lcp->LcpFailedMagic), 0);
sigpause(0);
sigemptyset(&emptyset);
sigsuspend(&emptyset);
} else {
lcp->his_magic = magic;
memcpy(dec->ackend, cp, length);

18
usr.sbin/ppp/timer.c
View File

@ -63,11 +63,13 @@ tState2Nam(u_int state)
void
timer_Stop(struct pppTimer *tp)
{
int omask;
sigset_t mask, omask;
omask = sigblock(sigmask(SIGALRM));
sigemptyset(&mask);
sigaddset(&mask, SIGALRM);
sigprocmask(SIG_BLOCK, &mask, &omask);
StopTimerNoBlock(tp);
sigsetmask(omask);
sigprocmask(SIG_SETMASK, &omask, NULL);
}
void
@ -76,16 +78,18 @@ timer_Start(struct pppTimer *tp)
struct itimerval itimer;
struct pppTimer *t, *pt;
u_long ticks = 0;
int omask;
sigset_t mask, omask;
omask = sigblock(sigmask(SIGALRM));
sigemptyset(&mask);
sigaddset(&mask, SIGALRM);
sigprocmask(SIG_BLOCK, &mask, &omask);
if (tp->state != TIMER_STOPPED)
StopTimerNoBlock(tp);
if (tp->load == 0) {
log_Printf(LogTIMER, "%s timer[%p] has 0 load!\n", tp->name, tp);
sigsetmask(omask);
sigprocmask(SIG_SETMASK, &omask, NULL);
return;
}
@ -121,7 +125,7 @@ timer_Start(struct pppTimer *tp)
if (t)
t->rest -= tp->rest;
sigsetmask(omask);
sigprocmask(SIG_SETMASK, &omask, NULL);
}
static void