From 68925b20eb431f4ee7803c7b8cba127efd06195b Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Thu, 3 Jun 2004 16:21:22 +0000 Subject: [PATCH] Make pr_domain and pr_usrreqs pointers to const. The general stack is not supposed to change this and it allows us to make all this structures const like they should be. If a network protocol wants to modify them, they can still either modify the private version directly or create a copy and change that. --- sys/netinet/ipprotosw.h | 6 +++--- sys/netinet6/ip6protosw.h | 6 +++--- sys/netinet6/udp6_usrreq.c | 6 +++--- sys/sys/protosw.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/netinet/ipprotosw.h b/sys/netinet/ipprotosw.h index fdb226315e..063133b503 100644 --- a/sys/netinet/ipprotosw.h +++ b/sys/netinet/ipprotosw.h @@ -61,7 +61,7 @@ * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/sys/netinet/ipprotosw.h,v 1.1 1999/12/22 19:13:23 shin Exp $ - * $DragonFly: src/sys/netinet/Attic/ipprotosw.h,v 1.4 2004/06/03 15:04:51 joerg Exp $ + * $DragonFly: src/sys/netinet/Attic/ipprotosw.h,v 1.5 2004/06/03 16:21:22 joerg Exp $ */ #ifndef _NETINET_IPPROTOSW_H_ @@ -76,7 +76,7 @@ struct sockopt; struct ipprotosw { short pr_type; /* socket type used for */ - struct domain *pr_domain; /* domain protocol a member of */ + const struct domain *pr_domain; /* domain protocol a member of */ short pr_protocol; /* protocol number */ short pr_flags; /* see below */ /* protocol-protocol hooks */ @@ -98,7 +98,7 @@ struct ipprotosw { /* slow timeout (500ms) */ void (*pr_drain) (void); /* flush any excess space possible */ - struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ + const struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ }; #endif /* !_NETINET_IPPROTOSW_H_ */ diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index 65a909b070..955d6560b6 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6protosw.h,v 1.2.2.4 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6protosw.h,v 1.5 2004/06/03 15:04:51 joerg Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6protosw.h,v 1.6 2004/06/03 16:21:22 joerg Exp $ */ /* $KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $ */ /* @@ -121,7 +121,7 @@ struct lwkt_port; struct ip6protosw { short pr_type; /* socket type used for */ - struct domain *pr_domain; /* domain protocol a member of */ + const struct domain *pr_domain; /* domain protocol a member of */ short pr_protocol; /* protocol number */ short pr_flags; /* see below */ @@ -149,7 +149,7 @@ struct ip6protosw { (void); void (*pr_drain) /* flush any excess space possible */ (void); - struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ + const struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ }; #endif /* !_NETINET6_IP6PROTOSW_H_ */ diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 59805b695f..7e4ab712dc 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.6.2.13 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.14 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.15 2004/06/03 16:21:22 joerg Exp $ */ /* $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -695,7 +695,7 @@ udp6_disconnect(struct socket *so) return EINVAL; if (inp->inp_vflag & INP_IPV4) { - struct pr_usrreqs *pru; + const struct pr_usrreqs *pru; pru = inetsw[ip_protox[IPPROTO_UDP]].pr_usrreqs; return ((*pru->pru_disconnect)(so)); @@ -747,7 +747,7 @@ udp6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, ? 1 : 0; } if (hasv4addr) { - struct pr_usrreqs *pru; + const struct pr_usrreqs *pru; if (sin6) in6_sin6_2_sin_in_sock(addr); diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 5089aecee2..d9509a910f 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -32,7 +32,7 @@ * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/sys/sys/protosw.h,v 1.28.2.2 2001/07/03 11:02:01 ume Exp $ - * $DragonFly: src/sys/sys/protosw.h,v 1.10 2004/06/03 15:04:52 joerg Exp $ + * $DragonFly: src/sys/sys/protosw.h,v 1.11 2004/06/03 16:21:22 joerg Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -74,7 +74,7 @@ struct pr_output_info { */ struct protosw { short pr_type; /* socket type used for */ - struct domain *pr_domain; /* domain protocol a member of */ + const struct domain *pr_domain; /* domain protocol a member of */ short pr_protocol; /* protocol number */ short pr_flags; /* see below */ /* protocol-protocol hooks */ @@ -96,7 +96,7 @@ struct protosw { /* slow timeout (500ms) */ void (*pr_drain) (void); /* flush any excess space possible */ - struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ + const struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ }; /*#endif*/ -- 2.41.0