From 9e46ce35b58b5ce6bd963dc1440a173cf328da28 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 25 Mar 1998 00:59:38 +0000
Subject: [PATCH] Use bundle_Phase(), not bundle->phase.

---
 usr.sbin/ppp/bundle.c   | 6 +++---
 usr.sbin/ppp/datalink.c | 6 +++---
 usr.sbin/ppp/main.c     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index d0cb803f2e81..b8dff317277d 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bundle.c,v 1.1.2.30 1998/03/19 22:25:44 brian Exp $
+ *	$Id: bundle.c,v 1.1.2.31 1998/03/20 19:47:40 brian Exp $
  */
 
 #include <sys/param.h>
@@ -178,7 +178,7 @@ bundle_LayerStart(void *v, struct fsm *fp)
   /* The given FSM is about to start up ! */
   struct bundle *bundle = (struct bundle *)v;
 
-  if (fp->proto == PROTO_LCP && bundle->phase == PHASE_DEAD)
+  if (fp->proto == PROTO_LCP && bundle_Phase(bundle) == PHASE_DEAD)
     bundle_NewPhase(bundle, PHASE_ESTABLISH);
 }
 
@@ -713,7 +713,7 @@ bundle_Open(struct bundle *bundle, const char *name)
       if (name != NULL)
         break;
     }
-  if (bundle->phase == PHASE_DEAD)
+  if (bundle_Phase(bundle) == PHASE_DEAD)
     bundle_NewPhase(bundle, PHASE_ESTABLISH);
 }
 
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 2dfb62614fb6..120fe169b6a7 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/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.1.2.26 1998/03/18 21:54:03 brian Exp $
+ *	$Id: datalink.c,v 1.1.2.27 1998/03/20 19:47:54 brian Exp $
  */
 
 #include <sys/param.h>
@@ -390,8 +390,8 @@ datalink_LayerUp(void *v, struct fsm *fp)
     dl->lcp.auth_ineed = dl->lcp.want_auth;
     dl->lcp.auth_iwait = dl->lcp.his_auth;
     if (dl->lcp.his_auth || dl->lcp.want_auth) {
-      if (dl->bundle->phase == PHASE_DEAD ||
-          dl->bundle->phase == PHASE_ESTABLISH)
+      if (bundle_Phase(dl->bundle) == PHASE_DEAD ||
+          bundle_Phase(dl->bundle) == PHASE_ESTABLISH)
         bundle_NewPhase(dl->bundle, PHASE_AUTHENTICATE);
       LogPrintf(LogPHASE, "%s: his = %s, mine = %s\n", dl->name,
                 Auth2Nam(dl->lcp.his_auth), Auth2Nam(dl->lcp.want_auth));
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 25724a5f2885..2d2c0ea8fc87 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.121.2.35 1998/03/16 22:54:10 brian Exp $
+ * $Id: main.c,v 1.121.2.36 1998/03/20 19:48:11 brian Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
@@ -611,7 +611,7 @@ DoLoop(struct bundle *bundle)
        * Process on-demand dialup. Output packets are queued within tunnel
        * device until IPCP is opened.
        */
-      if (bundle->phase == PHASE_DEAD && (mode & MODE_AUTO) &&
+      if (bundle_Phase(bundle) == PHASE_DEAD && (mode & MODE_AUTO) &&
 	  (pri = PacketCheck(bundle, tun.data, n, &bundle->filter.dial)) >= 0)
         bundle_Open(bundle, NULL);