From 7994b5e62da16bcc7500dea0f2e9597191f5dcd4 Mon Sep 17 00:00:00 2001
From: Ilia <gpg@ilia.engineer>
Date: Sun, 10 Apr 2022 00:49:22 +0300
Subject: [PATCH] Add description when editing service; change output for multi
 ports

---
 firewalld/firewalld-lib.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/firewalld/firewalld-lib.pl b/firewalld/firewalld-lib.pl
index e86853e9e..683adeb64 100644
--- a/firewalld/firewalld-lib.pl
+++ b/firewalld/firewalld-lib.pl
@@ -103,7 +103,7 @@ if (-r $service_file) {
 	}
 @ports = &unique(@ports);
 @protos = &unique(@protos);
-return {'ports' => join(" $service:", @ports), 'protocols' => uc(join('/', @protos))};
+return {'ports' => join(":", @ports), 'protocols' => uc(join('/', @protos))};
 }
 
 # list_firewalld_services_with_ports()
@@ -120,7 +120,13 @@ foreach my $s (&list_firewalld_services()) {
 		push(@rv, [ $s, $s." (".$n[2]." ".uc($n[3]).")" ]);
 		}
 	else {
-		push(@rv, [ $s, $s ]);
+		my $sportsprotos = &list_firewalld_service_desc($s);
+		my $sports = $sportsprotos->{'ports'};
+		my $sprotocols = $sportsprotos->{'protocols'};
+		my $sdesc;
+		$sports =~ s/:/, /g;
+		$sdesc = " ($sports $sprotocols)" if ($sports);
+		push(@rv, [ $s, "$s$sdesc" ]);
 		}
 	}
 return @rv;