Move srp_mass_set() function to syms.c

bin/srp_load.c

@@ -10,7 +10,6 @@
 
 #include <sysrepo.h>
 #include <sysrepo/xpath.h>
-#include <sysrepo/netconf_acm.h>
 
 #include "klish_plugin_sysrepo.h"
 
@@ -31,9 +30,6 @@ typedef struct cmd_opts_s {
 } cmd_opts_t;
 
 
-int srp_mass_set(int fd, sr_datastore_t ds, pline_opts_t *opts,
-	const char *user, bool_t stop_on_error);
-
 // Command line options
 static cmd_opts_t *cmd_opts_init(void);
 static void cmd_opts_free(cmd_opts_t *opts);
@@ -75,104 +71,6 @@ out:
 }
 
 
-int srp_mass_set(int fd, sr_datastore_t ds, pline_opts_t *opts,
-	const char *user, bool_t stop_on_error)
-{
-	int ret = -1;
-	int err = SR_ERR_OK;
-	sr_conn_ctx_t *conn = NULL;
-	sr_session_ctx_t *sess = NULL;
-	faux_file_t *file = NULL;
-	char *line = NULL;
-	size_t err_num = 0;
-	sr_subscription_ctx_t *nacm_sub = NULL;
-
-	err = sr_connect(SR_CONN_DEFAULT, &conn);
-	if (err) {
-		fprintf(stderr, "Error: Can't connect to sysrepo\n");
-		goto out;
-	}
-	err = sr_session_start(conn, ds, &sess);
-	if (err) {
-		fprintf(stderr, "Error: Can't start session\n");
-		goto out;
-	}
-
-	sr_session_set_orig_name(sess, user);
-	// Init NACM session
-	if (opts->enable_nacm) {
-		if (sr_nacm_init(sess, 0, &nacm_sub) != SR_ERR_OK) {
-			fprintf(stderr, "Error: Can't init NACM\n");
-			goto out;
-		}
-		sr_nacm_set_user(sess, user);
-	}
-
-	file = faux_file_fdopen(fd);
-	if (!file) {
-		fprintf(stderr, "Error: Can't open input stream\n");
-		goto out;
-	}
-
-	while ((line = faux_file_getline(file))) {
-		pline_t *pline = NULL;
-		faux_argv_t *args = NULL;
-
-		args = faux_argv_new();
-		faux_argv_parse(args, line);
-		pline = pline_parse(sess, args, opts);
-		faux_argv_free(args);
-		if (!pline || pline->invalid) {
-			err_num++;
-			fprintf(stderr, "Error: Illegal: %s\n", line);
-		} else {
-			faux_list_node_t *iter = NULL;
-			pexpr_t *expr = NULL;
-
-			iter = faux_list_head(pline->exprs);
-			while ((expr = (pexpr_t *)faux_list_each(&iter))) {
-				if (!(expr->pat & PT_SET)) {
-					err_num++;
-					fprintf(stderr, "Error: Illegal expression for set operation\n");
-					break;
-				}
-				if (sr_set_item_str(sess, expr->xpath, expr->value, NULL, 0) !=
-					SR_ERR_OK) {
-					err_num++;
-					fprintf(stderr, "Error: Can't set data\n");
-					break;
-				}
-			}
-		}
-		if (stop_on_error && (err_num > 0)) {
-			sr_discard_changes(sess);
-			goto out;
-		}
-		pline_free(pline);
-		faux_str_free(line);
-	}
-
-	if (sr_has_changes(sess)) {
-		if (sr_apply_changes(sess, 0) != SR_ERR_OK) {
-			sr_discard_changes(sess);
-			fprintf(stderr, "Error: Can't apply changes\n");
-			goto out;
-		}
-	}
-
-	ret = 0;
-out:
-	faux_file_close(file);
-	if (opts->enable_nacm) {
-		sr_unsubscribe(nacm_sub);
-		sr_nacm_destroy();
-	}
-	sr_disconnect(conn);
-
-	return ret;
-}
-
-
 static cmd_opts_t *cmd_opts_init(void)
 {
 	cmd_opts_t *opts = NULL;

src/klish_plugin_sysrepo.h

@@ -255,6 +255,10 @@ int srp_show(kcontext_t *context);
 int srp_diff(kcontext_t *context);
 int srp_deactivate(kcontext_t *context);
 
+// Service functions
+int srp_mass_set(int fd, sr_datastore_t ds, pline_opts_t *opts,
+	const char *user, bool_t stop_on_error);
+
 // Plugin's user-data service functions
 pline_opts_t *srp_udata_opts(kcontext_t *context);
 faux_argv_t *srp_udata_path(kcontext_t *context);

src/syms.c

@@ -9,6 +9,7 @@
 #include <faux/argv.h>
 #include <faux/list.h>
 #include <faux/error.h>
+#include <faux/file.h>
 #include <klish/khelper.h>
 #include <klish/kplugin.h>
 #include <klish/kentry.h>
@@ -19,6 +20,7 @@
 #include <sysrepo.h>
 #include <sysrepo/xpath.h>
 #include <sysrepo/values.h>
+#include <sysrepo/netconf_acm.h>
 
 #include "klish_plugin_sysrepo.h"
 
@@ -1180,3 +1182,104 @@ int srp_compl_xpath(kcontext_t *context)
 
 	return 0;
 }
+
+
+// Function for mass config strings load. It can load stream of KPath strings
+// (without "set" command, only path and value). Function doesn't use
+// pre-connected session because it can be executed within FILTER or utility.
+int srp_mass_set(int fd, sr_datastore_t ds, pline_opts_t *opts,
+	const char *user, bool_t stop_on_error)
+{
+	int ret = -1;
+	int err = SR_ERR_OK;
+	sr_conn_ctx_t *conn = NULL;
+	sr_session_ctx_t *sess = NULL;
+	faux_file_t *file = NULL;
+	char *line = NULL;
+	size_t err_num = 0;
+	sr_subscription_ctx_t *nacm_sub = NULL;
+
+	err = sr_connect(SR_CONN_DEFAULT, &conn);
+	if (err) {
+		fprintf(stderr, "Error: Can't connect to sysrepo\n");
+		goto out;
+	}
+	err = sr_session_start(conn, ds, &sess);
+	if (err) {
+		fprintf(stderr, "Error: Can't start session\n");
+		goto out;
+	}
+
+	sr_session_set_orig_name(sess, user);
+	// Init NACM session
+	if (opts->enable_nacm) {
+		if (sr_nacm_init(sess, 0, &nacm_sub) != SR_ERR_OK) {
+			fprintf(stderr, "Error: Can't init NACM\n");
+			goto out;
+		}
+		sr_nacm_set_user(sess, user);
+	}
+
+	file = faux_file_fdopen(fd);
+	if (!file) {
+		fprintf(stderr, "Error: Can't open input stream\n");
+		goto out;
+	}
+
+	while ((line = faux_file_getline(file))) {
+		pline_t *pline = NULL;
+		faux_argv_t *args = NULL;
+
+		args = faux_argv_new();
+		faux_argv_parse(args, line);
+		pline = pline_parse(sess, args, opts);
+		faux_argv_free(args);
+		if (!pline || pline->invalid) {
+			err_num++;
+			fprintf(stderr, "Error: Illegal: %s\n", line);
+		} else {
+			faux_list_node_t *iter = NULL;
+			pexpr_t *expr = NULL;
+
+			iter = faux_list_head(pline->exprs);
+			while ((expr = (pexpr_t *)faux_list_each(&iter))) {
+				if (!(expr->pat & PT_SET)) {
+					err_num++;
+					fprintf(stderr, "Error: Illegal expression for set operation\n");
+					break;
+				}
+				if (sr_set_item_str(sess, expr->xpath, expr->value, NULL, 0) !=
+					SR_ERR_OK) {
+					err_num++;
+					fprintf(stderr, "Error: Can't set data\n");
+					break;
+				}
+			}
+		}
+		if (stop_on_error && (err_num > 0)) {
+			sr_discard_changes(sess);
+			goto out;
+		}
+		pline_free(pline);
+		faux_str_free(line);
+	}
+
+	if (sr_has_changes(sess)) {
+		if (sr_apply_changes(sess, 0) != SR_ERR_OK) {
+			sr_discard_changes(sess);
+			fprintf(stderr, "Error: Can't apply changes\n");
+			goto out;
+		}
+	}
+
+	ret = 0;
+out:
+	faux_file_close(file);
+	if (opts->enable_nacm) {
+		sr_unsubscribe(nacm_sub);
+		sr_nacm_destroy();
+	}
+	sr_disconnect(conn);
+
+	return ret;
+}