frr/libnetconf2
1
0
Fork 0
Code Issues Activity

Merging upstream version 3.5.5 (Closes: #1098233).

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-18 11:33:30 +01:00
parent c86ae7dcba
commit 6af28b7e8e
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
144 changed files with 43534 additions and 11497 deletions
Download patch file Download diff file Expand all files Collapse all files

66
tests/test_fd_comm.c
View file

@ -12,6 +12,8 @@
* https://opensource.org/licenses/BSD-3-Clause
*/
#define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
@ -30,10 +32,9 @@
#include <libyang/libyang.h>
#include <messages_p.h>
#include <session_client.h>
#include <session_p.h>
#include <session_server.h>
#include "tests/config.h"
#include "ln2_test.h"
struct nc_session *server_session;
struct nc_session *client_session;
@ -59,7 +60,7 @@ my_getconfig_rpc_clb(struct lyd_node *rpc, struct nc_session *session)
assert_string_equal(rpc->schema->name, "get-config");
assert_ptr_equal(session, server_session);
lyd_new_path(NULL, session->ctx, "/ietf-netconf:get-config/data", NULL, LYD_NEW_PATH_OUTPUT, &data);
lyd_new_path(NULL, session->ctx, "/ietf-netconf:get-config/data", NULL, LYD_NEW_VAL_OUTPUT, &data);
assert_non_null(data);
return nc_server_reply_data(data, NC_WD_EXPLICIT, NC_PARAMTYPE_FREE);
@ -90,6 +91,7 @@ static struct nc_session *
test_new_session(NC_SIDE side)
{
struct nc_session *sess;
struct timespec ts;
sess = calloc(1, sizeof *sess);
if (!sess) {
@ -99,9 +101,13 @@ test_new_session(NC_SIDE side)
sess->side = side;
if (side == NC_SERVER) {
pthread_mutex_init(&sess->opts.server.ntf_status_lock, NULL);
pthread_mutex_init(&sess->opts.server.rpc_lock, NULL);
pthread_cond_init(&sess->opts.server.rpc_cond, NULL);
sess->opts.server.rpc_inuse = 0;
nc_timeouttime_get(&ts, 0);
sess->opts.server.last_rpc = ts.tv_sec;
}
sess->io_lock = malloc(sizeof *sess->io_lock);
@ -495,6 +501,55 @@ test_send_recv_notif_11(void **state)
test_send_recv_notif();
}
static void
test_send_recv_malformed_10(void **state)
{
int ret;
struct nc_pollsession *ps;
struct nc_rpc *rpc;
struct lyd_node *envp, *op, *node;
NC_MSG_TYPE msgtype;
const char *msg;
(void)state;
server_session->version = NC_VERSION_10;
client_session->version = NC_VERSION_10;
/* write malformed message */
msg =
"<nc:rpc xmlns:nc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">"
" <nc:commit/>"
"</nc:rpc>"
"]]>]]>";
assert_int_equal(write(client_session->ti.fd.out, msg, strlen(msg)), strlen(msg));
rpc = nc_rpc_commit(0, 0, NULL, NULL, 0);
assert_non_null(rpc);
/* server RPC, send reply */
ps = nc_ps_new();
assert_non_null(ps);
nc_ps_add_session(ps, server_session);
ret = nc_ps_poll(ps, 0, NULL);
assert_int_equal(ret, NC_PSPOLL_BAD_RPC | NC_PSPOLL_REPLY_ERROR);
/* server finished */
nc_ps_free(ps);
/* client reply */
msgtype = nc_recv_reply(client_session, rpc, 0, 0, &envp, &op);
assert_int_equal(msgtype, NC_MSG_REPLY_ERR_MSGID);
nc_rpc_free(rpc);
assert_string_equal(LYD_NAME(lyd_child(envp)), "rpc-error");
lyd_find_sibling_opaq_next(lyd_child(lyd_child(envp)), "error-tag", &node);
assert_non_null(node);
assert_string_equal(((struct lyd_node_opaq *)node)->value, "missing-attribute");
lyd_free_tree(envp);
assert_null(op);
}
int
main(void)
{
@ -532,13 +587,14 @@ main(void)
assert_non_null(node);
node->priv = my_commit_rpc_clb;
nc_server_init(ctx);
nc_server_init();
const struct CMUnitTest comm[] = {
cmocka_unit_test_setup_teardown(test_send_recv_ok_10, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_error_10, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_data_10, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_notif_10, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_malformed_10, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_ok_11, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_error_11, setup_sessions, teardown_sessions),
cmocka_unit_test_setup_teardown(test_send_recv_data_11, setup_sessions, teardown_sessions),