File do-not-crash-when-there-are-ipv6-established-co... of Package venv-salt-minion

Overview Repositories Revisions Requests Users Attributes Meta

File do-not-crash-when-there-are-ipv6-established-connect.patch of Package venv-salt-minion (Revision 39968e1719bae792b4806f338a5327ea)

Currently displaying revision 39968e1719bae792b4806f338a5327ea , Show latest

From 998136ffd4c8442e0c3a7030af3d8196abec6be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Tue, 7 May 2019 15:33:51 +0100
Subject: [PATCH] Do not crash when there are IPv6 established
 connections (bsc#1130784)

Add unit test for '_netlink_tool_remote_on'
---
 salt/utils/network.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/salt/utils/network.py b/salt/utils/network.py
index dd7fceb91a..d253ded3ab 100644
--- a/salt/utils/network.py
+++ b/salt/utils/network.py
@@ -1623,8 +1623,13 @@ def _netlink_tool_remote_on(port, which_end):
         elif "ESTAB" not in line:
             continue
         chunks = line.split()
+        local_host, local_port = chunks[3].rsplit(":", 1)
         remote_host, remote_port = chunks[4].rsplit(":", 1)
 
+        if which_end == "remote_port" and int(remote_port) != port:
+            continue
+        if which_end == "local_port" and int(local_port) != port:
+            continue
         remotes.add(remote_host.strip("[]"))
 
     if valid is False:
-- 
2.29.2

Places

File do-not-crash-when-there-are-ipv6-established-connect.patch of Package venv-salt-minion (Revision 39968e1719bae792b4806f338a5327ea)

Places