06c396fbe3
The issue reported is a particular case of a BC configured with redundant PTP clocks with same priority. When a clock recovers from a failure, as both clock were configured with same priority it's expected the active clock source to remain active. But if the recovered clock presented a better local clock class than active, it was being selected active. This specific case was fixed. Closes-bug: 2084723 Test plan: BC with same priority PASS: Start the PTP service with all clocks out of requirements, one is selected, no matter which one. PASS: Then, when the backup clock recovers from failure it is selected active. PASS: Then, when the other clock recovers from failure it remains as backup, no matter the local clock class. PASS: Then, when the active goes out of requirement, the backup is set active. Test plan: GM with same priority PASS: Start the PTP service with all clocks out of requirements, one is selected, no matter which one. PASS: Then, when the backup clock recovers from failure it is selected active. PASS: Then, when the other clock recovers from failure it remains as backup, no matter the local clock class. PASS: Then, when the active goes out of requirement, the backup is set active. Change-Id: Id2568bc8bbaad4cbf15070314f7904d3c3bbd53d Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Tue, 8 Aug 2023 13:10:50 -0300
|
|
Subject: [PATCH 45/61] Functions starts_with and str_at_column
|
|
|
|
Renaming starts_with and str_at_column functions to match ptp4l code
|
|
style.
|
|
|
|
Test plan: commands
|
|
PASS: Verify 'enable lock <interface>', 'disabel source <interface>' and
|
|
'enable source <interface>' still work.
|
|
|
|
Reviewed-by: Cole Walker <cole.walker@windriver.com>
|
|
Reviewed-by: Andre Fernando Zanella Kantek
|
|
<andrefernandozanella.kantek@windriver.com>
|
|
|
|
[commit f43f86eab5f8f5d2c9895d290d4bdfd6f60853f8 upstream]
|
|
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
phc2sys.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/phc2sys.c b/phc2sys.c
|
|
index a597014..6965162 100644
|
|
--- a/phc2sys.c
|
|
+++ b/phc2sys.c
|
|
@@ -1318,12 +1318,12 @@ static int ha_handle_status_msg(struct phc2sys_private *priv, char *response,
|
|
return curlen;
|
|
}
|
|
|
|
-static bool startsWith(const char *prefix, const char *str)
|
|
+static bool starts_with(const char *prefix, const char *str)
|
|
{
|
|
return 0 == strncmp(prefix, str, strlen(prefix) - 1);
|
|
}
|
|
|
|
-static char * strAtColumn(char *msg, size_t column)
|
|
+static char * str_at_column(char *msg, size_t column)
|
|
{
|
|
int i;
|
|
char * str = NULL;
|
|
@@ -1354,7 +1354,7 @@ static int ha_handle_enable_lock_msg(struct phc2sys_private *priv, char *msg,
|
|
char *interface = NULL;
|
|
struct clock *clock = NULL;
|
|
|
|
- interface = strAtColumn(msg, 3);
|
|
+ interface = str_at_column(msg, 3);
|
|
if (strlen(interface) == 0) {
|
|
return snprintf(response, resplen, "Error: Usage 'enable lock <interface>'");
|
|
}
|
|
@@ -1405,7 +1405,7 @@ static int ha_handle_enable_source_msg(struct phc2sys_private *priv,
|
|
char *interface = NULL;
|
|
struct clock *clock = NULL;
|
|
|
|
- interface = strAtColumn(msg, 3);
|
|
+ interface = str_at_column(msg, 3);
|
|
if (strlen(interface) == 0) {
|
|
return snprintf(response, resplen, "Error: Usage 'enable source <interface>'");
|
|
}
|
|
@@ -1437,7 +1437,7 @@ static int ha_handle_disable_source_msg(struct phc2sys_private *priv,
|
|
char *interface = NULL;
|
|
struct clock *clock = NULL;
|
|
|
|
- interface = strAtColumn(msg, 3);
|
|
+ interface = str_at_column(msg, 3);
|
|
if (strlen(interface) == 0) {
|
|
return snprintf(response, resplen, "Error: Usage 'disable source <interface>'");
|
|
}
|
|
@@ -1524,16 +1524,16 @@ static int ha_com_socket_handle_msg(struct phc2sys_private *priv,
|
|
} else if (strcmp((const char*)buffer, "forced lock") == 0) {
|
|
cnt = snprintf((char*)response, HA_SCK_BUFFER_SIZE, "%s",
|
|
priv->forced_source_clock ? "True" : "False");
|
|
- } else if (startsWith("enable lock", buffer)) {
|
|
+ } else if (starts_with("enable lock", buffer)) {
|
|
cnt = ha_handle_enable_lock_msg(priv, buffer, response,
|
|
HA_SCK_BUFFER_SIZE);
|
|
} else if (strcmp((const char*)buffer, "disable lock") == 0) {
|
|
cnt = ha_handle_disable_lock_msg(priv, cfg, response,
|
|
HA_SCK_BUFFER_SIZE);
|
|
- } else if (startsWith("enable source", buffer)) {
|
|
+ } else if (starts_with("enable source", buffer)) {
|
|
cnt = ha_handle_enable_source_msg(priv, cfg, buffer, response,
|
|
HA_SCK_BUFFER_SIZE);
|
|
- } else if (startsWith("disable source", buffer)) {
|
|
+ } else if (starts_with("disable source", buffer)) {
|
|
cnt = ha_handle_disable_source_msg(priv, cfg, buffer, response,
|
|
HA_SCK_BUFFER_SIZE);
|
|
} else {
|