zabpehely
/
wireguard-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wg: warn once on unrecognized items 

DaveM suggests we do in fact do this. Others on the same thread weren't
happy about the length of the proposed message, so we also give a bit of
a less dramatic warning.

This reverts commit a2cc976a3b572cf308cc2d97c080eacac60416fe.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2017-10-09 13:27:00 +02:00
parent 8774fccff3
commit e13b1e719b
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/containers.h
View File

@ -63,6 +63,7 @@ enum {
struct wgdevice { struct wgdevice {
char name[IFNAMSIZ]; char name[IFNAMSIZ];
uint32_t ifindex;
uint32_t flags; uint32_t flags;

21
src/ipc.c
View File

@ -91,6 +91,15 @@ static int add_next_to_inflatable_buffer(struct inflatable_buffer *buffer)
return 0; return 0;
} }
static void warn_unrecognized(const char *which)
{
static bool once = false;
if (once)
return;
once = true;
fprintf(stderr, "Warning: one or more unrecognized %s attributes", which);
}
static FILE *userspace_interface_file(const char *interface) static FILE *userspace_interface_file(const char *interface)
{ {
struct stat sbuf; struct stat sbuf;
@ -421,6 +430,8 @@ static int userspace_get_device(struct wgdevice **out, const char *interface)
peer->tx_bytes = NUM(0xffffffffffffffffULL); peer->tx_bytes = NUM(0xffffffffffffffffULL);
else if (!strcmp(key, "errno")) else if (!strcmp(key, "errno"))
ret = -NUM(0x7fffffffU); ret = -NUM(0x7fffffffU);
else
warn_unrecognized("daemon");
} }
ret = -EPROTO; ret = -EPROTO;
err: err:
@ -692,6 +703,8 @@ static int parse_allowedip(const struct nlattr *attr, void *data)
if (!mnl_attr_validate(attr, MNL_TYPE_U8)) if (!mnl_attr_validate(attr, MNL_TYPE_U8))
ctx->allowedip->cidr = mnl_attr_get_u8(attr); ctx->allowedip->cidr = mnl_attr_get_u8(attr);
break; break;
default:
warn_unrecognized("netlink");
} }
return MNL_CB_OK; return MNL_CB_OK;
@ -761,6 +774,8 @@ static int parse_peer(const struct nlattr *attr, void *data)
break; break;
case WGPEER_A_ALLOWEDIPS: case WGPEER_A_ALLOWEDIPS:
return mnl_attr_parse_nested(attr, parse_allowedips, ctx); return mnl_attr_parse_nested(attr, parse_allowedips, ctx);
default:
warn_unrecognized("netlink");
} }
return MNL_CB_OK; return MNL_CB_OK;
@ -794,6 +809,10 @@ static int parse_device(const struct nlattr *attr, void *data)
struct get_device_ctx *ctx = data; struct get_device_ctx *ctx = data;
switch (mnl_attr_get_type(attr)) { switch (mnl_attr_get_type(attr)) {
case WGDEVICE_A_IFINDEX:
if (!mnl_attr_validate(attr, MNL_TYPE_U32))
ctx->device->ifindex = mnl_attr_get_u32(attr);
break;
case WGDEVICE_A_IFNAME: case WGDEVICE_A_IFNAME:
if (!mnl_attr_validate(attr, MNL_TYPE_STRING)) if (!mnl_attr_validate(attr, MNL_TYPE_STRING))
strncpy(ctx->device->name, mnl_attr_get_str(attr), sizeof(ctx->device->name) - 1); strncpy(ctx->device->name, mnl_attr_get_str(attr), sizeof(ctx->device->name) - 1);
@ -816,6 +835,8 @@ static int parse_device(const struct nlattr *attr, void *data)
break; break;
case WGDEVICE_A_PEERS: case WGDEVICE_A_PEERS:
return mnl_attr_parse_nested(attr, parse_peers, ctx); return mnl_attr_parse_nested(attr, parse_peers, ctx);
default:
warn_unrecognized("netlink");
} }
return MNL_CB_OK; return MNL_CB_OK;