summaryrefslogtreecommitdiff
path: root/src/ipcpd/ipcp.c
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2017-10-12 02:15:39 +0200
committerdimitri staessens <[email protected]>2017-10-14 13:19:10 +0200
commitbedd1d4eadde9ab64f924c69eba716b015599e67 (patch)
treeb521ef89c8752334448bee1582b51dbe97851839 /src/ipcpd/ipcp.c
parenta483bc8597e5c19e796dc55c0587f1a045bc7281 (diff)
downloadouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.tar.gz
ouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.zip
lib: Deprecate ouroboros_init and ourboros_fini
This commit deprecates ouroboros_init and ouroboros_fini and adds them as a constructor or destructor, causing these function to be run automatically when a program that links to the library calls and exits main(). For this to fully work, the library had to be split so that we can avoid the irmd calling these functions (the IRMd has to create the shm structures on which these calls depend). The library is split in 3 parts: libouroboros-dev, libouroboros-irm and libouroboros-common. The latter is linked to the other two so that including libouroboros-dev or libouroboros-irm will also link libouroboros-common.
Diffstat (limited to 'src/ipcpd/ipcp.c')
-rw-r--r--src/ipcpd/ipcp.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 9f4d9eea..44dbb52a 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -544,7 +544,6 @@ static int parse_args(int argc,
int ipcp_init(int argc,
char ** argv,
- enum ipcp_type type,
struct ipcp_ops * ops)
{
bool log;
@@ -558,18 +557,6 @@ int ipcp_init(int argc,
log_init(log);
- if (type == IPCP_NORMAL) {
- if (ouroboros_init(argv[0])) {
- log_err("Failed to init normal IPCPI.");
- return -1;
- }
- } else {
- if (ouroboros_init(NULL)) {
- log_err("Failed to init shim IPCPI.");
- return -1;
- }
- }
-
ipcpi.irmd_fd = -1;
ipcpi.state = IPCP_NULL;
@@ -652,8 +639,6 @@ int ipcp_init(int argc,
fail_serv_sock:
free(ipcpi.sock_path);
fail_sock_path:
- ouroboros_fini();
-
return ret;
}
@@ -736,8 +721,6 @@ void ipcp_fini()
log_info("IPCP %d out.", getpid());
log_fini();
-
- ouroboros_fini();
}
void ipcp_set_state(enum ipcp_state state)