summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/ppp/ppp/auth.c19
-rw-r--r--usr.sbin/ppp/ppp/auth.h6
-rw-r--r--usr.sbin/ppp/ppp/datalink.c8
-rw-r--r--usr.sbin/ppp/ppp/pap.c10
-rw-r--r--usr.sbin/ppp/ppp/pap.h3
5 files changed, 20 insertions, 26 deletions
diff --git a/usr.sbin/ppp/ppp/auth.c b/usr.sbin/ppp/ppp/auth.c
index 550d7246a81..88b2d7a477d 100644
--- a/usr.sbin/ppp/ppp/auth.c
+++ b/usr.sbin/ppp/ppp/auth.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: auth.c,v 1.3 1999/02/01 13:50:27 brian Exp $
+ * $Id: auth.c,v 1.4 1999/02/02 09:49:57 brian Exp $
*
* TODO:
* o Implement check against with registered IP addresses.
@@ -31,10 +31,12 @@
#include <pwd.h>
#include <stdio.h>
#include <string.h>
+#include <termios.h>
#include <unistd.h>
#include "mbuf.h"
#include "defs.h"
+#include "log.h"
#include "timer.h"
#include "fsm.h"
#include "iplist.h"
@@ -53,6 +55,11 @@
#include "lcpproto.h"
#include "filter.h"
#include "mp.h"
+#include "cbcp.h"
+#include "chap.h"
+#include "async.h"
+#include "physical.h"
+#include "datalink.h"
#include "bundle.h"
const char *
@@ -244,8 +251,10 @@ AuthTimeout(void *vauthp)
if (--authp->retry > 0) {
timer_Start(&authp->authtimer);
(*authp->ChallengeFunc)(authp, ++authp->id, authp->physical);
- } else if (authp->FailedFunc)
- (*authp->FailedFunc)(authp->physical);
+ } else {
+ log_Printf(LogPHASE, "Auth: No response from server\n");
+ datalink_AuthNotOk(authp->physical->dl);
+ }
}
void
@@ -257,11 +266,9 @@ auth_Init(struct authinfo *authinfo)
void
auth_StartChallenge(struct authinfo *authp, struct physical *physical,
- void (*chal)(struct authinfo *, int, struct physical *),
- void (*fail)(struct physical *))
+ void (*chal)(struct authinfo *, int, struct physical *))
{
authp->ChallengeFunc = chal;
- authp->FailedFunc = fail;
authp->physical = physical;
timer_Stop(&authp->authtimer);
authp->authtimer.func = AuthTimeout;
diff --git a/usr.sbin/ppp/ppp/auth.h b/usr.sbin/ppp/ppp/auth.h
index 8f710e55e26..37d06aa5ee3 100644
--- a/usr.sbin/ppp/ppp/auth.h
+++ b/usr.sbin/ppp/ppp/auth.h
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: auth.h,v 1.2 1999/02/01 13:50:27 brian Exp $
+ * $Id: auth.h,v 1.3 1999/02/02 09:49:57 brian Exp $
*
* TODO:
*/
@@ -25,7 +25,6 @@ struct bundle;
struct authinfo {
void (*ChallengeFunc)(struct authinfo *, int, struct physical *);
- void (*FailedFunc)(struct physical *);
struct pppTimer authtimer;
int retry;
int id;
@@ -41,8 +40,7 @@ extern void auth_Init(struct authinfo *);
extern void auth_StopTimer(struct authinfo *);
extern void auth_StartChallenge(struct authinfo *, struct physical *,
void (*)(struct authinfo *, int,
- struct physical *),
- void (*)(struct physical *));
+ struct physical *));
extern int auth_Validate(struct bundle *, const char *, const char *,
struct physical *);
extern char *auth_GetSecret(struct bundle *, const char *, int,
diff --git a/usr.sbin/ppp/ppp/datalink.c b/usr.sbin/ppp/ppp/datalink.c
index ffb6da1fe8f..93cc161f9c8 100644
--- a/usr.sbin/ppp/ppp/datalink.c
+++ b/usr.sbin/ppp/ppp/datalink.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: datalink.c,v 1.8 1999/02/01 13:50:27 brian Exp $
+ * $Id: datalink.c,v 1.9 1999/02/02 09:49:57 brian Exp $
*/
#include <sys/types.h>
@@ -476,11 +476,9 @@ datalink_LayerUp(void *v, struct fsm *fp)
Auth2Nam(dl->physical->link.lcp.his_auth),
Auth2Nam(dl->physical->link.lcp.want_auth));
if (dl->physical->link.lcp.his_auth == PROTO_PAP)
- auth_StartChallenge(&dl->pap, dl->physical, pap_SendChallenge,
- pap_Failed);
+ auth_StartChallenge(&dl->pap, dl->physical, pap_SendChallenge);
if (dl->physical->link.lcp.want_auth == PROTO_CHAP)
- auth_StartChallenge(&dl->chap.auth, dl->physical, chap_SendChallenge,
- NULL);
+ auth_StartChallenge(&dl->chap.auth, dl->physical, chap_SendChallenge);
} else
datalink_AuthOk(dl);
}
diff --git a/usr.sbin/ppp/ppp/pap.c b/usr.sbin/ppp/ppp/pap.c
index a1bfe2cd423..c36d0098077 100644
--- a/usr.sbin/ppp/ppp/pap.c
+++ b/usr.sbin/ppp/ppp/pap.c
@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: pap.c,v 1.2 1999/02/01 13:50:27 brian Exp $
+ * $Id: pap.c,v 1.3 1999/02/02 09:49:57 brian Exp $
*
* TODO:
*/
@@ -135,14 +135,6 @@ PapValidate(struct bundle *bundle, u_char *name, u_char *key,
}
void
-pap_Failed(struct physical *p)
-{
- auth_StopTimer(&p->dl->pap);
- log_Printf(LogPHASE, "Pap: No response from server\n");
- datalink_AuthNotOk(p->dl);
-}
-
-void
pap_Input(struct bundle *bundle, struct mbuf *bp, struct physical *physical)
{
int len = mbuf_Length(bp);
diff --git a/usr.sbin/ppp/ppp/pap.h b/usr.sbin/ppp/ppp/pap.h
index 8fc405ca774..c5fcbd3daf2 100644
--- a/usr.sbin/ppp/ppp/pap.h
+++ b/usr.sbin/ppp/ppp/pap.h
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: pap.h,v 1.2 1999/02/01 13:50:27 brian Exp $
+ * $Id: pap.h,v 1.3 1999/02/02 09:49:57 brian Exp $
*
* TODO:
*/
@@ -29,6 +29,5 @@ struct physical;
struct authinfo;
struct bundle;
-extern void pap_Failed(struct physical *);
extern void pap_Input(struct bundle *, struct mbuf *, struct physical *);
extern void pap_SendChallenge(struct authinfo *, int, struct physical *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 09:54:00 +0000