woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify includes, remove unneeded, add needed

Browse Source
This commit is contained in:
Robert Swiecki 2017-10-18 14:46:17 +02:00
parent 58d6b3075c
commit 152d6d68ae
17 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -96,23 +96,23 @@ indent:
# DO NOT DELETE THIS LINE -- make depend depends on it.
nsjail.o: nsjail.h caps.h cmdline.h log.h net.h subproc.h common.h util.h
caps.o: caps.h nsjail.h log.h util.h common.h
cmdline.o: cmdline.h nsjail.h caps.h config.h common.h log.h mount.h user.h
nsjail.o: nsjail.h cmdline.h common.h log.h net.h subproc.h util.h
caps.o: caps.h nsjail.h common.h log.h util.h
cmdline.o: cmdline.h nsjail.h caps.h common.h config.h log.h mount.h user.h
cmdline.o: util.h
contain.o: contain.h nsjail.h caps.h cgroup.h cpu.h log.h mount.h net.h pid.h
contain.o: user.h util.h common.h uts.h
contain.o: user.h uts.h
log.o: log.h nsjail.h
cgroup.o: cgroup.h nsjail.h log.h util.h common.h
mount.o: mount.h nsjail.h log.h subproc.h common.h util.h
net.o: net.h nsjail.h log.h subproc.h common.h
pid.o: pid.h nsjail.h log.h subproc.h common.h
sandbox.o: sandbox.h nsjail.h common.h kafel/include/kafel.h log.h
subproc.o: subproc.h common.h nsjail.h cgroup.h contain.h log.h net.h
cgroup.o: cgroup.h nsjail.h log.h util.h
mount.o: mount.h nsjail.h common.h log.h subproc.h util.h
net.o: net.h nsjail.h log.h subproc.h
pid.o: pid.h nsjail.h log.h subproc.h
sandbox.o: sandbox.h nsjail.h kafel/include/kafel.h log.h
subproc.o: subproc.h nsjail.h cgroup.h common.h contain.h log.h net.h
subproc.o: sandbox.h user.h util.h
user.o: user.h nsjail.h log.h subproc.h common.h util.h
util.o: util.h common.h log.h nsjail.h
user.o: user.h nsjail.h common.h log.h subproc.h util.h
util.o: util.h nsjail.h common.h log.h
uts.o: uts.h nsjail.h log.h
cpu.o: cpu.h nsjail.h log.h util.h common.h
cpu.o: cpu.h nsjail.h log.h util.h
config.o: common.h caps.h nsjail.h cmdline.h config.h log.h mount.h user.h
config.o: util.h

1
caps.c
View File

@ -28,6 +28,7 @@
#include <sys/types.h>
#include <unistd.h>
#include "common.h"
#include "log.h"
#include "util.h"

4
cgroup.c
View File

@ -27,11 +27,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include "log.h"

3
cmdline.c
View File

@ -36,12 +36,11 @@
#include <strings.h>
#include <sys/mount.h>
#include <sys/personality.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include "caps.h"
#include "common.h"
#include "config.h"
#include "log.h"
#include "mount.h"

5
config.h
View File

@ -26,7 +26,10 @@
extern "C" {
#endif
#include "common.h"
#include <stdbool.h>
#include "nsjail.h"
bool configParse(struct nsjconf_t* nsjconf, const char* file);
#ifdef __cplusplus

4
contain.c
View File

@ -24,6 +24,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <signal.h>
#include <stdbool.h>
#include <stddef.h>
@ -32,8 +33,8 @@
#include <string.h>
#include <sys/personality.h>
#include <sys/prctl.h>
#include <sys/queue.h>
#include <sys/resource.h>
#include <sys/stat.h>
#include <unistd.h>
#include "caps.h"
@ -44,7 +45,6 @@
#include "net.h"
#include "pid.h"
#include "user.h"
#include "util.h"
#include "uts.h"
static bool containUserNs(struct nsjconf_t* nsjconf) { return userInitNsFromChild(nsjconf); }

2
cpu.c
View File

@ -21,7 +21,9 @@
#include "cpu.h"
#include <inttypes.h>
#include <sched.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>

5
mount.c
View File

@ -23,20 +23,25 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <limits.h>
#include <linux/sched.h>
#include <sched.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/syscall.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <syscall.h>
#include <unistd.h>
#include "common.h"
#include "log.h"
#include "subproc.h"
#include "util.h"

4
net.c
View File

@ -25,16 +25,16 @@
#include <errno.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
#include <netinet/tcp.h>
#include <sched.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>

3
nsjail.c
View File

@ -21,7 +21,6 @@
#include "nsjail.h"
#include <errno.h>
#include <signal.h>
#include <stdbool.h>
#include <stdio.h>
@ -30,8 +29,8 @@
#include <sys/time.h>
#include <unistd.h>
#include "caps.h"
#include "cmdline.h"
#include "common.h"
#include "log.h"
#include "net.h"
#include "subproc.h"

2
pid.c
View File

@ -24,8 +24,8 @@
#include <linux/sched.h>
#include <sched.h>
#include <signal.h>
#include <stddef.h>
#include <sys/prctl.h>
#include <sys/syscall.h>
#include <unistd.h>
#include "log.h"

2
sandbox.c
View File

@ -23,9 +23,9 @@
#include <linux/filter.h>
#include <linux/seccomp.h>
#include <stddef.h>
#include <sys/prctl.h>
#include "common.h"
#include "kafel.h"
#include "log.h"

7
subproc.c
View File

@ -21,22 +21,21 @@
#include "subproc.h"
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <linux/sched.h>
#include <netinet/in.h>
#include <sched.h>
#include <setjmp.h>
#include <signal.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/prctl.h>
#include <sys/queue.h>
#include <sys/syscall.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <time.h>

7
subproc.h
View File

@ -22,13 +22,12 @@
#ifndef NS_PROC_H
#define NS_PROC_H
#include "common.h"
#include <inttypes.h>
#include <stdbool.h>
#include <unistd.h>
#include "nsjail.h"
#include <inttypes.h>
#include <unistd.h>
void subprocRunChild(struct nsjconf_t* nsjconf, int fd_in, int fd_out, int fd_err);
int subprocCount(struct nsjconf_t* nsjconf);
void subprocDisplay(struct nsjconf_t* nsjconf);

3
user.c
View File

@ -29,14 +29,17 @@
#include <pwd.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/prctl.h>
#include <sys/queue.h>
#include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
#include "common.h"
#include "log.h"
#include "subproc.h"
#include "util.h"

3
util.c
View File

@ -28,6 +28,8 @@
#include <pthread.h>
#include <signal.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -38,6 +40,7 @@
#include <time.h>
#include <unistd.h>
#include "common.h"
#include "log.h"
void* utilMalloc(size_t sz)

2
util.h
View File

@ -26,7 +26,7 @@
#include <stdint.h>
#include <stdlib.h>
#include "common.h"
#include "nsjail.h"
void* utilMalloc(size_t sz);
void* utilCalloc(size_t sz);