Browse Source

Merge branch 'dglushenok-master'

Daiyuu Nobori 9 years ago
parent
commit
b818cd53c9
2 changed files with 3 additions and 2 deletions
  1. 1 0
      debian/rules
  2. 2 2
      src/Cedar/Interop_OpenVPN.c

+ 1 - 0
debian/rules

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

+ 2 - 2
src/Cedar/Interop_OpenVPN.c

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