aboutsummaryrefslogtreecommitdiff
path: root/src/vpn/gnunet-helper-vpn.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/vpn/gnunet-helper-vpn.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/vpn/gnunet-helper-vpn.c')
-rw-r--r--src/vpn/gnunet-helper-vpn.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 698c46f1d..ed97770cf 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -81,8 +81,8 @@ init_tun (char *dev)
81 81
82 if (-1 == (fd = open ("/dev/net/tun", O_RDWR))) 82 if (-1 == (fd = open ("/dev/net/tun", O_RDWR)))
83 { 83 {
84 fprintf (stderr, 84 fprintf (stderr, "Error opening `%s': %s\n", "/dev/net/tun",
85 "Error opening `%s': %s\n", "/dev/net/tun", strerror (errno)); 85 strerror (errno));
86 return -1; 86 return -1;
87 } 87 }
88 88
@@ -100,9 +100,8 @@ init_tun (char *dev)
100 100
101 if (-1 == ioctl (fd, TUNSETIFF, (void *) &ifr)) 101 if (-1 == ioctl (fd, TUNSETIFF, (void *) &ifr))
102 { 102 {
103 fprintf (stderr, 103 fprintf (stderr, "Error with ioctl on `%s': %s\n", "/dev/net/tun",
104 "Error with ioctl on `%s': %s\n", 104 strerror (errno));
105 "/dev/net/tun", strerror (errno));
106 close (fd); 105 close (fd);
107 return -1; 106 return -1;
108 } 107 }
@@ -132,8 +131,8 @@ set_address6 (const char *dev, const char *address, unsigned long prefix_len)
132 memset (&sa6, 0, sizeof (struct sockaddr_in6)); 131 memset (&sa6, 0, sizeof (struct sockaddr_in6));
133 if (1 != inet_pton (AF_INET6, address, sa6.sin6_addr.s6_addr)) 132 if (1 != inet_pton (AF_INET6, address, sa6.sin6_addr.s6_addr))
134 { 133 {
135 fprintf (stderr, 134 fprintf (stderr, "Failed to parse address `%s': %s\n", address,
136 "Failed to parse address `%s': %s\n", address, strerror (errno)); 135 strerror (errno));
137 exit (1); 136 exit (1);
138 } 137 }
139 138
@@ -165,8 +164,8 @@ set_address6 (const char *dev, const char *address, unsigned long prefix_len)
165 */ 164 */
166 if (-1 == ioctl (fd, SIOCSIFADDR, &ifr6)) 165 if (-1 == ioctl (fd, SIOCSIFADDR, &ifr6))
167 { 166 {
168 fprintf (stderr, 167 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
169 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 168 strerror (errno));
170 exit (1); 169 exit (1);
171 } 170 }
172 171
@@ -175,8 +174,8 @@ set_address6 (const char *dev, const char *address, unsigned long prefix_len)
175 */ 174 */
176 if (-1 == ioctl (fd, SIOCGIFFLAGS, &ifr)) 175 if (-1 == ioctl (fd, SIOCGIFFLAGS, &ifr))
177 { 176 {
178 fprintf (stderr, 177 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
179 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 178 strerror (errno));
180 exit (1); 179 exit (1);
181 } 180 }
182 181
@@ -186,8 +185,8 @@ set_address6 (const char *dev, const char *address, unsigned long prefix_len)
186 ifr.ifr_flags |= IFF_UP | IFF_RUNNING; 185 ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
187 if (-1 == ioctl (fd, SIOCSIFFLAGS, &ifr)) 186 if (-1 == ioctl (fd, SIOCSIFFLAGS, &ifr))
188 { 187 {
189 fprintf (stderr, 188 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
190 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 189 strerror (errno));
191 exit (1); 190 exit (1);
192 } 191 }
193 192
@@ -224,8 +223,8 @@ set_address4 (const char *dev, const char *address, const char *mask)
224 */ 223 */
225 if (1 != inet_pton (AF_INET, address, &addr->sin_addr.s_addr)) 224 if (1 != inet_pton (AF_INET, address, &addr->sin_addr.s_addr))
226 { 225 {
227 fprintf (stderr, 226 fprintf (stderr, "Failed to parse address `%s': %s\n", address,
228 "Failed to parse address `%s': %s\n", address, strerror (errno)); 227 strerror (errno));
229 exit (1); 228 exit (1);
230 } 229 }
231 230
@@ -253,8 +252,8 @@ set_address4 (const char *dev, const char *address, const char *mask)
253 addr = (struct sockaddr_in *) &(ifr.ifr_netmask); 252 addr = (struct sockaddr_in *) &(ifr.ifr_netmask);
254 if (1 != inet_pton (AF_INET, mask, &addr->sin_addr.s_addr)) 253 if (1 != inet_pton (AF_INET, mask, &addr->sin_addr.s_addr))
255 { 254 {
256 fprintf (stderr, 255 fprintf (stderr, "Failed to parse address `%s': %s\n", mask,
257 "Failed to parse address `%s': %s\n", mask, strerror (errno)); 256 strerror (errno));
258 exit (1); 257 exit (1);
259 } 258 }
260 259
@@ -263,8 +262,8 @@ set_address4 (const char *dev, const char *address, const char *mask)
263 */ 262 */
264 if (-1 == ioctl (fd, SIOCSIFNETMASK, &ifr)) 263 if (-1 == ioctl (fd, SIOCSIFNETMASK, &ifr))
265 { 264 {
266 fprintf (stderr, 265 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
267 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 266 strerror (errno));
268 exit (1); 267 exit (1);
269 } 268 }
270 269
@@ -273,8 +272,8 @@ set_address4 (const char *dev, const char *address, const char *mask)
273 */ 272 */
274 if (-1 == ioctl (fd, SIOCGIFFLAGS, &ifr)) 273 if (-1 == ioctl (fd, SIOCGIFFLAGS, &ifr))
275 { 274 {
276 fprintf (stderr, 275 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
277 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 276 strerror (errno));
278 exit (1); 277 exit (1);
279 } 278 }
280 279
@@ -284,8 +283,8 @@ set_address4 (const char *dev, const char *address, const char *mask)
284 ifr.ifr_flags |= IFF_UP | IFF_RUNNING; 283 ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
285 if (-1 == ioctl (fd, SIOCSIFFLAGS, &ifr)) 284 if (-1 == ioctl (fd, SIOCSIFFLAGS, &ifr))
286 { 285 {
287 fprintf (stderr, 286 fprintf (stderr, "ioctl failed at line %d: %s\n", __LINE__,
288 "ioctl failed at line %d: %s\n", __LINE__, strerror (errno)); 287 strerror (errno));
289 exit (1); 288 exit (1);
290 } 289 }
291 290
@@ -545,8 +544,8 @@ main (int argc, char **argv)
545 if (0 != setresuid (uid, uid, uid)) 544 if (0 != setresuid (uid, uid, uid))
546 fprintf (stderr, "Failed to setresuid: %s\n", strerror (errno)); 545 fprintf (stderr, "Failed to setresuid: %s\n", strerror (errno));
547 if (SIG_ERR == signal (SIGPIPE, SIG_IGN)) 546 if (SIG_ERR == signal (SIGPIPE, SIG_IGN))
548 fprintf (stderr, 547 fprintf (stderr, "Failed to protect against SIGPIPE: %s\n",
549 "Failed to protect against SIGPIPE: %s\n", strerror (errno)); 548 strerror (errno));
550 run (fd_tun); 549 run (fd_tun);
551 close (fd_tun); 550 close (fd_tun);
552 return 0; 551 return 0;