Ticket #44: dhcpserver.py.diff

code/dhcpserver.py

@@ -22 +22 @@
 
 dhcp_options = {'subnet_mask': '255.255.0.0',
                 'router': '18.181.0.1',
+                'domain_search': list('mit.edu'),
                 'domain_name_server': '18.70.0.160,18.71.0.151,18.72.0.3',
-                'domain_name': 'mit.edu',
                 'ip_address_lease_time': 60*60*24}
 
 class DhcpBackend:
@@ -61 +61 @@
     def getParameters(self, **extra):
         all_options=dict(dhcp_options)
         all_options.update(extra)
+        if all_options.has_key('domainname') and all_options.has_key('domain_search') and all_options['domainname'] not in all_options['domain_search']:
+            all_options['domain_search'].append(all_options['domain_name'])
         options = {}
         for parameter, value in all_options.iteritems():
             if value is None:
@@ -96 +98 @@
                     
             elif option_type == "string" :
                 options[parameter] = strlist(value).list()
+            
+            elif option_type == "RFC3397" :
+                parsed_value = ""
+                for item in value:
+                    components = item.split('.')
+                    item_fmt = "".join(chr(len(elt)) + elt for elt in components) + "\x00"
+                    parsed_value += item_fmt
                 
+                options[parameter] = strlist(parsed_value).list()
+            
             else :
                 options[parameter] = strlist(value).list()
         return options
@@ -111 +122 @@
         if ip is None:  #Deactivated?
             return False
         if nic.hostname and '.' in nic.hostname:
-            hostname = nic.hostname
+            hostname, domainname = nic.hostname.split('.', 1)
         elif nic.machine.name:
-            hostname = nic.machine.name + '.servers.csail.mit.edu'
+            hostname = nic.machine.name
+            domainname = 'servers.csail.mit.edu'
         else:
             hostname = None
         if ip is not None:
             ip = ipv4(ip)
             Log.Output(Log.debug,"dhcp_backend : Discover result = "+str(ip))
-            packet_parameters = self.getParameters(host_name=hostname)
-
+            packet_parameters = self.getParameters(host_name=hostname,
+                                                   domain_name=domainname)
+            
             # FIXME: Other offer parameters go here
             packet_parameters["yiaddr"] = ip.list()