|
|
|
@ -22,6 +22,7 @@ import re
|
|
|
|
import readline
|
|
|
|
import readline
|
|
|
|
from socket import socket, AF_UNIX, error
|
|
|
|
from socket import socket, AF_UNIX, error
|
|
|
|
from time import sleep
|
|
|
|
from time import sleep
|
|
|
|
|
|
|
|
import select
|
|
|
|
import sys
|
|
|
|
import sys
|
|
|
|
|
|
|
|
|
|
|
|
SURICATASC_VERSION = "0.9"
|
|
|
|
SURICATASC_VERSION = "0.9"
|
|
|
|
@ -114,7 +115,12 @@ class SuricataSC:
|
|
|
|
self.socket.send(json.dumps(cmdmsg))
|
|
|
|
self.socket.send(json.dumps(cmdmsg))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.socket.send(bytes(json.dumps(cmdmsg), 'iso-8859-1'))
|
|
|
|
self.socket.send(bytes(json.dumps(cmdmsg), 'iso-8859-1'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ready = select.select([self.socket], [], [], 600)
|
|
|
|
|
|
|
|
if ready[0]:
|
|
|
|
cmdret = self.json_recv()
|
|
|
|
cmdret = self.json_recv()
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
cmdret = None
|
|
|
|
|
|
|
|
|
|
|
|
if cmdret == None:
|
|
|
|
if cmdret == None:
|
|
|
|
raise SuricataReturnException("Unable to get message from server")
|
|
|
|
raise SuricataReturnException("Unable to get message from server")
|
|
|
|
|