Skip to content

fix: make ping.py compatible with Python 3 #16

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
fazalpsinfo-cmyk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make ping.py compatible with Python 3 #16

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
41 changes: 24 additions & 17 deletions ping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@
import os, sys, socket, struct, select, time

if sys.platform == "win32":
# On Windows, the best timer is time.clock()
default_timer = time.clock
# On Windows, the best timer is time.perf_counter()
if hasattr(time, "perf_counter"):
default_timer = time.perf_counter
else:
default_timer = time.clock
else:
# On most other platforms the best timer is time.time()
default_timer = time.time
Expand All @@ -87,18 +90,19 @@ def checksum(source_string):
I'm not too confident that this is right but testing seems
to suggest that it gives the same answers as in_cksum in ping.c
"""
source_bytes = bytearray(source_string)
sum = 0
countTo = (len(source_string)/2)*2
countTo = (len(source_bytes) // 2) * 2
count = 0
while count<countTo:
thisVal = ord(source_string[count + 1])*256 + ord(source_string[count])
while count < countTo:
thisVal = source_bytes[count + 1] * 256 + source_bytes[count]
sum = sum + thisVal
sum = sum & 0xffffffff # Necessary?
count = count + 2

if countTo<len(source_string):
sum = sum + ord(source_string[len(source_string) - 1])
sum = sum & 0xffffffff # Necessary?
if countTo < len(source_bytes):
sum = sum + source_bytes[len(source_bytes) - 1]
sum = sum & 0xffffffff

sum = (sum >> 16) + (sum & 0xffff)
sum = sum + (sum >> 16)
Expand Down Expand Up @@ -154,7 +158,7 @@ def send_one_ping(my_socket, dest_addr, ID):
# Make a dummy heder with a 0 checksum.
header = struct.pack("bbHHh", ICMP_ECHO_REQUEST, 0, my_checksum, ID, 1)
bytesInDouble = struct.calcsize("d")
data = (192 - bytesInDouble) * "Q"
data = (192 - bytesInDouble) * b"Q"
data = struct.pack("d", default_timer()) + data

# Calculate the checksum on the data and the dummy header.
Expand All @@ -176,7 +180,8 @@ def do_one(dest_addr, timeout):
icmp = socket.getprotobyname("icmp")
try:
my_socket = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp)
except socket.error, (errno, msg):
except socket.error as e:
errno, msg = e.args[0], e.args[1] if len(e.args) > 1 else str(e)
if errno == 1:
# Operation not permitted
msg = msg + (
Expand All @@ -200,20 +205,22 @@ def verbose_ping(dest_addr, timeout = 2, count = 4):
Send >count< ping to >dest_addr< with the given >timeout< and display
the result.
"""
for i in xrange(count):
print "ping %s..." % dest_addr,
for i in range(count):
print("ping %s..." % dest_addr, end="")
sys.stdout.flush()
try:
delay = do_one(dest_addr, timeout)
except socket.gaierror, e:
print "failed. (socket error: '%s')" % e[1]
except socket.gaierror as e:
err_msg = e.args[1] if len(e.args) > 1 else str(e)
print("failed. (socket error: '%s')" % err_msg)
break

if delay == None:
print "failed. (timeout within %ssec.)" % timeout
print("failed. (timeout within %ssec.)" % timeout)
else:
delay = delay * 1000
print "get ping in %0.4fms" % delay
print
print("get ping in %0.4fms" % delay)
print()


if __name__ == '__main__':
Expand Down