AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

fix conflict

Browse Source
This commit is contained in:
Daiyuu Nobori 2016-11-27 17:57:00 +09:00
commit 86d87d1ac4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/rules vendored
View File

@ -22,4 +22,5 @@ configure_config:
if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv7l' ]; then echo "1\n1\n" | ./configure; fi if [ $(shell uname -m) = 'armv7l' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv5tel' ]; then echo "1\n1\n" | ./configure; fi

4
src/Cedar/Interop_OpenVPN.c
View File

@ -2114,8 +2114,8 @@ void OvsRecvPacket(OPENVPN_SERVER *s, LIST *recv_packet_list, UINT protocol)
if (r->Exists) if (r->Exists)
{ {
Format(l3_options, sizeof(l3_options), Format(l3_options, sizeof(l3_options),
",route %r %r vpn_gateway", ",route %r %r %r",
&r->Network, &r->SubnetMask); &r->Network, &r->SubnetMask, &r->Gateway);
StrCat(option_str, sizeof(option_str), l3_options); StrCat(option_str, sizeof(option_str), l3_options);
} }