Ports command line argument handling for proxy and handler to Rust

Cargo.toml

@@ -50,6 +50,7 @@ zmq = "0.9"
 [dev-dependencies]
 criterion = "0.5"
 env_logger = { version = "0.9", default-features = false }
+tempfile = "3.20.0"
 test-log = "0.2"
 
 [build-dependencies]

src/bin/pushpin-handler.rs

@@ -14,15 +14,24 @@
  * limitations under the License.
  */
 
-use pushpin::core::call_c_main;
+use clap::Parser;
+use pushpin::handler::handlercliargs::ffi::HandlerCliArgs;
+use pushpin::handler::handlercliargs::{destroy_handler_cli_args, CliArgs};
 use pushpin::import_cpp;
-use std::env;
 use std::process::ExitCode;
 
 import_cpp! {
-    fn handler_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+    fn handler_main(args: *const HandlerCliArgs) -> libc::c_int;
 }
 
 fn main() -> ExitCode {
-    unsafe { ExitCode::from(call_c_main(handler_main, env::args_os())) }
+    let cli_args = CliArgs::parse().verify();
+    let cli_args_ffi = cli_args.to_ffi();
+
+    let exit_code = unsafe { handler_main(&cli_args_ffi) };
+
+    // Clean up the allocated memory
+    unsafe { destroy_handler_cli_args(cli_args_ffi) };
+
+    ExitCode::from(exit_code as u8)
 }

src/bin/pushpin-proxy.rs

@@ -14,15 +14,24 @@
  * limitations under the License.
  */
 
-use pushpin::core::call_c_main;
+use clap::Parser;
 use pushpin::import_cpp;
-use std::env;
+use pushpin::proxy::proxycliargs::ffi::ProxyCliArgs;
+use pushpin::proxy::proxycliargs::{destroy_proxy_cli_args, CliArgs};
 use std::process::ExitCode;
 
 import_cpp! {
-    fn proxy_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+    fn proxy_main(args: *const ProxyCliArgs) -> libc::c_int;
 }
 
 fn main() -> ExitCode {
-    unsafe { ExitCode::from(call_c_main(proxy_main, env::args_os())) }
+    let cli_args = CliArgs::parse().verify();
+    let cli_args_ffi = cli_args.to_ffi();
+
+    let exit_code = unsafe { proxy_main(&cli_args_ffi) };
+
+    // Clean up the allocated memory
+    unsafe { destroy_proxy_cli_args(cli_args_ffi) };
+
+    ExitCode::from(exit_code as u8)
 }

src/core/settings.cpp

@@ -189,3 +189,13 @@ void Settings::setPortOffset(int x)
 {
 	portOffset_ = x;
 }
+
+QString Settings::getIpcPrefix() const
+{
+	return ipcPrefix_;
+}
+
+int Settings::getPortOffset() const 
+{
+	return portOffset_;
+}

src/core/settings.h

@@ -31,16 +31,18 @@ class QSettings;
 class Settings
 {
 public:
+
 	Settings(const QString &fileName);
 	~Settings();
-
 	bool contains(const QString &key) const;
 	QVariant valueRaw(const QString &key, const QVariant &defaultValue = QVariant()) const;
 	QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
 	int adjustedPort(const QString &key, int defaultValue = -1) const;
 
 	void setIpcPrefix(const QString &s);
 	void setPortOffset(int x);
+	QString getIpcPrefix() const;
+	int getPortOffset() const;
 
 private:
 	QSettings *main_;

src/handler/handler.pri

@@ -28,7 +28,8 @@ HEADERS += \
 	$$PWD/filterstack.h \
 	$$PWD/handlerengine.h \
 	$$PWD/handlerapp.h \
-	$$PWD/main.h
+	$$PWD/main.h \
+	$$PWD/handlerargsdata.h 
 
 SOURCES += \
 	$$PWD/deferred.cpp \
@@ -56,4 +57,5 @@ SOURCES += \
 	$$PWD/filterstack.cpp \
 	$$PWD/handlerengine.cpp \
 	$$PWD/handlerapp.cpp \
-	$$PWD/handlermain.cpp
+	$$PWD/handlermain.cpp \
+	$$PWD/handlerargsdata.cpp