Changeset 17730

Timestamp:

10/09/11 23:00:45 (20 months ago)

Author:

sash

Message:

pppoesrv: radius backupserver sould work like this:
authserver 192.168.0.206:1812, 192.168.0.205:1812
acctserver 192.168.0.206:1813, 192.168.0.205:1813

Location:

src/router

Files:

• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• rp-pppoe-3.5/config/pppoe-server.nvramconfig (modified) (1 diff)
• services/services/pppoeserver.c (modified) (1 diff)
• services/sysinit/defaults.c (modified) (1 diff)

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -1265 +1265 @@
 service.pptp_legend="PPTP";
 service.pptp_srv="PPTP Server";
-service.pptp_forcemppe="MPPE Encryption";
+//service.pptp_forcemppe="MPPE Encryption";
 service.pptp_client="Client IP(s)";
 service.pptp_chap="CHAP-Secrets";

src/router/rp-pppoe-3.5/config/pppoe-server.nvramconfig

@@ -10 +10 @@
  "pppoeserver_idle" "" "RANGE"  "0"  "9999"  "FALSE" "0"
  "pppoeserver_authserverip" "" "NULL"  "TRUE" "0" 
+ "pppoeserver_authserverip_backup" "" "NULL"  "TRUE" "0" 
  "pppoeserver_authserverport" "" "RANGE"  "1"  "65535"  "FALSE" "0"  
+ "pppoeserver_authserverport_backup" "" "RANGE"  "1"  "65535"  "FALSE" "0" 
  "pppoeserver_acctserverip" "" "NULL"  "TRUE" "0" 
  "pppoeserver_acctserverport" "" "RANGE"  "1"  "65535"  "FALSE" "0"
+ "pppoeserver_acctserverport_backup" "" "RANGE"  "1"  "65535"  "FALSE" "0"
  "pppoeserver_encryption" "" "CHOICE"  "2" "0"  "1"  "FALSE" "0"
  "pppoeradius_enabled" "" "CHOICE"  "2" "0"  "1"  "FALSE" "0"
- "pppoeserver_sharedkey" "" "PASSWORD2" "63" "TRUE" "0"  
+ "pppoeserver_sharedkey" "" "PASSWORD2" "63" "TRUE" "0" 
+ "pppoeserver_sharedkey_backup" "" "PASSWORD2" "63" "TRUE" "0" 
  "pppoeserver_interface" "" "NULL" "TRUE" "0" 
  "pppoeserver_pool" "" "NULL" "TRUE" "0"

src/router/services/services/pppoeserver.c

@@ -313 +313 @@
                                 "radius_retries\t3\n"   //
                                 "login_local\t/bin/login\n"     //
-                                "authserver %s:%s\n"    //
-                                "acctserver %s:%s\n",   //
-                                nvram_safe_get("pppoeserver_authserverip"),
-                                nvram_safe_get("pppoeserver_authserverport"),
-                                nvram_safe_get("pppoeserver_authserverip"),
-                                nvram_safe_get("pppoeserver_acctserverport"));
+                                if nvram_match("pppoeserver_authserverip_backup", "0.0.0.0") {
+                                        "authserver %s:%s\n"    //
+                                        "acctserver %s:%s\n",   //
+                                        nvram_safe_get("pppoeserver_authserverip"),
+                                        nvram_safe_get("pppoeserver_authserverport"),
+                                        nvram_safe_get("pppoeserver_authserverip"),
+                                        nvram_safe_get("pppoeserver_acctserverport"));
+                                }
+                                else {  "authserver %s:%s, %s:%s\n"     //
+                                        "acctserver %s:%s, %s:%s\n",    //
+                                        nvram_safe_get("pppoeserver_authserverip"),
+                                        nvram_safe_get("pppoeserver_authserverport"),
+                                        nvram_safe_get("pppoeserver_authserverip_backup"),
+                                        nvram_safe_get("pppoeserver_acctserverport_backup"),
+                                        nvram_safe_get("pppoeserver_authserverip"),
+                                        nvram_safe_get("pppoeserver_acctserverport"),
+                                        nvram_safe_get("pppoeserver_authserverip_backup"),
+                                        nvram_safe_get("pppoeserver_acctserverport_backup"));
+                                }
                         fclose(fp);
                         fp = fopen("/tmp/pppoeserver/radius/servers", "wb");

src/router/services/sysinit/defaults.c

@@ -2805 +2805 @@
         {"pppoeserver_idle", "0", 0},
         {"pppoeserver_authserverip", "192.168.1.1", 0},
+        {"pppoeserver_authserverip_backup", "0.0.0.0", 0},
         {"pppoeserver_authserverport", "1812", 0},
+        {"pppoeserver_authserverport_backup", "1812", 0},
         {"pppoeserver_acctserverport", "1813", 0},
+        {"pppoeserver_acctserverport_backup", "1813", 0},
         {"pppoeserver_sharedkey", "", 0},
+        {"pppoeserver_sharedkey_backup", "", 0},
         {"pppoeserver_pool", "192.168.1.10-100", 0}, 
 #endif