xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 11:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Provide an xid if one is not preserved

Browse Source 
The SLP xid may be gone in a recheck, default to 42 in such a case.
This commit is contained in:
Jarrod Johnson 2018-11-13 16:09:37 -05:00
parent 1b84cd43fe
commit 2bb0a70a24
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,9 +295,11 @@ def _parse_attrlist(attrstr):
return attribs
def _parse_attrs(data, parsed):
def _parse_attrs(data, parsed, xid=None):
headinfo = _parse_slp_header(data)
if headinfo['function'] != 7 or headinfo['xid'] != parsed['xid']:
if xid is None:
xid = parsed['xid']
if headinfo['function'] != 7 or headinfo['xid'] != xid:
return
payload = headinfo['payload']
if struct.unpack('!H', bytes(payload[:2]))[0] != 0:
@ -317,7 +319,8 @@ def fix_info(info, handler):
handler(info)
def _add_attributes(parsed):
attrq = _generate_attr_request(parsed['services'][0], parsed['xid'])
xid = parsed.get('xid', 42)
attrq = _generate_attr_request(parsed['services'][0], xid)
target = None
# prefer reaching out to an fe80 if present, to be highly robust
# in face of network changes
@ -338,7 +341,7 @@ def _add_attributes(parsed):
net.sendall(attrq)
rsp = net.recv(8192)
net.close()
_parse_attrs(rsp, parsed)
_parse_attrs(rsp, parsed, xid)
def query_srvtypes(target):