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

Drop out of our main loop due to a signal rather than handling things in the

Browse Source 
signal handler.
Fix a spelling error.

Subtley pointed out by: bde

Make some stuff static
This commit is contained in:
Brian Somers 2000-12-04 22:13:30 +00:00
parent 5ee171d264
commit b884490bc0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=69582
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libexec/pppoed/pppoed.c
View File

@ -63,6 +63,8 @@
#define DEFAULT_EXEC_PREFIX "exec /usr/sbin/ppp -direct " #define DEFAULT_EXEC_PREFIX "exec /usr/sbin/ppp -direct "
static int ReceivedSignal;
static int static int
usage(const char *prog) usage(const char *prog)
{ {
@ -71,24 +73,11 @@ usage(const char *prog)
return EX_USAGE; return EX_USAGE;
} }
const char *pidfile;
static void static void
Fairwell(int sig) Farewell(int sig)
{ {
char buf[] = "Received signal XX, exiting"; ReceivedSignal = sig;
signal(sig, SIG_DFL); /* If something makes us block... */
/* No stdio in a signal handler */
buf[16] = '0' + ((sig / 10) % 10);
buf[17] = '0' + (sig % 10);
syslog(LOG_INFO, "%s", buf);
if (pidfile)
remove(pidfile);
signal(sig, SIG_DFL);
raise(sig);
} }
static int static int
@ -418,7 +407,7 @@ Spawn(const char *prog, const char *acname, const char *exec,
} }
#ifndef NOKLDLOAD #ifndef NOKLDLOAD
int static int
LoadModules(void) LoadModules(void)
{ {
const char *module[] = { "netgraph", "ng_socket", "ng_ether", "ng_pppoe" }; const char *module[] = { "netgraph", "ng_socket", "ng_ether", "ng_pppoe" };
@ -434,7 +423,7 @@ LoadModules(void)
} }
#endif #endif
void static void
nglog(const char *fmt, ...) nglog(const char *fmt, ...)
{ {
char nfmt[256]; char nfmt[256];
@ -446,7 +435,7 @@ nglog(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
void static void
nglogx(const char *fmt, ...) nglogx(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -464,6 +453,7 @@ main(int argc, char **argv)
const char *prog, *provider, *acname; const char *prog, *provider, *acname;
struct ngm_connect ngc; struct ngm_connect ngc;
int ch, cs, ds, ret, optF, optd, optn, sz, f; int ch, cs, ds, ret, optF, optd, optn, sz, f;
const char *pidfile;
prog = strrchr(argv[0], '/'); prog = strrchr(argv[0], '/');
prog = prog ? prog + 1 : argv[0]; prog = prog ? prog + 1 : argv[0];
@ -584,12 +574,12 @@ main(int argc, char **argv)
if (!optF && optn) if (!optF && optn)
NgSetErrLog(nglog, nglogx); NgSetErrLog(nglog, nglogx);
signal(SIGHUP, Fairwell); signal(SIGHUP, Farewell);
signal(SIGINT, Fairwell); signal(SIGINT, Farewell);
signal(SIGQUIT, Fairwell); signal(SIGQUIT, Farewell);
signal(SIGTERM, Fairwell); signal(SIGTERM, Farewell);
while (1) { while (!ReceivedSignal) {
if (*provider) if (*provider)
syslog(LOG_INFO, "Listening as provider %s", provider); syslog(LOG_INFO, "Listening as provider %s", provider);
else else
@ -620,5 +610,19 @@ main(int argc, char **argv)
Spawn(prog, acname, exec, ngc, cs, ds, response, sz, optd); Spawn(prog, acname, exec, ngc, cs, ds, response, sz, optd);
} }
if (pidfile)
remove(pidfile);
if (ReceivedSignal) {
syslog(LOG_INFO, "Received signal %d, exiting", ReceivedSignal);
signal(ReceivedSignal, SIG_DFL);
raise(ReceivedSignal);
/* NOTREACHED */
ret = -ReceivedSignal;
}
return ret; return ret;
} }