projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Close the proper filedescriptor (if it exists).
[tinc]
/
src
/
raw_socket
/
device.c
diff --git
a/src/raw_socket/device.c
b/src/raw_socket/device.c
index
1bece59
..
33857ba
100644
(file)
--- a/
src/raw_socket/device.c
+++ b/
src/raw_socket/device.c
@@
-1,7
+1,7
@@
/*
device.c -- raw socket
/*
device.c -- raw socket
- Copyright (C) 2002-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2002-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 2002-200
5 Ivo Timmermans
,
+ 2002-200
6 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
@@
-17,39
+17,27
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.9 2003/07/31 11:31:51 guus Exp
$
+ $Id$
*/
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
+#include "system.h"
+
#include <netpacket/packet.h>
#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#include <utils.h>
#include "conf.h"
#include "net.h"
#include "logger.h"
#include "conf.h"
#include "net.h"
#include "logger.h"
-
-#include "
system
.h"
+#include "utils.h"
+#include "
route
.h"
int device_fd = -1;
char *device;
int device_fd = -1;
char *device;
-char *i
nter
face;
+char *iface;
char ifrname[IFNAMSIZ];
char *device_info;
char ifrname[IFNAMSIZ];
char *device_info;
-int device_total_in = 0;
-int device_total_out = 0;
+
static
int device_total_in = 0;
+
static
int device_total_out = 0;
bool setup_device(void)
{
bool setup_device(void)
{
@@
-59,11
+47,11
@@
bool setup_device(void)
cp();
if(!get_config_string
cp();
if(!get_config_string
- (lookup_config(config_tree, "Interface"), &i
nter
face))
- i
nter
face = "eth0";
+ (lookup_config(config_tree, "Interface"), &iface))
+ iface = "eth0";
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device = i
nter
face;
+ device = iface;
device_info = _("raw socket");
device_info = _("raw socket");
@@
-74,10
+62,10
@@
bool setup_device(void)
}
memset(&ifr, 0, sizeof(ifr));
}
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_ifrn.ifrn_name, i
nter
face, IFNAMSIZ);
+ strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
- logger(LOG_ERR, _("Can't find interface %s: %s"), i
nter
face,
+ logger(LOG_ERR, _("Can't find interface %s: %s"), iface,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-88,7
+76,7
@@
bool setup_device(void)
sa.sll_ifindex = ifr.ifr_ifindex;
if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
sa.sll_ifindex = ifr.ifr_ifindex;
if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
- logger(LOG_ERR, _("Could not bind
to %s: %s"), devi
ce, strerror(errno));
+ logger(LOG_ERR, _("Could not bind
%s to %s: %s"), device, ifa
ce, strerror(errno));
return false;
}
return false;
}