session server UPDATE add UNIX socket api

Removed unix socket from configuration and moved it back to API.

Author: roman

doc/libnetconf.doc

@@ -307,6 +307,9 @@
  *
  * - ::nc_server_set_capab_withdefaults()
  * - ::nc_server_set_capability()
+ * - ::nc_server_endpt_count()
+ * - ::nc_server_add_endpt_unix_socket_listen()
+ * - ::nc_server_del_endpt_unix_socket()
  *
  * Server Configuration
  * ===

modules/[email protected]

@@ -375,38 +375,6 @@ module libnetconf2-netconf-server {
     uses keyboard-interactive-grouping;
   }
 
-  augment "/ncs:netconf-server/ncs:listen/ncs:endpoint/ncs:transport" {
-    case unix-socket {
-      container unix-socket {
-        description
-          "UNIX socket listening configuration for inbound connections.";
-        leaf path {
-          type string;
-          mandatory true;
-          description
-            "Path to the socket on which the communication will occur.";
-        }
-        leaf mode {
-          type string {
-            pattern '[0124567]{3}';
-          }
-          description
-            "Mode of the socket.";
-        }
-        leaf uid {
-          type uint16;
-          description
-            "User ID of the socket.";
-        }
-        leaf gid {
-          type uint16;
-          description
-            "Group ID of the socket.";
-        }
-      }
-    }
-  }
-
   augment "/ncs:netconf-server/ncs:listen/ncs:endpoint/ncs:transport/ncs:ssh" +
           "/ncs:ssh/ncs:ssh-server-parameters/ncs:client-authentication" {
     uses endpoint-reference-grouping;

src/server_config.c

@@ -770,42 +770,6 @@ nc_server_config_del_endpt_ssh(struct nc_endpt *endpt, struct nc_bind *bind)
     }
 }
 
-#endif /* NC_ENABLED_SSH_TLS */
-
-void
-nc_server_config_del_unix_socket_opts(struct nc_bind *bind, struct nc_server_unix_opts *opts)
-{
-    if (bind->sock > -1) {
-        close(bind->sock);
-    }
-
-    unlink(bind->address);
-    free(bind->address);
-    free(opts->address);
-
-    free(opts);
-}
-
-void
-nc_server_config_del_endpt_unix_socket(struct nc_endpt *endpt, struct nc_bind *bind)
-{
-    free(endpt->name);
-    nc_server_config_del_unix_socket_opts(bind, endpt->opts.unixsock);
-
-    server_opts.endpt_count--;
-    if (!server_opts.endpt_count) {
-        free(server_opts.endpts);
-        free(server_opts.binds);
-        server_opts.endpts = NULL;
-        server_opts.binds = NULL;
-    } else if (endpt != &server_opts.endpts[server_opts.endpt_count]) {
-        memcpy(endpt, &server_opts.endpts[server_opts.endpt_count], sizeof *server_opts.endpts);
-        memcpy(bind, &server_opts.binds[server_opts.endpt_count], sizeof *server_opts.binds);
-    }
-}
-
-#ifdef NC_ENABLED_SSH_TLS
-
 static void
 nc_server_config_del_cert(struct nc_cert_grouping *certs, struct nc_certificate *cert)
 {
@@ -1060,7 +1024,7 @@ nc_server_config_listen(const struct lyd_node *node, NC_OPERATION op)
                 break;
 #endif /* NC_ENABLED_SSH_TLS */
             case NC_TI_UNIX:
-                nc_server_config_del_endpt_unix_socket(&server_opts.endpts[i], &server_opts.binds[i]);
+                _nc_server_del_endpt_unix_socket(&server_opts.endpts[i], &server_opts.binds[i]);
                 break;
             case NC_TI_NONE:
             case NC_TI_FD:
@@ -1234,7 +1198,7 @@ nc_server_config_endpoint(const struct lyd_node *node, NC_OPERATION op)
                 break;
 #endif /* NC_ENABLED_SSH_TLS */
             case NC_TI_UNIX:
-                nc_server_config_del_endpt_unix_socket(endpt, bind);
+                _nc_server_del_endpt_unix_socket(endpt, bind);
                 break;
             case NC_TI_NONE:
             case NC_TI_FD:
@@ -1429,73 +1393,6 @@ nc_server_config_tls(const struct lyd_node *node, NC_OPERATION op)
     return ret;
 }
 
-#endif /* NC_ENABLED_SSH_TLS */
-
-static int
-nc_server_config_set_address_port(struct nc_endpt *endpt, struct nc_bind *bind, const char *address, uint16_t port)
-{
-    int sock = -1, set_addr, ret = 0;
-
-    assert((address && !port) || (!address && port) || (endpt->ti == NC_TI_UNIX));
-
-    if (address) {
-        set_addr = 1;
-    } else {
-        set_addr = 0;
-    }
-
-    if (set_addr) {
-        port = bind->port;
-    } else {
-        address = bind->address;
-    }
-
-    /* we have all the information we need to create a listening socket */
-    if ((address && port) || (endpt->ti == NC_TI_UNIX)) {
-        /* create new socket, close the old one */
-        if (endpt->ti == NC_TI_UNIX) {
-            sock = nc_sock_listen_unix(endpt->opts.unixsock);
-        } else {
-            sock = nc_sock_listen_inet(address, port, &endpt->ka);
-        }
-
-        if (sock == -1) {
-            ret = 1;
-            goto cleanup;
-        }
-
-        if (bind->sock > -1) {
-            close(bind->sock);
-        }
-        bind->sock = sock;
-    }
-
-    if (sock > -1) {
-        switch (endpt->ti) {
-        case NC_TI_UNIX:
-            VRB(NULL, "Listening on %s for UNIX connections.", endpt->opts.unixsock->address);
-            break;
-#ifdef NC_ENABLED_SSH_TLS
-        case NC_TI_LIBSSH:
-            VRB(NULL, "Listening on %s:%u for SSH connections.", address, port);
-            break;
-        case NC_TI_OPENSSL:
-            VRB(NULL, "Listening on %s:%u for TLS connections.", address, port);
-            break;
-#endif /* NC_ENABLED_SSH_TLS */
-        default:
-            ERRINT;
-            ret = 1;
-            break;
-        }
-    }
-
-cleanup:
-    return ret;
-}
-
-#ifdef NC_ENABLED_SSH_TLS
-
 /* mandatory leaf */
 static int
 nc_server_config_local_address(const struct lyd_node *node, NC_OPERATION op)
@@ -1518,7 +1415,7 @@ nc_server_config_local_address(const struct lyd_node *node, NC_OPERATION op)
         bind->address = strdup(lyd_get_value(node));
         NC_CHECK_ERRMEM_GOTO(!bind->address, ret = 1, cleanup);
 
-        ret = nc_server_config_set_address_port(endpt, bind, lyd_get_value(node), 0);
+        ret = nc_server_set_address_port(endpt, bind, lyd_get_value(node), 0);
         if (ret) {
             goto cleanup;
         }
@@ -1551,7 +1448,7 @@ nc_server_config_local_port(const struct lyd_node *node, NC_OPERATION op)
             bind->port = 0;
         }
 
-        ret = nc_server_config_set_address_port(endpt, bind, NULL, bind->port);
+        ret = nc_server_set_address_port(endpt, bind, NULL, bind->port);
         if (ret) {
             goto cleanup;
         }
@@ -2790,89 +2687,6 @@ nc_server_config_mac_alg(const struct lyd_node *node, NC_OPERATION op)
     return ret;
 }
 
-#endif /* NC_ENABLED_SSH_TLS */
-
-static int
-nc_server_config_create_unix_socket(struct nc_endpt *endpt)
-{
-    endpt->ti = NC_TI_UNIX;
-    endpt->opts.unixsock = calloc(1, sizeof *endpt->opts.unixsock);
-    NC_CHECK_ERRMEM_RET(!endpt->opts.unixsock, 1);
-
-    /* set default values */
-    endpt->opts.unixsock->mode = -1;
-    endpt->opts.unixsock->uid = -1;
-    endpt->opts.unixsock->gid = -1;
-
-    return 0;
-}
-
-static int
-nc_server_config_unix_socket(const struct lyd_node *node, NC_OPERATION op)
-{
-    int ret = 0;
-    uint32_t log_options = 0;
-    struct nc_endpt *endpt;
-    struct nc_bind *bind;
-    struct nc_server_unix_opts *opts;
-    struct lyd_node *data = NULL;
-
-    assert(!strcmp(LYD_NAME(node), "unix-socket"));
-
-    if (nc_server_config_get_endpt(node, &endpt, &bind)) {
-        ret = 1;
-        goto cleanup;
-    }
-
-    if (op == NC_OP_CREATE) {
-        if (nc_server_config_create_unix_socket(endpt)) {
-            ret = 1;
-            goto cleanup;
-        }
-
-        opts = endpt->opts.unixsock;
-
-        lyd_find_path(node, "path", 0, &data);
-        assert(data);
-
-        opts->address = strdup(lyd_get_value(data));
-        bind->address = strdup(lyd_get_value(data));
-        NC_CHECK_ERRMEM_GOTO(!opts->address || !bind->address, ret = 1, cleanup);
-
-        /* silently search for non-mandatory parameters */
-        ly_temp_log_options(&log_options);
-        ret = lyd_find_path(node, "mode", 0, &data);
-        if (!ret) {
-            opts->mode = strtol(lyd_get_value(data), NULL, 8);
-        }
-
-        ret = lyd_find_path(node, "uid", 0, &data);
-        if (!ret) {
-            opts->uid = strtol(lyd_get_value(data), NULL, 10);
-        }
-
-        ret = lyd_find_path(node, "gid", 0, &data);
-        if (!ret) {
-            opts->gid = strtol(lyd_get_value(data), NULL, 10);
-        }
-
-        /* reset the logging options */
-        ly_temp_log_options(NULL);
-
-        ret = nc_server_config_set_address_port(endpt, bind, NULL, 0);
-        if (ret) {
-            goto cleanup;
-        }
-    } else if (op == NC_OP_DELETE) {
-        nc_server_config_del_unix_socket_opts(bind, endpt->opts.unixsock);
-    }
-
-cleanup:
-    return ret;
-}
-
-#ifdef NC_ENABLED_SSH_TLS
-
 static int
 nc_server_config_check_endpt_reference_cycle(struct nc_endpt *original, struct nc_endpt *next)
 {
@@ -4063,8 +3877,6 @@ nc_server_config_parse_netconf_server(const struct lyd_node *node, NC_OPERATION
         ret = nc_server_config_hello_timeout(node, op);
     } else if (!strcmp(name, "endpoint")) {
         ret = nc_server_config_endpoint(node, op);
-    } else if (!strcmp(name, "unix-socket")) {
-        ret = nc_server_config_unix_socket(node, op);
     }
 #ifdef NC_ENABLED_SSH_TLS
     else if (!strcmp(name, "ssh")) {

src/server_config.h

@@ -122,23 +122,6 @@ int nc_server_config_add_address_port(const struct ly_ctx *ctx, const char *endp
 
 #endif /* NC_ENABLED_SSH_TLS */
 
-/**
- * @brief Creates new YANG data nodes for a UNIX socket.
- *
- * @param[in] ctx libyang context.
- * @param[in] endpt_name Arbitrary identifier of the endpoint.
- * If an endpoint with this identifier already exists, its contents might be changed.
- * @param[in] path Path to the socket.
- * @param[in] mode New mode, use -1 for default.
- * @param[in] uid New uid, use -1 for default
- * @param[in] gid New gid, use -1 for default
- * @param[in,out] config Configuration YANG data tree. If *config is NULL, it will be created.
- * Otherwise the new YANG data will be added to the previous data and may override it.
- * @return 0 on success, non-zero otherwise.
- */
-int nc_server_config_add_unix_socket(const struct ly_ctx *ctx, const char *endpt_name, const char *path,
-        mode_t mode, uid_t uid, gid_t gid, struct lyd_node **config);
-
 /**
  * @brief Deletes an endpoint from the YANG data.
  *

src/server_config_util.c

@@ -1325,65 +1325,6 @@ nc_server_config_del_truststore_cert(const char *cert_bag_name,
 
 #endif /* NC_ENABLED_SSH_TLS */
 
-API int
-nc_server_config_add_unix_socket(const struct ly_ctx *ctx, const char *endpt_name, const char *path,
-        mode_t mode, uid_t uid, gid_t gid, struct lyd_node **config)
-{
-    int ret = 0;
-    char *tree_path = NULL;
-    char buf[12] = {0};
-
-    NC_CHECK_ARG_RET(NULL, ctx, endpt_name, path, config, 1);
-
-    ret = asprintf(&tree_path, "/ietf-netconf-server:netconf-server/listen/endpoint[name='%s']/libnetconf2-netconf-server:unix-socket", endpt_name);
-    NC_CHECK_ERRMEM_GOTO(ret == -1, tree_path = NULL; ret = 1, cleanup);
-
-    /* path to unix socket */
-    ret = nc_server_config_append(ctx, tree_path, "path", path, config);
-    if (ret) {
-        goto cleanup;
-    }
-
-    /* mode */
-    if (mode != (mode_t)-1) {
-        if (mode > 0777) {
-            ERR(NULL, "Invalid mode value (%o).", mode);
-            ret = 1;
-            goto cleanup;
-        }
-
-        sprintf(buf, "%o", mode);
-        ret = nc_server_config_append(ctx, tree_path, "mode", buf, config);
-        if (ret) {
-            goto cleanup;
-        }
-    }
-
-    /* uid */
-    if (uid != (uid_t)-1) {
-        memset(buf, 0, 12);
-        sprintf(buf, "%u", uid);
-        ret = nc_server_config_append(ctx, tree_path, "uid", buf, config);
-        if (ret) {
-            goto cleanup;
-        }
-    }
-
-    /* gid */
-    if (gid != (gid_t)-1) {
-        memset(buf, 0, 12);
-        sprintf(buf, "%u", gid);
-        ret = nc_server_config_append(ctx, tree_path, "gid", buf, config);
-        if (ret) {
-            goto cleanup;
-        }
-    }
-
-cleanup:
-    free(tree_path);
-    return ret;
-}
-
 API int
 nc_server_config_add_ch_persistent(const struct ly_ctx *ctx, const char *ch_client_name, struct lyd_node **config)
 {