Date: Wed, 16 Jan 2002 06:04:42 -0800 (PST) From: Brian Somers <brian@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/ppp arp.c atm.c iface.c ipcp.c mp.c probe.c route.c server.c tcp.c tun.c udp.c Message-ID: <200201161404.g0GE4g810546@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
brian 2002/01/16 06:04:42 PST
Modified files: (Branch: NETGRAPH)
usr.sbin/ppp arp.c atm.c iface.c ipcp.c mp.c probe.c
route.c server.c tcp.c tun.c udp.c
Log:
Index: arp.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/arp.c,v
retrieving revision 1.43
diff -u -r1.43 arp.c
--- arp.c 16 Jan 2002 13:15:47 -0000 1.43
+++ arp.c 16 Jan 2002 13:59:56 -0000
@@ -112,7 +112,7 @@
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));
Index: atm.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/atm.c,v
retrieving revision 1.5
diff -u -r1.5 atm.c
--- atm.c 16 Jan 2002 13:15:47 -0000 1.5
+++ atm.c 16 Jan 2002 13:59:56 -0000
@@ -184,7 +184,7 @@
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);
Index: iface.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/iface.c,v
retrieving revision 1.30
diff -u -r1.30 iface.c
--- iface.c 30 Nov 2001 14:01:21 -0000 1.30
+++ iface.c 16 Jan 2002 13:59:56 -0000
@@ -551,7 +551,7 @@
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;
Index: ipcp.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/ipcp.c,v
retrieving revision 1.111
diff -u -r1.111 ipcp.c
--- ipcp.c 16 Aug 2001 02:01:05 -0000 1.111
+++ ipcp.c 16 Jan 2002 13:59:56 -0000
@@ -616,7 +616,7 @@
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;
Index: mp.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/mp.c,v
retrieving revision 1.48
diff -u -r1.48 mp.c
--- mp.c 16 Jan 2002 13:15:47 -0000 1.48
+++ mp.c 16 Jan 2002 13:59:56 -0000
@@ -1000,7 +1000,7 @@
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 @@
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;
Index: probe.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/probe.c,v
retrieving revision 1.5
diff -u -r1.5 probe.c
--- probe.c 16 Aug 2001 16:58:12 -0000 1.5
+++ probe.c 16 Jan 2002 13:59:56 -0000
@@ -56,7 +56,7 @@
{
int s;
- if ((s = ID0socket(AF_INET6, SOCK_DGRAM, 0)) == -1)
+ if ((s = ID0socket(PF_INET6, SOCK_DGRAM, 0)) == -1)
return 0;
close(s);
Index: route.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/route.c,v
retrieving revision 1.84
diff -u -r1.84 route.c
--- route.c 16 Jan 2002 13:15:47 -0000 1.84
+++ route.c 16 Jan 2002 13:59:56 -0000
@@ -723,7 +723,7 @@
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 @@
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;
Index: server.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/server.c,v
retrieving revision 1.39
diff -u -r1.39 server.c
--- server.c 16 Jan 2002 13:15:47 -0000 1.39
+++ server.c 16 Jan 2002 13:59:56 -0000
@@ -259,7 +259,7 @@
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 @@
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 @@
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) {
Index: tcp.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/tcp.c,v
retrieving revision 1.14
diff -u -r1.14 tcp.c
--- tcp.c 16 Jan 2002 13:15:47 -0000 1.14
+++ tcp.c 16 Jan 2002 13:59:56 -0000
@@ -84,7 +84,7 @@
}
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;
Index: tun.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/tun.c,v
retrieving revision 1.25
diff -u -r1.25 tun.c
--- tun.c 21 Aug 2001 11:07:58 -0000 1.25
+++ tun.c 16 Jan 2002 13:59:56 -0000
@@ -88,7 +88,7 @@
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));
Index: udp.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/udp.c,v
retrieving revision 1.14
diff -u -r1.14 udp.c
--- udp.c 16 Jan 2002 13:15:47 -0000 1.14
+++ udp.c 16 Jan 2002 13:59:56 -0000
@@ -229,7 +229,7 @@
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);
Revision Changes Path
1.38.2.6 +1 -1 src/usr.sbin/ppp/arp.c
1.2.2.5 +1 -1 src/usr.sbin/ppp/atm.c
1.15.2.16 +1 -1 src/usr.sbin/ppp/iface.c
1.100.2.12 +2 -2 src/usr.sbin/ppp/ipcp.c
1.42.2.7 +2 -2 src/usr.sbin/ppp/mp.c
1.3.4.3 +2 -2 src/usr.sbin/ppp/probe.c
1.68.2.16 +2 -2 src/usr.sbin/ppp/route.c
1.31.2.9 +3 -3 src/usr.sbin/ppp/server.c
1.11.2.5 +1 -1 src/usr.sbin/ppp/tcp.c
1.20.4.6 +2 -2 src/usr.sbin/ppp/tun.c
1.10.4.6 +1 -1 src/usr.sbin/ppp/udp.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201161404.g0GE4g810546>