added --nobuf flag

bin/decode.py

@@ -480,6 +480,8 @@ def main(*largs, **kwargs):
                      '\tpcap=PCAPFILE to write packets to a PCAP file\n' +
                      '\tsession=SESSION to write session text\n' +
                      '\tdirection=data direction to write (c,s,both,split)')
+    group.add_option('--nobuf', help='turn off output buffering', dest='nobuffer',
+                     action='store_true', default=False)
     group.add_option('-w', '--session', dest='session',
                      help='write session file, same as -o session=')
     group.add_option('-W', '--pcap', dest='pcap', default=None,
@@ -566,6 +568,8 @@ def main(*largs, **kwargs):
         # set output file (and other args if -o filename,key=val...)
         if options.outfile:
             outfile, outkw = util.strtok(options.outfile)
+        if options.nobuffer:
+            outkw.update(nobuffer=True)
         # output extra?
         if options.oextra:
             outkw.update(extra=True)

lib/output/colorout.py

@@ -142,6 +142,8 @@ def _htmlwrite(self, text):
             self.htmlbuffer += text
         else:
             self.fh.write(text)
+            if self.nobuffer:
+                self.fh.flush()
 
     def htmldump(self):
         '''
@@ -241,6 +243,8 @@ def _write_string(self, text, direction, timestamp, encoding=None):
         elif self._COLORMODE == 'TTY' and self._timemode and timestamp != None:
             self.fh.write('\x1b[36m%s UTC:\x1b[0m\n' %
                           datetime.datetime.utcfromtimestamp(timestamp))
+            if self.nobuffer:
+                self.fh.flush()
 
         # Set Direction
         if direction.lower() == 'cs':
@@ -275,6 +279,8 @@ def _write_string(self, text, direction, timestamp, encoding=None):
                 self._write_tty(text, colorTag)
             else:
                 self.fh.write(text)
+                if self.nobuffer:
+                    self.fh.flush()
 
         # Plain Text
         else:
@@ -308,6 +314,8 @@ def _write_tty(self, text, colorTag):
             self.fh.write(colorTag + _line[0] + '\x1b[0m')
             if len(_line) > 1:
                 self.fh.write('\n')
+            if self.nobuffer:
+                self.fh.flush()
 
     def _HTMLHeader(self, title="Dshell"):
 

lib/output/jsonout.py

@@ -79,5 +79,7 @@ def alert(self, *args, **kw):
                         del kw[name]
         self.fh.write(
             json.dumps(kw, ensure_ascii=self.options['ensure_ascii']) + "\n")
+        if self.nobuffer:
+            self.fh.flush()
 
 obj = JSONOutput

lib/output/netflowout.py

@@ -80,5 +80,7 @@ def __alert(self, *args, **kw):
                                                                                                        kw['endtime'] - kw['starttime'])
                                                                                                    )
                       )
+        if self.nobuffer:
+            self.fh.flush()
 
 obj = NetflowOutput

lib/output/output.py

@@ -42,6 +42,9 @@ def __init__(self, *a, **kw):
         self.timeformat = (kw.get('timeformat', self._DEFAULT_TIMEFORMAT))
         self.delim = (kw.get('delim', self._DEFAULT_DELIM))
 
+        # Run flush() after every relevant write() if this is true
+        self.nobuffer = (kw.get('nobuffer', False))
+
         if 'pcap' in kw:
             self.pcapwriter = PCAPWriter(kw['pcap'])
         else:
@@ -241,6 +244,8 @@ def write(self, obj, **kw):
             self.sessionwriter.write(obj, **kw)
         elif self.fh:
             self.fh.write(str(obj))
+            if self.nobuffer:
+                self.fh.flush()
 
     def close(self):
         '''close output if not stdout'''
@@ -269,6 +274,8 @@ def alert(self, *args, **kw):
         rec = self.parse(*args, **kw)
         if rec:
             self.fh.write(self.format % rec)
+            if self.nobuffer:
+                self.fh.flush()
 
 
 class DBOutput(Output):