Changeset 171 for trunk/src/pxeconfigd.py

Timestamp:

08/19/09 10:53:16 (15 years ago)

Author:

bas

Message:

configure. configure.in, Makefile.in:

• added new files

src/pxeconfigd.in:

• new daemon code, like client side

src/pxeconfigd.py:

• use the common function defined in pxe_global.py
• reformat the code
• added daemon hook script

setup.py:

• added some new modules

File:

• trunk/src/pxeconfigd.py (modified) (4 diffs)

trunk/src/pxeconfigd.py

@@ -29 +29 @@
 
         command line option:
-          -d/--directory <dir>
-            Where <dir> is the directory where the pxe config files reside.
           -V/--version 
             Prints the version number and exits
@@ -45 +43 @@
 import getopt
 
+# PXE modules
+from pxe_global import *
+
 # DEBUG
 #
@@ -54 +55 @@
 STDIN=0
 STDOUT=1
-SHORTOPT_LIST='Vd:'
-LONGOPT_LIST=['version', 'directory=']
+SHORTOPT_LIST='V'
+LONGOPT_LIST=['version']
 
 PXE_CONF_DIR = '/tftpboot/pxelinux.cfg'
-VERSION = '2.0.0'
+VERSION = '3.0.0'
 
 # Give the current time
@@ -92 +93 @@
 # the connection if there is no data
 #
-def handleConnection():
-  """Determines which host connects to the server
-  """
+def handleConnection(settings):
+        """
+        Determines which host connects to the server
+        """ 
+        
+        # Determine client address
+        # 
+        try:
+                client_addr = socket.fromfd(sys.stdin.fileno(), socket.AF_INET, 
+                          socket.SOCK_STREAM)
+                client_ip = client_addr.getpeername()[0] 
+        except socket.error, detail:
+                error =  "pxeconfigd can only be started from inetd!!!"
+                raise PxeConfig, error 
+                
+        # translate ip address ---> hex address
+        #
+        d = string.split(client_ip, '.')
+        client_haddr = '%02X%02X%02X%02X' %(int(d[0]), int(d[1]), int(d[2]), int(d[3])) 
+        
+        if DEBUG:
+                print 'ip = %s, hex = %s' %(client_ip, client_haddr) 
 
-  # Determine client address
-  # 
-  try:
-    client_addr = socket.fromfd(sys.stdin.fileno(), socket.AF_INET, 
-                          socket.SOCK_STREAM)
-    client_ip = client_addr.getpeername()[0] 
+        if settings['daemon_script_hook']:
+                cmd = '%s %s' %(settings['daemon_script_hook'], client_ip)
+                print cmd
+                os.system(cmd)
 
-  except socket.error, detail:
-    print "pxeconfigd can only be started from inetd!!!"
-    sys.exit(1)
+        remove_link(client_haddr)
+        sys.exit(0)
 
+def check_args(argv, settings):
+        """
+        Must we use another directory for the PXE configuration
+        """
+        global PXE_CONF_DIR 
+        
+        try:
+                opts, args = getopt.getopt(argv[1:], SHORTOPT_LIST, LONGOPT_LIST)
+        except getopt.error, detail:
+                print __doc__
+                print detail
+                sys.exit(1) 
+                
+        for opt, value in opts:
+                if opt in ['-V', '--version']:
+                        print VERSION
+                        sys.exit(0)
 
-  # translate ip address ---> hex address
-  #
-  d = string.split(client_ip, '.')
-  client_haddr = '%02X%02X%02X%02X' %(int(d[0]), int(d[1]), int(d[2]), int(d[3]))
-
-  if DEBUG:
-    print 'ip = %s, hex = %s' %(client_ip, client_haddr)
-
-  remove_link(client_haddr)
-  sys.exit(0)
-
-def check_args(argv):
-  """
-  Must we use another directory for the PXE configuration
-  """
-  global PXE_CONF_DIR
-
-  try:
-    opts, args = getopt.getopt(argv[1:], SHORTOPT_LIST, LONGOPT_LIST)
-  except getopt.error, detail:
-    print __doc__
-    print detail
-    sys.exit(1)
-
-  for opt, value in opts:
-
-    if opt in ['-d', '--directory']:
-      if not os.path.isdir(value):
-        os.write(STDOUT, "PXE booting is not configured")
-        sys.exit(1)
-      else:
-        PXE_CONF_DIR = value
-
-    elif opt in ['-V', '--version']:
-      print VERSION
-      sys.exit(0)
+        try:
+                PXE_CONF_DIR = settings['pxe_config_dir']
+        except KeyError:
+                pass 
+                
+        PXE_CONF_DIR = os.path.realpath(PXE_CONF_DIR) 
+        if not os.path.isdir(PXE_CONF_DIR):
+                error =  'pxeconfig directory: %s does not exists' %(PXE_CONF_DIR)
+                raise PxeConfig, error
 
 def server():
   """Start the daemon
   """
-  check_args(sys.argv)
-  handleConnection()
+  config = ReadConfig()
+  check_args(sys.argv, config)
+  handleConnection(config)
 
 if __name__ == '__main__':