Print eui64 too while printing clients

[snf-nfdhcpd] / nfdhcpd

diff --git a/nfdhcpd b/nfdhcpd
index 0bb36ea..c66c435 100755 (executable)
--- a/nfdhcpd
+++ b/nfdhcpd
@@ -55,7 +55,7 @@ from scapy.layers.inet6 import IPv6, ICMPv6ND_RA, ICMPv6ND_NA, \
 from scapy.layers.dhcp import BOOTP, DHCP
 from scapy.layers.dhcp6 import DHCP6_Reply, DHCP6OptDNSServers, \
                                DHCP6OptServerId, DHCP6OptClientId, \
-                               DUID_LLT, DHCP6_InfoRequest
+                               DUID_LLT, DHCP6_InfoRequest, DHCP6OptDNSDomains
 
 
 DEFAULT_CONFIG = "/etc/nfdhcpd/nfdhcpd.conf"
@@ -96,6 +96,7 @@ rs_queue = integer(min=0, max=65535)
 ns_queue = integer(min=0, max=65535)
 dhcp_queue = integer(min=0, max=65535)
 nameservers = ip_addr_list(family=6)
+domains = force_list(default=None)
 """
 
 
@@ -356,9 +357,10 @@ class VMNetProxy(object):  # pylint: disable=R0902
                  rs_queue_num=None, ns_queue_num=None, dhcpv6_queue_num=None,
                  dhcp_lease_lifetime=DEFAULT_LEASE_LIFETIME,
                  dhcp_lease_renewal=DEFAULT_LEASE_RENEWAL,
-                 dhcp_domain='',
+                 dhcp_domain=None,
                  dhcp_server_ip=DHCP_DUMMY_SERVER_IP, dhcp_nameservers=None,
-                 ra_period=DEFAULT_RA_PERIOD, ipv6_nameservers=None):
+                 ra_period=DEFAULT_RA_PERIOD, ipv6_nameservers=None,
+                 dhcpv6_domains=None):
 
         try:
             getattr(nfqueue.payload, 'get_physindev')
@@ -381,6 +383,11 @@ class VMNetProxy(object):  # pylint: disable=R0902
         else:
             self.ipv6_nameservers = ipv6_nameservers
 
+        if dhcpv6_domains is None:
+            self.dhcpv6_domains = []
+        else:
+            self.dhcpv6_domains = dhcpv6_domains
+
         self.ipv6_enabled = False
 
         self.clients = {}
@@ -543,11 +550,13 @@ class VMNetProxy(object):  # pylint: disable=R0902
             if b.is_valid():
                 if self.mac_indexed_clients:
                     self.clients[b.mac] = b
+                    k = b.mac
                 else:
                     self.clients[ifindex] = b
-                logging.debug(" - Added client:")
-                logging.debug(" + %5s: %10s %20s %7s %15s",
-                               ifindex, b.hostname, b.mac, b.tap, b.ip)
+                    k = ifindex
+                logging.info(" - Added client:")
+                logging.info(" + %10s | %20s %20s %10s %20s %40s",
+                             k, b.hostname, b.mac, b.tap, b.ip, b.eui64)
 
     def remove_tap(self, tap):
         """ Cleanup clients on a removed interface
@@ -558,8 +567,8 @@ class VMNetProxy(object):  # pylint: disable=R0902
                 if cl.tap == tap:
                     logging.info("Removing client %s and closing socket on %s",
                                  cl.hostname, cl.tap)
-                    logging.debug(" - %10s | %10s %20s %10s %20s",
-                                  k, cl.hostname, cl.mac, cl.tap, cl.ip)
+                    logging.info(" - %10s | %20s %20s %10s %20s %40s",
+                                 k, cl.hostname, cl.mac, cl.tap, cl.ip, cl.eui64)
                     cl.socket.close()
                     del self.clients[k]
         except:
@@ -733,6 +742,10 @@ class VMNetProxy(object):  # pylint: disable=R0902
 
         subnet = binding.net6
 
+        if subnet.net is None:
+            logging.debug(" - No IPv6 network assigned for tap %s", binding.tap)
+            return
+
         indevmac = self.get_iface_hw_addr(binding.indev)
         ifll = subnet.make_ll64(indevmac)
         if ifll is None:
@@ -745,14 +758,23 @@ class VMNetProxy(object):  # pylint: disable=R0902
         logging.info(" - Generating DHCPv6 response for host %s (mac %s) on tap %s",
                       binding.hostname, binding.mac, binding.tap)
 
+        if self.dhcpv6_domains:
+            domains = self.dhcpv6_domains
+        else:
+            domains = [binding.hostname.split('.', 1)[-1]]
+
+        # We do this in order not to caclulate optlen ourselves
+        dnsdomains = str(DHCP6OptDNSDomains(dnsdomains=domains))
+        dnsservers = str(DHCP6OptDNSServers(dnsservers=self.ipv6_nameservers))
+
         resp = Ether(src=indevmac, dst=binding.mac)/\
                IPv6(tc=192, src=str(ifll), dst=str(ofll))/\
                UDP(sport=pkt.dport, dport=pkt.sport)/\
                DHCP6_Reply(trid=pkt[DHCP6_InfoRequest].trid)/\
                DHCP6OptClientId(duid=pkt[DHCP6OptClientId].duid)/\
                DHCP6OptServerId(duid=DUID_LLT(lladdr=indevmac, timeval=time.time()))/\
-               DHCP6OptDNSServers(dnsservers=self.ipv6_nameservers,
-                                  optlen=16 * len(self.ipv6_nameservers))
+               DHCP6OptDNSDomains(dnsdomains)/\
+               DHCP6OptDNSServers(dnsservers)
 
         try:
             binding.sendp(resp)
@@ -936,7 +958,7 @@ class VMNetProxy(object):  # pylint: disable=R0902
             if ifll is None:
                 continue
             resp = Ether(src=indevmac)/\
-                   IPv6(src=str(ifll))/ICMPv6ND_RA(routerlifetime=14400)/\
+                   IPv6(src=str(ifll))/ICMPv6ND_RA(O=1, routerlifetime=14400)/\
                    ICMPv6NDOptPrefixInfo(prefix=str(subnet.prefix),
                                          prefixlen=subnet.prefixlen)
             if self.ipv6_nameservers:
@@ -1024,11 +1046,11 @@ class VMNetProxy(object):  # pylint: disable=R0902
                     timeout = self.ra_period - (time.time() - start)
 
     def print_clients(self):
-        logging.info("%10s   %20s %20s %10s %20s",
-                     'Key', 'Client', 'MAC', 'TAP', 'IP')
+        logging.info("%10s   %20s %20s %10s %20s %40s",
+                     'Key', 'Client', 'MAC', 'TAP', 'IP', 'IPv6')
         for k, cl in self.clients.items():
-            logging.info("%10s | %20s %20s %10s %20s",
-                         k, cl.hostname, cl.mac, cl.tap, cl.ip)
+            logging.info("%10s | %20s %20s %10s %20s %40s",
+                         k, cl.hostname, cl.mac, cl.tap, cl.ip, cl.eui64)
 
 
 
@@ -1186,6 +1208,7 @@ if __name__ == "__main__":
             "ns_queue_num": config["ipv6"].as_int("ns_queue"),
             "ra_period": config["ipv6"].as_int("ra_period"),
             "ipv6_nameservers": config["ipv6"]["nameservers"],
+            "dhcpv6_domains": config["ipv6"]["domains"],
         })
 
     # pylint: disable=W0142