Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

464xlat: fix white space errors

Browse source 
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2017-06-02 15:35:58 +02:00
parent 3d18d0cfc2
commit c39de0ab35
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nat46/src/464xlatcfg.c
View file

@ -32,12 +32,12 @@ int main(int argc, const char *argv[])
{ {
char buf[INET6_ADDRSTRLEN], prefix[INET6_ADDRSTRLEN + 4]; char buf[INET6_ADDRSTRLEN], prefix[INET6_ADDRSTRLEN + 4];
int pid; int pid;
if (argc <= 1) { if (argc <= 1) {
fprintf(stderr, "Usage: %s <name> [ifname] [ipv6prefix] [ipv4addr] [ipv6addr]\n", argv[0]); fprintf(stderr, "Usage: %s <name> [ifname] [ipv6prefix] [ipv4addr] [ipv6addr]\n", argv[0]);
return 1; return 1;
} }
snprintf(buf, sizeof(buf), "/var/run/%s.pid", argv[1]); snprintf(buf, sizeof(buf), "/var/run/%s.pid", argv[1]);
FILE *fp = fopen(buf, "r"); FILE *fp = fopen(buf, "r");
if (fp) { if (fp) {
@ -47,10 +47,10 @@ int main(int argc, const char *argv[])
unlink(buf); unlink(buf);
fclose(fp); fclose(fp);
} }
if (!argv[2]) if (!argv[2])
return 0; return 0;
if (!argv[3] || !argv[4] || !(fp = fopen(buf, "wx"))) if (!argv[3] || !argv[4] || !(fp = fopen(buf, "wx")))
return 1; return 1;
@ -74,7 +74,7 @@ int main(int argc, const char *argv[])
strcat(prefix, "/96"); strcat(prefix, "/96");
freeaddrinfo(res); freeaddrinfo(res);
} }
int i = 0; int i = 0;
int sock; int sock;
struct sockaddr_in6 saddr; struct sockaddr_in6 saddr;
@ -102,7 +102,7 @@ int main(int argc, const char *argv[])
sleep(3); sleep(3);
i++; i++;
} while (i < 3); } while (i < 3);
struct ipv6_mreq mreq = {saddr.sin6_addr, if_nametoindex(argv[2])}; struct ipv6_mreq mreq = {saddr.sin6_addr, if_nametoindex(argv[2])};
if (!argv[5]) { if (!argv[5]) {
if (IN6_IS_ADDR_LINKLOCAL(&mreq.ipv6mr_multiaddr)) if (IN6_IS_ADDR_LINKLOCAL(&mreq.ipv6mr_multiaddr))
@ -115,21 +115,21 @@ int main(int argc, const char *argv[])
} else if (inet_pton(AF_INET6, argv[5], &mreq.ipv6mr_multiaddr) != 1) { } else if (inet_pton(AF_INET6, argv[5], &mreq.ipv6mr_multiaddr) != 1) {
return 1; return 1;
} }
if (setsockopt(sock, SOL_IPV6, IPV6_JOIN_ANYCAST, &mreq, sizeof(mreq))) if (setsockopt(sock, SOL_IPV6, IPV6_JOIN_ANYCAST, &mreq, sizeof(mreq)))
return 3; return 3;
inet_ntop(AF_INET6, &mreq.ipv6mr_multiaddr, buf, sizeof(buf)); inet_ntop(AF_INET6, &mreq.ipv6mr_multiaddr, buf, sizeof(buf));
fputs(buf, stdout); fputs(buf, stdout);
fputc('\n', stdout); fputc('\n', stdout);
fflush(stdout); fflush(stdout);
FILE *nat46 = fopen("/proc/net/nat46/control", "w"); FILE *nat46 = fopen("/proc/net/nat46/control", "w");
if (!nat46 || fprintf(nat46, "add %s\nconfig %s local.style NONE local.v4 %s/32 local.v6 %s/128 " if (!nat46 || fprintf(nat46, "add %s\nconfig %s local.style NONE local.v4 %s/32 local.v6 %s/128 "
"remote.style RFC6052 remote.v6 %s\n", argv[1], argv[1], argv[4], buf, prefix) < 0 || "remote.style RFC6052 remote.v6 %s\n", argv[1], argv[1], argv[4], buf, prefix) < 0 ||
fclose(nat46)) fclose(nat46))
return 4; return 4;
if (!(pid = fork())) { if (!(pid = fork())) {
fclose(fp); fclose(fp);
fclose(stdin); fclose(stdin);
@ -149,6 +149,6 @@ int main(int argc, const char *argv[])
rewind(fp); rewind(fp);
fprintf(fp, "%d\n", pid); fprintf(fp, "%d\n", pid);
} }
return 0; return 0;
} }