fixed net/tcpconnect service
This commit is contained in:
parent
681edcd1c4
commit
880e3db851
1 changed files with 16 additions and 16 deletions
|
|
@ -44,29 +44,29 @@ class TcpconnectService(Service):
|
||||||
def needs_arguments(self):
|
def needs_arguments(self):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def execute(self, jobInfo):
|
def execute(self, execution):
|
||||||
|
|
||||||
|
error_code = 0
|
||||||
|
msg = "Connection successful established"
|
||||||
|
e = "None"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
except socket.error, msg:
|
except socket.error, e:
|
||||||
jobInfo.set_errorcode(2)
|
error_code = 2
|
||||||
jobInfo.set_message("[tcpconnect: " + jobInfo.jobHex + "] Could not create socket to host: " +
|
msg = "Could not create socket"
|
||||||
jobInfo.get_host() + " on port: " + str(self.port) + " (" + str(msg) + ")")
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
sock.connect((jobInfo.get_host(), self.port))
|
sock.connect((execution.get_host_name(), self.port))
|
||||||
except socket.error, msg:
|
except socket.error, e:
|
||||||
jobInfo.set_errorcode(1)
|
error_code = 1
|
||||||
jobInfo.set_message("[tcpconnect: " + jobInfo.jobHex + "] Could not establish connection to host: " +
|
msg = "Could not establish connection"
|
||||||
jobInfo.get_host() + " on port: " + str(self.port) + " (" + str(msg) + ")")
|
|
||||||
|
|
||||||
if jobInfo.get_errorcode() == -1:
|
|
||||||
jobInfo.set_execution_successful(True)
|
|
||||||
jobInfo.set_errorcode(0)
|
|
||||||
jobInfo.set_message("[tcpconnect: " + jobInfo.jobHex + "] Connection successful established to host: " +
|
|
||||||
jobInfo.get_host() + " on port: " + str(self.port))
|
|
||||||
|
|
||||||
sock.close()
|
sock.close()
|
||||||
|
|
||||||
|
d = {"Port": self.port, "Exception": e}
|
||||||
|
execution.set_result(error_code, msg, d)
|
||||||
|
|
||||||
|
|
||||||
def create(kwargs):
|
def create(kwargs):
|
||||||
return TcpconnectService(**kwargs)
|
return TcpconnectService(**kwargs)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue