projects
/
project
/
ubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45c8733
)
add support for overriding the socket name
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 6 Feb 2011 17:40:47 +0000
(18:40 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 6 Feb 2011 17:40:47 +0000
(18:40 +0100)
ubusd.c
patch
|
blob
|
history
diff --git
a/ubusd.c
b/ubusd.c
index 491659d7903b9bfeca2a24dd743d6c2f0451d952..02e0086172887a8ee14a8d3aa619d7048faf3450 100644
(file)
--- a/
ubusd.c
+++ b/
ubusd.c
@@
-311,9
+311,20
@@
static struct uloop_fd server_fd = {
.cb = server_cb,
};
.cb = server_cb,
};
+static int usage(const char *progname)
+{
+ fprintf(stderr, "Usage: %s [<options>]\n"
+ "Options: \n"
+ " -s <socket>: Set the unix domain socket to listen on\n"
+ "\n", progname);
+ return 1;
+}
+
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+ const char *ubus_socket = UBUS_UNIX_SOCKET;
int ret = 0;
int ret = 0;
+ int ch;
signal(SIGPIPE, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
@@
-321,8
+332,18
@@
int main(int argc, char **argv)
uloop_init();
uloop_init();
- unlink(UBUS_UNIX_SOCKET);
- server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, UBUS_UNIX_SOCKET, NULL);
+ while ((ch = getopt(argc, argv, "s:")) != -1) {
+ switch (ch) {
+ case 's':
+ ubus_socket = optarg;
+ break;
+ default:
+ return usage(argv[0]);
+ }
+ }
+
+ unlink(ubus_socket);
+ server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
if (server_fd.fd < 0) {
perror("usock");
ret = -1;
if (server_fd.fd < 0) {
perror("usock");
ret = -1;