Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get process information from linux /proc #221

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Get process information from linux /proc #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7c279a2
Get process information from linux /proc
Sep 12, 2018
fbd73ac
Use __linux__ and fix whitespace
droe Sep 12, 2018
d372159
Revert removal of automatic HAVE_LOCAL_PROCINFO detection
droe Sep 12, 2018
d174f15
use separate client socket for proc_*, and lock it before using
Sep 13, 2018
a180119
Fix whitespace
droe Sep 13, 2018
dcdb6b9
Fail proc_linux_init() if mutex initialization fails
droe Sep 13, 2018
0f0b3c5
Include limits.h on Linux for PATH_MAX
droe Oct 6, 2018
a46ca26
Make privsep communication IPv4/IPv6-agnostic
droe Oct 7, 2018
887db1c
Add fastpath to Linux -i
droe Oct 8, 2018
9408b68
PATH_MAX includes NUL
droe Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,11 @@ main(int argc, char *argv[])
* child process doing the actual work. We request 4 privsep client
* sockets: three logger threads, and the child process main thread,
* which will become the main proxy thread. */
#ifdef __linux__
int clisock[5];
#else /* !__linux__ */
int clisock[4];
#endif /* !__linux__ */
if (privsep_fork(opts, clisock,
sizeof(clisock)/sizeof(clisock[0])) != 0) {
/* parent has exited the monitor loop after waiting for child,
Expand Down Expand Up @@ -826,6 +830,13 @@ main(int argc, char *argv[])
goto out_sslreinit_failed;
}

#ifdef __linux__
if (proc_linux_init(clisock[4]) == -1) {
fprintf(stderr, "%s: failed to init proc_linux\n", argv0);
goto out_sslreinit_failed;
}
#endif /* __linux__ */

/* Post-privdrop/chroot/detach initialization, thread spawning */
if (log_init(opts, proxy, &clisock[1]) == -1) {
fprintf(stderr, "%s: failed to init log facility: %s\n",
Expand Down
Loading