diff options
author | Philipp Tölke <toelke@in.tum.de> | 2010-09-07 13:37:26 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2010-09-07 13:37:26 +0000 |
commit | 020498bd6a5314554abebfe56e74499fce1adaed (patch) | |
tree | 2006d1575a8d5bae428b1993c374c2e2c6da848a /src/vpn/gnunet-helper-vpn.c | |
parent | e3a246d526ab3df078e6f061827abfbf3f3b9ecb (diff) | |
download | gnunet-020498bd6a5314554abebfe56e74499fce1adaed.tar.gz gnunet-020498bd6a5314554abebfe56e74499fce1adaed.zip |
Worked through the easy klockwork-issues
Diffstat (limited to 'src/vpn/gnunet-helper-vpn.c')
-rw-r--r-- | src/vpn/gnunet-helper-vpn.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index 00ac1b0ec..3f9bcb3d4 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c | |||
@@ -82,6 +82,7 @@ static void set_address6(char* dev, char* address, unsigned long prefix_len) { / | |||
82 | /* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr); | 82 | /* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr); |
83 | ifr.ifr_flags |= IFF_UP | IFF_RUNNING; | 83 | ifr.ifr_flags |= IFF_UP | IFF_RUNNING; |
84 | /* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr); | 84 | /* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr); |
85 | close(fd); | ||
85 | } /* }}} */ | 86 | } /* }}} */ |
86 | 87 | ||
87 | static void set_address4(char* dev, char* address, char* mask) { /* {{{ */ | 88 | static void set_address4(char* dev, char* address, char* mask) { /* {{{ */ |
@@ -123,6 +124,7 @@ static void set_address4(char* dev, char* address, char* mask) { /* {{{ */ | |||
123 | /* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr); | 124 | /* FIXME */ ioctl(fd, SIOCGIFFLAGS, &ifr); |
124 | ifr.ifr_flags |= IFF_UP | IFF_RUNNING; | 125 | ifr.ifr_flags |= IFF_UP | IFF_RUNNING; |
125 | /* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr); | 126 | /* FIXME */ ioctl(fd, SIOCSIFFLAGS, &ifr); |
127 | close(fd); | ||
126 | } /* }}} */ | 128 | } /* }}} */ |
127 | 129 | ||
128 | void setnonblocking(int fd) {/*{{{*/ | 130 | void setnonblocking(int fd) {/*{{{*/ |
@@ -150,7 +152,7 @@ int main(int argc, char** argv) { | |||
150 | int fd_tun = init_tun(dev); | 152 | int fd_tun = init_tun(dev); |
151 | 153 | ||
152 | if (fd_tun < 0) { | 154 | if (fd_tun < 0) { |
153 | fprintf(stderr, "Could not initialize tun-interface: %m\n"); | 155 | fprintf(stderr, "Could not initialize tun-interface: %s\n", strerror(errno)); |
154 | exit(1); | 156 | exit(1); |
155 | } | 157 | } |
156 | 158 | ||
@@ -270,7 +272,7 @@ outer: | |||
270 | while(r < ntohs(hdr.size)) { | 272 | while(r < ntohs(hdr.size)) { |
271 | int t = write(1, buf, ntohs(hdr.size) - r); | 273 | int t = write(1, buf, ntohs(hdr.size) - r); |
272 | if (t < 0) { | 274 | if (t < 0) { |
273 | fprintf(stderr, "write-error 1: %m, written %d/%d\n", r, ntohs(hdr.size)); | 275 | fprintf(stderr, "write-error 1: %s, written %d/%d\n", strerror(errno), r, ntohs(hdr.size)); |
274 | shutdown(fd_tun, SHUT_RD); | 276 | shutdown(fd_tun, SHUT_RD); |
275 | shutdown(1, SHUT_WR); | 277 | shutdown(1, SHUT_WR); |
276 | rea = 0; | 278 | rea = 0; |
@@ -283,5 +285,7 @@ outer: | |||
283 | } | 285 | } |
284 | fprintf(stderr, "Quitting!\n"); | 286 | fprintf(stderr, "Quitting!\n"); |
285 | 287 | ||
288 | close(fd_tun); | ||
289 | |||
286 | return 0; | 290 | return 0; |
287 | } | 291 | } |