File do-not-crash-when-there-are-ipv6-established-co... of Package py27-compat-salt

Overview Repositories Revisions Requests Users Attributes Meta

File do-not-crash-when-there-are-ipv6-established-connect.patch of Package py27-compat-salt (Revision 506242651d258c2dc8b4ece49ab78dd2)

Currently displaying revision 506242651d258c2dc8b4ece49ab78dd2 , Show latest

From bfee3a7c47786bb860663de97fca26725101f1d0 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 2ae2e213b7..307cab885f 100644
--- a/salt/utils/network.py
+++ b/salt/utils/network.py
@@ -1442,8 +1442,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.23.0

Places

File do-not-crash-when-there-are-ipv6-established-connect.patch of Package py27-compat-salt (Revision 506242651d258c2dc8b4ece49ab78dd2)

Places