* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.80 1999/07/21 00:24:31 paulus Exp $";
-#endif
+#define RCSID "$Id: main.c,v 1.83 1999/08/13 06:46:15 paulus Exp $"
#include <stdio.h>
#include <ctype.h>
#include "atcp.h"
#endif
+static const char rcsid[] = RCSID;
+
/* interface vars */
char ifname[32]; /* Interface name */
int ifunit; /* Interface unit number */
char *progname; /* Name of this program */
char hostname[MAXNAMELEN]; /* Our hostname */
static char pidfilename[MAXPATHLEN]; /* name of pid file */
+static char linkpidfile[MAXPATHLEN]; /* name of linkname pid file */
static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
static uid_t uid; /* Our real user-id */
static int conn_running; /* we have a [dis]connector running */
int prepass = 0; /* doing prepass to find device name */
int devnam_fixed; /* set while in options.ttyxx file */
volatile int status; /* exit status for pppd */
+int unsuccess; /* # unsuccessful connection attempts */
static int fd_ppp = -1; /* fd for talking PPP */
static int fd_loop; /* fd for getting demand-dial packets */
/* Prototypes for procedures local to this file. */
static void create_pidfile __P((void));
+static void create_linkpidfile __P((void));
static void cleanup __P((void));
static void close_tty __P((void));
static void get_input __P((void));
waiting = 0;
+ create_linkpidfile();
+
/*
* If we're doing dial-on-demand, set up the interface now.
*/
ttyfd = -1;
real_ttyfd = -1;
status = EXIT_OK;
+ ++unsuccess;
if (demand) {
/*
if (!demand) {
if (pidfilename[0] != 0
&& unlink(pidfilename) < 0 && errno != ENOENT)
- warn("unable to delete pid file: %m");
+ warn("unable to delete pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
- if (!persist)
+ if (!persist || (maxfail > 0 && unsuccess >= maxfail))
break;
kill_link = 0;
close(2);
detached = 1;
log_to_fd = -1;
- /* update pid file if it has been written already */
+ /* update pid files if they have been written already */
if (pidfilename[0])
create_pidfile();
+ if (linkpidfile[0])
+ create_linkpidfile();
}
/*
}
slprintf(numbuf, sizeof(numbuf), "%d", getpid());
script_setenv("PPPD_PID", numbuf);
+ if (linkpidfile[0])
+ create_linkpidfile();
+}
+
+static void
+create_linkpidfile()
+{
+ FILE *pidfile;
+
+ if (linkname[0] == 0)
+ return;
+ slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid",
+ _PATH_VARRUN, linkname);
+ if ((pidfile = fopen(linkpidfile, "w")) != NULL) {
+ fprintf(pidfile, "%d\n", getpid());
+ if (pidfilename[0])
+ fprintf(pidfile, "%s\n", ifname);
+ (void) fclose(pidfile);
+ } else {
+ error("Failed to create pid file %s: %m", linkpidfile);
+ linkpidfile[0] = 0;
+ }
+ script_setenv("LINKNAME", linkname);
}
/*
close_tty();
if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT)
- warn("unable to delete pid file: %m");
+ warn("unable to delete pid file %s: %m", pidfilename);
pidfilename[0] = 0;
+ if (linkpidfile[0] != 0 && unlink(linkpidfile) < 0 && errno != ENOENT)
+ warn("unable to delete pid file %s: %m", linkpidfile);
+ linkpidfile[0] = 0;
if (locked)
unlock();