When running ppp -background, show comfort messages showing

when we're redialing/reconnecting.

While we're here, log redial, reconnect and phone number
announcements to LogCHAT, and reduce some other logging to
LogDEBUG.

1 files changed, 8 insertions, 2 deletions

diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 779d6220ae52..8a34c608bee4 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -83,7 +83,7 @@ datalink_OpenTimeout(void *v)
 
   timer_Stop(&dl->dial.timer);
   if (dl->state == DATALINK_OPENING)
-    log_Printf(LogPHASE, "%s: Redial timer expired.\n", dl->name);
+    log_Printf(LogCHAT, "%s: Redial timer expired.\n", dl->name);
 }
 
 static int
@@ -170,11 +170,16 @@ datalink_HangupDone(struct datalink *dl)
       dl->dial.tries = dl->cfg.dial.max;
       dl->dial.incs = 0;
       dl->reconnect_tries--;
+      log_Printf(LogCHAT, "%s: Reconnect try %d of %d\n",
+                 dl->name, dl->cfg.reconnect.max - dl->reconnect_tries,
+                 dl->cfg.reconnect.max);
+      bundle_Notify(dl->bundle, EX_RECONNECT);
     } else {
       if (dl->phone.next == NULL)
         datalink_StartDialTimer(dl, datalink_GetDialTimeout(dl));
       else
         datalink_StartDialTimer(dl, dl->cfg.dial.next_timeout);
+      bundle_Notify(dl->bundle, EX_REDIAL);
     }
   }
 }
@@ -197,7 +202,7 @@ datalink_ChoosePhoneNumber(struct datalink *dl)
   phone = strsep(&dl->phone.alt, "|");
   dl->phone.chosen = *phone ? phone : "[NONE]";
   if (*phone)
-    log_Printf(LogPHASE, "Phone: %s\n", phone);
+    log_Printf(LogCHAT, "Phone: %s\n", phone);
   return phone;
 }
 
@@ -309,6 +314,7 @@ datalink_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w, fd_set *e,
             int timeout;
 
             timeout = datalink_StartDialTimer(dl, datalink_GetDialTimeout(dl));
+            bundle_Notify(dl->bundle, EX_REDIAL);
             log_WritePrompts(dl, "Failed to open %s, pause %d seconds\n",
                              dl->physical->name.full, timeout);
           }