From e3aeb3b63b9996bd06c20861e1dac1c9421d9312 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 7 Jan 2015 01:12:01 +0000 Subject: Experimental decoupling of socketbinders and daemons in ucspi servers. Rewrite of s6-ipcserver as a small wrapper. s6-tcpserver4 and s6-tcpserver6 will follow. --- package/deps-build | 1 + package/deps.mak | 22 ++++++++++++++++++++-- package/modes | 6 ++++++ package/targets.mak | 8 +++++++- 4 files changed, 34 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/deps-build b/package/deps-build index 254622d..dcd2abc 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,3 +1,4 @@ /package/prog/skalibs /package/admin/execline +/package/admin/s6 /package/web/s6-dns diff --git a/package/deps.mak b/package/deps.mak index 4c50a60..0c6bd79 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -16,15 +16,21 @@ src/conn-tools/s6-ident-client.o src/conn-tools/s6-ident-client.lo: src/conn-too src/conn-tools/s6-ioconnect.o src/conn-tools/s6-ioconnect.lo: src/conn-tools/s6-ioconnect.c src/conn-tools/s6-ipcclient.o src/conn-tools/s6-ipcclient.lo: src/conn-tools/s6-ipcclient.c src/conn-tools/s6-ipcserver-access.o src/conn-tools/s6-ipcserver-access.lo: src/conn-tools/s6-ipcserver-access.c src/include/s6-networking/accessrules.h -src/conn-tools/s6-ipcserver.o src/conn-tools/s6-ipcserver.lo: src/conn-tools/s6-ipcserver.c +src/conn-tools/s6-ipcserver-socketbinder.o src/conn-tools/s6-ipcserver-socketbinder.lo: src/conn-tools/s6-ipcserver-socketbinder.c +src/conn-tools/s6-ipcserver.o src/conn-tools/s6-ipcserver.lo: src/conn-tools/s6-ipcserver.c src/include/s6-networking/config.h +src/conn-tools/s6-ipcserverd.o src/conn-tools/s6-ipcserverd.lo: src/conn-tools/s6-ipcserverd.c src/conn-tools/s6-sudo.o src/conn-tools/s6-sudo.lo: src/conn-tools/s6-sudo.c src/include/s6-networking/config.h src/conn-tools/s6-sudoc.o src/conn-tools/s6-sudoc.lo: src/conn-tools/s6-sudoc.c src/conn-tools/s6-sudo.h src/conn-tools/s6-sudod.o src/conn-tools/s6-sudod.lo: src/conn-tools/s6-sudod.c src/conn-tools/s6-sudo.h src/conn-tools/s6-tcpclient.o src/conn-tools/s6-tcpclient.lo: src/conn-tools/s6-tcpclient.c src/include/s6-networking/ident.h src/conn-tools/s6-tcpserver-access.o src/conn-tools/s6-tcpserver-access.lo: src/conn-tools/s6-tcpserver-access.c src/include/s6-networking/s6net.h src/conn-tools/s6-tcpserver.o src/conn-tools/s6-tcpserver.lo: src/conn-tools/s6-tcpserver.c src/include/s6-networking/config.h +src/conn-tools/s6-tcpserver4-socketbinder.o src/conn-tools/s6-tcpserver4-socketbinder.lo: src/conn-tools/s6-tcpserver4-socketbinder.c src/conn-tools/s6-tcpserver4.o src/conn-tools/s6-tcpserver4.lo: src/conn-tools/s6-tcpserver4.c +src/conn-tools/s6-tcpserver4d.o src/conn-tools/s6-tcpserver4d.lo: src/conn-tools/s6-tcpserver4d.c +src/conn-tools/s6-tcpserver6-socketbinder.o src/conn-tools/s6-tcpserver6-socketbinder.lo: src/conn-tools/s6-tcpserver6-socketbinder.c src/conn-tools/s6-tcpserver6.o src/conn-tools/s6-tcpserver6.lo: src/conn-tools/s6-tcpserver6.c +src/conn-tools/s6-tcpserver6d.o src/conn-tools/s6-tcpserver6d.lo: src/conn-tools/s6-tcpserver6d.c src/conn-tools/seekablepipe.o src/conn-tools/seekablepipe.lo: src/conn-tools/seekablepipe.c src/libs6net/s6net_accessrules_backend_cdb.o src/libs6net/s6net_accessrules_backend_cdb.lo: src/libs6net/s6net_accessrules_backend_cdb.c src/include/s6-networking/accessrules.h src/libs6net/s6net_accessrules_backend_fs.o src/libs6net/s6net_accessrules_backend_fs.lo: src/libs6net/s6net_accessrules_backend_fs.c src/include/s6-networking/accessrules.h @@ -66,10 +72,14 @@ s6-ioconnect: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-ioconnect: src/conn-tools/s6-ioconnect.o -lskarnet s6-ipcclient: private EXTRA_LIBS := ${SOCKET_LIB} s6-ipcclient: src/conn-tools/s6-ipcclient.o -lskarnet -s6-ipcserver: private EXTRA_LIBS := ${SOCKET_LIB} +s6-ipcserver: private EXTRA_LIBS := s6-ipcserver: src/conn-tools/s6-ipcserver.o -lskarnet s6-ipcserver-access: private EXTRA_LIBS := ${SOCKET_LIB} s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o -ls6net -lskarnet +s6-ipcserver-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} +s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o -lskarnet +s6-ipcserverd: private EXTRA_LIBS := ${SOCKET_LIB} +s6-ipcserverd: src/conn-tools/s6-ipcserverd.o -lskarnet s6-sudo: private EXTRA_LIBS := s6-sudo: src/conn-tools/s6-sudo.o -lskarnet s6-sudoc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} @@ -84,8 +94,16 @@ s6-tcpserver-access: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-tcpserver-access: src/conn-tools/s6-tcpserver-access.o -ls6net -ls6dns -lskarnet s6-tcpserver4: private EXTRA_LIBS := ${SOCKET_LIB} s6-tcpserver4: src/conn-tools/s6-tcpserver4.o -lskarnet +s6-tcpserver4-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} +s6-tcpserver4-socketbinder: src/conn-tools/s6-tcpserver4-socketbinder.o -lskarnet +s6-tcpserver4d: private EXTRA_LIBS := ${SOCKET_LIB} +s6-tcpserver4d: src/conn-tools/s6-tcpserver4d.o -lskarnet s6-tcpserver6: private EXTRA_LIBS := ${SOCKET_LIB} s6-tcpserver6: src/conn-tools/s6-tcpserver6.o -lskarnet +s6-tcpserver6-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} +s6-tcpserver6-socketbinder: src/conn-tools/s6-tcpserver6-socketbinder.o -lskarnet +s6-tcpserver6d: private EXTRA_LIBS := ${SOCKET_LIB} +s6-tcpserver6d: src/conn-tools/s6-tcpserver6d.o -lskarnet seekablepipe: private EXTRA_LIBS := seekablepipe: src/conn-tools/seekablepipe.o -lskarnet libs6net.a: src/libs6net/s6net_accessrules_backend_cdb.o src/libs6net/s6net_accessrules_backend_fs.o src/libs6net/s6net_accessrules_keycheck_ip4.o src/libs6net/s6net_accessrules_keycheck_ip6.o src/libs6net/s6net_accessrules_keycheck_reversedns.o src/libs6net/s6net_accessrules_keycheck_uidgid.o src/libs6net/s6net_accessrules_uidgid_cdb.o src/libs6net/s6net_accessrules_uidgid_fs.o src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o diff --git a/package/modes b/package/modes index bc896a6..cc7dfa7 100644 --- a/package/modes +++ b/package/modes @@ -4,9 +4,15 @@ s6-ioconnect 0755 s6-ident-client 0755 s6-ipcclient 0755 s6-ipcserver 0755 +s6-ipcserverd 0755 +s6-ipcserver-socketbinder 0755 s6-tcpclient 0755 s6-tcpserver4 0755 +s6-tcpserver4d 0755 +s6-tcpserver4-socketbinder 0755 s6-tcpserver6 0755 +s6-tcpserver6d 0755 +s6-tcpserver6-socketbinder 0755 s6-tcpserver 0755 s6-accessrules-cdb-from-fs 0755 s6-accessrules-fs-from-cdb 0755 diff --git a/package/targets.mak b/package/targets.mak index 35c60a4..1267a93 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -5,10 +5,16 @@ s6-ioconnect \ s6-ident-client \ s6-ipcclient \ s6-ipcserver \ +s6-ipcserverd \ +s6-ipcserver-socketbinder \ s6-tcpclient \ +s6-tcpserver \ s6-tcpserver4 \ +s6-tcpserver4d \ +s6-tcpserver4-socketbinder \ s6-tcpserver6 \ -s6-tcpserver \ +s6-tcpserver6d \ +s6-tcpserver6-socketbinder \ s6-accessrules-cdb-from-fs \ s6-accessrules-fs-from-cdb \ s6-ipcserver-access \ -- cgit v1.2.3