ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

removed IPSECPOLICY compile option

This commit is contained in:
Andreas Steffen 2007-01-29 07:42:30 +00:00
parent e43641e712
commit f527c5a288
2 changed files with 3 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pluto/plutomain.c
View File

@ -507,19 +507,6 @@ main(int argc, char **argv)
}
}
#ifdef IPSECPOLICY
/* create info socket. */
{
err_t ugh = init_info_socket();
if (ugh != NULL)
{
fprintf(stderr, "pluto: %s", ugh);
exit_pluto(1);
}
}
#endif
/* If not suppressed, do daemon fork */
if (fork_desired)
@ -571,12 +558,10 @@ main(int argc, char **argv)
int i;
for (i = getdtablesize() - 1; i >= 0; i--) /* Bad hack */
if ((!log_to_stderr || i != 2)
#ifdef IPSECPOLICY
&& i != info_fd
#endif
&& i != ctl_fd)
{
if ((!log_to_stderr || i != 2) && i != ctl_fd)
close(i);
}
/* make sure that stdin, stdout, stderr are reserved */
if (open("/dev/null", O_RDONLY) != 0)

62
src/pluto/server.c
View File

@ -124,50 +124,6 @@ delete_ctl_socket(void)
unlink(ctl_addr.sun_path);
}
#ifdef IPSECPOLICY
/* Initialize the info socket.
*/
err_t
init_info_socket(void)
{
err_t failed = NULL;
delete_info_socket(); /* preventative medicine */
info_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (info_fd == -1)
failed = "create";
else if (fcntl(info_fd, F_SETFD, FD_CLOEXEC) == -1)
failed = "fcntl FD+CLOEXEC";
else if (setsockopt(info_fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof(on)) < 0)
failed = "setsockopt";
else
{
/* this socket should be openable by all proceses */
mode_t ou = umask(0);
if (bind(info_fd, (struct sockaddr *)&info_addr
, offsetof(struct sockaddr_un, sun_path) + strlen(info_addr.sun_path)) < 0)
failed = "bind";
umask(ou);
}
/* 64 might be big enough, and the system may limit us anyway.
*/
if (failed == NULL && listen(info_fd, 64) < 0)
failed = "listen() on";
return failed == NULL? NULL : builddiag("could not %s info socket: %d %s"
, failed, errno, strerror(errno));
}
void
delete_info_socket(void)
{
unlink(info_addr.sun_path);
}
#endif /* IPSECPOLICY */
bool listening = FALSE; /* should we pay attention to IKE messages? */
struct iface *interfaces = NULL; /* public interfaces */
@ -879,11 +835,6 @@ call_server(void)
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_SET(ctl_fd, &readfds);
#ifdef IPSECPOLICY
FD_SET(info_fd, &readfds);
if (maxfd < info_fd)
maxfd = info_fd;
#endif
/* the only write file-descriptor of interest */
if (adns_qfd != NULL_FD && unsent_ADNS_queries)
@ -1033,19 +984,6 @@ call_server(void)
ndes--;
}
#ifdef IPSECPOLICY
if (FD_ISSET(info_fd, &readfds))
{
passert(ndes > 0);
DBG(DBG_CONTROL,
DBG_log(BLANK_FORMAT);
DBG_log("*received info message"));
info_handle(info_fd);
passert(GLOBALS_ARE_RESET());
ndes--;
}
#endif
passert(ndes == 0);
}
}