Skip to content

omi: add support for ovpn-dco-win #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

omi: add support for ovpn-dco-win #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f098c0
ovpnagent: fix quoting of omiclient parameters
facboy May 23, 2022
79593cd
omi: add support for ovpn-dco-win
facboy Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openvpn/omi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
option(CLI_OVPNDCOWIN "Build ovpncli with ovpn-dco-win driver support" OFF)

add_executable(omicliagent openvpn.cpp)
add_core_dependencies(omicliagent)
add_json_library(omicliagent)
target_compile_definitions(omicliagent PRIVATE -DOPENVPN_COMMAND_AGENT -DOVPNAGENT_DISABLE_PATH_CHECK)

add_executable(omicli openvpn.cpp)
add_core_dependencies(omicli)

if (WIN32 AND ${CLI_OVPNDCOWIN})
target_compile_definitions(omicliagent PRIVATE ENABLE_OVPNDCOWIN)
target_compile_definitions(omicli PRIVATE ENABLE_OVPNDCOWIN)
target_link_libraries(omicliagent "bcrypt.lib")
target_link_libraries(omicli "bcrypt.lib")
endif ()
6 changes: 4 additions & 2 deletions openvpn/ovpnagent/win/ovpnagent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,16 @@ class MyListener : public WS::Server::Listener

// create command line for openvpn process
std::ostringstream ss;
ss << "client --config " << config_dir << "\\" << config_file << " --exit-event-name "
ss << "client --config \"" << config_dir << "\\" << config_file << "\" --exit-event-name "
<< exit_event_name << " --auth-retry interact --management " << management_host << " "
<< management_port << " stdin --management-query-passwords --management-hold " << "--log"
<< (log_append ? "-append " : " ") << log;
<< (log_append ? "-append \"" : " \"") << log << "\"";
std::string cmd = ss.str();
std::unique_ptr<char[]> buf(new char[cmd.length() + 1]);
strcpy(buf.get(), cmd.c_str());

// OPENVPN_LOG("Launching omiclient: " << config.omiclient_exe.c_str() << " " << buf.get());

STARTUPINFO startup_info = { 0 };
startup_info.cb = sizeof(startup_info);
startup_info.dwFlags = STARTF_USESTDHANDLES;
Expand Down