Changeset 13645

Timestamp:

01/17/10 16:13:37 (3 years ago)

Author:

BrainSlayer

Message:

allow lease time setting for static entries

Location:

src/router

Files:

• httpd/validate/validators.c (modified) (3 diffs)
• httpd/visuals/dd-wrt.c (modified) (1 diff)
• services/services/dnsmasq.c (modified) (1 diff)
• services/services/udhcpd.c (modified) (1 diff)
• udhcpd/config/dhcpd.webservices (modified) (1 diff)

src/router/httpd/validate/validators.c

@@ -2230 +2230 @@
         char lease_hostname[32] = "leasexxx_hostname";
         char lease_ip[32] = "leasexxx_ip";
+        char lease_time[32] = "leasexxx_time";
         char *sln = nvram_safe_get("static_leasenum");
         char *hwaddr;
@@ -2265 +2266 @@
                 snprintf(lease_ip, 31, "lease%d_ip", i);
                 char *ip = websGetVar(wp, lease_ip, "");
+
+                snprintf(lease_time, 31, "lease%d_time", i);
+                char *time = websGetVar(wp, lease_time, "");
 
                 if (hostname == NULL || strlen(hostname) == 0 || ip == NULL
@@ -2273 +2277 @@
                 strcat(leases, "=");
                 strcat(leases, ip);
+                strcat(leases, "=");
+                strcat(leases, time);
                 strcat(leases, " ");
         }

src/router/httpd/visuals/dd-wrt.c

@@ -1008 +1008 @@
                           "<td><input name=\"lease%d_hostname\" value=\"%s\" size=\"24\" maxlength=\"24\" onblur=\"valid_name(this,share.hostname,SPACE_NO)\" /></td>",
                           i, sep != NULL ? sep : "");
+                sep = strsep(&leases, "=");
+                websWrite(wp,
+                          "<td><input name=\"lease%d_ip\" value=\"%s\" size=\"15\" maxlength=\"15\" class=\"num\" onblur=\"valid_name(this,share.ip,SPACE_NO)\" /></td></tr>\n",
+                          i, sep != NULL ? sep : "");
                 sep = strsep(&leases, " ");
                 websWrite(wp,
-                          "<td><input name=\"lease%d_ip\" value=\"%s\" size=\"15\" maxlength=\"15\" class=\"num\" onblur=\"valid_name(this,share.ip,SPACE_NO)\" /></td></tr>\n",
+                          "<td><input name=\"lease%d_time\" value=\"%s\" size=\"15\" maxlength=\"15\" class=\"num\" onblur=\"valid_name(this,share.time,SPACE_NO)\" /></td></tr>\n",
                           i, sep != NULL ? sep : "");
         }

src/router/services/services/dnsmasq.c

@@ -383 +383 @@
                                 char *mac = strsep(&leasebuf, "=");
                                 char *host = strsep(&leasebuf, "=");
-                                char *ip = strsep(&leasebuf, " ");
+                                char *ip = strsep(&leasebuf, "=");
+                                char *time = strsep(&leasebuf, " ");
 
                                 if (mac == NULL || host == NULL || ip == NULL)
                                         continue;
-
+                                if (!time||strlen(time)==0)
                                 fprintf(fp, "dhcp-host=%s,%s,%s,infinite\n",
                                         mac, host, ip);
+                                else
+                                fprintf(fp, "dhcp-host=%s,%s,%s,%sm\n",
+                                        mac, host, ip);
+                                
                                 addHost(host, ip);
                         }

src/router/services/services/udhcpd.c

@@ -333 +333 @@
                         char *mac = strsep(&leasebuf, "=");
                         char *host = strsep(&leasebuf, "=");
-                        char *ip = strsep(&leasebuf, " ");
+                        char *ip = strsep(&leasebuf, "=");
+                        char *time = strsep(&leasebuf, " ");
 
                         if (mac == NULL || host == NULL || ip == NULL)

src/router/udhcpd/config/dhcpd.webservices

@@ -58 +58 @@
                         <th width="34%"><% tran("share.hostname"); %></th>
                         <th width="33%"><% tran("share.ip"); %></th>
+                        <th width="33%"><% tran("idx.dhcp_lease"); %></th>
                 </tr>
                         <% show_staticleases(); %>