xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-03-01 00:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Improve scan result with missing neigh entries

Browse Source 
If no neigh table is present for
a given address, send a packet to
induce kernel activity.

Then wait for a bit over 2 seconds to allow for
2 retries (at default settings)
and then proceed assuming all findable neighbor table
entries will be found.
This commit is contained in:
Jarrod Johnson 2021-10-04 16:22:12 -04:00
parent 1c69700e1d
commit c569826ff1
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
confluent_server/confluent/discovery/protocols/slp.py
View File

@ -104,8 +104,6 @@ def _parse_slp_packet(packet, peer, rsps, xidmap):
if not parsed:
return
addr = peer[0]
if '%' in addr:
addr = addr[:addr.index('%')]
mac = neighutil.get_hwaddr(addr)
if mac:
identifier = mac
@ -413,8 +411,7 @@ def rescan(handler):
for addr in scanned['addresses']:
if addr in known_peers:
break
ip = addr[0].partition('%')[0] # discard scope if present
macaddr = neighutil.get_hwaddr(ip)
macaddr = neighutil.get_hwaddr(addr[0])
if not macaddr:
continue
known_peers.add(addr)
@ -478,10 +475,9 @@ def snoop(handler, protocol=None):
while r:
for s in r:
(rsp, peer) = s.recvfrom(9000)
ip = peer[0].partition('%')[0]
if peer in known_peers:
continue
mac = neighutil.get_hwaddr(ip)
mac = neighutil.get_hwaddr(peer[0])
if not mac:
continue
known_peers.add(peer)
@ -534,14 +530,31 @@ def snoop(handler, protocol=None):
def active_scan(handler, protocol=None):
known_peers = set([])
net4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
net6 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
toprocess = []
# Implement a warmup, inducing neighbor table activity
# by kernel and giving 2 seconds for a retry or two if
# needed
for scanned in scan():
toprocess.append(scanned)
for addr in scanned['addresses']:
macaddr = neighutil.get_hwaddr(addr[0])
if not macaddr:
if ':' in addr[0]:
net6.sendto(b'\x00', (addr[0], 8989))
else:
net4.sendto(b'\x00', (addr[0], 8989))
eventlet.sleep(2.2)
for scanned in toprocess:
for addr in scanned['addresses']:
if addr in known_peers:
break
ip = addr[0].partition('%')[0] # discard scope if present
macaddr = neighutil.get_hwaddr(ip)
macaddr = neighutil.get_hwaddr(addr[0])
if not macaddr:
continue
if not scanned.get('hwaddr', None):
scanned['hwaddr'] = macaddr
known_peers.add(addr)
else:
scanned['protocol'] = protocol

11
confluent_server/confluent/discovery/protocols/ssdp.py
View File

@ -63,8 +63,7 @@ def active_scan(handler, protocol=None):
for addr in scanned['addresses']:
if addr in known_peers:
break
ip = addr[0].partition('%')[0] # discard scope if present
hwaddr = neighutil.get_hwaddr(ip)
hwaddr = neighutil.get_hwaddr(addr[0])
if not hwaddr:
continue
known_peers.add(addr)
@ -130,10 +129,9 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
rsp = rsp.split(b'\r\n')
method, _, _ = rsp[0].split(b' ', 2)
if method == b'NOTIFY':
ip = peer[0].partition('%')[0]
if peer in known_peers:
continue
mac = neighutil.get_hwaddr(ip)
mac = neighutil.get_hwaddr(peer[0])
if not mac:
continue
known_peers.add(peer)
@ -309,10 +307,9 @@ def check_cpstorage(urldata):
def _parse_ssdp(peer, rsp, peerdata):
ip = peer[0].partition('%')[0]
nid = ip
nid = peer[0]
mac = None
mac = neighutil.get_hwaddr(ip)
mac = neighutil.get_hwaddr(peer[0])
if mac:
nid = mac
headlines = rsp.split(b'\r\n')

2
confluent_server/confluent/neighutil.py
View File

@ -76,6 +76,8 @@ def _update_neigh():
def get_hwaddr(ipaddr):
if '%' in ipaddr:
ipaddr, _ = ipaddr.split('%', 1)
hwaddr = None
if os.name == 'nt':
return hwaddr