Changeset 19210

Timestamp:

05/07/12 00:47:05 (14 months ago)

Author:

sash

Message:

pppoesrv: prep better client handling

Location:

src/router

Files:

• kromo/dd-wrt/PPPoE_Server.asp (modified) (2 diffs)
• 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/PPPoE_Server.asp

@@ -58 +58 @@
 
                 toggle_layer_ext(document.setup.pppoeradius_enabled, 'idpppoerad', 'idpppoelocal', <% nvram_else_match("pppoeradius_enabled", "1", "1", "0"); %> == 1);
+                show_layer_ext(document.setup.pppoeserver_clip, 'idpppoeiploc', <% nvram_else_match("pppoeserver_clip", "local", "1", "0"); %> == 1);
                 show_layer_ext(document.setup.pppoeserver_enabled, 'idpppoesrv', <% nvram_else_match("pppoeserver_enabled", "1", "1", "0"); %> == 1);
                 
@@ -118 +119 @@
                         </div>
                         <div class="setting">
+                                <div class="label"><% tran("service.pppoesrv_auth"); %></div>
+                                <input class="spaceradio" type="radio" name="pppoeserver_clip" value="1" <% nvram_checked("pppoeserver_clip", "1"); %> onclick="show_layer_ext(this, 'idpppoeiploc', true)" /><% tran("radius.legend"); %>
+                                <input class="spaceradio" type="radio" name="pppoeserver_clip" value="0" <% nvram_checked("pppoeserver_clip", "0"); %> onclick="show_layer_ext(this, 'idpppoeiploc', false)" /><% tran("service.pppoesrv_chaps"); %>
+                        </div>
+                        <div id="idpppoeiploc">                 
+                                <div class="setting">
                                 <div class="label"><% tran("service.pptp_client"); %></div>
-                                <textarea cols="20" rows="2" id="pppoeserver_pool" name="pppoeserver_pool" onblur="valid_ip_str(this, share.ip)"></textarea>
-                                <script type="text/javascript">
-                                //<![CDATA[
-                                        var pppoeserver_pool = fix_cr( '<% nvram_get("pppoeserver_pool"); %>' );
-                                        document.getElementById("pppoeserver_pool").value = pppoeserver_pool;
-                                //]]>
-                                </script>
+                                        <textarea cols="20" rows="2" id="pppoeserver_pool" name="pppoeserver_pool" onblur="valid_ip_str(this, share.ip)"></textarea>
+                                        <script type="text/javascript">
+                                        //<![CDATA[
+                                                var pppoeserver_pool = fix_cr( '<% nvram_get("pppoeserver_pool"); %>' );
+                                                document.getElementById("pppoeserver_pool").value = pppoeserver_pool;
+                                        //]]>
+                                        </script>
+                                </div>
+                                <div class="setting">
+                                        <div class="label"><% tran("service.pppoesrv_limit"); %></div>
+                                        <input size="5" maxlength="4" class="num" name="pppoeserver_clcount" value="<% nvram_get("pppoeserver_clcount"); %>" />
+                                        <span class="default"><script type="text/javascript">
+                                        //<![CDATA[
+                                        document.write("(" + share.deflt + ": 64)");
+                                        //]]>
+                                        </script></span>
+                                </div>
                         </div>
                         <div class="setting">

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

@@ -22 +22 @@
  "pppoeserver_interface" "" "NULL" "TRUE" "0" 
  "pppoeserver_pool" "" "NULL" "TRUE" "0"
+ "pppoeserver_clip" "client ip switch" "CHOICE"  "2" "radius"  "local"  "FALSE" "0"
+ "pppoeserver_clcount" "client count" "NULL" "TRUE" "0"

src/router/services/services/pppoeserver.c

@@ -357 +357 @@
 
                 //create the ip pool file
-                fp = fopen("/tmp/pppoeserver/pool", "wb");
-                fprintf(fp, "%s\n", nvram_safe_get("pppoeserver_pool"));
-                fclose(fp);
+                //fp = fopen("/tmp/pppoeserver/pool", "wb");
+                //fprintf(fp, "%s\n", nvram_safe_get("pppoeserver_pool"));
+                //fclose(fp);
 
                 eval("pppoe-server", "-k", "-I", nvram_safe_get("pppoeserver_interface"), 
                         "-L", getifip(), "-i", "-x", nvram_safe_get("pppoeserver_sessionlimit"), 
-                        "-N", "512", "-p", "/tmp/pppoeserver/pool", 
+                        "-N", nvram_safe_get("pppoeserver_clcount"), "-R", nvram_safe_get("pppoeserver_pool"), 
                         "-X", "/var/run/pppoeserver.pid");      
                 dd_syslog(LOG_INFO,

src/router/services/sysinit/defaults.c

@@ -2850 +2850 @@
         {"pppoeserver_sharedkey_backup", "", 0},
         {"pppoeserver_pool", "192.168.1.10-100", 0}, 
+        {"pppoeserver_clip", "local", 0},
+        {"pppoeserver_clcount", "64", 0},
 #endif
 #ifdef HAVE_MILKFISH