Changes between Version 7 and Version 8 of WARPnet1/BuildClientScripts

Timestamp:

Jun 18, 2010, 2:24:14 PM (14 years ago)

Author:

sgupta

Comment:

--

WARPnet1/BuildClientScripts

@@ -21 +21 @@
         int pktGen_period;
         int pktGen_length;
+        int pktGen_numPackets;
 } warpnetControl;
 }}}
@@ -36 +37 @@
         packetGeneratorPeriod = 0
         packetGeneratorLength = 0
+        packetGeneratorNumPackets = 0
         
-        def __init__(self):
+        def __init__(self, logger=None):
+                ClientStruct.__init__(self, logger)
                 self.structID = STRUCTID_CONTROL
+                self.expectedReturnStructID = STRUCTID_CONTROL_ACK
                 self.txPower = 63
                 self.channel = 4
                 self.modOrderHeader = 0
                 self.modOrderPayload = 2
-                self.packetGeneratorPeriod = 0
+                self.packetGeneratorPeriod = 10
                 self.packetGeneratorLength = 1300
-                self.expectedReturnStructID = STRUCTID_CONTROL_ACK
+                self.packetGeneratorNumPackets = 1000
         
         def prepToSend(self, nodeID):
                 self.updateDone = False
                 return struct.pack('!6BHII', self.structID, nodeID, self.txPower, self.channel, self.modOrderHeader, \
-                self.modOrderPayload, self.reserved, self.packetGeneratorPeriod, self.packetGeneratorLength)
+                                self.modOrderPayload, self.reserved, self.packetGeneratorPeriod, self.packetGeneratorLength)
                 
         def updateFromNode(self, rawData, pcapts):