www.usr.com/support/gpl/USR9107_release.1.4.tar.gz

[bcm963xx.git] / userapps / opensource / ppp / pppoe / auth.c

diff --git a/userapps/opensource/ppp/pppoe/auth.c b/userapps/opensource/ppp/pppoe/auth.c
index b7d0ced..9e8d2b7 100755 (executable)
--- a/userapps/opensource/ppp/pppoe/auth.c
+++ b/userapps/opensource/ppp/pppoe/auth.c
@@ -658,14 +658,17 @@ auth_withpeer_fail(unit, protocol)
     if ((strlen(user) > 0) || autoscanP2) {
     printf("PPP: Authenication failed.\n");
     create_msg(BCM_PPPOE_AUTH_FAILED); 
-    //Ali for DT log
-#ifdef LOGMSG_EN
-       syslog(LOG_USER, "Username and Password: Failed\n") ;
-#else
-    syslog(LOG_USER,"Benutzername und Passwort: Fehlgeschlagen.\n");
-#endif
+    syslog(LOG_ERR,"User name and password authentication failed.\n");
     }
+
+    if (autoscanP2) {
+    maxfail=0;
     persist=0;
+    }
+    else {
+    unsuccess++;
+    persist=1;
+    }
 }
 
 /*
@@ -690,12 +693,9 @@ auth_withpeer_success(unit, protocol)
        warn("auth_withpeer_success: unknown protocol %x", protocol);
        bit = 0;
     }
-    //Ali for DT log
-#ifdef LOGMSG_EN
-       syslog(LOG_USER, "Username and Password: OK\n") ;
-#else
-    syslog(LOG_USER,"Benutzername und Passwort: OK\n");
-#endif
+
+    persist=1;  // for autoscan
+
     /*
      * If there is no more authentication still being done,
      * proceed to the network (or callback) phase.
@@ -720,6 +720,7 @@ np_up(unit, proto)
         */
        status = EXIT_OK;
        unsuccess = 0;
+        holdoff = 10;
        new_phase(PHASE_RUNNING);
 
        if (idle_time_hook != 0)
@@ -793,6 +794,7 @@ check_idle(arg)
     struct ppp_idle idle;
     time_t itime;
     int tlim;
+
     if (!get_idle_time(0, &idle))
        return;
     if (idle_time_hook != 0) {
@@ -808,12 +810,6 @@ check_idle(arg)
        lcp_close(0, "Link inactive");
        need_holdoff = 0;
        status = EXIT_IDLE_TIMEOUT;
-
-       /*
-       ** Added by marson by ppp ever up       
-       */
-       isDialUpEnabled = 0;
-
        // brcm
        redisconn = 0;
        sprintf(oldsession, "%s", "");