summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-07 02:56:48 +0100
committerFelix Fietkau <nbd@openwrt.org>2013-01-07 02:56:48 +0100
commitf8573c7b4c3a9e1a67cae787690f27a976aee11c (patch)
tree3c12caa8232012458026ed3d7b49fbe445877a3f /main.c
parent11cbb4498b2da95ece2ad4ce940ca9cda8b479eb (diff)
add ubus support
Diffstat (limited to 'main.c')
-rw-r--r--main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/main.c b/main.c
index 0dfa4ca..73a925c 100644
--- a/main.c
+++ b/main.c
@@ -40,6 +40,7 @@ static int run_server(void)
{
uloop_init();
uh_setup_listeners();
+ uh_plugin_post_init();
uloop_run();
return 0;
@@ -338,6 +339,15 @@ int main(int argc, char **argv)
conf.lua_handler = optarg;
break;
#endif
+#ifdef HAVE_UBUS
+ case 'u':
+ conf.ubus_prefix = optarg;
+ break;
+
+ case 'U':
+ conf.ubus_socket = optarg;
+ break;
+#endif
default:
return usage(argv[0]);
}
@@ -376,6 +386,10 @@ int main(int argc, char **argv)
return 1;
}
#endif
+#ifdef HAVE_UBUS
+ if (conf.ubus_prefix && uh_plugin_init("uhttpd_ubus.so"))
+ return 1;
+#endif
/* fork (if not disabled) */
if (!nofork) {