flush dns , every time

This commit is contained in:
cppla 2023-05-31 11:06:28 +08:00
parent 9077f1058a
commit 5cfd533daf
2 changed files with 20 additions and 18 deletions

@ -155,17 +155,18 @@ def _ping_thread(host, mark, port):
lostPacket = 0 lostPacket = 0
packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN) packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN)
IP = host while True:
if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname # flush dns , every time.
try: IP = host
if PROBE_PROTOCOL_PREFER == 'ipv4': if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname
IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] try:
else: if PROBE_PROTOCOL_PREFER == 'ipv4':
IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0]
except Exception: else:
IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0]
except Exception:
pass pass
while True:
if packet_queue.full(): if packet_queue.full():
if packet_queue.get() == 0: if packet_queue.get() == 0:
lostPacket -= 1 lostPacket -= 1

@ -153,17 +153,18 @@ def _ping_thread(host, mark, port):
lostPacket = 0 lostPacket = 0
packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN) packet_queue = Queue(maxsize=PING_PACKET_HISTORY_LEN)
IP = host while True:
if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname # flush dns, every time.
try: IP = host
if PROBE_PROTOCOL_PREFER == 'ipv4': if host.count(':') < 1: # if not plain ipv6 address, means ipv4 address or hostname
IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0] try:
else: if PROBE_PROTOCOL_PREFER == 'ipv4':
IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0] IP = socket.getaddrinfo(host, None, socket.AF_INET)[0][4][0]
except Exception: else:
IP = socket.getaddrinfo(host, None, socket.AF_INET6)[0][4][0]
except Exception:
pass pass
while True:
if packet_queue.full(): if packet_queue.full():
if packet_queue.get() == 0: if packet_queue.get() == 0:
lostPacket -= 1 lostPacket -= 1