diff options
| author |   florian <florian@openbsd.org> | 2018-05-17 11:51:27 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2018-05-17 11:51:27 +0000 |
| commit | 5d55626a0b762bc1a36e75ef8bdf2a81c5eef161 (patch) | |
| tree | 3101a7c910a07ed7bd74c53f971bda2b2a591d22 | |
| parent | Pass size argument to free(9). (diff) | |
| download | wireguard-openbsd-5d55626a0b762bc1a36e75ef8bdf2a81c5eef161.tar.xz wireguard-openbsd-5d55626a0b762bc1a36e75ef8bdf2a81c5eef161.zip | |
Introduce SLAACD_RTA_LABEL define to not use a string constant all
over the place.
| -rw-r--r-- | sbin/slaacd/frontend.c | 9 | ||||
| -rw-r--r-- | sbin/slaacd/slaacd.c | 9 | ||||
| -rw-r--r-- | sbin/slaacd/slaacd.h | 3 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sbin/slaacd/frontend.c b/sbin/slaacd/frontend.c index 0d7f316a8a1..c57e122ee33 100644 --- a/sbin/slaacd/frontend.c +++ b/sbin/slaacd/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.15 2018/05/16 11:39:30 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.16 2018/05/17 11:51:27 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -747,9 +747,10 @@ handle_route_message(struct rt_msghdr *rtm, struct sockaddr **rti_info) } *ap = NULL; - if (argv[0] != NULL && strncmp(argv[0], "slaacd:", - strlen("slaacd:")) == 0 && argv[1] != NULL && - argv[2] != NULL && argv[3] == NULL) { + if (argv[0] != NULL && strncmp(argv[0], + SLAACD_RTA_LABEL":", strlen(SLAACD_RTA_LABEL":")) + == 0 && argv[1] != NULL && argv[2] != NULL && + argv[3] == NULL) { id = strtonum(argv[1], 0, INT64_MAX, &errstr); if (errstr != NULL) { log_warn("%s: proposal seq is %s: %s", diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c index ffdec630dd1..4e08c865ed4 100644 --- a/sbin/slaacd/slaacd.c +++ b/sbin/slaacd/slaacd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.c,v 1.19 2018/05/16 11:39:30 florian Exp $ */ +/* $OpenBSD: slaacd.c,v 1.20 2018/05/17 11:51:27 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -728,8 +728,8 @@ handle_proposal(struct imsg_proposal *proposal) rl.sr_len = sizeof(rl); rl.sr_family = AF_UNSPEC; - if (snprintf(rl.sr_label, sizeof(rl.sr_label), "%s: %lld %d", "slaacd", - proposal->id, (int32_t)proposal->pid) >= + if (snprintf(rl.sr_label, sizeof(rl.sr_label), "%s: %lld %d", + SLAACD_RTA_LABEL, proposal->id, (int32_t)proposal->pid) >= (ssize_t)sizeof(rl.sr_label)) log_warnx("route label truncated"); @@ -859,7 +859,8 @@ configure_gateway(struct imsg_configure_dfr *dfr, uint8_t rtm_type) memset(&rl, 0, sizeof(rl)); rl.sr_len = sizeof(rl); rl.sr_family = AF_UNSPEC; - (void)snprintf(rl.sr_label, sizeof(rl.sr_label), "%s", "slaacd"); + (void)snprintf(rl.sr_label, sizeof(rl.sr_label), "%s", + SLAACD_RTA_LABEL); iov[iovcnt].iov_base = &rl; iov[iovcnt++].iov_len = sizeof(rl); rtm.rtm_msglen += sizeof(rl); diff --git a/sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h index 8570391a355..0efbe0cb1fb 100644 --- a/sbin/slaacd/slaacd.h +++ b/sbin/slaacd/slaacd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.h,v 1.14 2018/05/12 07:39:06 florian Exp $ */ +/* $OpenBSD: slaacd.h,v 1.15 2018/05/17 11:51:27 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -20,6 +20,7 @@ #define SLAACD_SOCKET "/dev/slaacd.sock" #define SLAACD_USER "_slaacd" +#define SLAACD_RTA_LABEL "slaacd" #define SLAACD_SOIIKEY_LEN 16 |