New CHAP implementation, rewritten from scratch to avoid the code

[ppp.git] / pppd / main.c

diff --git a/pppd/main.c b/pppd/main.c
index 6bb4b65b256efb9255d2c1121b081cdd897b1a39..640782ad6f35d03b02f08d583733669734943acd 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -40,7 +40,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: main.c,v 1.125 2003/03/30 08:26:56 paulus Exp $"
+#define RCSID  "$Id: main.c,v 1.128 2003/06/11 23:56:26 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -74,7 +74,7 @@
 #include "ipv6cp.h"
 #endif
 #include "upap.h"
-#include "chap.h"
+#include "chap-new.h"
 #include "eap.h"
 #include "ccp.h"
 #include "ecp.h"
@@ -175,6 +175,8 @@ struct pppd_stats link_stats;
 unsigned link_connect_time;
 int link_stats_valid;
 
+int error_count;
+
 /*
  * We maintain a list of child process pids and
  * functions to call when they exit.
@@ -436,8 +438,6 @@ main(argc, argv)
 
     waiting = 0;
 
-    create_linkpidfile(getpid());
-
     /*
      * If we're doing dial-on-demand, set up the interface now.
      */
@@ -457,6 +457,7 @@ main(argc, argv)
         * Configure the interface and mark it up, etc.
         */
        demand_conf();
+       create_linkpidfile(getpid());
     }
 
     do_callback = 0;
@@ -513,6 +514,9 @@ main(argc, argv)
            status = EXIT_FATAL_ERROR;
            goto disconnect;
        }
+       /* create the pid file, now that we've obtained a ppp interface */
+       if (!demand)
+           create_linkpidfile(getpid());
 
        if (!demand && ifunit >= 0)
            set_ifunit(1);
@@ -1060,6 +1064,48 @@ get_input()
     lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
 }
 
+/*
+ * ppp_send_config - configure the transmit-side characteristics of
+ * the ppp interface.  Returns -1, indicating an error, if the channel
+ * send_config procedure called error() (or incremented error_count
+ * itself), otherwise 0.
+ */
+int
+ppp_send_config(unit, mtu, accm, pcomp, accomp)
+    int unit, mtu;
+    u_int32_t accm;
+    int pcomp, accomp;
+{
+       int errs;
+
+       if (the_channel->send_config == NULL)
+               return 0;
+       errs = error_count;
+       (*the_channel->send_config)(mtu, accm, pcomp, accomp);
+       return (error_count != errs)? -1: 0;
+}
+
+/*
+ * ppp_recv_config - configure the receive-side characteristics of
+ * the ppp interface.  Returns -1, indicating an error, if the channel
+ * recv_config procedure called error() (or incremented error_count
+ * itself), otherwise 0.
+ */
+int
+ppp_recv_config(unit, mru, accm, pcomp, accomp)
+    int unit, mru;
+    u_int32_t accm;
+    int pcomp, accomp;
+{
+       int errs;
+
+       if (the_channel->recv_config == NULL)
+               return 0;
+       errs = error_count;
+       (*the_channel->recv_config)(mru, accm, pcomp, accomp);
+       return (error_count != errs)? -1: 0;
+}
+
 /*
  * new_phase - signal the start of a new phase of pppd's operation.
  */