Mercurial > hg > dhcpcd
changeset 2491:6ec3f4009bb4 draft
Sockets would be opened with PF_*, not AF_*.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Tue, 20 May 2014 08:54:00 +0000 |
| parents | 19b7947d234c |
| children | 12585d26b91a |
| files | if-bsd.c if-linux-wireless.c if.c ipv6nd.c |
| diffstat | 4 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/if-bsd.c Tue May 20 08:36:12 2014 +0000 +++ b/if-bsd.c Tue May 20 08:54:00 2014 +0000 @@ -149,7 +149,7 @@ char nwid[IEEE80211_NWID_LEN + 1]; #endif - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; #if defined(SIOCG80211NWID) /* NetBSD */ @@ -197,7 +197,7 @@ int s, r; struct ifmediareq ifmr; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); @@ -397,7 +397,7 @@ struct sockaddr_in *sin; } _s; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; memset(&ifa, 0, sizeof(ifa)); @@ -543,7 +543,7 @@ struct in6_aliasreq ifa; struct in6_addr mask; - if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET6, SOCK_DGRAM, 0)) == -1) return -1; memset(&ifa, 0, sizeof(ifa)); @@ -738,7 +738,7 @@ int s, flags; struct in6_ifreq ifr6; - s = socket(AF_INET6, SOCK_DGRAM, 0); + s = socket(PF_INET6, SOCK_DGRAM, 0); flags = -1; if (s != -1) { memset(&ifr6, 0, sizeof(ifr6)); @@ -962,7 +962,7 @@ struct in6_ndireq nd; unsigned int oflags; - if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET6, SOCK_DGRAM, 0)) == -1) return -1; memset(&nd, 0, sizeof(nd)); strlcpy(nd.ifname, ifname, sizeof(nd.ifname)); @@ -994,7 +994,7 @@ int s, flags; struct in6_nbrinfo nbi; - if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) + if ((s = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) return -1; memset(&nbi, 0, sizeof(nbi)); @@ -1063,7 +1063,7 @@ int s; char dummy[IFNAMSIZ + 8]; - s = socket(AF_INET6, SOCK_DGRAM, 0); + s = socket(PF_INET6, SOCK_DGRAM, 0); if (s == -1) return -1; strlcpy(dummy, "lo0", sizeof(dummy));
--- a/if-linux-wireless.c Tue May 20 08:36:12 2014 +0000 +++ b/if-linux-wireless.c Tue May 20 08:54:00 2014 +0000 @@ -69,7 +69,7 @@ int s, retval; struct iwreq iwr; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; memset(&iwr, 0, sizeof(iwr)); strlcpy(iwr.ifr_name, ifname, sizeof(iwr.ifr_name));
--- a/if.c Tue May 20 08:36:12 2014 +0000 +++ b/if.c Tue May 20 08:54:00 2014 +0000 @@ -102,7 +102,7 @@ char *p; #endif - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return LINK_UNKNOWN; memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, iface->name, sizeof(ifr.ifr_name)); @@ -141,7 +141,7 @@ char *p; #endif - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, iface->name, sizeof(ifr.ifr_name)); @@ -198,11 +198,11 @@ #endif #ifdef SIOCGIFPRIORITY - if ((s_inet = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s_inet = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return NULL; #endif #ifdef IFLR_ACTIVE - if ((s_link = socket(AF_LINK, SOCK_DGRAM, 0)) == -1) { + if ((s_link = socket(PF_LINK, SOCK_DGRAM, 0)) == -1) { #ifdef SIOCGIFPRIORITY close(s_inet); #endif @@ -502,7 +502,7 @@ int s, r; struct ifreq ifr; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + if ((s = socket(PF_INET, SOCK_DGRAM, 0)) == -1) return -1; memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
--- a/ipv6nd.c Tue May 20 08:36:12 2014 +0000 +++ b/ipv6nd.c Tue May 20 08:54:00 2014 +0000 @@ -172,12 +172,12 @@ if (ctx->nd_fd != -1) return ctx->nd_fd; #ifdef SOCK_CLOEXEC - ctx->nd_fd = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, + ctx->nd_fd = socket(PF_INET6, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, IPPROTO_ICMPV6); if (ctx->nd_fd == -1) return -1; #else - if ((ctx->nd_fd = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1) + if ((ctx->nd_fd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1) return -1; if ((on = fcntl(ctx->nd_fd, F_GETFD, 0)) == -1 || fcntl(ctx->nd_fd, F_SETFD, on | FD_CLOEXEC) == -1)