projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace MinGW with Windows to avoid ambiguities
[tinc]
/
src
/
ifconfig.c
diff --git
a/src/ifconfig.c
b/src/ifconfig.c
index
4b47ad1
..
f4ce313
100644
(file)
--- a/
src/ifconfig.c
+++ b/
src/ifconfig.c
@@
-1,6
+1,6
@@
/*
ifconfig.c -- Generate platform specific interface configuration commands
/*
ifconfig.c -- Generate platform specific interface configuration commands
- Copyright (C) 2016-201
7
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2016-201
8
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,7
+25,7
@@
static long start;
static long start;
-#ifndef HAVE_
MINGW
+#ifndef HAVE_
WINDOWS
void ifconfig_header(FILE *out) {
fprintf(out, "#!/bin/sh\n");
start = ftell(out);
void ifconfig_header(FILE *out) {
fprintf(out, "#!/bin/sh\n");
start = ftell(out);
@@
-71,10
+71,12
@@
void ifconfig_dhcp(FILE *out) {
}
void ifconfig_dhcp6(FILE *out) {
}
void ifconfig_dhcp6(FILE *out) {
+ (void)out;
fprintf(stderr, "DHCPv6 requested, but not supported by tinc on this platform\n");
}
void ifconfig_slaac(FILE *out) {
fprintf(stderr, "DHCPv6 requested, but not supported by tinc on this platform\n");
}
void ifconfig_slaac(FILE *out) {
+ (void)out;
// It's the default?
}
// It's the default?
}
@@
-126,7
+128,7
@@
void ifconfig_address(FILE *out, const char *value) {
return;
}
return;
}
-#elif defined(HAVE_
MINGW) || defined(HAVE_CYGWIN
)
+#elif defined(HAVE_
WINDOWS
)
switch(address.type) {
case SUBNET_MAC:
switch(address.type) {
case SUBNET_MAC:
@@
-134,11
+136,11
@@
void ifconfig_address(FILE *out, const char *value) {
break;
case SUBNET_IPV4:
break;
case SUBNET_IPV4:
- fprintf(out, "netsh in
etface ipv4 set address \"$INTERFACE
\" static %s\n", address_str);
+ fprintf(out, "netsh in
terface ipv4 set address \"%%INTERFACE%%
\" static %s\n", address_str);
break;
case SUBNET_IPV6:
break;
case SUBNET_IPV6:
- fprintf(out, "netsh in
etface ipv6 set address \"$INTERFACE\" static
%s\n", address_str);
+ fprintf(out, "netsh in
terface ipv6 set address \"%%INTERFACE%%\"
%s\n", address_str);
break;
default:
break;
default:
@@
-199,11
+201,11
@@
void ifconfig_route(FILE *out, const char *value) {
if(*gateway_str) {
switch(subnet.type) {
case SUBNET_IPV4:
if(*gateway_str) {
switch(subnet.type) {
case SUBNET_IPV4:
- fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"\n", subnet_str, gateway_str);
+ fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"
onlink
\n", subnet_str, gateway_str);
break;
case SUBNET_IPV6:
break;
case SUBNET_IPV6:
- fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"\n", subnet_str, gateway_str);
+ fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"
onlink
\n", subnet_str, gateway_str);
break;
default:
break;
default:
@@
-224,16
+226,16
@@
void ifconfig_route(FILE *out, const char *value) {
}
}
}
}
-#elif defined(HAVE_
MINGW) || defined(HAVE_CYGWIN
)
+#elif defined(HAVE_
WINDOWS
)
if(*gateway_str) {
switch(subnet.type) {
case SUBNET_IPV4:
if(*gateway_str) {
switch(subnet.type) {
case SUBNET_IPV4:
- fprintf(out, "netsh in
et
face ipv4 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str);
+ fprintf(out, "netsh in
ter
face ipv4 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str);
break;
case SUBNET_IPV6:
break;
case SUBNET_IPV6:
- fprintf(out, "netsh in
et
face ipv6 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str);
+ fprintf(out, "netsh in
ter
face ipv6 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str);
break;
default:
break;
default:
@@
-242,11
+244,11
@@
void ifconfig_route(FILE *out, const char *value) {
} else {
switch(subnet.type) {
case SUBNET_IPV4:
} else {
switch(subnet.type) {
case SUBNET_IPV4:
- fprintf(out, "netsh in
et
face ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str);
+ fprintf(out, "netsh in
ter
face ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str);
break;
case SUBNET_IPV6:
break;
case SUBNET_IPV6:
- fprintf(out, "netsh in
et
face ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str);
+ fprintf(out, "netsh in
ter
face ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str);
break;
default:
break;
default: