* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: main.c,v 1.108 2001/12/14 02:51:34 mostrows Exp $"
+#define RCSID "$Id: main.c,v 1.113 2002/05/21 17:26:49 dfs Exp $"
#include <stdio.h>
#include <ctype.h>
#include "upap.h"
#include "chap.h"
#include "ccp.h"
+#include "ecp.h"
#include "pathnames.h"
+
+#ifdef USE_TDB
#include "tdb.h"
+#endif
#ifdef CBCP_SUPPORT
#include "cbcp.h"
static char pidfilename[MAXPATHLEN]; /* name of pid file */
static char linkpidfile[MAXPATHLEN]; /* name of linkname pid file */
char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
+char remote_number[MAXNAMELEN]; /* Remote telephone number, if available */
uid_t uid; /* Our real user-id */
struct notifier *pidchange = NULL;
struct notifier *phasechange = NULL;
int unsuccess; /* # unsuccessful connection attempts */
int do_callback; /* != 0 if we should do callback next */
int doing_callback; /* != 0 if we are doing callback */
+int ppp_session_number; /* Session number, for channels with such a
+ concept (eg PPPoE) */
+#ifdef USE_TDB
TDB_CONTEXT *pppdb; /* database for storing status etc. */
+#endif
+
char db_key[32];
int (*holdoff_hook) __P((void)) = NULL;
int (*new_phase_hook) __P((int)) = NULL;
+void (*snoop_recv_hook) __P((unsigned char *p, int len)) = NULL;
+void (*snoop_send_hook) __P((unsigned char *p, int len)) = NULL;
static int conn_running; /* we have a [dis]connector running */
static int devfd; /* fd of underlying device */
static void bad_signal __P((int));
static void holdoff_end __P((void *));
static int reap_kids __P((int waitfor));
+
+#ifdef USE_TDB
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));
+#endif
+
static void handle_events __P((void));
static void print_link_stats __P((void));
&ipv6cp_protent,
#endif
&ccp_protent,
+ &ecp_protent,
#ifdef IPX_CHANGE
&ipxcp_protent,
#endif
*/
sys_init();
+#ifdef USE_TDB
pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644);
if (pppdb != NULL) {
slprintf(db_key, sizeof(db_key), "pppd%d", getpid());
multilink = 0;
}
}
+#endif
/*
* Detach ourselves from the terminal, if required,
/*
* Open the loopback channel and set it up to be the ppp interface.
*/
+#ifdef USE_TDB
tdb_writelock(pppdb);
+#endif
fd_loop = open_ppp_loopback();
set_ifunit(1);
+#ifdef USE_TDB
tdb_writeunlock(pppdb);
-
+#endif
/*
* Configure the interface and mark it up, etc.
*/
goto fail;
/* set up the serial device as a ppp interface */
+#ifdef USE_TDB
tdb_writelock(pppdb);
+#endif
fd_ppp = the_channel->establish_ppp(devfd);
if (fd_ppp < 0) {
+#ifdef USE_TDB
tdb_writeunlock(pppdb);
+#endif
status = EXIT_FATAL_ERROR;
goto disconnect;
}
if (!demand && ifunit >= 0)
set_ifunit(1);
+#ifdef USE_TDB
tdb_writeunlock(pppdb);
+#endif
/*
* Start opening the connection and wait for
}
dump_packet("rcvd", p, len);
+ if (snoop_recv_hook) snoop_recv_hook(p, len);
p += 2; /* Skip address and control */
GETSHORT(protocol, p);
warn("unable to delete pid file %s: %m", linkpidfile);
linkpidfile[0] = 0;
+#ifdef USE_TDB
if (pppdb != NULL)
cleanup_db();
+#endif
+
}
void
(chp? chp->prog: "??"), pid, WTERMSIG(status));
} else if (debug)
dbglog("Script %s finished (pid %d), status = 0x%x",
- (chp? chp->prog: "??"), pid, status);
+ (chp? chp->prog: "??"), pid,
+ WIFEXITED(status) ? WEXITSTATUS(status) : status);
if (chp && chp->done)
(*chp->done)(chp->arg);
if (chp)
}
/*
- * notify - call a set of functions registered with add_notify.
+ * notify - call a set of functions registered with add_notifier.
*/
void
notify(notif, val)
if (script_env != 0) {
for (i = 0; (p = script_env[i]) != 0; ++i) {
if (strncmp(p, var, varl) == 0 && p[varl] == '=') {
+#ifdef USE_TDB
if (p[-1] && pppdb != NULL)
delete_db_key(p);
+#endif
free(p-1);
script_env[i] = newstring;
+#ifdef USE_TDB
if (iskey && pppdb != NULL)
add_db_key(newstring);
update_db_entry();
+#endif
return;
}
}
script_env[i] = newstring;
script_env[i+1] = 0;
+#ifdef USE_TDB
if (pppdb != NULL) {
if (iskey)
add_db_key(newstring);
update_db_entry();
}
+#endif
}
/*
return;
for (i = 0; (p = script_env[i]) != 0; ++i) {
if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
+#ifdef USE_TDB
if (p[-1] && pppdb != NULL)
delete_db_key(p);
+#endif
free(p-1);
while ((script_env[i] = script_env[i+1]) != 0)
++i;
break;
}
}
+#ifdef USE_TDB
if (pppdb != NULL)
update_db_entry();
+#endif
}
+#ifdef USE_TDB
/*
* update_db_entry - update our entry in the database.
*/
if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
error("tdb_store failed: %s", tdb_error(pppdb));
+ if (vbuf)
+ free(vbuf);
+
}
/*
if (p[-1])
delete_db_key(p);
}
+#endif /* USE_TDB */