style: format code for consistency and readability

This commit is contained in:
Kevin Yue committed 2025-07-16 10:01:28 +08:00
1 parent 5ba7bf2e18
commit e4fa429dcc
4 files changed
+164 -150

No files matched your search

+6
View File
@@ -0,0 +1,6 @@
BasedOnStyle: LLVM
IndentWidth: 8
TabWidth: 8
UseTab: Always
ColumnLimit: 80
BreakBeforeBraces: Linux
+4
View File
@@ -8,5 +8,9 @@ end_of_line = lf
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[{*.c,*.h}]
indent_style = tab
indent_size = 8
[{Makefile,Makefile.in}] [{Makefile,Makefile.in}]
indent_style = tab indent_style = tab
+112 -103
View File
@@ -1,9 +1,9 @@
#include <openconnect.h>
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#include <unistd.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <openconnect.h> #include <unistd.h>
#include "vpn.h" #include "vpn.h"
@@ -15,146 +15,155 @@ static const char *g_vpnc_interface;
static vpn_connected_callback on_vpn_connected; static vpn_connected_callback on_vpn_connected;
/* Validate the peer certificate */ /* Validate the peer certificate */
static int validate_peer_cert(__attribute__((unused)) void *_vpninfo, const char *reason) static int validate_peer_cert(__attribute__((unused)) void *_vpninfo,
const char *reason)
{ {
INFO("Accepting the server certificate though %s", reason); INFO("Accepting the server certificate though %s", reason);
return 0; return 0;
} }
/* Print progress messages */ /* Print progress messages */
static void print_progress(__attribute__((unused)) void *_vpninfo, int level, const char *format, ...) static void print_progress(__attribute__((unused)) void *_vpninfo, int level,
const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
char *message = format_message(format, args); char *message = format_message(format, args);
va_end(args); va_end(args);
if (message == NULL) { if (message == NULL) {
ERROR("Failed to format log message"); ERROR("Failed to format log message");
} else { } else {
LOG(level, message); LOG(level, message);
free(message); free(message);
} }
} }
static void setup_tun_handler(void *_vpninfo) static void setup_tun_handler(void *_vpninfo)
{ {
int ret = openconnect_setup_tun_device(_vpninfo, g_vpnc_script, g_vpnc_interface); int ret = openconnect_setup_tun_device(_vpninfo, g_vpnc_script,
if (!ret) { g_vpnc_interface);
on_vpn_connected(g_cmd_pipe_fd, g_user_data); if (!ret) {
} on_vpn_connected(g_cmd_pipe_fd, g_user_data);
}
} }
/* Initialize VPN connection */ /* Initialize VPN connection */
int vpn_connect(const vpn_options *options, vpn_connected_callback callback) int vpn_connect(const vpn_options *options, vpn_connected_callback callback)
{ {
INFO("openconnect version: %s", openconnect_get_version()); INFO("openconnect version: %s", openconnect_get_version());
struct openconnect_info *vpninfo; struct openconnect_info *vpninfo;
struct utsname utsbuf; struct utsname utsbuf;
g_user_data = options->user_data; g_user_data = options->user_data;
g_vpnc_script = options->script; g_vpnc_script = options->script;
g_vpnc_interface = options->interface; g_vpnc_interface = options->interface;
on_vpn_connected = callback; on_vpn_connected = callback;
INFO("User agent: %s", options->user_agent); INFO("User agent: %s", options->user_agent);
INFO("VPNC script: %s", options->script); INFO("VPNC script: %s", options->script);
INFO("OS: %s", options->os); INFO("OS: %s", options->os);
INFO("CSD_USER: %d", options->csd_uid); INFO("CSD_USER: %d", options->csd_uid);
INFO("CSD_WRAPPER: %s", options->csd_wrapper); INFO("CSD_WRAPPER: %s", options->csd_wrapper);
INFO("RECONNECT_TIMEOUT: %d", options->reconnect_timeout); INFO("RECONNECT_TIMEOUT: %d", options->reconnect_timeout);
INFO("MTU: %d", options->mtu); INFO("MTU: %d", options->mtu);
INFO("DISABLE_IPV6: %d", options->disable_ipv6); INFO("DISABLE_IPV6: %d", options->disable_ipv6);
INFO("NO_DTLS: %d", options->no_dtls); INFO("NO_DTLS: %d", options->no_dtls);
INFO("DPD_INTERVAL: %d", options->dpd_interval); INFO("DPD_INTERVAL: %d", options->dpd_interval);
vpninfo = openconnect_vpninfo_new(options->user_agent, validate_peer_cert, NULL, NULL, print_progress, NULL); vpninfo =
openconnect_vpninfo_new(options->user_agent, validate_peer_cert,
NULL, NULL, print_progress, NULL);
if (!vpninfo) { if (!vpninfo) {
ERROR("openconnect_vpninfo_new failed"); ERROR("openconnect_vpninfo_new failed");
return 1; return 1;
} }
openconnect_set_loglevel(vpninfo, PRG_TRACE); openconnect_set_loglevel(vpninfo, PRG_TRACE);
openconnect_init_ssl(); openconnect_init_ssl();
openconnect_set_protocol(vpninfo, "gp"); openconnect_set_protocol(vpninfo, "gp");
openconnect_parse_url(vpninfo, options->server); openconnect_parse_url(vpninfo, options->server);
openconnect_set_cookie(vpninfo, options->cookie); openconnect_set_cookie(vpninfo, options->cookie);
if (options->os) { if (options->os) {
openconnect_set_reported_os(vpninfo, options->os); openconnect_set_reported_os(vpninfo, options->os);
} }
if (options->certificate) { if (options->certificate) {
INFO("Setting client certificate: %s", options->certificate); INFO("Setting client certificate: %s", options->certificate);
openconnect_set_client_cert(vpninfo, options->certificate, options->sslkey); openconnect_set_client_cert(vpninfo, options->certificate,
} options->sslkey);
}
if (options->key_password) { if (options->key_password) {
openconnect_set_key_password(vpninfo, options->key_password); openconnect_set_key_password(vpninfo, options->key_password);
} }
if (options->csd_wrapper) { if (options->csd_wrapper) {
openconnect_setup_csd(vpninfo, options->csd_uid, 1, options->csd_wrapper); openconnect_setup_csd(vpninfo, options->csd_uid, 1,
} options->csd_wrapper);
}
if (options->mtu > 0) { if (options->mtu > 0) {
int mtu = options->mtu < 576 ? 576 : options->mtu; int mtu = options->mtu < 576 ? 576 : options->mtu;
openconnect_set_reqmtu(vpninfo, mtu); openconnect_set_reqmtu(vpninfo, mtu);
} }
if (options->disable_ipv6) { if (options->disable_ipv6) {
openconnect_disable_ipv6(vpninfo); openconnect_disable_ipv6(vpninfo);
} }
if (options->dpd_interval > 0) { if (options->dpd_interval > 0) {
openconnect_set_dpd(vpninfo, options->dpd_interval); openconnect_set_dpd(vpninfo, options->dpd_interval);
} }
g_cmd_pipe_fd = openconnect_setup_cmd_pipe(vpninfo); g_cmd_pipe_fd = openconnect_setup_cmd_pipe(vpninfo);
if (g_cmd_pipe_fd < 0) { if (g_cmd_pipe_fd < 0) {
ERROR("openconnect_setup_cmd_pipe failed"); ERROR("openconnect_setup_cmd_pipe failed");
return 1; return 1;
} }
if (!uname(&utsbuf)) { if (!uname(&utsbuf)) {
openconnect_set_localname(vpninfo, utsbuf.nodename); openconnect_set_localname(vpninfo, utsbuf.nodename);
} }
// Essential step // Essential step
if (openconnect_make_cstp_connection(vpninfo) != 0) { if (openconnect_make_cstp_connection(vpninfo) != 0) {
ERROR("openconnect_make_cstp_connection failed"); ERROR("openconnect_make_cstp_connection failed");
return 1; return 1;
} }
if (options->no_dtls || openconnect_setup_dtls(vpninfo, 60) != 0) { if (options->no_dtls || openconnect_setup_dtls(vpninfo, 60) != 0) {
openconnect_disable_dtls(vpninfo); openconnect_disable_dtls(vpninfo);
} }
// Essential step // Essential step
openconnect_set_setup_tun_handler(vpninfo, setup_tun_handler); openconnect_set_setup_tun_handler(vpninfo, setup_tun_handler);
while (1) { while (1) {
int ret = openconnect_mainloop(vpninfo, options->reconnect_timeout, 10); int ret = openconnect_mainloop(vpninfo,
options->reconnect_timeout, 10);
if (ret) { if (ret) {
INFO("openconnect_mainloop returned %d, exiting", ret); INFO("openconnect_mainloop returned %d, exiting", ret);
openconnect_vpninfo_free(vpninfo); openconnect_vpninfo_free(vpninfo);
return ret; return ret;
} }
INFO("openconnect_mainloop returned 0, reconnecting"); INFO("openconnect_mainloop returned 0, reconnecting");
} }
} }
/* Stop the VPN connection */ /* Stop the VPN connection */
void vpn_disconnect() void vpn_disconnect()
{ {
char cmd = OC_CMD_CANCEL; char cmd = OC_CMD_CANCEL;
INFO("Stopping VPN connection: %d", g_cmd_pipe_fd); INFO("Stopping VPN connection: %d", g_cmd_pipe_fd);
if (write(g_cmd_pipe_fd, &cmd, 1) < 0) { if (write(g_cmd_pipe_fd, &cmd, 1) < 0) {
ERROR("Failed to write to command pipe, VPN connection may not be stopped"); ERROR("Failed to write to command pipe, VPN connection may not "
} "be stopped");
}
} }
+42 -47
View File
@@ -1,34 +1,33 @@
#include <openconnect.h>
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#include <openconnect.h>
typedef void (*vpn_connected_callback)(int cmd_pipe_fd, void *user_data); typedef void (*vpn_connected_callback)(int cmd_pipe_fd, void *user_data);
typedef struct vpn_options typedef struct vpn_options {
{ void *user_data;
void *user_data; const char *server;
const char *server; const char *cookie;
const char *cookie; const char *user_agent;
const char *user_agent;
const char *script; const char *script;
const char *interface; const char *interface;
const char *os; const char *os;
const char *certificate; const char *certificate;
const char *sslkey; const char *sslkey;
const char *key_password; const char *key_password;
const char *servercert; const char *servercert;
const uid_t csd_uid; const uid_t csd_uid;
const char *csd_wrapper; const char *csd_wrapper;
const int reconnect_timeout; const int reconnect_timeout;
const int mtu; const int mtu;
const int disable_ipv6; const int disable_ipv6;
const int no_dtls; const int no_dtls;
const int dpd_interval; const int dpd_interval;
} vpn_options; } vpn_options;
int vpn_connect(const vpn_options *options, vpn_connected_callback callback); int vpn_connect(const vpn_options *options, vpn_connected_callback callback);
@@ -38,40 +37,36 @@ extern void vpn_log(int level, const char *msg);
static char *format_message(const char *format, va_list args) static char *format_message(const char *format, va_list args)
{ {
va_list args_copy; va_list args_copy;
va_copy(args_copy, args); va_copy(args_copy, args);
int len = vsnprintf(NULL, 0, format, args_copy); int len = vsnprintf(NULL, 0, format, args_copy);
va_end(args_copy); va_end(args_copy);
char *buffer = (char*)malloc(len + 1); char *buffer = (char *)malloc(len + 1);
if (buffer == NULL) if (buffer == NULL) {
{ return NULL;
return NULL; }
}
vsnprintf(buffer, len + 1, format, args); vsnprintf(buffer, len + 1, format, args);
return buffer; return buffer;
} }
static void _log(int level, ...) static void _log(int level, ...)
{ {
va_list args; va_list args;
va_start(args, level); va_start(args, level);
char *format = va_arg(args, char *); char *format = va_arg(args, char *);
char *message = format_message(format, args); char *message = format_message(format, args);
va_end(args); va_end(args);
if (message == NULL) if (message == NULL) {
{ vpn_log(PRG_ERR, "Failed to format log message");
vpn_log(PRG_ERR, "Failed to format log message"); } else {
} vpn_log(level, message);
else free(message);
{ }
vpn_log(level, message);
free(message);
}
} }
#define LOG(level, ...) _log(level, __VA_ARGS__) #define LOG(level, ...) _log(level, __VA_ARGS__)