mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-10 14:56:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into tunnel_endpoint_ip_and_mac_mobility_params

Browse Source
This commit is contained in:
Josh Bailey 2021-09-09 19:31:33 +12:00 committed by GitHub
commit 442d9f8197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ryu/services/protocols/bgp/base.py
View File

@ -285,7 +285,7 @@ class Activity(object):
"""Stops all threads spawn by this activity.
"""
for thread_name, thread in list(self._child_thread_map.items()):
if name is not None and thread_name is name:
if name is None or thread_name == name:
LOG.debug('%s: Stopping child thread %s',
self.name, thread_name)
thread.kill()

4
ryu/services/protocols/bgp/processor.py
View File

@ -36,6 +36,8 @@ from ryu.lib.packet.bgp import BGP_ATTR_ORIGIN_IGP
from ryu.lib.packet.bgp import BGP_ATTR_ORIGIN_EGP
from ryu.lib.packet.bgp import BGP_ATTR_ORIGIN_INCOMPLETE
from ryu.services.protocols.bgp.constants import VRF_TABLE
LOG = logging.getLogger('bgpspeaker.processor')
@ -428,7 +430,7 @@ def _cmp_by_asn(local_asn, path1, path2):
"""
def get_path_source_asn(path):
asn = None
if path.source is None:
if path.source is None or path.source == VRF_TABLE:
asn = local_asn
else:
asn = path.source.remote_as