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

uapi: use flag instead of C bitfield for portability 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2017-01-09 19:47:29 -08:00
parent 12904a1095
commit 48f7c3522a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/config.c
View File

@ -213,7 +213,7 @@ static inline bool parse_ipmasks(struct inflatable_device *buf, size_t peer_offs
return false; return false;
}; };
peer = peer_from_offset(buf->dev, peer_offset); peer = peer_from_offset(buf->dev, peer_offset);
peer->replace_ipmasks = true; peer->flags |= WGPEER_REPLACE_IPMASKS;
if (!strlen(value)) { if (!strlen(value)) {
free(mutable); free(mutable);
return true; return true;
@ -271,7 +271,7 @@ static bool process_line(struct config_ctx *ctx, const char *line)
++ctx->buf.dev->num_peers; ++ctx->buf.dev->num_peers;
ctx->is_peer_section = true; ctx->is_peer_section = true;
ctx->is_device_section = false; ctx->is_device_section = false;
peer_from_offset(ctx->buf.dev, ctx->peer_offset)->replace_ipmasks = true; peer_from_offset(ctx->buf.dev, ctx->peer_offset)->flags |= WGPEER_REPLACE_IPMASKS;
peer_from_offset(ctx->buf.dev, ctx->peer_offset)->persistent_keepalive_interval = (__u16)-1; peer_from_offset(ctx->buf.dev, ctx->peer_offset)->persistent_keepalive_interval = (__u16)-1;
return true; return true;
} }
@ -347,7 +347,8 @@ bool config_read_init(struct config_ctx *ctx, struct wgdevice **device, bool app
perror("calloc"); perror("calloc");
return false; return false;
} }
ctx->buf.dev->replace_peer_list = !append; if (!append)
ctx->buf.dev->flags |= WGDEVICE_REPLACE_PEERS;
return true; return true;
} }
@ -361,11 +362,11 @@ bool config_read_finish(struct config_ctx *ctx)
{ {
size_t i; size_t i;
struct wgpeer *peer; struct wgpeer *peer;
if (ctx->buf.dev->replace_peer_list && !ctx->buf.dev->num_peers) { if (ctx->buf.dev->flags & WGDEVICE_REPLACE_PEERS && !ctx->buf.dev->num_peers) {
fprintf(stderr, "No peers configured\n"); fprintf(stderr, "No peers configured\n");
goto err; goto err;
} }
if (ctx->buf.dev->replace_peer_list && !key_is_valid(ctx->buf.dev->private_key)) { if (ctx->buf.dev->flags & WGDEVICE_REPLACE_PEERS && !key_is_valid(ctx->buf.dev->private_key)) {
fprintf(stderr, "No private key configured\n"); fprintf(stderr, "No private key configured\n");
goto err; goto err;
} }
@ -462,7 +463,7 @@ bool config_read_cmd(struct wgdevice **device, char *argv[], int argc)
} }
free(line); free(line);
} else if (ret == 1) } else if (ret == 1)
buf.dev->remove_private_key = true; buf.dev->flags |= WGDEVICE_REMOVE_PRIVATE_KEY;
else else
goto error; goto error;
argv += 2; argv += 2;
@ -477,7 +478,7 @@ bool config_read_cmd(struct wgdevice **device, char *argv[], int argc)
} }
free(line); free(line);
} else if (ret == 1) } else if (ret == 1)
buf.dev->remove_preshared_key = true; buf.dev->flags |= WGDEVICE_REMOVE_PRESHARED_KEY;
else else
goto error; goto error;
argv += 2; argv += 2;
@ -495,7 +496,7 @@ bool config_read_cmd(struct wgdevice **device, char *argv[], int argc)
argv += 2; argv += 2;
argc -= 2; argc -= 2;
} else if (!strcmp(argv[0], "remove") && argc >= 1 && buf.dev->num_peers) { } else if (!strcmp(argv[0], "remove") && argc >= 1 && buf.dev->num_peers) {
peer_from_offset(buf.dev, peer_offset)->remove_me = true; peer_from_offset(buf.dev, peer_offset)->flags |= WGPEER_REMOVE_ME;
argv += 1; argv += 1;
argc -= 1; argc -= 1;
} else if (!strcmp(argv[0], "endpoint") && argc >= 2 && buf.dev->num_peers) { } else if (!strcmp(argv[0], "endpoint") && argc >= 2 && buf.dev->num_peers) {