| datalink.c (44468) | datalink.c (45350) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $Id: datalink.c,v 1.34 1999/02/26 21:28:10 brian Exp $ | 26 * $Id: datalink.c,v 1.35 1999/03/04 17:42:15 brian Exp $ |
| 27 */ 28 29#include <sys/param.h> 30#include <netinet/in.h> 31#include <netinet/in_systm.h> 32#include <netinet/ip.h> 33#include <sys/un.h> 34 --- 454 unchanged lines hidden (view full) --- 489 struct datalink *dl = (struct datalink *)v; 490 struct lcp *lcp = &dl->physical->link.lcp; 491 492 if (fp->proto == PROTO_LCP) { 493 datalink_GotAuthname(dl, ""); 494 lcp->auth_ineed = lcp->want_auth; 495 lcp->auth_iwait = lcp->his_auth; 496 if (lcp->his_auth || lcp->want_auth) { | 27 */ 28 29#include <sys/param.h> 30#include <netinet/in.h> 31#include <netinet/in_systm.h> 32#include <netinet/ip.h> 33#include <sys/un.h> 34 --- 454 unchanged lines hidden (view full) --- 489 struct datalink *dl = (struct datalink *)v; 490 struct lcp *lcp = &dl->physical->link.lcp; 491 492 if (fp->proto == PROTO_LCP) { 493 datalink_GotAuthname(dl, ""); 494 lcp->auth_ineed = lcp->want_auth; 495 lcp->auth_iwait = lcp->his_auth; 496 if (lcp->his_auth || lcp->want_auth) { |
| 497 if (bundle_Phase(dl->bundle) == PHASE_ESTABLISH) | 497 if (bundle_Phase(dl->bundle) != PHASE_NETWORK) |
| 498 bundle_NewPhase(dl->bundle, PHASE_AUTHENTICATE); 499 log_Printf(LogPHASE, "%s: his = %s, mine = %s\n", dl->name, 500 Auth2Nam(lcp->his_auth, lcp->his_authtype), 501 Auth2Nam(lcp->want_auth, lcp->want_authtype)); 502 if (lcp->his_auth == PROTO_PAP) 503 auth_StartReq(&dl->pap); 504 if (lcp->want_auth == PROTO_CHAP) 505 auth_StartReq(&dl->chap.auth); --- 859 unchanged lines hidden --- | 498 bundle_NewPhase(dl->bundle, PHASE_AUTHENTICATE); 499 log_Printf(LogPHASE, "%s: his = %s, mine = %s\n", dl->name, 500 Auth2Nam(lcp->his_auth, lcp->his_authtype), 501 Auth2Nam(lcp->want_auth, lcp->want_authtype)); 502 if (lcp->his_auth == PROTO_PAP) 503 auth_StartReq(&dl->pap); 504 if (lcp->want_auth == PROTO_CHAP) 505 auth_StartReq(&dl->chap.auth); --- 859 unchanged lines hidden --- |