diff options
author | Daiyuu Nobori <daiyuu.git@softether.co.jp> | 2016-11-27 11:57:00 +0300 |
---|---|---|
committer | Daiyuu Nobori <daiyuu.git@softether.co.jp> | 2016-11-27 11:57:00 +0300 |
commit | 86d87d1ac485d57a710f7aaf4fe3cfb0e08bc384 (patch) | |
tree | 2b38f20dfd8be673a56c4a48671e887a3f80644e /src | |
parent | 5f8ce287c3f61d089b5122efd7be5b8fc997bbed (diff) | |
parent | 8ffb2233770e8c9c1a934e2f40cfa30e31f6b1e7 (diff) |
fix conflict
Diffstat (limited to 'src')
-rw-r--r-- | src/Cedar/Interop_OpenVPN.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c index 801f48b9..6b7260a5 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/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);
}
|