cfe25f0193
Fixed the port id map in the Port Data Set event handling. The port id is composed by port number and node index after the HA implementation. Code tidying. As definition, the port id and the port number are different. An existing port number variable was rennamed to prevent missinterpretation. Code tidying. The HA node state change processing was disabled when HA feature is not enabled. Test plan: PASS: Verify the phc2sys executable recognizes the port in the port state change event, when -a configuration option is used PASS: Verify the events in the HA scenario are being recognized Story: 2010723 Task: 49405 Change-Id: Iea2b3c4e7d7dcd07ca2ad52bc4042f80282b1a9a Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 508ab6941772db145ad095a9d2707caf1f1e1198 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Thu, 4 Jan 2024 13:27:09 -0300
|
|
Subject: [PATCH 55/56] Ignore interface in conf file when HA is disabled
|
|
|
|
Fixed the behavior when HA is disabled, one interface has been configured and
|
|
'-a' autoconfiguration option is enabled. The behavior before HA feature was
|
|
to ignore the givven interface. To keep retrocompatibility with earlier
|
|
configurations, interfaces in the configuration file are ignored
|
|
if HA is disabled.
|
|
|
|
Test Plan: non HA
|
|
PASS: Verify behavior when HA is disabled and interface has been configured
|
|
PASS: Verify behavior when HA is ommited and interface has been configured
|
|
PASS: Verify behavior when HA is disabled and no interface has been configured
|
|
|
|
Test Plan: HA
|
|
PASS: Verify phc2sys exit with error when HA is enabled and one interface
|
|
has been configured.
|
|
|
|
Closes-bug: 2048085
|
|
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
phc2sys.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/phc2sys.c b/phc2sys.c
|
|
index 4120568..1f6b6c2 100644
|
|
--- a/phc2sys.c
|
|
+++ b/phc2sys.c
|
|
@@ -2236,7 +2236,8 @@ int main(int argc, char *argv[])
|
|
return c;
|
|
}
|
|
|
|
- if (src_cnt == 0) {
|
|
+ ha_enabled = config_get_int(cfg, NULL, "ha_enabled");
|
|
+ if (ha_enabled && src_cnt == 0) {
|
|
/* get the source interface list from configuration file */
|
|
src_cnt = config_get_interfaces(cfg, src_names, MAX_SRC_CLOCKS);
|
|
if (src_cnt == (unsigned int)-1) {
|
|
@@ -2297,7 +2298,6 @@ int main(int argc, char *argv[])
|
|
goto end;
|
|
}
|
|
|
|
- ha_enabled = config_get_int(cfg, NULL, "ha_enabled");
|
|
if (!ha_enabled && src_cnt > 1) {
|
|
fprintf(stderr, "too many source clocks\n");
|
|
fprintf(stderr, "Use 'ha_enabled 1' to accept more than one source clock\n");
|
|
--
|
|
2.25.1
|
|
|