diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-04-26 11:50:07 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-04-26 11:50:07 +0000 |
| commit | 74b9e54d92a0b0937b457b2a2e4e5bc3a5eae783 (patch) | |
| tree | 53417125e6a0fd3a3f5f70f2f40806ae1c8b9765 /src/rpc | |
| parent | 5a6cfb01304fc4a11d49db8e09ede330767ab9de (diff) | |
| download | skabus-74b9e54d92a0b0937b457b2a2e4e5bc3a5eae783.tar.xz | |
Small rpc fixes
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/deps-exe/skabus-rpcd | 2 | ||||
| -rw-r--r-- | src/rpc/skabus-rpcc.c | 3 | ||||
| -rw-r--r-- | src/rpc/skabus_rpccctl.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/rpc/deps-exe/skabus-rpcd b/src/rpc/deps-exe/skabus-rpcd index 370b6d5..3399272 100644 --- a/src/rpc/deps-exe/skabus-rpcd +++ b/src/rpc/deps-exe/skabus-rpcd @@ -1,7 +1,7 @@ skabus_rpcd_client.o skabus_rpcd_interface.o skabus_rpcd_query.o -libskabus.a.xyzzy +${LIBSKABUS} -ls6 -lskarnet ${SOCKET_LIB} diff --git a/src/rpc/skabus-rpcc.c b/src/rpc/skabus-rpcc.c index 523c490..5890fde 100644 --- a/src/rpc/skabus-rpcc.c +++ b/src/rpc/skabus-rpcc.c @@ -33,6 +33,7 @@ #include <skalibs/gensetdyn.h> #include <skalibs/genqdyn.h> #include <skalibs/skamisc.h> + #include <execline/config.h> #include <skabus/rpc.h> @@ -144,7 +145,7 @@ static int interface_add (char const *ifname, char const *ifprog, char const *re int fd[2] ; tain_t deadline ; skabus_rpc_interface_t ifbody = { .f = &rclient_function, .cancelf = &rclient_cancel_function, .aux = y } - char const *argv[4] = { EXECLINE_EXTBINPREFIX "execlineb", "-c", ifprog, 0 } ; + char const *argv[4] = { EXECLINE_EXTBINPREFIX "execlineb", "-Pc", ifprog, 0 } ; pid_t pid = child_spawn2(argv[0], argv, (char const *const *)environ, fd) ; if (!pid) return 0 ; if (!gensetdyn_new(&interfaces, &yy)) goto err ; diff --git a/src/rpc/skabus_rpccctl.c b/src/rpc/skabus_rpccctl.c index 83b72ac..1c63bdb 100644 --- a/src/rpc/skabus_rpccctl.c +++ b/src/rpc/skabus_rpccctl.c @@ -62,6 +62,7 @@ int skabus_rpcc_interface_register (skabus_rpcc_t *a, char const *ifname, char c uint32_pack_big(buf + 5, relen) ; if (!textmessage_timed_commandv(&a->out, v, 5, deadline, stamp)) goto err ; } + free(ifprogfn) ; return 1 ; terr: |