diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2019-01-22 09:25:30 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2019-01-22 09:25:30 +0000 |
| commit | f510e60a932c248b782e0217055433775b7f1bbf (patch) | |
| tree | 3c0a341e1946064b8468bb29d0dfa9f0b63e6a05 /sbin | |
| parent | b13e6a05b26f1b7259902e126de9350a99cd6fc8 (diff) | |
PF_ROUTE -> AF_ROUTE in the scattered sock()/setsockopt() calls
where the "wrong" #define was used.
ok dlg@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/util.c | 4 | ||||
| -rw-r--r-- | sbin/route/route.c | 4 | ||||
| -rw-r--r-- | sbin/slaacd/slaacd.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c index e535f922aa6..7263465dacb 100644 --- a/sbin/isakmpd/util.c +++ b/sbin/isakmpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.70 2017/12/05 20:31:45 jca Exp $ */ +/* $OpenBSD: util.c,v 1.71 2019/01/22 09:25:29 krw Exp $ */ /* $EOM: util.c,v 1.23 2000/11/23 12:22:08 niklas Exp $ */ /* @@ -219,7 +219,7 @@ text2sockaddr(char *address, char *port, struct sockaddr **sa, sa_family_t af, * it to select a source address. */ if (!strcmp(address, "default")) { - fd = socket(PF_ROUTE, SOCK_RAW, af); + fd = socket(AF_ROUTE, SOCK_RAW, af); bzero(buf, sizeof(buf)); diff --git a/sbin/route/route.c b/sbin/route/route.c index aa346564215..b96befbc4e4 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.227 2018/11/12 16:39:12 krw Exp $ */ +/* $OpenBSD: route.c,v 1.228 2019/01/22 09:25:29 krw Exp $ */ /* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */ /* @@ -222,7 +222,7 @@ main(int argc, char **argv) } } - s = socket(PF_ROUTE, SOCK_RAW, af); + s = socket(AF_ROUTE, SOCK_RAW, af); if (s == -1) err(1, "socket"); diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c index 86c5256221e..cd80bfffa60 100644 --- a/sbin/slaacd/slaacd.c +++ b/sbin/slaacd/slaacd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.c,v 1.31 2018/08/19 12:29:03 florian Exp $ */ +/* $OpenBSD: slaacd.c,v 1.32 2019/01/22 09:25:29 krw Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -202,7 +202,7 @@ main(int argc, char *argv[]) log_procinit(log_procnames[slaacd_process]); - if ((routesock = socket(PF_ROUTE, SOCK_RAW | SOCK_CLOEXEC | + if ((routesock = socket(AF_ROUTE, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, AF_INET6)) < 0) fatal("route socket"); shutdown(SHUT_RD, routesock); @@ -264,14 +264,14 @@ main(int argc, char *argv[]) sizeof(filt)) == -1) fatal("ICMP6_FILTER"); - if ((frontend_routesock = socket(PF_ROUTE, SOCK_RAW | SOCK_CLOEXEC, + if ((frontend_routesock = socket(AF_ROUTE, SOCK_RAW | SOCK_CLOEXEC, AF_INET6)) < 0) fatal("route socket"); rtfilter = ROUTE_FILTER(RTM_IFINFO) | ROUTE_FILTER(RTM_NEWADDR) | ROUTE_FILTER(RTM_DELADDR) | ROUTE_FILTER(RTM_PROPOSAL) | ROUTE_FILTER(RTM_DELETE) | ROUTE_FILTER(RTM_CHGADDRATTR); - if (setsockopt(frontend_routesock, PF_ROUTE, ROUTE_MSGFILTER, + if (setsockopt(frontend_routesock, AF_ROUTE, ROUTE_MSGFILTER, &rtfilter, sizeof(rtfilter)) < 0) fatal("setsockopt(ROUTE_MSGFILTER)"); |