summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-01-15 20:51:39 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-01-15 20:51:39 +0000
commitebfd0ba17e0d4b220725018d16e294e8e22a1745 (patch)
tree4b29683050ce9e8f24f1920f1be38b2f837ef5ad /src/include
parent20c7d8e1b328155145ce9e8648435e127b60c208 (diff)
downloads6-networking-ebfd0ba17e0d4b220725018d16e294e8e22a1745.tar.xz
Move Unix domain socket and access control stuff to s6.
Move seekablepipe to s6-portable-utils. Version: 2.0.1.0, release candidate
Diffstat (limited to 'src/include')
-rw-r--r--src/include/s6-networking/accessrules.h53
-rw-r--r--src/include/s6-networking/s6net.h1
2 files changed, 0 insertions, 54 deletions
diff --git a/src/include/s6-networking/accessrules.h b/src/include/s6-networking/accessrules.h
deleted file mode 100644
index ec7a0d5..0000000
--- a/src/include/s6-networking/accessrules.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ISC license. */
-
-#ifndef S6NET_ACCESSRULES_H
-#define S6NET_ACCESSRULES_H
-
-#include <skalibs/cdb.h>
-#include <skalibs/stralloc.h>
-#include <skalibs/ip46.h>
-
-typedef struct s6net_accessrules_params_s s6net_accessrules_params_t, *s6net_accessrules_params_t_ref ;
-struct s6net_accessrules_params_s
-{
- stralloc env ;
- stralloc exec ;
-} ;
-#define S6NET_ACCESSRULES_PARAMS_ZERO { STRALLOC_ZERO, STRALLOC_ZERO }
-
-typedef enum s6net_accessrules_result_e s6net_accessrules_result_t, *s6net_accessrules_result_t_ref ;
-enum s6net_accessrules_result_e
-{
- S6NET_ACCESSRULES_ERROR = -1,
- S6NET_ACCESSRULES_DENY = 0,
- S6NET_ACCESSRULES_ALLOW = 1,
- S6NET_ACCESSRULES_NOTFOUND = 2
-} ;
-
-typedef s6net_accessrules_result_t s6net_accessrules_backend_func_t (char const *, unsigned int, void *, s6net_accessrules_params_t *) ;
-typedef s6net_accessrules_backend_func_t *s6net_accessrules_backend_func_t_ref ;
-
-extern s6net_accessrules_backend_func_t s6net_accessrules_backend_fs ;
-extern s6net_accessrules_backend_func_t s6net_accessrules_backend_cdb ;
-
-typedef s6net_accessrules_result_t s6net_accessrules_keycheck_func_t (void const *, void *, s6net_accessrules_params_t *, s6net_accessrules_backend_func_t_ref) ;
-typedef s6net_accessrules_keycheck_func_t *s6net_accessrules_keycheck_func_t_ref ;
-
-extern s6net_accessrules_keycheck_func_t s6net_accessrules_keycheck_uidgid ;
-extern s6net_accessrules_keycheck_func_t s6net_accessrules_keycheck_ip4 ;
-extern s6net_accessrules_keycheck_func_t s6net_accessrules_keycheck_ip6 ;
-extern s6net_accessrules_keycheck_func_t s6net_accessrules_keycheck_reversedns ;
-#define s6net_accessrules_keycheck_ip46(key, data, params, f) (ip46_is6((ip46_t const *)(key)) ? s6net_accessrules_keycheck_ip6(((ip46_t const *)(key))->ip, data, params, f) : s6net_accessrules_keycheck_ip4(((ip46_t const *)(key))->ip, data, params, f))
-
-extern s6net_accessrules_result_t s6net_accessrules_uidgid_cdb (unsigned int, unsigned int, struct cdb *, s6net_accessrules_params_t *) ;
-extern s6net_accessrules_result_t s6net_accessrules_uidgid_fs (unsigned int, unsigned int, char const *, s6net_accessrules_params_t *) ;
-#define s6net_accessrules_ip4_cdb(ip4, c, params) s6net_accessrules_keycheck_ip4(ip4, c, (params), &s6net_accessrules_backend_cdb)
-#define s6net_accessrules_ip4_fs(ip4, rulesdir, params) s6net_accessrules_keycheck_ip4(ip4, rulesdir, (params), &s6net_accessrules_backend_fs)
-#define s6net_accessrules_ip6_cdb(ip6, c, params) s6net_accessrules_keycheck_ip6(ip6, c, (params), &s6net_accessrules_backend_cdb)
-#define s6net_accessrules_ip6_fs(ip6, rulesdir, params) s6net_accessrules_keycheck_ip6(ip6, rulesdir, (params), &s6net_accessrules_backend_fs)
-#define s6net_accessrules_ip46_cdb(ip, c, params) s6net_accessrules_keycheck_ip46(ip, c, (params), &s6net_accessrules_backend_cdb)
-#define s6net_accessrules_ip46_fs(ip, rulesdir, params) s6net_accessrules_keycheck_ip46(ip, rulesdir, (params), &s6net_accessrules_backend_fs)
-#define s6net_accessrules_reversedns_cdb(name, c, params) s6net_accessrules_keycheck_reversedns(name, c, (params), &s6net_accessrules_backend_cdb)
-#define s6net_accessrules_reversedns_fs(name, c, params) s6net_accessrules_keycheck_reversedns(name, c, (params), &s6net_accessrules_backend_fs)
-
-#endif
diff --git a/src/include/s6-networking/s6net.h b/src/include/s6-networking/s6net.h
index 81d804e..8778527 100644
--- a/src/include/s6-networking/s6net.h
+++ b/src/include/s6-networking/s6net.h
@@ -3,7 +3,6 @@
#ifndef S6NET_H
#define S6NET_H
-#include <s6-networking/accessrules.h>
#include <s6-networking/ident.h>
#endif