fix conflict

This commit is contained in:
Daiyuu Nobori committed 2016-11-27 17:57:00 +09:00
commit 86d87d1ac4
2 files changed
+3 -2

No files matched your search

+2 -2
View File
@@ -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);
}