Commit 0dd69b61ce for frr
commit 0dd69b61ce8d135b09453e1cae44b4887753517c
Author: Lincoln Thurlow <lincoln@isi.edu>
Date: Fri Nov 20 10:15:30 2026 -0800
pceplib: count unknown PCEP messages per minute
pathd closes a long-lived PCEP session once it has received
max_unknown_messages messages, even when they slower than the
once per minute rate RFC 5440 specifies.
increment_unknown_message() is meant to purge the timestamps older
than a minute, but compares them against now + 60 seconds, so
nothing is ever purged and the count only grows.
This commit purges the timestamps from 60 seconds ago or earlier, so
only the last minute counts towards the limit.
Signed-off-by: Lincoln Thurlow <lincoln@isi.edu>
diff --git a/pceplib/pcep_session_logic_states.c b/pceplib/pcep_session_logic_states.c
index 5b341c780c..f2213432e9 100644
--- a/pceplib/pcep_session_logic_states.c
+++ b/pceplib/pcep_session_logic_states.c
@@ -705,7 +705,7 @@ void increment_unknown_message(pcep_session *session)
time_t *unknown_message_time =
pceplib_malloc(PCEPLIB_INFRA, sizeof(time_t));
*unknown_message_time = time(NULL);
- time_t expire_time = *unknown_message_time + 60;
+ time_t expire_time = *unknown_message_time - 60;
queue_enqueue(session->num_unknown_messages_time_queue,
unknown_message_time);
@@ -713,7 +713,7 @@ void increment_unknown_message(pcep_session *session)
* queue head */
queue_node *time_node = session->num_unknown_messages_time_queue->head;
while (time_node != NULL) {
- if (*((time_t *)time_node->data) > expire_time) {
+ if (*((time_t *)time_node->data) <= expire_time) {
pceplib_free(
PCEPLIB_INFRA,
queue_dequeue(
diff --git a/pceplib/test/pcep_session_logic_states_test.c b/pceplib/test/pcep_session_logic_states_test.c
index 695d59d7ae..6f59c05e64 100644
--- a/pceplib/test/pcep_session_logic_states_test.c
+++ b/pceplib/test/pcep_session_logic_states_test.c
@@ -805,6 +805,36 @@ void test_handle_socket_comm_event_unknown_msg()
}
+/* Unknown messages older than a minute no longer count towards
+ * max_unknown_messages (RFC 5440 is a per-minute rate).
+ */
+void test_handle_socket_comm_event_unknown_msg_purge(void)
+{
+ time_t *old_time = pceplib_malloc(PCEPLIB_INFRA, sizeof(time_t));
+ mock_socket_comm_info *mock_info;
+ uint8_t *encoded_msg;
+
+ /* One unknown message two minutes ago, max_unknown_messages = 2 */
+ *old_time = time(NULL) - 120;
+ queue_enqueue(session.num_unknown_messages_time_queue, old_time);
+
+ create_message_for_test(13, false, false);
+ mock_info = get_mock_socket_comm_info();
+ mock_info->send_message_save_message = true;
+
+ handle_socket_comm_event(&event);
+
+ /* The old entry is purged: an error is sent, the session stays open */
+ CU_ASSERT_EQUAL(session.num_unknown_messages_time_queue->num_entries, 1);
+ CU_ASSERT_EQUAL(session_logic_event_queue_->event_queue->num_entries, 0);
+ verify_socket_comm_times_called(0, 0, 0, 1, 0, 0, 0);
+
+ encoded_msg = dll_delete_first_node(mock_info->sent_message_list);
+ CU_ASSERT_PTR_NOT_NULL(encoded_msg);
+ pceplib_free(PCEPLIB_MESSAGES, encoded_msg);
+ destroy_message_for_test();
+}
+
void test_connection_failure(void)
{
/*
diff --git a/pceplib/test/pcep_session_logic_states_test.h b/pceplib/test/pcep_session_logic_states_test.h
index 3d8dcc030d..bb78795d40 100644
--- a/pceplib/test/pcep_session_logic_states_test.h
+++ b/pceplib/test/pcep_session_logic_states_test.h
@@ -35,6 +35,7 @@ void test_handle_socket_comm_event_initiate(void);
void test_handle_socket_comm_event_notify(void);
void test_handle_socket_comm_event_error(void);
void test_handle_socket_comm_event_unknown_msg(void);
+void test_handle_socket_comm_event_unknown_msg_purge(void);
void test_connection_failure(void);
#endif /* PCEPTIMERINTERNALS_H_ */
diff --git a/pceplib/test/pcep_session_logic_tests.c b/pceplib/test/pcep_session_logic_tests.c
index eac574e650..2b09a16469 100644
--- a/pceplib/test/pcep_session_logic_tests.c
+++ b/pceplib/test/pcep_session_logic_tests.c
@@ -163,6 +163,9 @@ int main(int argc, char **argv)
CU_add_test(test_session_logic_states_suite,
"test_handle_socket_comm_event_unknown_msg",
test_handle_socket_comm_event_unknown_msg);
+ CU_add_test(test_session_logic_states_suite,
+ "test_handle_socket_comm_event_unknown_msg_purge",
+ test_handle_socket_comm_event_unknown_msg_purge);
CU_add_test(test_session_logic_states_suite, "test_connection_failure",
test_connection_failure);