Subnet fixes

diff --git a/dhcp-dns/dhcp-dns-lib.pl b/dhcp-dns/dhcp-dns-lib.pl
index b9a1a14..6d9112c 100644 (file)
--- a/dhcp-dns/dhcp-dns-lib.pl
+++ b/dhcp-dns/dhcp-dns-lib.pl
@@ -13,16 +13,22 @@ sub list_dhcp_hosts
 local $conf = &dhcpd::get_config();
 local $parent = &dhcpd::get_parent_config();
 local @rv;
+
+# Top-level hosts
 foreach my $h (&dhcpd::find("host", $conf)) {
        $h->{'parent'} = $parent;
        push(@rv, $h);
        }
+
+# Hosts in groups
 foreach my $g (&dhcpd::find("group", $conf)) {
        foreach my $h (&dhcpd::find("host", $g->{'members'})) {
                $h->{'parent'} = $g;
                push(@rv, $h);
                }
        }
+
+# Hosts in subjects, and hosts in groups in subnets
 foreach my $s (&dhcpd::find("subnet", $conf)) {
        foreach my $h (&dhcpd::find("host", $s->{'members'})) {
                $h->{'parent'} = $s;
@@ -35,6 +41,58 @@ foreach my $s (&dhcpd::find("subnet", $conf)) {
                        }
                }
        }
+
+# All of those, in shared networks
+foreach my $n (&dhcpd::find("shared-network", $conf)) {
+       # Hosts in shared network
+       foreach my $h (&dhcpd::find("host", $n->{'members'})) {
+               $h->{'parent'} = $n;
+               push(@rv, $h);
+               }
+
+       # Hosts in groups
+       foreach my $g (&dhcpd::find("group", $n->{'members'})) {
+               foreach my $h (&dhcpd::find("host", $g->{'members'})) {
+                       $h->{'parent'} = $g;
+                       push(@rv, $h);
+                       }
+               }
+
+       # Hosts in subjects, and hosts in groups in subnets, in shared network
+       foreach my $s (&dhcpd::find("subnet", $n->{'members'})) {
+               foreach my $h (&dhcpd::find("host", $s->{'members'})) {
+                       $h->{'parent'} = $s;
+                       push(@rv, $h);
+                       }
+               foreach my $g (&dhcpd::find("group", $s->{'members'})) {
+                       foreach my $h (&dhcpd::find("host", $g->{'members'})) {
+                               $h->{'parent'} = $g;
+                               push(@rv, $h);
+                               }
+                       }
+               }
+       }
+
+return @rv;
+}
+
+# list_dhcp_subnets()
+# Returns a list of all DHCP subnet objects
+sub list_dhcp_subnets
+{
+local @rv;
+local $conf = &dhcpd::get_config();
+local $parent = &dhcpd::get_parent_config();
+foreach my $s (&dhcpd::find("subnet", $conf)) {
+       $s->{'parent'} = $parent;
+       push(@rv, $s);
+       }
+foreach my $n (&dhcpd::find("shared-network", $conf)) {
+       foreach my $s (&dhcpd::find("subnet", $n->{'members'})) {
+               $s->{'parent'} = $n;
+               push(@rv, $s);
+               }
+       }
 return @rv;
 }
 
@@ -67,6 +125,17 @@ local $fixed = &dhcpd::find("fixed-address", $h->{'members'});
 $rv .= &ui_table_row($text{'form_ip'},
        &ui_textbox("ip", $fixed ? $fixed->{'values'}->[0] : undef, 20));
 
+# Subnet for new host
+if ($new) {
+       local @subnets = &list_dhcp_subnets();
+       if (@subnets) {
+               $rv .= &ui_table_row($text{'form_subnet'},
+                       &ui_select("subnet", $subnets[0]->{'values'}->[0],
+                         [ [ undef, $text{'form_nosubnet'} ],
+                           map { [ $_->{'values'}->[0] ] } @subnets ]));
+               }
+       }
+
 # MAC address
 local $hard = &dhcpd::find("hardware", $h->{'members'});
 $rv .= &ui_table_row($text{'form_mac'},

diff --git a/dhcp-dns/save.cgi b/dhcp-dns/save.cgi
index d5616a7..e900365 100644 (file)
--- a/dhcp-dns/save.cgi
+++ b/dhcp-dns/save.cgi
@@ -15,8 +15,21 @@ else {
        $host = { 'name' => 'host',
                  'type' => 1,
                  'members' => [ ] };
-       $par = @hosts ? $hosts[0]->{'parent'}
-                     : &dhcpd::get_config_parent();
+       if ($in{'subnet'}) {
+               # Add to subnet selected
+               ($par) = grep { $_->{'values'}->[0] eq $in{'subnet'} }
+                             &list_dhcp_subnets();
+               }
+       else {
+               if (@hosts && $hosts[0]->{'parent'}->{'name'} ne 'subnet') {
+                       # Where other hosts are
+                       $par = $hosts[0]->{'parent'};
+                       }
+               else {
+                       # Top level
+                       $par = &dhcpd::get_config_parent();
+                       }
+               }
        }
 
 if ($in{'delete'}) {