Fixed bug in 'writer' decoder that caused it to raise an exception when passed additional keyword arguments.

Author: dev195

decoders/misc/writer.py

@@ -23,15 +23,18 @@ def __init__(self, **kwargs):
         '''
         self.file = None
         dshell.Decoder.__init__(self,
-                                name='writer',
-                                description='pcap/session writer',
-                                author='twp',
-                                raw=True,
-                                optiondict=dict(filename=dict(default='%(clientip)s:%(clientport)s-%(serverip)s:%(serverport)s-%(direction)s.txt'),
-                                                )
-                                )
-
-    def rawHandler(self, pktlen, pkt, ts):
+            name='writer',
+            description='pcap/session writer',
+            author='twp',
+            raw=True,
+            optiondict=dict(
+                filename=dict(
+                    default='%(clientip)s:%(clientport)s-%(serverip)s:%(serverport)s-%(direction)s.txt'
+                ),
+            )
+        )
+
+    def rawHandler(self, pktlen, pkt, ts, **kwargs):
         self.decodedbytes += pktlen
         self.count += 1
         self.dump(pktlen, pkt, ts)  # pktlen may be wrong if we stripped vlan