Changeset 89fe6da for server/lib/ipprequest.py

Timestamp:

Mar 5, 2011, 5:33:55 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

574aee4

Parents:

aaa1da3

git-author:

Jessica B. Hamrick <jhamrick@…> (03/05/11 17:33:55)

git-committer:

Jessica B. Hamrick <jhamrick@…> (03/05/11 17:33:55)

Message:

Add 'length' keyword to IPPRequest constructor

File:

• server/lib/ipprequest.py (modified) (10 diffs)

server/lib/ipprequest.py

@@ -420 +420 @@
     # can be read from to get the request
     def __init__(self, version=None, operation_id=None, request_id=None,
-                 attribute_groups=[], data=None, request=None):
+                 attribute_groups=[], data=None, request=None, length=sys.maxint):
         """
         Create an IPPRequest.  Takes either the segments of the
@@ -469 +469 @@
             # read the version-number (two signed chars)
             self.version        = struct.unpack('>bb', request.read(2))
+            length -= 2
             logger.debug("version-number : (0x%X, 0x%X)" % self.version)
 
@@ -474 +475 @@
             # for a response) (signed short)
             self.operation_id   = struct.unpack('>h', request.read(2))[0]
+            length -= 2
             logger.debug("operation-id : 0x%X" % self.operation_id)
 
             # read the request-id (signed int)
             self.request_id     = struct.unpack('>i', request.read(4))[0]
+            length -= 4
             logger.debug("request-id : 0x%X" % self.request_id)
 
@@ -486 +489 @@
             # read in the next byte
             next_byte = struct.unpack('>b', request.read(1))[0]
+            length -=1
             logger.debug("next byte : 0x%X" % next_byte)
 
@@ -498 +502 @@
 
                 next_byte = struct.unpack('>b', request.read(1))[0]
+                length -= 1
                 logger.debug("next byte : 0x%X" % next_byte)
 
@@ -508 +513 @@
                     # read in the length of the name (signed short)
                     name_length   = struct.unpack('>h', request.read(2))[0]
+                    length -= 2
                     logger.debug("name-length : %i" % name_length)
                     
@@ -513 +519 @@
                         # read the name (a string of name_length bytes)
                         name          = request.read(name_length)
+                        length -= name_length
                         logger.debug("name : %s" % name)
                     
                         # read in the length of the value (signed short)
                         value_length  = struct.unpack('>h', request.read(2))[0]
+                        length -= 2
                         logger.debug("value-length : %i" % value_length)
                     
                         # read in the value (string of value_length bytes)
                         value         = request.read(value_length)
-
+                        length -= value_length
+                        
                         ippvalue = IPPValue(value_tag, value)
                         logger.debug("value : %s" % ippvalue.value)
@@ -532 +541 @@
                         # read in the length of the value (signed short)
                         value_length  = struct.unpack('>h', request.read(2))[0]
+                        length -= 2
                         logger.debug("value-length : %i" % value_length)
                     
                         # read in the value (string of value_length bytes)
                         value         = request.read(value_length)
+                        length -= value_length
 
                         ippvalue = IPPValue(value_tag, value)
@@ -545 +556 @@
                     # read another byte
                     next_byte = struct.unpack('>b', request.read(1))[0]
+                    length -= 1
 
                 self.attribute_groups.append(IPPAttributeGroup(attribute_group_tag, attributes))
@@ -550 +562 @@
             # once we hit the end-of-attributes tag, the only thing
             # left is the data, so go ahead and read all of it
-            self.data = request.read()
+            assert length >= 0
+            self.data = request.read(length)
             logger.debug("data : %s" % self.data)