void/amneziawg-tools
2
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-tools.git synced 2025-06-07 21:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix indents

Browse source
This commit is contained in:
Iurii Egorov 2023-11-20 22:53:21 +03:00
parent 0ef35eed6f
commit 9634c932f5
3 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
contrib/embeddable-wg-library/wireguard.c
View file

@ -48,15 +48,15 @@ enum wgdevice_attribute {
WGDEVICE_A_LISTEN_PORT, WGDEVICE_A_LISTEN_PORT,
WGDEVICE_A_FWMARK, WGDEVICE_A_FWMARK,
WGDEVICE_A_PEERS, WGDEVICE_A_PEERS,
WGDEVICE_A_JC, WGDEVICE_A_JC,
WGDEVICE_A_JMIN, WGDEVICE_A_JMIN,
WGDEVICE_A_JMAX, WGDEVICE_A_JMAX,
WGDEVICE_A_S1, WGDEVICE_A_S1,
WGDEVICE_A_S2, WGDEVICE_A_S2,
WGDEVICE_A_H1, WGDEVICE_A_H1,
WGDEVICE_A_H2, WGDEVICE_A_H2,
WGDEVICE_A_H3, WGDEVICE_A_H3,
WGDEVICE_A_H4, WGDEVICE_A_H4,
__WGDEVICE_A_LAST __WGDEVICE_A_LAST
}; };
@ -113,18 +113,18 @@ enum mnl_attr_data_type {
#define mnl_attr_for_each(attr, nlh, offset) \ #define mnl_attr_for_each(attr, nlh, offset) \
for ((attr) = mnl_nlmsg_get_payload_offset((nlh), (offset)); \ for ((attr) = mnl_nlmsg_get_payload_offset((nlh), (offset)); \
mnl_attr_ok((attr), (char *)mnl_nlmsg_get_payload_tail(nlh) - (char *)(attr)); \ mnl_attr_ok((attr), (char *)mnl_nlmsg_get_payload_tail(nlh) - (char *)(attr)); \
(attr) = mnl_attr_next(attr)) (attr) = mnl_attr_next(attr))
#define mnl_attr_for_each_nested(attr, nest) \ #define mnl_attr_for_each_nested(attr, nest) \
for ((attr) = mnl_attr_get_payload(nest); \ for ((attr) = mnl_attr_get_payload(nest); \
mnl_attr_ok((attr), (char *)mnl_attr_get_payload(nest) + mnl_attr_get_payload_len(nest) - (char *)(attr)); \ mnl_attr_ok((attr), (char *)mnl_attr_get_payload(nest) + mnl_attr_get_payload_len(nest) - (char *)(attr)); \
(attr) = mnl_attr_next(attr)) (attr) = mnl_attr_next(attr))
#define mnl_attr_for_each_payload(payload, payload_size) \ #define mnl_attr_for_each_payload(payload, payload_size) \
for ((attr) = (payload); \ for ((attr) = (payload); \
mnl_attr_ok((attr), (char *)(payload) + payload_size - (char *)(attr)); \ mnl_attr_ok((attr), (char *)(payload) + payload_size - (char *)(attr)); \
(attr) = mnl_attr_next(attr)) (attr) = mnl_attr_next(attr))
#define MNL_CB_ERROR -1 #define MNL_CB_ERROR -1
#define MNL_CB_STOP 0 #define MNL_CB_STOP 0
@ -186,8 +186,8 @@ static void *mnl_nlmsg_get_payload_offset(const struct nlmsghdr *nlh, size_t off
static bool mnl_nlmsg_ok(const struct nlmsghdr *nlh, int len) static bool mnl_nlmsg_ok(const struct nlmsghdr *nlh, int len)
{ {
return len >= (int)sizeof(struct nlmsghdr) && return len >= (int)sizeof(struct nlmsghdr) &&
nlh->nlmsg_len >= sizeof(struct nlmsghdr) && nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
(int)nlh->nlmsg_len <= len; (int)nlh->nlmsg_len <= len;
} }
static struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len) static struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len)
@ -229,8 +229,8 @@ static void *mnl_attr_get_payload(const struct nlattr *attr)
static bool mnl_attr_ok(const struct nlattr *attr, int len) static bool mnl_attr_ok(const struct nlattr *attr, int len)
{ {
return len >= (int)sizeof(struct nlattr) && return len >= (int)sizeof(struct nlattr) &&
attr->nla_len >= sizeof(struct nlattr) && attr->nla_len >= sizeof(struct nlattr) &&
(int)attr->nla_len <= len; (int)attr->nla_len <= len;
} }
static struct nlattr *mnl_attr_next(const struct nlattr *attr) static struct nlattr *mnl_attr_next(const struct nlattr *attr)
@ -248,7 +248,7 @@ static int mnl_attr_type_valid(const struct nlattr *attr, uint16_t max)
} }
static int __mnl_attr_validate(const struct nlattr *attr, static int __mnl_attr_validate(const struct nlattr *attr,
enum mnl_attr_data_type type, size_t exp_len) enum mnl_attr_data_type type, size_t exp_len)
{ {
uint16_t attr_len = mnl_attr_get_payload_len(attr); uint16_t attr_len = mnl_attr_get_payload_len(attr);
const char *attr_data = mnl_attr_get_payload(attr); const char *attr_data = mnl_attr_get_payload(attr);
@ -413,7 +413,7 @@ static struct nlattr *mnl_attr_nest_start(struct nlmsghdr *nlh, uint16_t type)
} }
static bool mnl_attr_put_check(struct nlmsghdr *nlh, size_t buflen, static bool mnl_attr_put_check(struct nlmsghdr *nlh, size_t buflen,
uint16_t type, size_t len, const void *data) uint16_t type, size_t len, const void *data)
{ {
if (nlh->nlmsg_len + MNL_ATTR_HDRLEN + MNL_ALIGN(len) > buflen) if (nlh->nlmsg_len + MNL_ATTR_HDRLEN + MNL_ALIGN(len) > buflen)
return false; return false;
@ -541,15 +541,15 @@ out:
} }
static int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq, static int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data, unsigned int portid, mnl_cb_t cb_data, void *data,
const mnl_cb_t *cb_ctl_array, unsigned int cb_ctl_array_len) const mnl_cb_t *cb_ctl_array, unsigned int cb_ctl_array_len)
{ {
return __mnl_cb_run(buf, numbytes, seq, portid, cb_data, data, return __mnl_cb_run(buf, numbytes, seq, portid, cb_data, data,
cb_ctl_array, cb_ctl_array_len); cb_ctl_array, cb_ctl_array_len);
} }
static int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq, static int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq,
unsigned int portid, mnl_cb_t cb_data, void *data) unsigned int portid, mnl_cb_t cb_data, void *data)
{ {
return __mnl_cb_run(buf, numbytes, seq, portid, cb_data, data, NULL, 0); return __mnl_cb_run(buf, numbytes, seq, portid, cb_data, data, NULL, 0);
} }
@ -622,7 +622,7 @@ static ssize_t mnl_socket_sendto(const struct mnl_socket *nl, const void *buf,
.nl_family = AF_NETLINK .nl_family = AF_NETLINK
}; };
return sendto(nl->fd, buf, len, 0, return sendto(nl->fd, buf, len, 0,
(struct sockaddr *) &snl, sizeof(snl)); (struct sockaddr *) &snl, sizeof(snl));
} }
static ssize_t mnl_socket_recvfrom(const struct mnl_socket *nl, void *buf, static ssize_t mnl_socket_recvfrom(const struct mnl_socket *nl, void *buf,
@ -780,7 +780,7 @@ static int get_family_id_attr_cb(const struct nlattr *attr, void *data)
return MNL_CB_ERROR; return MNL_CB_ERROR;
if (type == CTRL_ATTR_FAMILY_ID && if (type == CTRL_ATTR_FAMILY_ID &&
mnl_attr_validate(attr, MNL_TYPE_U16) < 0) mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
return MNL_CB_ERROR; return MNL_CB_ERROR;
tb[type] = attr; tb[type] = attr;
return MNL_CB_OK; return MNL_CB_OK;
@ -1531,11 +1531,11 @@ static int decode_base64(const char src[static 4])
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
val |= (-1 val |= (-1
+ ((((('A' - 1) - src[i]) & (src[i] - ('Z' + 1))) >> 8) & (src[i] - 64)) + ((((('A' - 1) - src[i]) & (src[i] - ('Z' + 1))) >> 8) & (src[i] - 64))
+ ((((('a' - 1) - src[i]) & (src[i] - ('z' + 1))) >> 8) & (src[i] - 70)) + ((((('a' - 1) - src[i]) & (src[i] - ('z' + 1))) >> 8) & (src[i] - 70))
+ ((((('0' - 1) - src[i]) & (src[i] - ('9' + 1))) >> 8) & (src[i] + 5)) + ((((('0' - 1) - src[i]) & (src[i] - ('9' + 1))) >> 8) & (src[i] + 5))
+ ((((('+' - 1) - src[i]) & (src[i] - ('+' + 1))) >> 8) & 63) + ((((('+' - 1) - src[i]) & (src[i] - ('+' + 1))) >> 8) & 63)
+ ((((('/' - 1) - src[i]) & (src[i] - ('/' + 1))) >> 8) & 64) + ((((('/' - 1) - src[i]) & (src[i] - ('/' + 1))) >> 8) & 64)
) << (18 - 6 * i); ) << (18 - 6 * i);
return val; return val;
} }

54
src/ipc-linux.h
View file

@ -461,57 +461,57 @@ static int parse_device(const struct nlattr *attr, void *data)
return mnl_attr_parse_nested(attr, parse_peers, device); return mnl_attr_parse_nested(attr, parse_peers, device);
case WGDEVICE_A_JC: case WGDEVICE_A_JC:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) { if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->junk_packet_count = mnl_attr_get_u16(attr); device->junk_packet_count = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_JC; device->flags |= WGDEVICE_HAS_JC;
} }
break; break;
case WGDEVICE_A_JMIN: case WGDEVICE_A_JMIN:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) { if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->junk_packet_min_size = mnl_attr_get_u16(attr); device->junk_packet_min_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_JMIN; device->flags |= WGDEVICE_HAS_JMIN;
} }
break; break;
case WGDEVICE_A_JMAX: case WGDEVICE_A_JMAX:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) { if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->junk_packet_max_size = mnl_attr_get_u16(attr); device->junk_packet_max_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_JMAX; device->flags |= WGDEVICE_HAS_JMAX;
} }
break; break;
case WGDEVICE_A_S1: case WGDEVICE_A_S1:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) { if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->init_packet_junk_size = mnl_attr_get_u16(attr); device->init_packet_junk_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_S1; device->flags |= WGDEVICE_HAS_S1;
} }
break; break;
case WGDEVICE_A_S2: case WGDEVICE_A_S2:
if (!mnl_attr_validate(attr, MNL_TYPE_U16)) { if (!mnl_attr_validate(attr, MNL_TYPE_U16)) {
device->response_packet_junk_size = mnl_attr_get_u16(attr); device->response_packet_junk_size = mnl_attr_get_u16(attr);
device->flags |= WGDEVICE_HAS_S2; device->flags |= WGDEVICE_HAS_S2;
} }
break; break;
case WGDEVICE_A_H1: case WGDEVICE_A_H1:
if (!mnl_attr_validate(attr, MNL_TYPE_U32)) { if (!mnl_attr_validate(attr, MNL_TYPE_U32)) {
device->init_packet_magic_header = mnl_attr_get_u32(attr); device->init_packet_magic_header = mnl_attr_get_u32(attr);
device->flags |= WGDEVICE_HAS_H1; device->flags |= WGDEVICE_HAS_H1;
} }
break; break;
case WGDEVICE_A_H2: case WGDEVICE_A_H2:
if (!mnl_attr_validate(attr, MNL_TYPE_U32)) { if (!mnl_attr_validate(attr, MNL_TYPE_U32)) {
device->response_packet_magic_header = mnl_attr_get_u32(attr); device->response_packet_magic_header = mnl_attr_get_u32(attr);
device->flags |= WGDEVICE_HAS_H2; device->flags |= WGDEVICE_HAS_H2;
} }
break; break;
case WGDEVICE_A_H3: case WGDEVICE_A_H3:
if (!mnl_attr_validate(attr, MNL_TYPE_U32)) { if (!mnl_attr_validate(attr, MNL_TYPE_U32)) {
device->underload_packet_magic_header = mnl_attr_get_u32(attr); device->underload_packet_magic_header = mnl_attr_get_u32(attr);
device->flags |= WGDEVICE_HAS_H3; device->flags |= WGDEVICE_HAS_H3;
} }
break; break;
case WGDEVICE_A_H4: case WGDEVICE_A_H4:
if (!mnl_attr_validate(attr, MNL_TYPE_U32)) { if (!mnl_attr_validate(attr, MNL_TYPE_U32)) {
device->transport_packet_magic_header = mnl_attr_get_u32(attr); device->transport_packet_magic_header = mnl_attr_get_u32(attr);
device->flags |= WGDEVICE_HAS_H4; device->flags |= WGDEVICE_HAS_H4;
} }
break; break;
} }

2
src/uapi/linux/linux/wireguard.h
View file

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */ /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
/* /*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* *