*/
#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.45 1998/03/25 01:28:14 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.48 1998/04/28 23:37:30 paulus Exp $";
#endif
#include <stdio.h>
int hungup; /* terminal has been hung up */
int privileged; /* we're running as real uid root */
int need_holdoff; /* need holdoff period before restarting */
+int detached; /* have detached from terminal */
int phase; /* where the link is at */
int kill_link;
int open_ccp_flag;
-int redirect_stderr; /* Connector's stderr should go to file */
char **script_env; /* Env. variable values for scripts */
int s_env_nalloc; /* # words avail at script_env */
/* Prototypes for procedures local to this file. */
+static void create_pidfile __P((void));
static void cleanup __P((void));
static void close_tty __P((void));
static void get_input __P((void));
{
int i, fdflags;
struct sigaction sa;
- FILE *pidfile;
char *p;
struct passwd *pw;
struct timeval timo;
*/
if (!default_device && strcmp(devnam, default_devnam) == 0)
default_device = 1;
- redirect_stderr = !nodetach || default_device;
+ if (default_device)
+ nodetach = 1;
/*
* Initialize system-dependent stuff and magic number package.
* Detach ourselves from the terminal, if required,
* and identify who is running us.
*/
- if (!default_device && !nodetach && daemon(0, 0) < 0) {
- perror("Couldn't detach from controlling terminal");
- exit(1);
- }
+ if (nodetach == 0)
+ detach();
pid = getpid();
p = getlogin();
if (p == NULL) {
(void) sprintf(ifname, "ppp%d", ifunit);
script_setenv("IFNAME", ifname);
- /* write pid to file */
- (void) sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, ifname);
- if ((pidfile = fopen(pidfilename, "w")) != NULL) {
- fprintf(pidfile, "%d\n", pid);
- (void) fclose(pidfile);
- } else {
- syslog(LOG_ERR, "Failed to create pid file %s: %m", pidfilename);
- pidfilename[0] = 0;
- }
+ create_pidfile(); /* write pid to file */
/*
* Configure the interface and mark it up, etc.
(void) sprintf(ifname, "ppp%d", ifunit);
script_setenv("IFNAME", ifname);
- /* write pid to file */
- (void) sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, ifname);
- if ((pidfile = fopen(pidfilename, "w")) != NULL) {
- fprintf(pidfile, "%d\n", pid);
- (void) fclose(pidfile);
- } else {
- syslog(LOG_ERR, "Failed to create pid file %s: %m",
- pidfilename);
- pidfilename[0] = 0;
- }
+ create_pidfile(); /* write pid to file */
}
/*
return 0;
}
+/*
+ * detach - detach us from the controlling terminal.
+ */
+void
+detach()
+{
+ if (detached)
+ return;
+ if (daemon(0, 0) < 0) {
+ perror("Couldn't detach from controlling terminal");
+ die(1);
+ }
+ detached = 1;
+ pid = getpid();
+ /* update pid file if it has been written already */
+ if (pidfilename[0])
+ create_pidfile();
+}
+
+/*
+ * Create a file containing our process ID.
+ */
+static void
+create_pidfile()
+{
+ FILE *pidfile;
+
+ (void) sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, ifname);
+ if ((pidfile = fopen(pidfilename, "w")) != NULL) {
+ fprintf(pidfile, "%d\n", pid);
+ (void) fclose(pidfile);
+ } else {
+ syslog(LOG_ERR, "Failed to create pid file %s: %m", pidfilename);
+ pidfilename[0] = 0;
+ }
+}
+
/*
* holdoff_end - called via a timeout when the holdoff period ends.
*/
close(out);
}
}
- if (redirect_stderr) {
+ if (nodetach == 0) {
close(2);
errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
if (errfd >= 0 && errfd != 2) {
fmt = va_arg(pvar, char *);
#endif
- vsprintf(buf, fmt, pvar);
+ n = vfmtmsg(buf, sizeof(buf), fmt, pvar);
va_end(pvar);
- n = strlen(buf);
if (linep + n + 1 > line + sizeof(line)) {
syslog(LOG_DEBUG, "%s", line);
linep = line;