change link_connect_time to unsigned

[ppp.git] / pppd / main.c

diff --git a/pppd/main.c b/pppd/main.c
index 03e1d8f6eee7f7174863427e96d8a28e6781e8b7..e24e08bfc806130605cca9f73b5b840ceab0f8d5 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -17,7 +17,7 @@
  * 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.118 2002/10/27 12:19:58 fcusack Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -53,8 +53,12 @@
 #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"
@@ -94,11 +98,18 @@ volatile int status;                /* exit status for pppd */
 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 */
@@ -135,7 +146,7 @@ int ngroups;                        /* How many groups valid in groups */
 static struct timeval start_time;      /* Time when link was started. */
 
 struct pppd_stats link_stats;
-int link_connect_time;
+unsigned link_connect_time;
 int link_stats_valid;
 
 /*
@@ -170,10 +181,14 @@ static void open_ccp __P((int));
 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));
 
@@ -207,6 +222,7 @@ struct protent *protocols[] = {
     &ipv6cp_protent,
 #endif
     &ccp_protent,
+    &ecp_protent,
 #ifdef IPX_CHANGE
     &ipxcp_protent,
 #endif
@@ -344,15 +360,25 @@ main(argc, argv)
        init_pr_log(NULL, LOG_INFO);
        print_options(pr_log, NULL);
        end_pr_log();
-       if (dryrun)
-           die(0);
     }
 
+    /*
+     * Early check for remote number authorization.
+     */
+    if (!auth_number()) {
+       warn("calling number %q is not authorized", remote_number);
+       exit(EXIT_CNID_AUTH_FAILED);
+    }
+
+    if (dryrun)
+       die(0);
+
     /*
      * Initialize system-dependent stuff.
      */
     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());
@@ -364,6 +390,7 @@ main(argc, argv)
            multilink = 0;
        }
     }
+#endif
 
     /*
      * Detach ourselves from the terminal, if required,
@@ -400,11 +427,14 @@ main(argc, argv)
        /*
         * 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.
         */
@@ -454,17 +484,23 @@ main(argc, argv)
            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
@@ -944,6 +980,7 @@ get_input()
     }
 
     dump_packet("rcvd", p, len);
+    if (snoop_recv_hook) snoop_recv_hook(p, len);
 
     p += 2;                            /* Skip address and control */
     GETSHORT(protocol, p);
@@ -1042,8 +1079,11 @@ cleanup()
        warn("unable to delete pid file %s: %m", linkpidfile);
     linkpidfile[0] = 0;
 
+#ifdef USE_TDB
     if (pppdb != NULL)
        cleanup_db();
+#endif
+
 }
 
 void
@@ -1076,11 +1116,11 @@ update_link_stats(u)
     link_connect_time = now.tv_sec - start_time.tv_sec;
     link_stats_valid = 1;
 
-    slprintf(numbuf, sizeof(numbuf), "%d", link_connect_time);
+    slprintf(numbuf, sizeof(numbuf), "%u", link_connect_time);
     script_setenv("CONNECT_TIME", numbuf, 0);
-    slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_out);
+    slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_out);
     script_setenv("BYTES_SENT", numbuf, 0);
-    slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_in);
+    slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_in);
     script_setenv("BYTES_RCVD", numbuf, 0);
 }
 
@@ -1583,7 +1623,8 @@ reap_kids(waitfor)
                 (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)
@@ -1640,7 +1681,7 @@ remove_notifier(notif, func, arg)
 }
 
 /*
- * notify - call a set of functions registered with add_notify.
+ * notify - call a set of functions registered with add_notifier.
  */
 void
 notify(notif, val)
@@ -1689,13 +1730,17 @@ script_setenv(var, value, iskey)
     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;
            }
        }
@@ -1722,11 +1767,13 @@ script_setenv(var, value, iskey)
     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
 }
 
 /*
@@ -1745,18 +1792,23 @@ script_unsetenv(var)
        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.
  */
@@ -1786,6 +1838,9 @@ update_db_entry()
     if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
        error("tdb_store failed: %s", tdb_error(pppdb));
 
+    if (vbuf)
+        free(vbuf);
+
 }
 
 /*
@@ -1836,3 +1891,4 @@ cleanup_db()
        if (p[-1])
            delete_db_key(p);
 }
+#endif /* USE_TDB */