Changeset 17745

Timestamp:

10/11/11 15:23:05 (20 months ago)

Author:

sash

Message:

pppoesrv: some fixes

Location:

src/router

Files:

• kromo/dd-wrt/PPPoE_Server.asp (modified) (2 diffs)
• services/services/pppoeserver.c (modified) (1 diff)

src/router/kromo/dd-wrt/PPPoE_Server.asp

@@ -119 +119 @@
                         <div class="setting">
                                 <div class="label"><% tran("service.pptp_client"); %></div>
-                                <input maxlength="19" size="20" name="pppoeserver_pool" onblur="valid_ip_str(this, share.ip)" value="<% nvram_get("pppoeserver_pool"); %>" />
+                                <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">
@@ -239 +245 @@
                         <div class="setting">
                                 <div class="label"><% tran("radius.label27"); %></div>
-                                <input size="20" maxlength="63" type="password" name="pppoeserver_sharedkey_backup" value="d6nw5v1x2pc7st9m" />
+                                <input size="20" maxlength="63" type="password" name="pppoeserver_sharedkey_backup" value="<% nvram_get("pppoeserver_sharedkey_backup"); %>" />
                         </div>
         </fieldset>

src/router/services/services/pppoeserver.c

@@ -326 +326 @@
                                                 nvram_safe_get("pppoeserver_authserverport"),
                                                 nvram_safe_get("pppoeserver_authserverip_backup"),
-                                                nvram_safe_get("pppoeserver_acctserverport_backup"),
+                                                nvram_safe_get("pppoeserver_authserverport_backup"),
                                                 nvram_safe_get("pppoeserver_authserverip"),
                                                 nvram_safe_get("pppoeserver_acctserverport"),