Skip to content

Compatible wth Python 3 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sumit-1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatible wth Python 3 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ntpserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
import socket
import struct
import time
import Queue
import mutex
import threading
import select
import sys

if sys.version_info >= (3, 0):
import queue as Queue
else:
import Queue

taskQueue = Queue.Queue()
stopFlag = False
Expand Down Expand Up @@ -244,18 +248,18 @@ def run(self):
global taskQueue,stopFlag
while True:
if stopFlag == True:
print "RecvThread Ended"
print ("RecvThread Ended")
break
rlist,wlist,elist = select.select([self.socket],[],[],1);
if len(rlist) != 0:
print "Received %d packets" % len(rlist)
print ("Received {} packets".format(len(rlist)))
for tempSocket in rlist:
try:
data,addr = tempSocket.recvfrom(1024)
recvTimestamp = recvTimestamp = system_to_ntp_time(time.time())
taskQueue.put((data,addr,recvTimestamp))
except socket.error,msg:
print msg;
except socket.error as msg:
print (msg)

class WorkThread(threading.Thread):
def __init__(self,socket):
Expand All @@ -265,7 +269,7 @@ def run(self):
global taskQueue,stopFlag
while True:
if stopFlag == True:
print "WorkThread Ended"
print ("WorkThread Ended")
break
try:
data,addr,recvTimestamp = taskQueue.get(timeout=1)
Expand All @@ -286,7 +290,7 @@ def run(self):
sendPacket.recv_timestamp = recvTimestamp
sendPacket.tx_timestamp = system_to_ntp_time(time.time())
socket.sendto(sendPacket.to_data(),addr)
print "Sended to %s:%d" % (addr[0],addr[1])
print ("Sended to {}:{}".format(addr[0], addr[1]))
except Queue.Empty:
continue

Expand All @@ -295,7 +299,7 @@ def run(self):
listenPort = 123
socket = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
socket.bind((listenIp,listenPort))
print "local socket: ", socket.getsockname();
print ("local socket: {}".format(socket.getsockname()))
recvThread = RecvThread(socket)
recvThread.start()
workThread = WorkThread(socket)
Expand All @@ -305,11 +309,11 @@ def run(self):
try:
time.sleep(0.5)
except KeyboardInterrupt:
print "Exiting..."
print ("Exiting...")
stopFlag = True
recvThread.join()
workThread.join()
#socket.close()
print "Exited"
print ("Exited")
break