From 298091dacd2d72a8e3069984e329a4def548cc14 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 14 May 1997 01:18:51 +0000
Subject: [PATCH] Build pid_filename without a double slash. Make ``Dial
 attempt'' diagnostics consistent.

Reset lostCarrier when it has reached max.
Suggested by:	Kevin Street <street@iName.com>
---
 usr.sbin/ppp/command.c |  4 ++--
 usr.sbin/ppp/main.c    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 8685bb49d383..4e510467bd1e 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: command.c,v 1.44 1997/05/10 03:39:51 brian Exp $
+ * $Id: command.c,v 1.45 1997/05/10 23:46:29 ache Exp $
  *
  */
 #include <sys/types.h>
@@ -143,7 +143,7 @@ char **argv;
   }
   tries = 0;
   do {
-    printf("Dial attempt %u\n", ++tries);
+    printf("Dial attempt %u of %d\n", ++tries, VarDialTries);
     modem = OpenModem(mode);
     if (modem < 0) {
       printf("failed to open modem.\n");
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index e4403f5f0e85..052cad124e09 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.48 1997/05/10 03:39:53 brian Exp $
+ * $Id: main.c,v 1.49 1997/05/11 10:23:16 brian Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
@@ -460,7 +460,7 @@ char **argv;
           close(BGFiledes[0]);
     }
 
-    snprintf(pid_filename, sizeof (pid_filename), "%s/tun%d.pid",
+    snprintf(pid_filename, sizeof (pid_filename), "%stun%d.pid",
              _PATH_VARRUN, tunno);
     (void)unlink(pid_filename);
 
@@ -768,13 +768,17 @@ DoLoop()
      * due to the "set reconnect" value, we'd better bring the line
      * back up now.
      */
-    if (LcpFsm.state <= ST_CLOSED && dial_up != TRUE
-        && lostCarrier && lostCarrier <= VarReconnectTries) {
+    if (LcpFsm.state <= ST_CLOSED && dial_up != TRUE && lostCarrier)
+      if (lostCarrier <= VarReconnectTries) {
         LogPrintf(LOG_PHASE_BIT, "Connection lost, re-establish (%d/%d)\n",
                   lostCarrier, VarReconnectTries);
 	StartRedialTimer(VarReconnectTimer);
         dial_up = TRUE;
-    }
+      } else {
+        LogPrintf(LOG_PHASE_BIT, "Connection lost, maximum (%d) times\n",
+                  VarReconnectTries);
+        lostCarrier = 0;
+      }
 
    /*
     * If Ip packet for output is enqueued and require dial up,