diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-11-13 06:34:14 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-11-13 06:34:14 +0000 |
| commit | 33f979fe12eb51c0b4c8ec25fccd83695e445223 (patch) | |
| tree | ea47edcd0585d05c0f0674bb3028f3a61e0b3dc8 /usr.sbin/npppd | |
| parent | 528247b9ce900f9281ab833a71da700ef2a37bee (diff) | |
Constify arguments to sendto_nat_t and add missing
#include "recvfromto.h" to l2tp_ctrl.c. no binary changes.
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/common/recvfromto.c | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/common/recvfromto.h | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/l2tp/l2tp_ctrl.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/npppd/common/recvfromto.c b/usr.sbin/npppd/common/recvfromto.c index 4054d9fa001..efeb311435b 100644 --- a/usr.sbin/npppd/common/recvfromto.c +++ b/usr.sbin/npppd/common/recvfromto.c @@ -204,7 +204,7 @@ recvfromto(s, buf, buflen, flags, from, fromlen, to, tolen) int sendto_nat_t(s, buf, buflen, flags, to, tolen, ipsec) int s; - void *buf; + const void *buf; size_t buflen; int flags; struct sockaddr *to; diff --git a/usr.sbin/npppd/common/recvfromto.h b/usr.sbin/npppd/common/recvfromto.h index cf0ac2295a7..8bbde3ce9fa 100644 --- a/usr.sbin/npppd/common/recvfromto.h +++ b/usr.sbin/npppd/common/recvfromto.h @@ -32,7 +32,7 @@ extern "C" { int recvfromto (int, void *, size_t, int, struct sockaddr *, u_int *, struct sockaddr *, u_int *); int recvfromto_nat_t (int, void *, size_t, int, struct sockaddr *, u_int *, struct sockaddr *, u_int *, void *, u_int *); -int sendto_nat_t (int, void *, size_t, int, struct sockaddr *, u_int, void *); +int sendto_nat_t (int, const void *, size_t, int, struct sockaddr *, u_int, void *); #ifdef __cplusplus } diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c index 1a980e51e27..141f3a71f73 100644 --- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c +++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: l2tp_ctrl.c,v 1.13 2012/09/18 13:14:08 yasuoka Exp $ */ +/* $OpenBSD: l2tp_ctrl.c,v 1.14 2012/11/13 06:34:13 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /**@file Control connection processing functions for L2TP LNS */ -/* $Id: l2tp_ctrl.c,v 1.13 2012/09/18 13:14:08 yasuoka Exp $ */ +/* $Id: l2tp_ctrl.c,v 1.14 2012/11/13 06:34:13 yasuoka Exp $ */ #include <sys/types.h> #include <sys/param.h> #include <sys/time.h> @@ -62,6 +62,7 @@ #include "l2tp_subr.h" #include "net_utils.h" #include "version.h" +#include "recvfromto.h" static int l2tp_ctrl_init (l2tp_ctrl *, l2tpd *, struct sockaddr *, struct sockaddr *, void *); static void l2tp_ctrl_reload (l2tp_ctrl *); |