diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-04-12 19:53:20 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-04-22 23:37:36 +0200 |
| commit | 11cb9cfbb088740ee7ee5e6c6b661958c0f962cb (patch) | |
| tree | 7d6740bffa2b9a8f05983d8a5dc79bedc73e7dc6 | |
| parent | 4375d1bc56301dd977ab102db995e07aa930d4a2 (diff) | |
| download | netifd-11cb9cfbb088740ee7ee5e6c6b661958c0f962cb.tar.gz | |
ubus: add interface method to trigger renew event
Not all topology or connectivity changes may be detected by netifd,
depending on the underlying technology (e.g. VPN software); this adds a way
to explicitly trigger a renew.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Acked-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | interface.c | 9 | ||||
| -rw-r--r-- | interface.h | 1 | ||||
| -rw-r--r-- | ubus.c | 14 |
3 files changed, 24 insertions, 0 deletions
diff --git a/interface.c b/interface.c index f150f7d..593b049 100644 --- a/interface.c +++ b/interface.c @@ -1076,6 +1076,15 @@ interface_set_down(struct interface *iface) return 0; } +int +interface_renew(struct interface *iface) +{ + if (iface->state == IFS_TEARDOWN || iface->state == IFS_DOWN) + return -1; + + return interface_proto_event(iface->proto, PROTO_CMD_RENEW, false); +} + void interface_start_pending(void) { diff --git a/interface.h b/interface.h index 1472324..d35fd98 100644 --- a/interface.h +++ b/interface.h @@ -184,6 +184,7 @@ void interface_set_available(struct interface *iface, bool new_state); int interface_set_up(struct interface *iface); int interface_set_down(struct interface *iface); void __interface_set_down(struct interface *iface, bool force); +int interface_renew(struct interface *iface); void interface_set_main_dev(struct interface *iface, struct device *dev); void interface_set_l3_dev(struct interface *iface, struct device *dev); @@ -378,6 +378,19 @@ netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +static int +netifd_handle_renew(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct interface *iface; + + iface = container_of(obj, struct interface, ubus); + interface_renew(iface); + + return 0; +} + static void netifd_add_interface_errors(struct blob_buf *b, struct interface *iface) { @@ -914,6 +927,7 @@ netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj, static struct ubus_method iface_object_methods[] = { { .name = "up", .handler = netifd_handle_up }, { .name = "down", .handler = netifd_handle_down }, + { .name = "renew", .handler = netifd_handle_renew }, { .name = "status", .handler = netifd_handle_status }, { .name = "prepare", .handler = netifd_handle_iface_prepare }, { .name = "dump", .handler = netifd_handle_dump }, |