j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Update all device.c files.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-18 13:41:37 +00:00
parent 271d3537fe
commit 00ddbf5723
8 changed files with 60 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/openbsd/device.c
View file

@ -17,30 +17,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.15 2003/07/12 17:41:48 guus Exp $
$Id: device.c,v 1.1.2.16 2003/07/18 13:41:36 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <fcntl.h>
#include <net/if.h>
#include <unistd.h>
#include <string.h>
#include <utils.h>
#include "conf.h"
#include "net.h"
#include "logger.h"
#include "system.h"
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0"
#define DEVICE_TYPE_ETHERTAP 0
@ -49,7 +35,7 @@
int device_fd = -1;
int device_type;
char *device;
char *interface;
char *iface;
char *device_info;
int device_total_in = 0;
@ -62,8 +48,8 @@ int setup_device(void)
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1;