d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

socket()s first argument should be a protocol family rather than an

Browse Source 
address family.
This commit is contained in:
Brian Somers 2002-01-16 14:03:52 +00:00
parent c87436f341
commit 63c6cac940
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=89422
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/ppp/arp.c
View File

@ -112,7 +112,7 @@ arp_ProxySub(struct bundle *bundle, struct in_addr addr, int add, int s)
inet_ntoa(addr));
return 0;
}
routes = ID0socket(AF_ROUTE, SOCK_RAW, AF_INET);
routes = ID0socket(PF_ROUTE, SOCK_RAW, AF_INET);
if (routes < 0) {
log_Printf(LogERROR, "arp_SetProxy: opening routing socket: %s\n",
strerror(errno));

2
usr.sbin/ppp/atm.c
View File

@ -184,7 +184,7 @@ atm_CreateDevice(struct physical *p, const char *iface, unsigned vpi,
log_Printf(LogPHASE, "%s: Connecting to %s:%u.%u\n", p->link.name,
iface, vpi, vci);
p->fd = socket(AF_NATM, SOCK_DGRAM, PROTO_NATMAAL5);
p->fd = socket(PF_NATM, SOCK_DGRAM, PROTO_NATMAAL5);
if (p->fd >= 0) {
log_Printf(LogDEBUG, "%s: Opened atm socket %s\n", p->link.name,
p->name.full);

2
usr.sbin/ppp/iface.c
View File

@ -551,7 +551,7 @@ iface_ChangeFlags(const char *ifname, int flags, int how)
struct ifreq ifrq;
int s;
s = ID0socket(AF_INET, SOCK_DGRAM, 0);
s = ID0socket(PF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "iface_ChangeFlags: socket: %s\n", strerror(errno));
return 0;

2
usr.sbin/ppp/ipcp.c
View File

@ -616,7 +616,7 @@ ipcp_proxyarp(struct ipcp *ipcp,
return 0;
}
if ((s = ID0socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
if ((s = ID0socket(PF_INET, SOCK_DGRAM, 0)) == -1) {
log_Printf(LogERROR, "ipcp_proxyarp: socket: %s\n",
strerror(errno));
return 0;

4
usr.sbin/ppp/mp.c
View File

@ -1000,7 +1000,7 @@ mp_SetEnddisc(struct cmdargs const *arg)
else
addr = arg->bundle->ncp.ipcp.my_ip;
s = ID0socket(AF_INET, SOCK_DGRAM, 0);
s = ID0socket(PF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "set enddisc: socket(): %s\n", strerror(errno));
return 2;
@ -1137,7 +1137,7 @@ mpserver_Open(struct mpserver *s, struct peerid *peer)
s->socket.sun_family = AF_LOCAL;
s->socket.sun_len = sizeof s->socket;
s->fd = ID0socket(AF_LOCAL, SOCK_DGRAM, 0);
s->fd = ID0socket(PF_LOCAL, SOCK_DGRAM, 0);
if (s->fd < 0) {
log_Printf(LogERROR, "mpserver: socket(): %s\n", strerror(errno));
return MPSERVER_FAILED;

2
usr.sbin/ppp/probe.c
View File

@ -56,7 +56,7 @@ ipv6_available(void)
{
int s;
if ((s = ID0socket(AF_INET6, SOCK_DGRAM, 0)) == -1)
if ((s = ID0socket(PF_INET6, SOCK_DGRAM, 0)) == -1)
return 0;
close(s);

4
usr.sbin/ppp/route.c
View File

@ -723,7 +723,7 @@ rt_Set(struct bundle *bundle, int cmd, const struct ncprange *dst,
cmdstr = (cmd == RTM_ADD ? "Add!" : "Delete!");
else
cmdstr = (cmd == RTM_ADD ? "Add" : "Delete");
s = ID0socket(AF_ROUTE, SOCK_RAW, 0);
s = ID0socket(PF_ROUTE, SOCK_RAW, 0);
if (s < 0) {
log_Printf(LogERROR, "rt_Set: socket(): %s\n", strerror(errno));
return result;
@ -835,7 +835,7 @@ rt_Update(struct bundle *bundle, const struct sockaddr *dst,
char *p;
int s, wb;
s = ID0socket(AF_ROUTE, SOCK_RAW, 0);
s = ID0socket(PF_ROUTE, SOCK_RAW, 0);
if (s < 0) {
log_Printf(LogERROR, "rt_Update: socket(): %s\n", strerror(errno));
return;

6
usr.sbin/ppp/server.c
View File

@ -259,7 +259,7 @@ server_LocalOpen(struct bundle *bundle, const char *name, mode_t mask)
ifsun.sun_family = AF_LOCAL;
strcpy(ifsun.sun_path, name);
s = socket(AF_LOCAL, SOCK_STREAM, 0);
s = socket(PF_LOCAL, SOCK_STREAM, 0);
if (s < 0) {
log_Printf(LogERROR, "Local: socket: %s\n", strerror(errno));
goto failed;
@ -328,7 +328,7 @@ server_TcpOpen(struct bundle *bundle, u_short port)
sin6->sin6_port = htons(port);
sin6->sin6_len = (u_int8_t)sizeof ss;
sz = sizeof *sin6;
s = socket(AF_INET6, SOCK_STREAM, 0);
s = socket(PF_INET6, SOCK_STREAM, 0);
} else
#endif
{
@ -337,7 +337,7 @@ server_TcpOpen(struct bundle *bundle, u_short port)
sin->sin_len = (u_int8_t)sizeof ss;
sin->sin_addr.s_addr = INADDR_ANY;
sz = sizeof *sin;
s = socket(AF_INET, SOCK_STREAM, 0);
s = socket(PF_INET, SOCK_STREAM, 0);
}
if (s < 0) {

2
usr.sbin/ppp/tcp.c
View File

@ -84,7 +84,7 @@ tcp_OpenConnection(const char *name, char *host, char *port)
}
log_Printf(LogPHASE, "%s: Connecting to %s:%s/tcp\n", name, host, port);
sock = socket(AF_INET, SOCK_STREAM, 0);
sock = socket(PF_INET, SOCK_STREAM, 0);
if (sock < 0)
return -2;

2
usr.sbin/ppp/tun.c
View File

@ -88,7 +88,7 @@ tun_configure(struct bundle *bundle)
struct ifreq ifr;
int s;
s = socket(AF_INET, SOCK_DGRAM, 0);
s = socket(PF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "tun_configure: socket(): %s\n", strerror(errno));

2
usr.sbin/ppp/udp.c
View File

@ -229,7 +229,7 @@ udp_CreateDevice(struct physical *p, char *host, char *port)
log_Printf(LogPHASE, "%s: Connecting to %s:%s/udp\n", p->link.name,
host, port);
p->fd = socket(AF_INET, SOCK_DGRAM, 0);
p->fd = socket(PF_INET, SOCK_DGRAM, 0);
if (p->fd >= 0) {
log_Printf(LogDEBUG, "%s: Opened udp socket %s\n", p->link.name,
p->name.full);