Changeset 582

Timestamp:

03/13/05 15:30:22 (20 years ago)

Author:

jerome

Message:

More code for IPP parsing

Files:

• tea4cups/trunk/tea4cups (modified) (4 diffs)

tea4cups/trunk/tea4cups

@@ -33 +33 @@
 from struct import unpack
 
-OPERATION_ATTRIBUTES_TAG = 0x01
-JOB_ATTRIBUTES_TAG = 0x02
-END_OF_ATTRIBUTES_TAG = 0x03
-PRINTER_ATTRIBUTES_TAG = 0x04
-UNSUPPORTED_ATTRIBUTES_TAG = 0x05
-
 class TeeError(Exception):
     """Base exception for Tea4CUPS related stuff."""
@@ -56 +50 @@
     pass 
     
+# Some IPP constants    
+OPERATION_ATTRIBUTES_TAG = 0x01
+JOB_ATTRIBUTES_TAG = 0x02
+END_OF_ATTRIBUTES_TAG = 0x03
+PRINTER_ATTRIBUTES_TAG = 0x04
+UNSUPPORTED_ATTRIBUTES_TAG = 0x05
+
 class IPPMessage :
     """A class for IPP message files."""
@@ -372 +373 @@
         self.Directory = self.getPrintQueueOption(self.PrinterName, "directory")
         self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % (self.myname, self.PrinterName, self.UserName, self.JobId))
-            
+        self.ClientHost = self.extractJobOriginatingHostName()
+            
+    def extractJobOriginatingHostName(self) :        
+        """Extracts the client's hostname or IP address from the CUPS message file for current job."""
+        requestroot = cupsdconf.get("requestroot", "/var/spool/cups")
+        if (len(self.JobId) < 5) and self.JobId.isdigit() :
+            ippmessagefile = "c%05i" % int(self.JobId)
+        else :    
+            ippmessagefile = "c%s" % self.JobId
+        ippmessagefile = os.path.join(requestroot, ippmessagefile)
+        ippmessage = {}
+        try :
+            ippdatafile = open(ippmessagefile)
+        except :    
+            self.logInfo("Unable to open IPP message file %s" % ippmessagefile, "warn")
+        else :    
+            self.logDebug("Parsing of IPP message file %s begins." % ippmessagefile)
+            try :
+                ippmessage = IPPMessage(ippdatafile.read())
+            except IPPError, msg :    
+                self.logInfo("Error while parsing %s : %s" % (ippmessagefile, msg), "warn")
+            else :    
+                self.logDebug("Parsing of IPP message file %s ends." % ippmessagefile)
+            ippdatafile.close()
+        return ippmessage.get("job-originating-host-name")    
+                
     def exportAttributes(self) :    
         """Exports our backend's attributes to the environment."""
@@ -381 +407 @@
         os.environ["TEAJOBSIZE"] = str(self.JobSize)
         os.environ["TEAMD5SUM"] = self.JobMD5Sum
+        os.environ["TEACLIENTHOST"] = self.ClientHost or ""
         os.environ["TEAJOBID"] = self.JobId
         os.environ["TEAUSERNAME"] = self.UserName