* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: main.c,v 1.149 2004/11/14 22:53:42 carlsonj Exp $"
+#define RCSID "$Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp $"
#include <stdio.h>
#include <ctype.h>
char *prog;
void (*done) __P((void *));
void *arg;
+ int killable;
struct subprocess *next;
};
static void open_ccp __P((int));
static void bad_signal __P((int));
static void holdoff_end __P((void *));
+static void forget_child __P((int pid, int status));
static int reap_kids __P((void));
static void childwait_end __P((void *));
script_unsetenv("BYTES_RCVD");
lcp_open(0); /* Start protocol */
+ start_link(0);
while (phase != PHASE_DEAD) {
handle_events();
get_input();
}
}
}
+ /* restore FSMs to original state */
+ lcp_close(0, "");
if (!persist || asked_to_quit || (maxfail > 0 && unsuccess >= maxfail))
break;
{ 0x8051, "KNX Bridging Control Protocol" },
{ 0x8053, "Encryption Control Protocol" },
{ 0x8055, "Individual Link Encryption Control Protocol" },
- { 0x8057, "IPv6 Control Protovol" },
+ { 0x8057, "IPv6 Control Protocol" },
{ 0x8059, "PPP Muxing Control Protocol" },
{ 0x805b, "Vendor-Specific Network Control Protocol (VSNCP)" },
{ 0x806f, "Stampede Bridging Control Protocol" },
int sig;
{
struct sigaction act, oldact;
+ struct subprocess *chp;
+
+ if (!detached) {
+ /*
+ * There might be other things in our process group that we
+ * didn't start that would get hit if we did a kill(0), so
+ * just send the signal individually to our children.
+ */
+ for (chp = children; chp != NULL; chp = chp->next)
+ if (chp->killable)
+ kill(chp->pid, sig);
+ return;
+ }
+ /* We've done a setsid(), so we can just use a kill(0) */
sigemptyset(&act.sa_mask); /* unnecessary in fact */
act.sa_handler = SIG_IGN;
act.sa_flags = 0;
if (errfd == 0 || errfd == 1)
errfd = dup(errfd);
+ closelog();
+
/* dup the in, out, err fds to 0, 1, 2 */
if (infd != 0)
dup2(infd, 0);
if (errfd != 2)
dup2(errfd, 2);
- closelog();
if (log_to_fd > 2)
close(log_to_fd);
if (the_channel->close)
return 0;
}
+static bool
+add_script_env(pos, newstring)
+ int pos;
+ char *newstring;
+{
+ if (pos + 1 >= s_env_nalloc) {
+ int new_n = pos + 17;
+ char **newenv = realloc(script_env, new_n * sizeof(char *));
+ if (newenv == NULL) {
+ free(newstring - 1);
+ return 0;
+ }
+ script_env = newenv;
+ s_env_nalloc = new_n;
+ }
+ script_env[pos] = newstring;
+ script_env[pos + 1] = NULL;
+ return 1;
+}
+
+static void
+remove_script_env(pos)
+ int pos;
+{
+ free(script_env[pos] - 1);
+ while ((script_env[pos] = script_env[pos + 1]) != NULL)
+ pos++;
+}
+
+/*
+ * update_system_environment - process the list of set/unset options
+ * and update the system environment.
+ */
+static void
+update_system_environment()
+{
+ struct userenv *uep;
+
+ for (uep = userenv_list; uep != NULL; uep = uep->ue_next) {
+ if (uep->ue_isset)
+ setenv(uep->ue_name, uep->ue_value, 1);
+ else
+ unsetenv(uep->ue_name);
+ }
+}
+
/*
* device_script - run a program to talk to the specified fds
* (e.g. to run the connector or disconnector script).
}
if (pid != 0) {
- if (dont_wait) {
- record_child(pid, program, NULL, NULL);
- status = 0;
- } else {
+ record_child(pid, program, NULL, NULL, 1);
+ status = 0;
+ if (!dont_wait) {
while (waitpid(pid, &status, 0) < 0) {
if (errno == EINTR)
continue;
fatal("error waiting for (dis)connection process: %m");
}
+ forget_child(pid, status);
--conn_running;
}
return (status == 0 ? 0 : -1);
fprintf(stderr, "pppd: setuid failed\n");
exit(1);
}
+ update_system_environment();
execl("/bin/sh", "sh", "-c", program, (char *)0);
perror("pppd: could not exec /bin/sh");
- exit(99);
+ _exit(99);
/* NOTREACHED */
}
/*
- * run-program - execute a program with given arguments,
- * but don't wait for it.
+ * update_script_environment - process the list of set/unset options
+ * and update the script environment. Note that we intentionally do
+ * not update the TDB. These changes are layered on top right before
+ * exec. It is not possible to use script_setenv() or
+ * script_unsetenv() safely after this routine is run.
+ */
+static void
+update_script_environment()
+{
+ struct userenv *uep;
+
+ for (uep = userenv_list; uep != NULL; uep = uep->ue_next) {
+ int i;
+ char *p, *newstring;
+ int nlen = strlen(uep->ue_name);
+
+ for (i = 0; (p = script_env[i]) != NULL; i++) {
+ if (strncmp(p, uep->ue_name, nlen) == 0 && p[nlen] == '=')
+ break;
+ }
+ if (uep->ue_isset) {
+ nlen += strlen(uep->ue_value) + 2;
+ newstring = malloc(nlen + 1);
+ if (newstring == NULL)
+ continue;
+ *newstring++ = 0;
+ slprintf(newstring, nlen, "%s=%s", uep->ue_name, uep->ue_value);
+ if (p != NULL)
+ script_env[i] = newstring;
+ else
+ add_script_env(i, newstring);
+ } else {
+ remove_script_env(i);
+ }
+ }
+}
+
+/*
+ * run_program - execute a program with given arguments,
+ * but don't wait for it unless wait is non-zero.
* If the program can't be executed, logs an error unless
* must_exist is 0 and the program file doesn't exist.
* Returns -1 if it couldn't fork, 0 if the file doesn't exist
* reap_kids) iff the return value is > 0.
*/
pid_t
-run_program(prog, args, must_exist, done, arg)
+run_program(prog, args, must_exist, done, arg, wait)
char *prog;
char **args;
int must_exist;
void (*done) __P((void *));
void *arg;
+ int wait;
{
- int pid;
+ int pid, status;
struct stat sbuf;
/*
if (pid != 0) {
if (debug)
dbglog("Script %s started (pid %d)", prog, pid);
- record_child(pid, prog, done, arg);
+ record_child(pid, prog, done, arg, 0);
+ if (wait) {
+ while (waitpid(pid, &status, 0) < 0) {
+ if (errno == EINTR)
+ continue;
+ fatal("error waiting for script %s: %m", prog);
+ }
+ forget_child(pid, status);
+ }
return pid;
}
#endif
/* run the program */
+ update_script_environment();
execve(prog, args, script_env);
if (must_exist || errno != ENOENT) {
/* have to reopen the log, there's nowhere else
syslog(LOG_ERR, "Can't execute %s: %m", prog);
closelog();
}
- _exit(-1);
+ _exit(99);
}
* to use.
*/
void
-record_child(pid, prog, done, arg)
+record_child(pid, prog, done, arg, killable)
int pid;
char *prog;
void (*done) __P((void *));
void *arg;
+ int killable;
{
struct subprocess *chp;
chp->done = done;
chp->arg = arg;
chp->next = children;
+ chp->killable = killable;
children = chp;
}
}
childwait_done = 1;
}
+/*
+ * forget_child - clean up after a dead child
+ */
+static void
+forget_child(pid, status)
+ int pid, status;
+{
+ struct subprocess *chp, **prevp;
+
+ for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) {
+ if (chp->pid == pid) {
+ --n_children;
+ *prevp = chp->next;
+ break;
+ }
+ }
+ if (WIFSIGNALED(status)) {
+ warn("Child process %s (pid %d) terminated with signal %d",
+ (chp? chp->prog: "??"), pid, WTERMSIG(status));
+ } else if (debug)
+ dbglog("Script %s finished (pid %d), status = 0x%x",
+ (chp? chp->prog: "??"), pid,
+ WIFEXITED(status) ? WEXITSTATUS(status) : status);
+ if (chp && chp->done)
+ (*chp->done)(chp->arg);
+ if (chp)
+ free(chp);
+}
+
/*
* reap_kids - get status from any dead child processes,
* and log a message for abnormal terminations.
reap_kids()
{
int pid, status;
- struct subprocess *chp, **prevp;
if (n_children == 0)
return 0;
while ((pid = waitpid(-1, &status, WNOHANG)) != -1 && pid != 0) {
- for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) {
- if (chp->pid == pid) {
- --n_children;
- *prevp = chp->next;
- break;
- }
- }
- if (WIFSIGNALED(status)) {
- warn("Child process %s (pid %d) terminated with signal %d",
- (chp? chp->prog: "??"), pid, WTERMSIG(status));
- } else if (debug)
- dbglog("Script %s finished (pid %d), status = 0x%x",
- (chp? chp->prog: "??"), pid,
- WIFEXITED(status) ? WEXITSTATUS(status) : status);
- if (chp && chp->done)
- (*chp->done)(chp->arg);
- if (chp)
- free(chp);
+ forget_child(pid, status);
}
if (pid == -1) {
if (errno == ECHILD)
free(p-1);
script_env[i] = newstring;
#ifdef USE_TDB
- if (iskey && pppdb != NULL)
- add_db_key(newstring);
- update_db_entry();
+ if (pppdb != NULL) {
+ if (iskey)
+ add_db_key(newstring);
+ update_db_entry();
+ }
#endif
return;
}
} else {
/* no space allocated for script env. ptrs. yet */
i = 0;
- script_env = (char **) malloc(16 * sizeof(char *));
- if (script_env == 0)
+ script_env = malloc(16 * sizeof(char *));
+ if (script_env == 0) {
+ free(newstring - 1);
return;
+ }
s_env_nalloc = 16;
}
- /* reallocate script_env with more space if needed */
- if (i + 1 >= s_env_nalloc) {
- int new_n = i + 17;
- char **newenv = (char **) realloc((void *)script_env,
- new_n * sizeof(char *));
- if (newenv == 0)
- return;
- script_env = newenv;
- s_env_nalloc = new_n;
- }
-
- script_env[i] = newstring;
- script_env[i+1] = 0;
+ if (!add_script_env(i, newstring))
+ return;
#ifdef USE_TDB
if (pppdb != NULL) {
if (p[-1] && pppdb != NULL)
delete_db_key(p);
#endif
- free(p-1);
- while ((script_env[i] = script_env[i+1]) != 0)
- ++i;
+ remove_script_env(i);
break;
}
}
dbuf.dptr = vbuf;
dbuf.dsize = vlen;
if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
- error("tdb_store failed: %s", tdb_error(pppdb));
+ error("tdb_store failed: %s", tdb_errorstr(pppdb));
if (vbuf)
free(vbuf);
dbuf.dptr = db_key;
dbuf.dsize = strlen(db_key);
if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
- error("tdb_store key failed: %s", tdb_error(pppdb));
+ error("tdb_store key failed: %s", tdb_errorstr(pppdb));
}
/*
projects / ppp.git / blobdiff