Unify RandString & RandBin

Author: gpotter2

scapy/arch/__init__.py

@@ -14,7 +14,7 @@
     SOLARIS, WINDOWS, BSD, IS_64BITS, LOOPBACK_NAME
 from scapy.error import *
 import scapy.config
-from scapy.pton_ntop import inet_pton
+from scapy.pton_ntop import inet_pton, inet_ntop
 from scapy.data import *
 
 def str2mac(s):
@@ -25,7 +25,7 @@ def str2mac(s):
         from scapy.arch.bpf.core import get_if_raw_addr
 
 def get_if_addr(iff):
-    return socket.inet_ntoa(get_if_raw_addr(iff))
+    return inet_ntop(socket.AF_INET, get_if_raw_addr(iff))
 
 def get_if_hwaddr(iff):
     addrfamily, mac = get_if_raw_hwaddr(iff)

scapy/volatile.py

@@ -70,7 +70,7 @@ def next(self):
     __next__ = next
 
 
-class VolatileValue:
+class VolatileValue(object):
     def __repr__(self):
         return "<%s>" % self.__class__.__name__
     def __eq__(self, other):
@@ -266,41 +266,33 @@ def _fix(self):
         return random.choice(self._choice)
 
 class RandString(RandField):
-    def __init__(self, size=None, chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"):
+    def __init__(self, size=None, chars=b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"):
         if size is None:
             size = RandNumExpo(0.01)
         self.size = size
         self.chars = chars
     def _fix(self):
-        s = ""
+        s = b""
         for _ in range(self.size):
-            s += random.choice(self.chars)
+            s += chb(random.choice(self.chars))
         return s
+    def __str__(self):
+        return plain_str(self._fix())
+    def __bytes__(self):
+        return raw(self._fix())
     def __mul__(self, n):
         return self._fix()*n
 
-class RandBin(RandString, object):
+class RandBin(RandString):
     def __init__(self, size=None):
         super(RandBin, self).__init__(size=size, chars=b"".join(chb(c) for c in range(256)))
-    def _fix(self):
-        s = b""
-        for _ in range(self.size):
-            s += chb(random.choice(self.chars))
-        return s
-
 
-class RandTermString(RandString):
+class RandTermString(RandBin):
     def __init__(self, size, term):
-        RandString.__init__(self, size, "".join(map(chr, range(1,256))))
-        self.term = term
+        self.term = raw(term)
+        super(RandTermString, self).__init__(size=size)
     def _fix(self):
-        return RandString._fix(self)+self.term
-
-    def __str__(self):
-        return str(self._fix())
-
-    def __bytes__(self):
-        return raw(self._fix())
+        return RandBin._fix(self)+self.term
 
 
 class RandIP(RandString):

test/regression.uts

@@ -8899,7 +8899,7 @@ assert(rss == ("CON:" if six.PY2 else "foo.exe:"))
 
 random.seed(0x2807)
 rts = RandTermString(4, "scapy")
-assert(sane(raw(rts)) in ["...[scapy", "......scapy"])
+assert(sane(raw(rts)) in ["...Zscapy", "$#..scapy"])
 
 
 ############