projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
804b289
)
Update to make it compile again.
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 8 Nov 2004 22:11:33 +0000
(22:11 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 8 Nov 2004 22:11:33 +0000
(22:11 +0000)
src/raw_socket/device.c
patch
|
blob
|
history
diff --git
a/src/raw_socket/device.c
b/src/raw_socket/device.c
index 188cb2ec82a699e7ed3a1e1e51d79218fbee80a3..705e5a612169a76d7dcc2dddd0ddd87854328168 100644
(file)
--- a/
src/raw_socket/device.c
+++ b/
src/raw_socket/device.c
@@
-20,31
+20,19
@@
$Id$
*/
$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;
@@
-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;
}