void/amneziawg-tools
2
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-tools.git synced 2025-08-02 09:32:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: minor

Browse source
This commit is contained in:
Mark Puha 2025-06-14 17:29:27 +02:00
parent 04afe0f0f3
commit c8723e4ecd
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/ipc-windows.h
View file

@ -528,66 +528,66 @@ static int kernel_set_device(struct wgdevice *dev)
wg_iface->Flags |= WG_IOCTL_INTERFACE_H4; wg_iface->Flags |= WG_IOCTL_INTERFACE_H4;
} }
if (dev->flags & WG_DEVICE_HAS_I1) if (dev->flags & WGDEVICE_HAS_I1)
{ {
const size_t i1_size = strlen(dev->i1) + 1; const size_t i1_size = strlen(dev->i1) + 1;
wg_iface->I1 = (UCHAR*)malloc(i1_size); wg_iface->I1 = (UCHAR*)malloc(i1_size);
memcpy(wg_iface->I1, dev->i1, i1_size); memcpy(wg_iface->I1, dev->i1, i1_size);
dev->flags |= WG_IOCTL_INTERFACE_I1; wg_iface->Flags |= WG_IOCTL_INTERFACE_I1;
} }
if (dev->flags & WG_DEVICE_HAS_I2) if (dev->flags & WGDEVICE_HAS_I2)
{ {
const size_t i2_size = strlen(dev->i2) + 1; const size_t i2_size = strlen(dev->i2) + 1;
wg_iface->I2 = (UCHAR*)malloc(i2_size); wg_iface->I2 = (UCHAR*)malloc(i2_size);
memcpy(wg_iface->I2, dev->i2, i2_size); memcpy(wg_iface->I2, dev->i2, i2_size);
dev->flags |= WG_IOCTL_INTERFACE_I2; wg_iface->Flags |= WG_IOCTL_INTERFACE_I2;
} }
if (dev->flags & WG_DEVICE_HAS_I3) if (dev->flags & WGDEVICE_HAS_I3)
{ {
const size_t i3_size = strlen(dev->i3) + 1; const size_t i3_size = strlen(dev->i3) + 1;
wg_iface->I3 = (UCHAR*)malloc(i3_size); wg_iface->I3 = (UCHAR*)malloc(i3_size);
memcpy(wg_iface->I3, dev->i3, i3_size); memcpy(wg_iface->I3, dev->i3, i3_size);
dev->flags |= WG_IOCTL_INTERFACE_I3; wg_iface->Flags |= WG_IOCTL_INTERFACE_I3;
} }
if (dev->flags & WG_DEVICE_HAS_I4) if (dev->flags & WGDEVICE_HAS_I4)
{ {
const size_t i4_size = strlen(dev->i4) + 1; const size_t i4_size = strlen(dev->i4) + 1;
wg_iface->I4 = (UCHAR*)malloc(i4_size); wg_iface->I4 = (UCHAR*)malloc(i4_size);
memcpy(wg_iface->I4, dev->i4, i4_size); memcpy(wg_iface->I4, dev->i4, i4_size);
dev->flags |= WG_IOCTL_INTERFACE_I4; wg_iface->Flags |= WG_IOCTL_INTERFACE_I4;
} }
if (dev->flags & WG_DEVICE_HAS_I5) if (dev->flags & WGDEVICE_HAS_I5)
{ {
const size_t i5_size = strlen(dev->i5) + 1; const size_t i5_size = strlen(dev->i5) + 1;
wg_iface->I5 = (UCHAR*)malloc(i5_size); wg_iface->I5 = (UCHAR*)malloc(i5_size);
memcpy(wg_iface->I5, dev->i5, i5_size); memcpy(wg_iface->I5, dev->i5, i5_size);
dev->flags |= WG_IOCTL_INTERFACE_I5; wg_iface->Flags |= WG_IOCTL_INTERFACE_I5;
} }
if (dev->flags & WG_DEVICE_HAS_J1) if (dev->flags & WGDEVICE_HAS_J1)
{ {
const size_t j1_size = strlen(dev->j1) + 1; const size_t j1_size = strlen(dev->j1) + 1;
wg_iface->J1 = (UCHAR*)malloc(j1_size); wg_iface->J1 = (UCHAR*)malloc(j1_size);
memcpy(wg_iface->J1, dev->j1, j1_size); memcpy(wg_iface->J1, dev->j1, j1_size);
dev->flags |= WG_IOCTL_INTERFACE_J1; wg_iface->Flags |= WG_IOCTL_INTERFACE_J1;
} }
if (dev->flags & WG_DEVICE_HAS_J2) if (dev->flags & WGDEVICE_HAS_J2)
{ {
const size_t j2_size = strlen(dev->j2) + 1; const size_t j2_size = strlen(dev->j2) + 1;
wg_iface->J2 = (UCHAR*)malloc(j2_size); wg_iface->J2 = (UCHAR*)malloc(j2_size);
memcpy(wg_iface->J2, dev->j2, j2_size); memcpy(wg_iface->J2, dev->j2, j2_size);
dev->flags |= WG_IOCTL_INTERFACE_J2; wg_iface->Flags |= WG_IOCTL_INTERFACE_J2;
} }
if (dev->flags & WG_DEVICE_HAS_J3) if (dev->flags & WGDEVICE_HAS_J3)
{ {
const size_t j3_size = strlen(dev->j3) + 1; const size_t j3_size = strlen(dev->j3) + 1;
wg_iface->J3 = (UCHAR*)malloc(j3_size); wg_iface->J3 = (UCHAR*)malloc(j3_size);
memcpy(wg_iface->J3, dev->j3, j3_size); memcpy(wg_iface->J3, dev->j3, j3_size);
dev->flags |= WG_IOCTL_INTERFACE_J3; wg_iface->Flags |= WG_IOCTL_INTERFACE_J3;
} }
if (dev->flags & WG_DEVICE_HAS_ITIME) if (dev->flags & WGDEVICE_HAS_ITIME)
{ {
wg_iface->Itime = dev->Itime; wg_iface->Itime = dev->itime;
wg_iface->flags |= WG_IOCTL_INTERFACE_HAS_ITIME; wg_iface->Flags |= WG_IOCTL_INTERFACE_ITIME;
} }
peer_count = 0; peer_count = 0;

3
src/wg-quick/android.c
View file

@ -42,6 +42,7 @@ static bool is_exiting = false;
static bool binder_available = false; static bool binder_available = false;
static unsigned int sdk_version; static unsigned int sdk_version;
static bool is_asecurity_on = false; static bool is_asecurity_on = false;
static bool is_special_handshake_on = false;
static void *xmalloc(size_t size) static void *xmalloc(size_t size)
{ {
@ -633,7 +634,7 @@ static void auto_su(int argc, char *argv[])
static void add_if(const char *iface) static void add_if(const char *iface)
{ {
if (is_asecurity_on) if (is_asecurity_on || is_special_handshake_on)
cmd("amneziawg-go %s", iface); cmd("amneziawg-go %s", iface);
else else
cmd("ip link add %s type amneziawg", iface); cmd("ip link add %s type amneziawg", iface);