diff options
author | glebius <glebius@FreeBSD.org> | 2013-04-26 12:50:32 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2013-04-26 12:50:32 +0000 |
commit | b4bc270e8f6757fa385861750ab22ba0ca4978ed (patch) | |
tree | 073e97431b8851637e702226bc02446cb01b0f4b /sys/netinet | |
parent | 7eab2144525c38723764e418181b36c7e9cbafad (diff) | |
download | FreeBSD-src-b4bc270e8f6757fa385861750ab22ba0ca4978ed.zip FreeBSD-src-b4bc270e8f6757fa385861750ab22ba0ca4978ed.tar.gz |
Add const qualifier to the dst parameter of the ifnet if_output method.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/if_atm.c | 5 | ||||
-rw-r--r-- | sys/netinet/if_atm.h | 2 | ||||
-rw-r--r-- | sys/netinet/if_ether.c | 14 | ||||
-rw-r--r-- | sys/netinet/if_ether.h | 23 | ||||
-rw-r--r-- | sys/netinet/ip_carp.c | 2 | ||||
-rw-r--r-- | sys/netinet/ip_carp.h | 5 | ||||
-rw-r--r-- | sys/netinet/ip_output.c | 5 |
7 files changed, 29 insertions, 27 deletions
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c index c46460e..4816678 100644 --- a/sys/netinet/if_atm.c +++ b/sys/netinet/if_atm.c @@ -317,7 +317,7 @@ failed: * but this is enough for PVCs entered via the "route" command. */ int -atmresolve(struct rtentry *rt, struct mbuf *m, struct sockaddr *dst, +atmresolve(struct rtentry *rt, struct mbuf *m, const struct sockaddr *dst, struct atm_pseudohdr *desten) { struct sockaddr_dl *sdl; @@ -329,7 +329,8 @@ atmresolve(struct rtentry *rt, struct mbuf *m, struct sockaddr *dst, } if (rt == NULL) { - rt = RTALLOC1(dst, 0); /* link level on table 0 XXX MRT */ + /* link level on table 0 XXX MRT */ + rt = RTALLOC1(__DECONST(struct sockaddr *, dst), 0); if (rt == NULL) goto bad; /* failed */ RT_REMREF(rt); /* don't keep LL references */ diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h index bd8b514..04ad218 100644 --- a/sys/netinet/if_atm.h +++ b/sys/netinet/if_atm.h @@ -43,5 +43,5 @@ struct rtentry; struct sockaddr; void atm_rtrequest(int, struct rtentry *, struct rt_addrinfo *); -int atmresolve(struct rtentry *, struct mbuf *, struct sockaddr *, +int atmresolve(struct rtentry *, struct mbuf *, const struct sockaddr *, struct atm_pseudohdr *); diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 7031784..9ba356c 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> -#define SIN(s) ((struct sockaddr_in *)s) +#define SIN(s) ((const struct sockaddr_in *)(s)) #define SDL(s) ((struct sockaddr_dl *)s) SYSCTL_DECL(_net_link_ether); @@ -215,8 +215,8 @@ arptimer(void *arg) * - arp header source ethernet address */ void -arprequest(struct ifnet *ifp, struct in_addr *sip, struct in_addr *tip, - u_char *enaddr) +arprequest(struct ifnet *ifp, const struct in_addr *sip, + const struct in_addr *tip, u_char *enaddr) { struct mbuf *m; struct arphdr *ah; @@ -272,9 +272,9 @@ arprequest(struct ifnet *ifp, struct in_addr *sip, struct in_addr *tip, ah->ar_hln = ifp->if_addrlen; /* hardware address length */ ah->ar_pln = sizeof(struct in_addr); /* protocol address length */ ah->ar_op = htons(ARPOP_REQUEST); - bcopy((caddr_t)enaddr, (caddr_t)ar_sha(ah), ah->ar_hln); - bcopy((caddr_t)sip, (caddr_t)ar_spa(ah), ah->ar_pln); - bcopy((caddr_t)tip, (caddr_t)ar_tpa(ah), ah->ar_pln); + bcopy(enaddr, ar_sha(ah), ah->ar_hln); + bcopy(sip, ar_spa(ah), ah->ar_pln); + bcopy(tip, ar_tpa(ah), ah->ar_pln); sa.sa_family = AF_ARP; sa.sa_len = 2; m->m_flags |= M_BCAST; @@ -298,7 +298,7 @@ arprequest(struct ifnet *ifp, struct in_addr *sip, struct in_addr *tip, */ int arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, - struct sockaddr *dst, u_char *desten, struct llentry **lle) + const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *la = 0; u_int flags = 0; diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 6b47912..fbd0a1a 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -48,9 +48,9 @@ (enaddr)[0] = 0x01; \ (enaddr)[1] = 0x00; \ (enaddr)[2] = 0x5e; \ - (enaddr)[3] = ((u_char *)ipaddr)[1] & 0x7f; \ - (enaddr)[4] = ((u_char *)ipaddr)[2]; \ - (enaddr)[5] = ((u_char *)ipaddr)[3]; \ + (enaddr)[3] = ((const u_char *)ipaddr)[1] & 0x7f; \ + (enaddr)[4] = ((const u_char *)ipaddr)[2]; \ + (enaddr)[5] = ((const u_char *)ipaddr)[3]; \ } /* * Macro to map an IP6 multicast address to an Ethernet multicast address. @@ -63,10 +63,10 @@ { \ (enaddr)[0] = 0x33; \ (enaddr)[1] = 0x33; \ - (enaddr)[2] = ((u_char *)ip6addr)[12]; \ - (enaddr)[3] = ((u_char *)ip6addr)[13]; \ - (enaddr)[4] = ((u_char *)ip6addr)[14]; \ - (enaddr)[5] = ((u_char *)ip6addr)[15]; \ + (enaddr)[2] = ((const u_char *)ip6addr)[12]; \ + (enaddr)[3] = ((const u_char *)ip6addr)[13]; \ + (enaddr)[4] = ((const u_char *)ip6addr)[14]; \ + (enaddr)[5] = ((const u_char *)ip6addr)[15]; \ } /* @@ -115,11 +115,10 @@ extern u_char ether_ipmulticast_max[ETHER_ADDR_LEN]; struct llentry; struct ifaddr; -int arpresolve(struct ifnet *ifp, struct rtentry *rt, - struct mbuf *m, struct sockaddr *dst, u_char *desten, - struct llentry **lle); -void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, - u_char *); +int arpresolve(struct ifnet *ifp, struct rtentry *rt, struct mbuf *m, + const struct sockaddr *dst, u_char *desten, struct llentry **lle); +void arprequest(struct ifnet *, const struct in_addr *, + const struct in_addr *, u_char *); void arp_ifinit(struct ifnet *, struct ifaddr *); void arp_ifinit2(struct ifnet *, struct ifaddr *, u_char *); void arp_ifscrub(struct ifnet *, uint32_t); diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index eaff4f6..43c387f 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1372,7 +1372,7 @@ carp_multicast_cleanup(struct carp_if *cif, sa_family_t sa) } int -carp_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa) +carp_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa) { struct m_tag *mtag; struct carp_softc *sc; diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h index 22b08b2..de71185 100644 --- a/sys/netinet/ip_carp.h +++ b/sys/netinet/ip_carp.h @@ -147,7 +147,8 @@ void carp_detach(struct ifaddr *); void carp_carpdev_state(struct ifnet *); void carp_input (struct mbuf *, int); int carp6_input (struct mbuf **, int *, int); -int carp_output (struct ifnet *, struct mbuf *, struct sockaddr *); +int carp_output (struct ifnet *, struct mbuf *, + const struct sockaddr *); int carp_master(struct ifaddr *); int carp_iamatch(struct ifaddr *, uint8_t **); struct ifaddr *carp_iamatch6(struct ifnet *, struct in6_addr *); @@ -166,7 +167,7 @@ extern int (*carp_master_p)(struct ifaddr *); extern int (*carp_forus_p)(struct ifnet *, u_char *); /* net/if_ethersubr.c */ extern int (*carp_output_p)(struct ifnet *, struct mbuf *, - struct sockaddr *); + const struct sockaddr *); /* net/rtsock.c */ extern int (*carp_get_vhid_p)(struct ifaddr *); #ifdef INET diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 5770ae7..21d47f7 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -622,7 +622,8 @@ passout: * to avoid confusing lower layers. */ m->m_flags &= ~(M_PROTOFLAGS); - error = (*ifp->if_output)(ifp, m, (struct sockaddr *)gw, ro); + error = (*ifp->if_output)(ifp, m, + (const struct sockaddr *)gw, ro); goto done; } @@ -656,7 +657,7 @@ passout: m->m_flags &= ~(M_PROTOFLAGS); error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)gw, ro); + (const struct sockaddr *)gw, ro); } else m_freem(m); } |