* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: main.c,v 1.92 2000/04/04 07:06:51 paulus Exp $"
+#define RCSID "$Id: main.c,v 1.98 2000/04/29 12:32:59 paulus Exp $"
#include <stdio.h>
#include <ctype.h>
static int conn_running; /* we have a [dis]connector running */
int ttyfd; /* Serial port file descriptor */
-mode_t tty_mode = -1; /* Original access permissions to tty */
+mode_t tty_mode = (mode_t)-1; /* Original access permissions to tty */
int baud_rate; /* Actual bits/second for serial device */
int hungup; /* terminal has been hung up */
int privileged; /* we're running as real uid root */
static void update_db_entry __P((void));
static void add_db_key __P((const char *));
static void delete_db_key __P((const char *));
+static void cleanup_db __P((void));
static int open_socket __P((char *));
static int start_charshunt __P((int, int));
static void charshunt_done __P((void *));
NULL
};
+/*
+ * If PPP_DRV_NAME is not defined, use the legacy "ppp" as the
+ * device name.
+ */
+#if !defined(PPP_DRV_NAME)
+#define PPP_DRV_NAME "ppp"
+#endif /* !defined(PPP_DRV_NAME) */
+
int
main(argc, argv)
int argc;
if (debug)
setlogmask(LOG_UPTO(LOG_DEBUG));
- pppdb = tdb_open(_PATH_PPPDB, 0, TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0644);
+ pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644);
if (pppdb != NULL) {
slprintf(db_key, sizeof(db_key), "pppd%d", getpid());
update_db_entry();
if (devnam[0])
script_setenv("DEVICE", devnam, 1);
+ slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+ script_setenv("PPPD_PID", numbuf, 1);
setup_signals();
/*
* Open the loopback channel and set it up to be the ppp interface.
*/
+ tdb_writelock(pppdb);
fd_loop = open_ppp_loopback();
set_ifunit(1);
+ tdb_writeunlock(pppdb);
/*
* Configure the interface and mark it up, etc.
}
/* set up the serial device as a ppp interface */
+ tdb_writelock(pppdb);
fd_ppp = establish_ppp(ttyfd);
if (fd_ppp < 0) {
+ tdb_writeunlock(pppdb);
status = EXIT_FATAL_ERROR;
goto disconnect;
}
if (!demand && ifunit >= 0)
set_ifunit(1);
+ tdb_writeunlock(pppdb);
/*
* Start opening the connection and wait for
fd_ppp = -1;
if (!hungup)
lcp_lowerdown(0);
+ if (!demand)
+ script_unsetenv("IFNAME");
/*
* Run disconnector script, if requested.
set_ifunit(iskey)
int iskey;
{
- info("Using interface ppp%d", ifunit);
- slprintf(ifname, sizeof(ifname), "ppp%d", ifunit);
+ info("Using interface %s%d", PPP_DRV_NAME, ifunit);
+ slprintf(ifname, sizeof(ifname), PPP_DRV_NAME "%d", ifunit);
script_setenv("IFNAME", ifname, iskey);
- create_pidfile(); /* write pid to file */
- create_linkpidfile();
+ if (iskey) {
+ create_pidfile(); /* write pid to file */
+ create_linkpidfile();
+ }
}
/*
detach()
{
int pid;
+ char numbuf[16];
if (detached)
return;
close(1);
close(2);
detached = 1;
- log_to_fd = -1;
+ if (!log_to_file && !log_to_specific_fd)
+ log_to_fd = -1;
/* 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, 1);
}
/*
create_pidfile()
{
FILE *pidfile;
- char numbuf[16];
slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
_PATH_VARRUN, ifname);
error("Failed to create pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
- slprintf(numbuf, sizeof(numbuf), "%d", getpid());
- script_setenv("PPPD_PID", numbuf, 1);
}
static void
if (linkname[0] == 0)
return;
+ script_setenv("LINKNAME", linkname, 1);
slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid",
_PATH_VARRUN, linkname);
if ((pidfile = fopen(linkpidfile, "w")) != NULL) {
error("Failed to create pid file %s: %m", linkpidfile);
linkpidfile[0] = 0;
}
- script_setenv("LINKNAME", linkname, 1);
}
/*
if (locked)
unlock();
- if (pppdb != NULL) {
- TDB_DATA key;
-
- key.dptr = db_key;
- key.dsize = strlen(db_key);
- tdb_delete(pppdb, key);
- }
+ if (pppdb != NULL)
+ cleanup_db();
}
/*
int i;
char *p, *newstring;
- newstring = (char *) malloc(vl);
+ newstring = (char *) malloc(vl+1);
if (newstring == 0)
return;
+ *newstring++ = iskey;
slprintf(newstring, vl, "%s=%s", var, value);
/* check if this variable is already set */
if (script_env != 0) {
for (i = 0; (p = script_env[i]) != 0; ++i) {
if (strncmp(p, var, varl) == 0 && p[varl] == '=') {
- if (iskey && pppdb != NULL) {
+ if (p[-1] && pppdb != NULL)
delete_db_key(p);
- add_db_key(newstring);
- }
- free(p);
+ free(p-1);
script_env[i] = newstring;
+ if (iskey && pppdb != NULL)
+ add_db_key(newstring);
+ update_db_entry();
return;
}
}
return;
for (i = 0; (p = script_env[i]) != 0; ++i) {
if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
- free(p);
+ if (p[-1] && pppdb != NULL)
+ delete_db_key(p);
+ free(p-1);
while ((script_env[i] = script_env[i+1]) != 0)
++i;
break;
tdb_delete(pppdb, key);
}
+/*
+ * cleanup_db - delete all the entries we put in the database.
+ */
+static void
+cleanup_db()
+{
+ TDB_DATA key;
+ int i;
+ char *p;
+
+ key.dptr = db_key;
+ key.dsize = strlen(db_key);
+ tdb_delete(pppdb, key);
+ for (i = 0; (p = script_env[i]) != 0; ++i)
+ if (p[-1])
+ delete_db_key(p);
+}
+
/*
* open_socket - establish a stream socket connection to the nominated
* host and port.
sad.sin_family = AF_INET;
sad.sin_port = htons(port);
sad.sin_addr.s_addr = host;
- if (connect(sock, &sad, sizeof(sad)) < 0) {
+ if (connect(sock, (struct sockaddr *)&sad, sizeof(sad)) < 0) {
error("Can't connect to %s: %m", dest);
close(sock);
return -1;
n = max_level - olevel;
n = write(ofd, obufp, n);
if (n < 0) {
- if (errno != EIO) {
+ if (errno == EIO) {
+ pty_readable = 0;
+ nobuf = 0;
+ } else if (errno != EAGAIN && errno != EINTR) {
error("Error writing standard output: %m");
break;
}
- pty_readable = 0;
- nobuf = 0;
} else {
obufp += n;
nobuf -= n;
n = max_level - ilevel;
n = write(pty_master, ibufp, n);
if (n < 0) {
- if (errno != EIO) {
+ if (errno == EIO) {
+ stdin_readable = 0;
+ nibuf = 0;
+ } else if (errno != EAGAIN && errno != EINTR) {
error("Error writing pseudo-tty master: %m");
break;
}
- stdin_readable = 0;
- nibuf = 0;
} else {
ibufp += n;
nibuf -= n;
projects / ppp.git / blobdiff