diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-09-19 17:50:18 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-09-19 17:50:18 +0000 |
| commit | dc0d522f7aed69a5d09f5804a3bfe980fe6b418a (patch) | |
| tree | ab959eba7ad241cbab5597a63da71a910b9f9b21 /usr.sbin | |
| parent | e07638478523e3044e34296f59801b5f97c65c4e (diff) | |
cleanup around the pipex. naming style, delete or update comments.
no functional changes.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/npppd/npppd/npppd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/npppd/npppd/npppd.c b/usr.sbin/npppd/npppd/npppd.c index b08ee3dddf5..cb9a5a65e41 100644 --- a/usr.sbin/npppd/npppd/npppd.c +++ b/usr.sbin/npppd/npppd/npppd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: npppd.c,v 1.21 2012/09/18 13:14:08 yasuoka Exp $ */ +/* $OpenBSD: npppd.c,v 1.22 2012/09/19 17:50:17 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -29,7 +29,7 @@ * Next pppd(nppd). This file provides a npppd daemon process and operations * for npppd instance. * @author Yasuoka Masahiko - * $Id: npppd.c,v 1.21 2012/09/18 13:14:08 yasuoka Exp $ + * $Id: npppd.c,v 1.22 2012/09/19 17:50:17 yasuoka Exp $ */ #include <sys/cdefs.h> #include "version.h" @@ -965,7 +965,7 @@ npppd_ppp_pipex_enable(npppd *_this, npppd_ppp *ppp) pppoe_session_listen_ifname(pppoe), sizeof(req.pr_proto.pppoe.over_ifname)); - sa = (struct sockaddr *)&req.peer_address; + sa = (struct sockaddr *)&req.pr_peer_address; sa->sa_family = AF_UNSPEC; sa->sa_len = sizeof(struct sockaddr); @@ -997,9 +997,9 @@ npppd_ppp_pipex_enable(npppd *_this, npppd_ppp *ppp) NPPPD_ASSERT(call->ctrl->peer.ss_family == AF_INET); NPPPD_ASSERT(call->ctrl->our.ss_family == AF_INET); - memcpy(&req.peer_address, &call->ctrl->peer, + memcpy(&req.pr_peer_address, &call->ctrl->peer, call->ctrl->peer.ss_len); - memcpy(&req.local_address, &call->ctrl->our, + memcpy(&req.pr_local_address, &call->ctrl->our, call->ctrl->our.ss_len); break; #endif @@ -1024,9 +1024,9 @@ npppd_ppp_pipex_enable(npppd *_this, npppd_ppp *ppp) req.pr_proto.l2tp.ns_nxt = l2tp->snd_nxt; req.pr_proto.l2tp.nr_nxt = l2tp->rcv_nxt; - memcpy(&req.peer_address, &l2tpctrl->peer, + memcpy(&req.pr_peer_address, &l2tpctrl->peer, l2tpctrl->peer.ss_len); - memcpy(&req.local_address, &l2tpctrl->sock, + memcpy(&req.pr_local_address, &l2tpctrl->sock, l2tpctrl->sock.ss_len); #ifdef USE_SA_COOKIE if (l2tpctrl->sa_cookie != NULL) { |