projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of black:tinc
[tinc]
/
src
/
vde_device.c
diff --git
a/src/vde_device.c
b/src/vde_device.c
index
8f601e7
..
258945e
100644
(file)
--- a/
src/vde_device.c
+++ b/
src/vde_device.c
@@
-1,6
+1,6
@@
/*
device.c -- VDE plug
/*
device.c -- VDE plug
- Copyright (C) 201
1
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 201
2
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-74,6
+74,10
@@
static bool setup_device(void) {
device_fd = plug.vde_datafd(conn);
device_fd = plug.vde_datafd(conn);
+#ifdef FD_CLOEXEC
+ fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
logger(LOG_INFO, "%s is a %s", device, device_info);
if(routing_mode == RMODE_ROUTER)
logger(LOG_INFO, "%s is a %s", device, device_info);
if(routing_mode == RMODE_ROUTER)