diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2022-06-10 16:10:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 16:10:27 -0500 |
| commit | 1d044370a95d76c97f6d5ff96f2fd418edf421ef (patch) | |
| tree | d4bb57dec61b19ade57de67df20d8c4cccbcf2ae | |
| parent | d0911c6bdd3d0157565aa2604f450c2dca521f69 (diff) | |
| parent | 981b25429799df19c061691d8b1380700d5533a6 (diff) | |
Merge pull request #11378 from ton31337/fix/compile_sysrepo
lib: sysrepo compilation issues
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/northbound_sysrepo.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 4fc5a334bb..ff53e1224f 100644 --- a/configure.ac +++ b/configure.ac @@ -1970,7 +1970,7 @@ dnl --------------- dnl sysrepo dnl --------------- if test "$enable_sysrepo" = "yes"; then - PKG_CHECK_MODULES([SYSREPO], [sysrepo], + PKG_CHECK_MODULES([SYSREPO], [sysrepo >= 2.1.42], [AC_DEFINE([HAVE_SYSREPO], [1], [Enable sysrepo integration]) SYSREPO=true], [SYSREPO=false diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c index 8a64347871..f035ac8611 100644 --- a/lib/northbound_sysrepo.c +++ b/lib/northbound_sysrepo.c @@ -515,7 +515,7 @@ static int frr_sr_notification_send(const char *xpath, struct list *arguments) } } - ret = sr_event_notif_send(session, xpath, values, values_cnt, 0, 0); + ret = sr_notif_send(session, xpath, values, values_cnt, 0, 0); if (ret != SR_ERR_OK) { flog_err(EC_LIB_LIBSYSREPO, "%s: sr_event_notif_send() failed for xpath %s", @@ -532,7 +532,8 @@ static void frr_sr_read_cb(struct thread *thread) int fd = THREAD_FD(thread); int ret; - ret = sr_process_events(module->sr_subscription, session, NULL); + ret = sr_subscription_process_events(module->sr_subscription, session, + NULL); if (ret != SR_ERR_OK) { flog_err(EC_LIB_LIBSYSREPO, "%s: sr_fd_event_process(): %s", __func__, sr_strerror(ret)); @@ -578,9 +579,9 @@ static int frr_sr_subscribe_state(const struct lysc_node *snode, void *arg) DEBUGD(&nb_dbg_client_sysrepo, "sysrepo: providing data to '%s'", nb_node->xpath); - ret = sr_oper_get_items_subscribe( - session, snode->module->name, nb_node->xpath, frr_sr_state_cb, - NULL, SR_SUBSCR_CTX_REUSE, &module->sr_subscription); + ret = sr_oper_get_subscribe(session, snode->module->name, + nb_node->xpath, frr_sr_state_cb, NULL, 0, + &module->sr_subscription); if (ret != SR_ERR_OK) flog_err(EC_LIB_LIBSYSREPO, "sr_oper_get_items_subscribe(): %s", sr_strerror(ret)); @@ -605,8 +606,7 @@ static int frr_sr_subscribe_rpc(const struct lysc_node *snode, void *arg) nb_node->xpath); ret = sr_rpc_subscribe(session, nb_node->xpath, frr_sr_config_rpc_cb, - NULL, 0, SR_SUBSCR_CTX_REUSE, - &module->sr_subscription); + NULL, 0, 0, &module->sr_subscription); if (ret != SR_ERR_OK) flog_err(EC_LIB_LIBSYSREPO, "sr_rpc_subscribe(): %s", sr_strerror(ret)); |