Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Static lease controls #189

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/router/httpd/httpd.c
Expand Up @@ -546,7 +546,7 @@ static void send_error(webs_t conn_fp, int noheader, int status, char *title, ch
websWrite(conn_fp, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" //
"<head>\n" //
"<meta http-equiv=\"Content-Type\" content=\"application/xhtml+xml; charset=%s\" />\n", charset);
websWrite(conn_fp, "<title>%d %s</title></head>\n<body BGCOLOR=\"#cc9999\"><H4>%d %s</H4>\n", status, title, status, title);
websWrite(conn_fp, "<title>%d %s</title></head>\n<body bgcolor=\"#cc9999\"><h4>%d %s</h4>\n", status, title, status, title);
websWrite(conn_fp, "%s\n", text);
websWrite(conn_fp, "</body>");
websWrite(conn_fp, "</html>\n");
Expand Down
6 changes: 3 additions & 3 deletions src/router/kromo/dd-wrt/Status_Lan.asp
Expand Up @@ -120,11 +120,11 @@ function setDHCPTable() {

var cell = row.insertCell(-1);
cell.title = errmsg.err58;
cell.align = "center";
cell.align = "right";
cell.innerHTML = "<input class=\"remove\" type=\"button\" aria-label=\"" + sbutton.del + "\" onclick=\"deleteLease('" + val[i+1] + "', '" + val[i+2] + "')\" />";
var cellbutton = row.insertCell(-1);
cellbutton.title = errmsg.err582;
cellbutton.align = "center";
cellbutton.align = "left";
cellbutton.innerHTML = "<input class=\"add\" type=\"button\" aria-label=\"" + share.add + "\" onclick=\"staticLease('" + val[i] + "', '" + val[i+1] + "', '" + val[i+2] + "')\" />";
}
}
Expand Down Expand Up @@ -349,7 +349,7 @@ addEvent(window, "unload", function() {
<th sortdir="up" width="18%"><% tran("idx.dhcp_lease"); %></th>
<!-- Try to display both delete/add icons under static lease th
<th sortdir="up" width="5%"><% tran("share.del"); %></th> -->
<th sortdir="up" width="15%" colspan="2"><% tran("share.static_lease"); %></th>
<th sortdir="up" width="12%" class="center" colspan="2"><% tran("share.static_lease"); %></th>
</tr>
</table>
<script type="text/javascript">
Expand Down
4 changes: 2 additions & 2 deletions src/router/kromo/dd-wrt/lang_pack/arabic.js
Expand Up @@ -819,7 +819,7 @@ idx.dhcp_fwd="DHCP Forwarder";
idx.dhcp_start="Start IP Address";
idx.dhcp_end="End IP Address"; //used in Status_Lan.asp
idx.dhcp_maxusers="Maximum DHCP Users";
idx.dhcp_lease="Client Lease Time";
idx.dhcp_lease="Lease Expiration";
idx.dhcp_dnsmasq="Use DNSMasq for DHCP";
idx.dns_dnsmasq="Use DNSMasq for DNS";
idx.auth_dnsmasq="DHCP-Authoritative";
Expand Down Expand Up @@ -1389,7 +1389,7 @@ status_router.cputemp="Temperatures";
hstatus_router.right2="This is the specific name for the router, which you set on the <i>Setup</i> tab.";
hstatus_router.right4="This is the router's MAC Address, as seen by your ISP.";
hstatus_router.right6="This is the router's current firmware.";
hstatus_router.right8="This is time received from the ntp server set on the <em>" + bmenu.admin + " | " + bmenu.adminManagement + "</em> tab.";
hstatus_router.right8="This is time received from the NTP server set on the <em>" + bmenu.admin + " | " + bmenu.adminManagement + "</em> tab.";
hstatus_router.right10="This is a measure of the time the router has been \"up\" and running.";
hstatus_router.right12="This is given as three numbers that represent the system load during the last one, five, and fifteen minute periods.";

Expand Down
2 changes: 1 addition & 1 deletion src/router/kromo/dd-wrt/lang_pack/catalan.js
Expand Up @@ -1384,7 +1384,7 @@ service.vpn_route="Enrutament basat en Política";

//help container
hstatus_vpn.right1="Enrutament basat en Política:<br /><i>Afegiu els IP/NET en la forma 0.0.0.0/0 per forçar que els clients utilitzin el túnel com gateway per defecte. Una línia per IP/NET.<br /><i>Adreça IP/Màscara de xarxa:</i><br />Ha de ser establert quan s'utilitza el mode DHCP-Proxy i el TAP local NO s'extén</i>";
hstatus_vpn.right2="Configuració Adicional:<br /><i>Per empenyar les rutes als clients afegiu \'push \"ruta IP màscara gateway\"\', per empenyar DNS/WINS afegiu \'push \"opció-dhcp DNS (o WINS) IP\"\' a la configuració.</i><br />directori de connexió de client:<br /><i>Quan USB o JFFS està muntat a /jffs, els scripts es trucan de /jffs/etc/openvpn/ccd/</i>";
hstatus_vpn.right2="Configuració Adicional:<br /><i>Per empenyar les rutes als clients afegiu \'push \"ruta IP màscara gateway\"\', per empenyar DNS/WINS afegiu \'push \"opció-DHCP DNS (o WINS) IP\"\' a la configuració.</i><br />directori de connexió de client:<br /><i>Quan USB o JFFS està muntat a /jffs, els scripts es trucan de /jffs/etc/openvpn/ccd/</i>";
hstatus_vpn.right3="General:<br /><i>3 mètodes d'autenticació es soportan: pkcs12 (+dh en el servidor), estàtica, i certificats estàndards. Habiliteu el MSS en només un costat de l'enllaç, fragmenteu en ambdós.</i>";

//vnc.repeater
Expand Down
6 changes: 3 additions & 3 deletions src/router/kromo/dd-wrt/lang_pack/chinese_simplified.js
Expand Up @@ -1177,7 +1177,7 @@ hidx.page18="<dd>Enter the maximum number of PCs that you want the DHCP server t
hidx.page19="<dd>The Client Lease Expiration is the amount of time a network user will be allowed connection to the router with their current dynamic IP address. Enter the amount of time, in minutes, that the user will be \"leased\" this dynamic IP address.</dd>";
hidx.page20="<dd>The Domain Name System (DNS) is how the Internet translates domain or website names into Internet addresses or URLs. Your ISP will provide you with at least one DNS Server IP address. If you wish to utilize another, enter that IP address in one of these fields. You can enter up to three DNS Server IP addresses here. The router will utilize these for quicker access to functioning DNS servers.</dd>";
hidx.page21="<dd>The Windows Internet Naming Service (WINS) manages each PC's interaction with the Internet. If you use a WINS server, enter that server's IP address here. Otherwise, leave this blank.</dd>";
hidx.dns_dnsmasq="<dd>Dnsmasq's local DNS server resolves all host names known to the router from dhcp (dynamic and static) as well as forwarding and caching DNS entries from remote DNS servers. Enabling DNSMasq for DNS enables DHCP clients on the LAN to resolve local hostnames, including static and dynamic IP assignments.</dd>";
hidx.dns_dnsmasq="<dd>Dnsmasq's local DNS server resolves all host names known to the router from DHCP (dynamic and static) as well as forwarding and caching DNS entries from remote DNS servers. Enabling DNSMasq for DNS enables DHCP clients on the LAN to resolve local hostnames, including static and dynamic IP assignments.</dd>";
hidx.auth_dnsmasq="<dd>DHCP-Authoritative should be set when DD-WRT is the only DHCP server on its network segment (as in most common setups). The DHCP server will return a NAK response to clients that try to register using IPs from another netblock.</dd>";
hidx.force_dnsmasq="<dd>This setting causes all port 53 DNS requests from the LAN to external DNS servers to be redirected to DD-WRT's internal DNSmasq server.</dd>";
hidx.page22="<dd>Select the time zone for your location, or desired location.</dd><dd>Check all values and click <i>Save Settings</i> to save your settings. Click <i>Cancel Changes</i> to cancel your unsaved changes. You can test the settings by connecting to the Internet.</dd>";
Expand Down Expand Up @@ -1786,7 +1786,7 @@ service.vpn_tls_auth="TLS Auth";

//help page
hservice.page1="<dd>DHCPd assigns IP addresses to your local devices. While the main configuration is on the setup page you can program some nifty special functions here.<ul class=\"wide\"><li>Used domain &ndash; You can select here which domain the DHCP clients should get as their local domain. This can be the WAN domain set on the Setup screen or the LAN domain which can be set here.</li><li>LAN Domain &ndash; You can define here your local LAN domain which is used as local domain for dnsmasq and DHCP service if chosen above.</li><li>Static Leases &ndash; If you want to assign certain hosts a specific address then you can define them here. This is also the way to add hosts with a fixed address to the router's local DNS service (dnsmasq).</li></ul><br />There are some extra options you can set by entering them in <em>Additional DHCPD Options</em>.</dd>";
hservice.page2="<dd>Dnsmasq is a local DNS and DHCP server. It will resolve all host names known to the router from dhcp (dynamic and static) as well as forwarding and caching DNS entries from remote DNS servers. Dnsmasq will always appear enabled here if either <em>DHCP Server</em> or <em>Use DNSMasq for DNS</em> is enabled on the Basic Setup page.<br />There are some extra options you can set by entering them in <em>Additional DNS Options</em>. For example : <br /><ul><li>static allocation : dhcp-host=AB:CD:EF:11:22:33,192.168.0.10,myhost,myhost.domain,12h</li><li>max lease number : dhcp-lease-max=2</li><li>DHCP server IP range : dhcp-range=192.168.0.110,192.168.0.111,12h</li></ul><br /><br /><div class=\"note\"><h4>Note</h4><div>All options are saved in /tmp/dnsmasq.conf file. The format of this file consists of one option per line.<br />The complete list of available options : <a href=\"http:\/\/thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html\" target=\"_new\">DNSMasq man</a>.</div></div></dd>";
hservice.page2="<dd>Dnsmasq is a local DNS and DHCP server. It will resolve all host names known to the router from DHCP (dynamic and static) as well as forwarding and caching DNS entries from remote DNS servers. Dnsmasq will always appear enabled here if either <em>DHCP Server</em> or <em>Use DNSMasq for DNS</em> is enabled on the Basic Setup page.<br />There are some extra options you can set by entering them in <em>Additional DNS Options</em>. For example : <br /><ul><li>static allocation : dhcp-host=AB:CD:EF:11:22:33,192.168.0.10,myhost,myhost.domain,12h</li><li>max lease number : dhcp-lease-max=2</li><li>DHCP server IP range : dhcp-range=192.168.0.110,192.168.0.111,12h</li></ul><br /><br /><div class=\"note\"><h4>Note</h4><div>All options are saved in /tmp/dnsmasq.conf file. The format of this file consists of one option per line.<br />The complete list of available options : <a href=\"http:\/\/thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html\" target=\"_new\">DNSMasq man</a>.</div></div></dd>";
hservice.dnsmasq_dnssec="<dd>Requests and validates DNSSEC records for domains that provide them, if supported on your router model.</dd>";
hservice.dnsmasq_dnssec_proxy="<dd>Copies the DNSSEC status bit from the upstream server. This option is available on some routers that don't support direct DNSSEC validation, but should only be used when the upstream server is trustworthy. Cache size 0 is recommended when using this option.</dd>";
hservice.dnsmasq_dnssec_cu="<dd>When DNSSEC validation is enabled, also check that unsigned DNS replies are legitimate (they belong to domains that actually do not publish DNSSEC records).</dd>";
Expand Down Expand Up @@ -2117,7 +2117,7 @@ status_router.cputemp="CPU 温度";
hstatus_router.right2="这是您在 <i>设置</i> 标签中所指定的路由器的名称。";
hstatus_router.right4="这是您的ISP所看到的路由器的MAC地址。";
hstatus_router.right6="这是路由器当前的固件。";
hstatus_router.right8="这是您从ntp服务器(在<em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em>标签页设置)获取的时间。";
hstatus_router.right8="这是您从NTP服务器(在<em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em>标签页设置)获取的时间。";
hstatus_router.right10="这个数值表示路由器\"启动\"和运行的时间。";
hstatus_router.right12="这里给出的三个数字表示系统在过去1、5、15分钟时间内的系统负载。";

Expand Down
2 changes: 1 addition & 1 deletion src/router/kromo/dd-wrt/lang_pack/chinese_traditional.js
Expand Up @@ -1395,7 +1395,7 @@ status_router.cputemp="CPU 溫度";
hstatus_router.right2="這是您在 <i>設定</i> 標籤中所指定的路由器的名稱.";
hstatus_router.right4="這是您的ISP所看到的路由器的MAC位址.";
hstatus_router.right6="這是路由器目前的韌體.";
hstatus_router.right8="這是由ntp伺服器所設定得到 <em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em> 時間";
hstatus_router.right8="這是由NTP伺服器所設定得到 <em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em> 時間";
hstatus_router.right10="這個數值表示路由器\"啟動\"並且運行的時間.";
hstatus_router.right12="這裏給的三個數位表示系統在過去1、5、15分鐘時間內的系統負載.";

Expand Down
2 changes: 1 addition & 1 deletion src/router/kromo/dd-wrt/lang_pack/dutch.js
Expand Up @@ -1501,7 +1501,7 @@ status_router.cputemp="Temperatuur";
hstatus_router.right2="Dit is de specifieke naam opgegeven aan de router, U kunt deze veranderen op de <i>Setup</i> pagina.";
hstatus_router.right4="Dit is het MAC-Adres van de router, zoals uw internetprovider het zal herkennen.";
hstatus_router.right6="Dit is de huidige firmware van de router.";
hstatus_router.right8="Dit is de tijd verkregen van de ntp server ingesteld op de <em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em> pagina.";
hstatus_router.right8="Dit is de tijd verkregen van de NTP server ingesteld op de <em>" + bmenu.setup + " | " + bmenu.setupbasic + "</em> pagina.";
hstatus_router.right10="Dit is een berekening van de tijd dat de router \"Aan en in Werking\" is.";
hstatus_router.right12="Dit is een gegeven van drie nummers dat de belasting van het systeem voorstelt gedurende de laatste &eacute;&eacute;n, vijf of vijftien minuten.";

Expand Down