projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interface: don't segfault with an unknown protocol
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
1f73130
..
60efc7e
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-5,6
+5,7
@@
#include "netifd.h"
#include "device.h"
#include "interface.h"
#include "netifd.h"
#include "device.h"
#include "interface.h"
+#include "interface-ip.h"
#include "proto.h"
#include "ubus.h"
#include "config.h"
#include "proto.h"
#include "ubus.h"
#include "config.h"
@@
-12,28
+13,21
@@
static LIST_HEAD(interfaces);
enum {
static LIST_HEAD(interfaces);
enum {
- IFACE_ATTR_TYPE,
IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
IFACE_ATTR_MAX
};
IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
IFACE_ATTR_MAX
};
-static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
- [IFACE_ATTR_IFNAME].type = BLOBMSG_TYPE_STRING,
-};
-
static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
- [IFACE_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
- [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_
ARRAY
},
+ [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_
STRING
},
[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
};
const struct config_param_list interface_attr_list = {
.n_params = IFACE_ATTR_MAX,
.params = iface_attrs,
[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
};
const struct config_param_list interface_attr_list = {
.n_params = IFACE_ATTR_MAX,
.params = iface_attrs,
- .info = iface_attr_info,
};
static void
};
static void
@@
-90,22
+84,26
@@
interface_event(struct interface *iface, enum interface_event ev)
static void
mark_interface_down(struct interface *iface)
{
static void
mark_interface_down(struct interface *iface)
{
- interface_del_ctx_addr(iface, NULL);
- release_device(iface->main_dev.dev);
+ vlist_flush_all(&iface->proto_addr);
+ vlist_flush_all(&iface->proto_route);
+ if (iface->main_dev.dev)
+ device_release(&iface->main_dev);
iface->state = IFS_DOWN;
}
static int
iface->state = IFS_DOWN;
}
static int
-__
set_interface
_up(struct interface *iface)
+__
interface_set
_up(struct interface *iface)
{
int ret;
if (iface->state != IFS_DOWN)
return 0;
{
int ret;
if (iface->state != IFS_DOWN)
return 0;
- ret = device_claim(iface->main_dev.dev);
- if (ret)
- return ret;
+ if (iface->main_dev.dev) {
+ ret = device_claim(&iface->main_dev);
+ if (ret)
+ return ret;
+ }
iface->state = IFS_SETUP;
ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
iface->state = IFS_SETUP;
ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
@@
-119,7
+117,7
@@
__set_interface_up(struct interface *iface)
}
static void
}
static void
-__
set_interface
_down(struct interface *iface, bool force)
+__
interface_set
_down(struct interface *iface, bool force)
{
clear_interface_errors(iface);
{
clear_interface_errors(iface);
@@
-129,8
+127,6
@@
__set_interface_down(struct interface *iface, bool force)
iface->state = IFS_TEARDOWN;
interface_event(iface, IFEV_DOWN);
iface->state = IFS_TEARDOWN;
interface_event(iface, IFEV_DOWN);
-
- interface_del_all_routes(iface);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
}
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
}
@@
-152,16
+148,22
@@
interface_cb(struct device_user *dep, enum device_event ev)
return;
}
return;
}
- if (iface->active == new_state)
+ interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
+ if (iface->available == new_state)
return;
return;
- iface->a
ctiv
e = new_state;
+ iface->a
vailabl
e = new_state;
if (new_state) {
if (iface->autostart && !config_init)
if (new_state) {
if (iface->autostart && !config_init)
-
set_interface
_up(iface);
+
interface_set
_up(iface);
} else
} else
- __
set_interface
_down(iface, true);
+ __
interface_set
_down(iface, true);
}
static void
}
static void
@@
-183,6
+185,13
@@
interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
mark_interface_down(iface);
break;
mark_interface_down(iface);
break;
+ case IFPEV_LINK_LOST:
+ if (iface->state != IFS_UP)
+ return;
+
+ iface->state = IFS_SETUP;
+ interface_event(iface, IFEV_DOWN);
+ break;
}
}
}
}
@@
-203,49
+212,56
@@
void interface_set_proto_state(struct interface *iface, struct interface_proto_s
}
struct interface *
}
struct interface *
-
alloc_interface(const char *name, struct uci_section *s
, struct blob_attr *attr)
+
interface_alloc(const char *name
, struct blob_attr *attr)
{
struct interface *iface;
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
struct device *dev;
{
struct interface *iface;
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
struct device *dev;
+ const char *proto_name = NULL;
- iface =
get_interface
(name);
+ iface =
interface_get
(name);
if (iface)
return iface;
iface = calloc(1, sizeof(*iface));
iface->main_dev.cb = interface_cb;
if (iface)
return iface;
iface = calloc(1, sizeof(*iface));
iface->main_dev.cb = interface_cb;
- iface->l3_
iface
= &iface->main_dev;
+ iface->l3_
dev
= &iface->main_dev;
strncpy(iface->name, name, sizeof(iface->name) - 1);
strncpy(iface->name, name, sizeof(iface->name) - 1);
- list_add(&iface->list, &interfaces);
+ list_add
_tail
(&iface->list, &interfaces);
INIT_LIST_HEAD(&iface->errors);
INIT_LIST_HEAD(&iface->errors);
- INIT_LIST_HEAD(&iface->address);
- INIT_LIST_HEAD(&iface->routes);
- proto_attach_interface(iface, s);
-
- netifd_ubus_add_interface(iface);
+ interface_ip_init(iface);
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(attr), blob_len(attr));
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(attr), blob_len(attr));
- if ((cur = tb[IFACE_ATTR_TYPE])) {
- if (!strcmp(blobmsg_data(cur), "bridge"))
- interface_attach_bridge(iface, s);
- }
+ if ((cur = tb[IFACE_ATTR_PROTO]))
+ proto_name = blobmsg_data(cur);
- if ((cur = tb[IFACE_ATTR_IFNAME])) {
+ proto_attach_interface(iface, proto_name);
+
+ if (iface->proto_handler &&
+ !(iface->proto_handler->flags & PROTO_FLAG_NODEV) &&
+ (cur = tb[IFACE_ATTR_IFNAME])) {
dev = device_get(blobmsg_data(cur), true);
if (dev)
device_add_user(&iface->main_dev, dev);
}
dev = device_get(blobmsg_data(cur), true);
if (dev)
device_add_user(&iface->main_dev, dev);
}
+ if ((cur = tb[IFACE_ATTR_AUTO]))
+ iface->autostart = blobmsg_get_bool(cur);
+ else
+ iface->autostart = true;
+
+ netifd_ubus_add_interface(iface);
+ config_set_state(&iface->config, attr);
+
return iface;
}
void
return iface;
}
void
-
free_interfac
e(struct interface *iface)
+
interface_fre
e(struct interface *iface)
{
netifd_ubus_remove_interface(iface);
list_del(&iface->list);
{
netifd_ubus_remove_interface(iface);
list_del(&iface->list);
@@
-255,7
+271,7
@@
free_interface(struct interface *iface)
}
struct interface *
}
struct interface *
-
get_interface
(const char *name)
+
interface_get
(const char *name)
{
struct interface *iface;
{
struct interface *iface;
@@
-296,11
+312,11
@@
interface_add_link(struct interface *iface, struct device *dev)
}
int
}
int
-
set_interface
_up(struct interface *iface)
+
interface_set
_up(struct interface *iface)
{
iface->autostart = true;
{
iface->autostart = true;
- if (!iface->a
ctiv
e) {
+ if (!iface->a
vailabl
e) {
interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
return -1;
}
interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
return -1;
}
@@
-308,25
+324,30
@@
set_interface_up(struct interface *iface)
if (iface->state != IFS_DOWN)
return 0;
if (iface->state != IFS_DOWN)
return 0;
- return __
set_interface
_up(iface);
+ return __
interface_set
_up(iface);
}
int
}
int
-
set_interface
_down(struct interface *iface)
+
interface_set
_down(struct interface *iface)
{
{
- iface->autostart = false;
- __set_interface_down(iface, false);
+ if (!iface) {
+ list_for_each_entry(iface, &interfaces, list)
+ __interface_set_down(iface, false);
+ } else {
+ iface->autostart = false;
+ __interface_set_down(iface, false);
+ }
return 0;
}
void
return 0;
}
void
-
start_pending_interfaces
(void)
+
interface_start_pending
(void)
{
struct interface *iface;
list_for_each_entry(iface, &interfaces, list) {
{
struct interface *iface;
list_for_each_entry(iface, &interfaces, list) {
- if (iface->a
ctiv
e && iface->autostart)
-
set_interface
_up(iface);
+ if (iface->a
vailabl
e && iface->autostart)
+
interface_set
_up(iface);
}
}
}
}