common BUGFIX set error to event session

Author: michalvasko

src/common.c

@@ -921,7 +921,7 @@ op_filter_create(struct lyd_node *filter_node, struct np2_filter *filter)
 
 int
 op_filter_data_get(sr_session_ctx_t *session, uint32_t max_depth, sr_get_oper_options_t get_opts,
-        const struct np2_filter *filter, struct lyd_node **data)
+        const struct np2_filter *filter, sr_session_ctx_t *ev_sess, struct lyd_node **data)
 {
     const sr_error_info_t *err_info;
     struct lyd_node *node;
@@ -933,7 +933,7 @@ op_filter_data_get(sr_session_ctx_t *session, uint32_t max_depth, sr_get_oper_op
         if (rc) {
             ERR("Getting data \"%s\" from sysrepo failed (%s).", filter->filters[i].str, sr_strerror(rc));
             sr_get_error(session, &err_info);
-            sr_set_error(session, err_info->err[0].xpath, err_info->err[0].message);
+            sr_set_error(ev_sess, err_info->err[0].xpath, err_info->err[0].message);
             return rc;
         }
 

src/common.h

@@ -86,7 +86,7 @@ int op_filter_create(struct lyd_node *filter_node, struct np2_filter *filter);
  * @brief Get all data matching the selection filters.
  */
 int op_filter_data_get(sr_session_ctx_t *session, uint32_t max_depth, sr_get_oper_options_t get_opts,
-        const struct np2_filter *filter, struct lyd_node **data);
+        const struct np2_filter *filter, sr_session_ctx_t *ev_sess, struct lyd_node **data);
 
 /**
  * @brief Filter out only the data matching the content filters.

src/netconf.c

@@ -111,7 +111,8 @@ np2srv_get_rpc_module_filters(const struct np2_filter *filter, struct np2_filter
  * @brief Get data for a get RPC.
  */
 static int
-np2srv_get_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter, struct lyd_node **data)
+np2srv_get_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter, sr_session_ctx_t *ev_sess,
+        struct lyd_node **data)
 {
     struct lyd_node *all_data = NULL;
     sr_datastore_t ds;
@@ -133,7 +134,7 @@ np2srv_get_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter,
 get_sr_data:
     sr_session_switch_ds(session, ds);
 
-    if ((rc = op_filter_data_get(session, 0, get_opts, &mod_filter, &all_data))) {
+    if ((rc = op_filter_data_get(session, 0, get_opts, &mod_filter, ev_sess, &all_data))) {
         goto cleanup;
     }
 
@@ -160,7 +161,8 @@ np2srv_get_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter,
  * @brief get data for a get-config RPC.
  */
 static int
-np2srv_getconfig_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter, sr_datastore_t ds, struct lyd_node **data)
+np2srv_getconfig_rpc_data(sr_session_ctx_t *session, const struct np2_filter *filter, sr_datastore_t ds,
+        sr_session_ctx_t *ev_sess, struct lyd_node **data)
 {
     struct lyd_node *select_data = NULL;
     int rc = SR_ERR_OK;
@@ -171,7 +173,7 @@ np2srv_getconfig_rpc_data(sr_session_ctx_t *session, const struct np2_filter *fi
     /*
      * create the data tree for the data reply
      */
-    if ((rc = op_filter_data_get(session, 0, 0, filter, &select_data))) {
+    if ((rc = op_filter_data_get(session, 0, 0, filter, ev_sess, &select_data))) {
         goto cleanup;
     }
 
@@ -271,9 +273,9 @@ np2srv_rpc_get_cb(sr_session_ctx_t *session, const char *op_path, const struct l
 
     /* get filtered data */
     if (!strcmp(op_path, "/ietf-netconf:get-config")) {
-        rc = np2srv_getconfig_rpc_data(user_sess, &filter, ds, &data_get);
+        rc = np2srv_getconfig_rpc_data(user_sess, &filter, ds, session, &data_get);
     } else {
-        rc = np2srv_get_rpc_data(user_sess, &filter, &data_get);
+        rc = np2srv_get_rpc_data(user_sess, &filter, session, &data_get);
     }
     if (rc) {
         goto cleanup;

src/netconf_nmda.c

@@ -230,7 +230,7 @@ np2srv_rpc_getdata_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), co
     /*
      * create the data tree for the data reply
      */
-    if ((rc = op_filter_data_get(user_sess, max_depth, get_opts, &filter, &select_data))) {
+    if ((rc = op_filter_data_get(user_sess, max_depth, get_opts, &filter, session, &select_data))) {
         goto cleanup;
     }
     if ((rc = op_filter_data_filter(&select_data, &filter, 0, &data))) {