From: Kenneth Ekman <bk_ekman@hotmail.com>
Date: Sat, 20 Jun 2026 11:48:44 +0000 (+0200)
Subject: Fix mixup between single and dual signature in strings. (#792)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce4f8427fd960b79ef35f5b7687516f326cef201;p=thirdparty%2Flldpd.git

Fix mixup between single and dual signature in strings. (#792)

* Fix mixup between single and dual signature in strings.

Change-Id: I9ac304342915bf144983b7bff59efdf85ba4f76a

* tests: fix failing pcap integration test

Change-Id: I28fe5ced8cd77dfa40ffb8109dcb9f651256210d

---------

Co-authored-by: Kenneth Ekman <kenneen@axis.com>
---

diff --git a/src/lib/atoms/dot3.c b/src/lib/atoms/dot3.c
index f3f490ae..dd0ef015 100644
--- a/src/lib/atoms/dot3.c
+++ b/src/lib/atoms/dot3.c
@@ -77,8 +77,8 @@ static struct atom_map port_dot3_power_pse_status_map = {
 	.map = {
 		{ 0, "unknown" },
 		{ 1, "2-pair powering" },
-		{ 2, "4-pair powering dual-signature PD" },
-		{ 3, "4-pair powering single-signature PD" },
+		{ 2, "4-pair powering single-signature PD" },
+		{ 3, "4-pair powering dual-signature PD" },
 		{ 0, NULL },
 	},
 };
@@ -87,9 +87,9 @@ static struct atom_map port_dot3_power_pd_status_map = {
 	.key = lldpctl_k_dot3_power_pd_status,
 	.map = {
 		{ 0, "unknown" },
-		{ 1, "2-pair powered PD" },
-		{ 2, "4-pair powered dual-signature PD" },
-		{ 3, "4-pair powered single-signature PD" },
+		{ 1, "Powered single-signature PD" },
+		{ 2, "2-pair powered dual-signature PD" },
+		{ 3, "4-pair powered dual-signature PD" },
 		{ 0, NULL },
 	},
 };
diff --git a/tests/integration/test_pcap.py b/tests/integration/test_pcap.py
index ef8ff01c..053dcc48 100644
--- a/tests/integration/test_pcap.py
+++ b/tests/integration/test_pcap.py
@@ -75,7 +75,7 @@ def test_8023bt(lldpd1, lldpcli, namespaces):
             "lldp.eth0.port.power.requested-b": "35500",
             "lldp.eth0.port.power.allocated-a": "25500",
             "lldp.eth0.port.power.allocated-b": "25500",
-            "lldp.eth0.port.power.pse-powering-status": "4-pair powering single-signature PD",
+            "lldp.eth0.port.power.pse-powering-status": "4-pair powering dual-signature PD",
             "lldp.eth0.port.power.pd-powering-status": "unknown",
             "lldp.eth0.port.power.power-pairs-ext": "both alternatives",
             "lldp.eth0.port.power.power-class-ext-a": "class 4",