Merge pull request #3 from Bandie/preMerge

Removing trailing whitespaces
This commit is contained in:
Bandie 2018-04-04 16:34:27 +02:00 committed by GitHub
commit dc027362f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

2
ding
View File

@ -41,7 +41,7 @@ def send(conn, cmd):
conn.connect((host, port)) conn.connect((host, port))
buf = conn.recv(1024) buf = conn.recv(1024)
if(buf == b"OK 1337\n"): if(buf == b"OK 1337\n"):
conn.sendall(cmd) conn.sendall(cmd)
buf = conn.recv(1024) buf = conn.recv(1024)
if(buf == b"OK CMD"): if(buf == b"OK CMD"):

7
dingd
View File

@ -33,7 +33,7 @@ def execFromConfig(option, pw=False):
if(option == password): if(option == password):
return 4 return 4
else: else:
return 5 return 5
else: else:
@ -52,13 +52,12 @@ def execFromConfig(option, pw=False):
print(getTimestamp(), "No execution set:", option) print(getTimestamp(), "No execution set:", option)
return 1 return 1
def main(): def main():
while True: while True:
newsocket, fromaddr = bindsocket.accept() newsocket, fromaddr = bindsocket.accept()
try: try:
connstream = context.wrap_socket(newsocket, server_side=True) connstream = context.wrap_socket(newsocket, server_side=True)
print(getTimestamp(), "Incoming connection:", fromaddr[0]) print(getTimestamp(), "Incoming connection:", fromaddr[0])
connstream.send(b"OK 1337\n") connstream.send(b"OK 1337\n")