confile_utils: fix return value & cleanups

[mirror_lxc.git] / src / lxc / confile_utils.h

diff --git a/src/lxc/confile_utils.h b/src/lxc/confile_utils.h
index c33ba047374f9ae1633a6b8b8c16c74263cb3118..b58ce47b2dd2a71754efe3228d767448d3141223 100644 (file)
--- a/src/lxc/confile_utils.h
+++ b/src/lxc/confile_utils.h
@@ -23,16 +23,75 @@
 #include <stdbool.h>
 
 #include "conf.h"
+#include "confile_utils.h"
+
+#ifndef MACVLAN_MODE_PRIVATE
+#define MACVLAN_MODE_PRIVATE 1
+#endif
+
+#ifndef MACVLAN_MODE_VEPA
+#define MACVLAN_MODE_VEPA 2
+#endif
+
+#ifndef MACVLAN_MODE_BRIDGE
+#define MACVLAN_MODE_BRIDGE 4
+#endif
+
+#ifndef MACVLAN_MODE_PASSTHRU
+#define MACVLAN_MODE_PASSTHRU 8
+#endif
+
+#define strprint(str, inlen, ...)                                       \
+       do {                                                            \
+               if (str)                                                \
+                       len = snprintf(str, inlen, ##__VA_ARGS__);      \
+               else                                                    \
+                       len = snprintf((char *){""}, 0, ##__VA_ARGS__); \
+               if (len < 0) {                                          \
+                       SYSERROR("failed to create string");            \
+                       return -1;                                      \
+               };                                                      \
+               fulllen += len;                                         \
+               if (inlen > 0) {                                        \
+                       if (str)                                        \
+                               str += len;                             \
+                       inlen -= len;                                   \
+                       if (inlen < 0)                                  \
+                               inlen = 0;                              \
+               }                                                       \
+       } while (0);
 
 extern int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
                        unsigned long *hostid, unsigned long *range);
 
 extern bool lxc_config_value_empty(const char *value);
-extern struct lxc_netdev *lxc_find_netdev_by_idx(struct lxc_conf *conf,
-                                                unsigned int idx);
-extern struct lxc_netdev *lxc_get_netdev_by_idx(struct lxc_conf *conf,
-                                               unsigned int idx);
+extern struct lxc_netdev *lxc_network_add(struct lxc_list *networks, int idx,
+                                         bool tail);
+extern struct lxc_netdev *
+lxc_get_netdev_by_idx(struct lxc_conf *conf, unsigned int idx, bool allocate);
 extern void lxc_log_configured_netdevs(const struct lxc_conf *conf);
 extern bool lxc_remove_nic_by_idx(struct lxc_conf *conf, unsigned int idx);
+extern void lxc_free_networks(struct lxc_list *networks);
+extern int lxc_macvlan_mode_to_flag(int *mode, const char *value);
+extern char *lxc_macvlan_flag_to_mode(int mode);
+
+extern int set_config_string_item(char **conf_item, const char *value);
+extern int set_config_string_item_max(char **conf_item, const char *value,
+                                     size_t max);
+extern int set_config_path_item(char **conf_item, const char *value);
+extern int config_ip_prefix(struct in_addr *addr);
+extern int network_ifname(char *valuep, const char *value, size_t size);
+extern void rand_complete_hwaddr(char *hwaddr);
+extern bool lxc_config_net_hwaddr(const char *line);
+extern void update_hwaddr(const char *line);
+extern bool new_hwaddr(char *hwaddr);
+extern int lxc_get_conf_str(char *retv, int inlen, const char *value);
+extern int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen, int v);
+extern int lxc_get_conf_size_t(struct lxc_conf *c, char *retv, int inlen, size_t v);
+extern int lxc_get_conf_uint64(struct lxc_conf *c, char *retv, int inlen, uint64_t v);
+extern bool parse_limit_value(const char **value, rlim_t *res);
+extern int lxc_inherit_namespace(const char *lxcname_or_pid,
+                                const char *lxcpath, const char *namespace);
+extern int sig_parse(const char *signame);
 
 #endif /* __LXC_CONFILE_UTILS_H */