Merge ~paelzer/ubuntu/+source/ipset:lp-1918936-speed-up-numeric-port-adds-FOCAL into ubuntu/+source/ipset:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

I'm setting those to WIP but only to have them vanish from the server Teams review queue.

Do not consider this a withdrawl, I still consider these as "provided as much of a helping hand that I can cross-team, but now needs a review/ack/upload from the owner".

[Christian Ehrhardt  (paelzer)]

Or better, I'll consume the server Team slot and leave it as is since I already added an openstack packagers slot before.

+1 from my POV

review: Approve

Unmerged commits

f543822... by Christian Ehrhardt  on 2021-06-25

changelog: speed up numeric port adds (LP: #1918936)

Signed-off-by: Christian Ehrhardt <email address hidden>

c6ed807... by Christian Ehrhardt  on 2021-06-25

d/p/lp-1918936-Parse-port-before-trying-by-service-name.patch: speed up numeric port adds (LP: #1918936)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 5b28d83..9b2a73f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipset (7.5-1~exp1.ubuntu0.1) focal; urgency=medium
+
+  * d/p/lp-1918936-Parse-port-before-trying-by-service-name.patch: speed
+    up numeric port adds (LP: #1918936)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 25 Jun 2021 08:07:14 +0200
+
 ipset (7.5-1~exp1) experimental; urgency=medium
 
   * [9c18ea7] New upstream version 7.5
diff --git a/debian/patches/lp-1918936-Parse-port-before-trying-by-service-name.patch b/debian/patches/lp-1918936-Parse-port-before-trying-by-service-name.patch
new file mode 100644
index 0000000..53ca445
--- /dev/null
+++ b/debian/patches/lp-1918936-Parse-port-before-trying-by-service-name.patch
@@ -0,0 +1,39 @@
+From dbeb20a667e82e4efb8b26b24a0ec641dab5c857 Mon Sep 17 00:00:00 2001
+From: Haw Loeung <[e-mail]>
+Date: Wed, 17 Feb 2021 10:15:07 +0100
+Subject: [PATCH] Parse port before trying by service name
+
+This improves performance for loading IP sets using port numbers,
+especially large ones.
+
+Signed-off-by: Jozsef Kadlecsik <[e-mail]>
+
+Origin: upstream, https://git.netfilter.org/ipset/commit/?id=dbeb20a667e8
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1918936
+Last-Update: 2021-06-25
+
+---
+ lib/parse.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/parse.c b/lib/parse.c
+index 31a619db..f3f2d113 100644
+--- a/lib/parse.c
++++ b/lib/parse.c
+@@ -319,11 +319,11 @@ ipset_parse_port(struct ipset_session *session,
+ 	assert(opt == IPSET_OPT_PORT || opt == IPSET_OPT_PORT_TO);
+ 	assert(str);
+ 
+-	if (parse_portname(session, str, &port, proto) == 0) {
++	if (string_to_u16(session, str, &port) == 0) {
+ 		return ipset_session_data_set(session, opt, &port);
+ 	}
+ 	/* Error is stored as warning in session report */
+-	if (string_to_u16(session, str, &port) == 0) {
++	if (parse_portname(session, str, &port, proto) == 0) {
+ 		/* No error, so reset false error messages */
+ 		ipset_session_report_reset(session);
+ 		return ipset_session_data_set(session, opt, &port);
+-- 
+2.32.0
+
diff --git a/debian/patches/series b/debian/patches/series
index f86188f..f59762a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ test-installed.patch
 workaround-iphash-delete-one-by-one-test-failed.patch
 05-delay-the-set-with-timeout-resizing-test.patch
 fix-bash-completion.patch
+lp-1918936-Parse-port-before-trying-by-service-name.patch