X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=be68e8e680c7b88d4d47a74648f2d627760f0e54;hp=614177b7bff6cb3836d8a9833f4f4abb2cd8e2fd;hb=c7a52ed70eaae0207d7f7e6c4a31035f5ec3757e;hpb=37bdee9b7282f08cbe6e423765bd3950d753a2c6

diff --git a/proto-static.c b/proto-static.c
index 614177b..be68e8e 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -2,19 +2,46 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include "netifd.h"
+#include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
+#include "system.h"
 
 struct static_proto_state {
-    struct interface_proto_state proto;
+	struct interface_proto_state proto;
+
+	struct blob_attr *config;
 };
 
+static bool
+static_proto_setup(struct static_proto_state *state)
+{
+	return proto_apply_ip_settings(state->proto.iface, state->config, false) == 0;
+}
 
 static int
 static_handler(struct interface_proto_state *proto,
 	       enum interface_proto_cmd cmd, bool force)
 {
-	return 0;
+	struct static_proto_state *state;
+	int ret = 0;
+
+	state = container_of(proto, struct static_proto_state, proto);
+
+	switch (cmd) {
+	case PROTO_CMD_SETUP:
+		if (!static_proto_setup(state))
+			return -1;
+
+		break;
+	case PROTO_CMD_TEARDOWN:
+		break;
+	}
+	return ret;
 }
 
 static void
@@ -23,25 +50,39 @@ static_free(struct interface_proto_state *proto)
 	struct static_proto_state *state;
 
 	state = container_of(proto, struct static_proto_state, proto);
+	free(state->config);
 	free(state);
 }
 
-struct interface_proto_state *
-static_attach(struct proto_handler *h, struct interface *iface,
-	      struct uci_section *s)
+static struct interface_proto_state *
+static_attach(const struct proto_handler *h, struct interface *iface,
+	      struct blob_attr *attr)
 {
 	struct static_proto_state *state;
 
 	state = calloc(1, sizeof(*state));
+	if (!state)
+		return NULL;
+
+	state->config = malloc(blob_pad_len(attr));
+	if (!state->config)
+		goto error;
+
+	memcpy(state->config, attr, blob_pad_len(attr));
 	state->proto.free = static_free;
-	state->proto.handler = static_handler;
-	state->proto.flags = PROTO_FLAG_IMMEDIATE;
+	state->proto.cb = static_handler;
 
 	return &state->proto;
+
+error:
+	free(state);
+	return NULL;
 }
 
 static struct proto_handler static_proto = {
 	.name = "static",
+	.flags = PROTO_FLAG_IMMEDIATE,
+	.config_params = &proto_ip_attr,
 	.attach = static_attach,
 };