Changeset 895:879144443345

Timestamp:

08/31/08 00:33:01 (4 months ago)

Author:

Phil <phil@secdev.org>

Message:

Move RandDHCPOptions to layers/dhcp.py

Files:

• scapy/layers/dhcp.py (modified) (2 diffs)
• scapy/volatile.py (modified) (1 diff)

scapy/layers/dhcp.py

@@ -11 +11 @@
-from scapy.layers.inet import UDP
-from scapy.base_classes import Net
+from scapy.volatile import RandField
-
-dhcpmagic="c\x82Sc"
@@ -146 +147 @@
-
-
+class RandDHCPOptions(RandField):
+    def __init__(self, size=None, rndstr=None):
+        if size is None:
+            size = RandNumExpo(0.05)
+        self.size = size
+        if rndstr is None:
+            rndstr = RandBin(RandNum(0,255))
+        self.rndstr=rndstr
+        self._opts = DHCPOptions.values()
+        self._opts.remove("pad")
+        self._opts.remove("end")
+    def _fix(self):
+        op = []
+        for k in range(self.size):
+            o = random.choice(self._opts)
+            if type(o) is str:
+                op.append((o,self.rndstr*1))
+            else:
+                op.append((o.name, o.randval()._fix()))
+        return op
+
-
-class DHCPOptionsField(StrField):

scapy/volatile.py

@@ -206 +206 @@
-            return ".".join(oid)
-            
-
-
-class RandDHCPOptions(RandField):
-    def __init__(self, size=None, rndstr=None):
-        if size is None:
-            size = RandNumExpo(0.05)
-        self.size = size
-        if rndstr is None:
-            rndstr = RandBin(RandNum(0,255))
-        self.rndstr=rndstr
-        self._opts = DHCPOptions.values()
-        self._opts.remove("pad")
-        self._opts.remove("end")
-    def _fix(self):
-        op = []
-        for k in range(self.size):
-            o = random.choice(self._opts)
-            if type(o) is str:
-                op.append((o,self.rndstr*1))
-            else:
-                op.append((o.name, o.randval()._fix()))
-        return op
-            
-