From fc0417877e053a01927256fa964e4e6730b929b3 Mon Sep 17 00:00:00 2001
From: pbi <none@none>
Date: Wed, 16 Mar 2005 13:18:28 +0000
Subject: [PATCH] - added StrNullField

---
 scapy.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scapy.py b/scapy.py
index 3131cc663..e1b548882 100755
--- a/scapy.py
+++ b/scapy.py
@@ -21,6 +21,9 @@
 
 #
 # $Log: scapy.py,v $
+# Revision 0.9.17.57  2005/03/16 14:18:28  pbi
+# - added StrNullField
+#
 # Revision 0.9.17.56  2005/03/14 18:14:28  pbi
 # - LLNumTypes fix
 # - Added linktype recognition to PcapWriter class
@@ -630,7 +633,7 @@
 
 from __future__ import generators
 
-RCSID="$Id: scapy.py,v 0.9.17.56 2005/03/14 18:14:28 pbi Exp $"
+RCSID="$Id: scapy.py,v 0.9.17.57 2005/03/16 14:18:28 pbi Exp $"
 
 VERSION = RCSID.split()[2]+"beta"
 
@@ -2219,6 +2222,15 @@ class ISAKMPTransformSetField(StrLenField):
       
         return s[l:],i
 
+class StrNullField(StrField):
+    def addfield(self, pkt, s, val):
+        return s+"\x00"+self.i2m(pkt, val)
+    def getfield(self, pkt, s):
+        l = s.find("\x00")
+        if l < 0:
+            #XXX \x00 not found
+            return "",s
+        return s[l+1:],self.m2i(pkt, s[:l])
 
 class StrStopField(StrField):
     def __init__(self, name, default, stop, additionnal=0):