[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12893 - gnunet/src/vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12893 - gnunet/src/vpn |
Date: |
Tue, 7 Sep 2010 15:37:26 +0200 |
Author: toelke
Date: 2010-09-07 15:37:26 +0200 (Tue, 07 Sep 2010)
New Revision: 12893
Modified:
gnunet/src/vpn/gnunet-helper-hijack-dns.c
gnunet/src/vpn/gnunet-helper-vpn.c
gnunet/src/vpn/gnunet-vpn-tun.c
Log:
Worked through the easy klockwork-issues
Modified: gnunet/src/vpn/gnunet-helper-hijack-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-hijack-dns.c 2010-09-07 13:30:39 UTC (rev
12892)
+++ gnunet/src/vpn/gnunet-helper-hijack-dns.c 2010-09-07 13:37:26 UTC (rev
12893)
@@ -30,7 +30,7 @@
int fork_and_exec(char* file, char* cmd[]) {
pid_t pid = fork();
if (pid < 0) {
- fprintf(stderr, "could not fork: %m\n");
+ fprintf(stderr, "could not fork: %s\n", strerror(errno));
return GNUNET_SYSERR;
}
@@ -61,7 +61,7 @@
struct stat s;
if (stat("/sbin/iptables", &s) < 0) {
- fprintf(stderr, "stat on /sbin/iptables failed: %m\n");
+ fprintf(stderr, "stat on /sbin/iptables failed: %s\n",
strerror(errno));
return GNUNET_SYSERR;
}
Modified: gnunet/src/vpn/gnunet-helper-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-vpn.c 2010-09-07 13:30:39 UTC (rev 12892)
+++ gnunet/src/vpn/gnunet-helper-vpn.c 2010-09-07 13:37:26 UTC (rev 12893)
@@ -82,6 +82,7 @@
/* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr);
ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
/* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr);
+ close(fd);
} /* }}} */
static void set_address4(char* dev, char* address, char* mask) { /* {{{ */
@@ -123,6 +124,7 @@
/* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr);
ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
/* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr);
+ close(fd);
} /* }}} */
void setnonblocking(int fd) {/*{{{*/
@@ -150,7 +152,7 @@
int fd_tun = init_tun(dev);
if (fd_tun < 0) {
- fprintf(stderr, "Could not initialize tun-interface: %m\n");
+ fprintf(stderr, "Could not initialize tun-interface: %s\n",
strerror(errno));
exit(1);
}
@@ -270,7 +272,7 @@
while(r < ntohs(hdr.size)) {
int t = write(1, buf, ntohs(hdr.size) -
r);
if (t < 0) {
- fprintf(stderr, "write-error 1:
%m, written %d/%d\n", r, ntohs(hdr.size));
+ fprintf(stderr, "write-error 1:
%s, written %d/%d\n", strerror(errno), r, ntohs(hdr.size));
shutdown(fd_tun, SHUT_RD);
shutdown(1, SHUT_WR);
rea = 0;
@@ -283,5 +285,7 @@
}
fprintf(stderr, "Quitting!\n");
+ close(fd_tun);
+
return 0;
}
Modified: gnunet/src/vpn/gnunet-vpn-tun.c
===================================================================
--- gnunet/src/vpn/gnunet-vpn-tun.c 2010-09-07 13:30:39 UTC (rev 12892)
+++ gnunet/src/vpn/gnunet-vpn-tun.c 2010-09-07 13:37:26 UTC (rev 12893)
@@ -29,7 +29,7 @@
int fd, err;
if( (fd = open("/dev/net/tun", O_RDWR)) < 0 ) {
- fprintf(stderr, "opening /dev/net/tun: %m\n");
+ fprintf(stderr, "opening /dev/net/tun: %s\n", strerror(errno));
return -1;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12893 - gnunet/src/vpn,
gnunet <=