diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2019-04-13 22:41:08 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2020-05-08 21:40:34 +0200 |
| commit | ccf13f91a2883fe1423499787fa03dd561dfed4d (patch) | |
| tree | 413c626702caa83017cc09720eef5e0914e302bc | |
| parent | e0cb9c65b837ad5d725761505049755db0112b1c (diff) | |
android fixes
| -rw-r--r-- | proto/wireguard/wireguard.c | 5 | ||||
| -rw-r--r-- | sysdep/unix/main.c | 3 | ||||
| -rw-r--r-- | sysdep/unix/wg_user.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/proto/wireguard/wireguard.c b/proto/wireguard/wireguard.c index 92b1171b..9129e224 100644 --- a/proto/wireguard/wireguard.c +++ b/proto/wireguard/wireguard.c @@ -149,8 +149,8 @@ wg_if_notify(struct proto *P, unsigned flags, struct iface *i) { DBG("WG: IF_CHANGE_UP %s\n", i->name); - int res = set_device(p); - WG_TRACE(D_EVENTS, "WG: wg_set_device %d", res); + /* int res = set_device(p); */ + /* WG_TRACE(D_EVENTS, "WG: wg_set_device %d", res); */ } } @@ -738,6 +738,7 @@ wg_shutdown(struct proto *P) struct wg_proto *p = (struct wg_proto*)P; wg_device *dev = NULL; + og_msg(L_INFO "wg_shutdown"); WG_TRACE(D_EVENTS, "WG: wg_shutdown"); if (get_device(p, &p->dev, cf->ifname) >= 0) { diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 1d258f4c..df59daf8 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -567,6 +567,7 @@ unlink_pid_file(void) void cmd_shutdown(void) { + log_msg(L_INFO "cmd_shutdown"); if (cli_access_restricted()) return; @@ -577,6 +578,7 @@ cmd_shutdown(void) void async_shutdown(void) { + log_msg(L_INFO "async_shutdown"); DBG("Shutting down...\n"); order_shutdown(0); } @@ -584,6 +586,7 @@ async_shutdown(void) void sysdep_shutdown_done(void) { + log_msg(L_INFO "sysdep_shutdown_done"); unlink_pid_file(); unlink(path_control_socket); log_msg(L_FATAL "Shutdown completed"); diff --git a/sysdep/unix/wg_user.h b/sysdep/unix/wg_user.h index a5e4251a..6ecceecb 100644 --- a/sysdep/unix/wg_user.h +++ b/sysdep/unix/wg_user.h @@ -3,7 +3,7 @@ #include "sysdep/config.h" -#define SOCKET_PATH PATH_RUNSTATEDIR "/wireguard/" +#define SOCKET_PATH PATH_RUNSTATEDIR "/" struct pool; struct wg_device; |