X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.c;h=e57084f75555887e7c9e8e9f882ce53818ab2827;hp=c85d0e419d4ca8cf7a2a395016bef3c781a5ea18;hb=f6f065d3997ccc8d42805529e4aad59b789579ad;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/system.c b/system.c
index c85d0e4..e57084f 100644
--- a/system.c
+++ b/system.c
@@ -13,15 +13,31 @@
  */
 #include "netifd.h"
 #include "system.h"
+#include <fcntl.h>
 
 static const struct blobmsg_policy tunnel_attrs[__TUNNEL_ATTR_MAX] = {
-	[TUNNEL_ATTR_TYPE] = { "mode", BLOBMSG_TYPE_STRING },
-	[TUNNEL_ATTR_LOCAL] = { "local", BLOBMSG_TYPE_STRING },
-	[TUNNEL_ATTR_REMOTE] = { "remote", BLOBMSG_TYPE_STRING },
-	[TUNNEL_ATTR_TTL] = { "ttl", BLOBMSG_TYPE_INT32 },
+	[TUNNEL_ATTR_TYPE] = { .name = "mode", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_LOCAL] = { .name = "local", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_REMOTE] = { .name = "remote", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+	[TUNNEL_ATTR_DF] = { .name = "df", .type = BLOBMSG_TYPE_BOOL },
+	[TUNNEL_ATTR_TTL] = { .name = "ttl", .type = BLOBMSG_TYPE_INT32 },
+	[TUNNEL_ATTR_TOS] = { .name = "tos", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_6RD_PREFIX] = {.name =  "6rd-prefix", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_6RD_RELAY_PREFIX] = { .name = "6rd-relay-prefix", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_LINK] = { .name = "link", .type = BLOBMSG_TYPE_STRING },
+	[TUNNEL_ATTR_FMRS] = { .name = "fmrs", .type = BLOBMSG_TYPE_ARRAY },
+	[TUNNEL_ATTR_INFO] = { .name = "info", .type = BLOBMSG_TYPE_STRING },
 };
 
-const struct config_param_list tunnel_attr_list = {
+const struct uci_blob_param_list tunnel_attr_list = {
 	.n_params = __TUNNEL_ATTR_MAX,
 	.params = tunnel_attrs,
 };
+
+void system_fd_set_cloexec(int fd)
+{
+#ifdef FD_CLOEXEC
+	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+#endif
+}