Date: Mon, 15 Sep 2014 23:43:01 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r271652 - in user/ae/inet6: sys/net sys/netinet sys/netinet6 sys/netipsec tools/tools/ipv6sasdebug Message-ID: <201409152343.s8FNh1Tb083412@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Sep 15 23:43:01 2014 New Revision: 271652 URL: http://svnweb.freebsd.org/changeset/base/271652 Log: Fix build after merge. Modified: user/ae/inet6/sys/net/rtsock.c user/ae/inet6/sys/netinet/sctp_asconf.c user/ae/inet6/sys/netinet/sctp_output.c user/ae/inet6/sys/netinet/sctp_pcb.c user/ae/inet6/sys/netinet/sctp_sysctl.c user/ae/inet6/sys/netinet/sctp_usrreq.c user/ae/inet6/sys/netinet/sctputil.c user/ae/inet6/sys/netinet6/in6_src.c user/ae/inet6/sys/netipsec/xform_ipip.c user/ae/inet6/tools/tools/ipv6sasdebug/stub.h Modified: user/ae/inet6/sys/net/rtsock.c ============================================================================== --- user/ae/inet6/sys/net/rtsock.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/net/rtsock.c Mon Sep 15 23:43:01 2014 (r271652) @@ -515,6 +515,7 @@ static int in6_rt_handle_lla(struct rt_msghdr **ortm, struct rt_addrinfo *info) { struct sockaddr_dl sdl; + struct walkarg w; struct sockaddr_in6 *sin6; struct rt_msghdr *rtm = *ortm; struct llentry *lle; @@ -551,7 +552,7 @@ in6_rt_handle_lla(struct rt_msghdr **ort rtm->rtm_flags |= RTF_STATIC; rtm->rtm_rmx.rmx_expire = 0; } else - rtm->rtm_rmx.rmx_expire = lle->la_expire; + rtm->rtm_rmx.rmx_expire = lle->la_expire; /* XXX */ LLE_RUNLOCK(lle); } else info->rti_info[RTAX_GATEWAY] = ifp->if_addr->ifa_addr; @@ -559,16 +560,18 @@ in6_rt_handle_lla(struct rt_msghdr **ort rtm->rtm_index = ifp->if_index; if (rtm->rtm_addrs & (RTA_IFA | RTA_IFP)) info->rti_info[RTAX_IFP] = ifp->if_addr->ifa_addr; - i = rt_msg2(rtm->rtm_type, info, NULL, NULL); + rtsock_msg_buffer(rtm->rtm_type, info, NULL, &i); if (i > rtm->rtm_msglen) { - R_Malloc(rtm, struct rt_msghdr *, i); + rtm = malloc(i, M_TEMP, M_NOWAIT); if (rtm == NULL) return (ENOBUFS); bcopy(*ortm, rtm, i); - Free(*ortm); + free(*ortm, M_TEMP); *ortm = rtm; } - rt_msg2(rtm->rtm_type, info, (caddr_t)rtm, NULL); + w.w_tmem = (caddr_t)rtm; + w.w_tmemsize = i; + rtsock_msg_buffer(rtm->rtm_type, info, &w, &i); rtm->rtm_addrs = info->rti_addrs; return (0); } @@ -582,6 +585,7 @@ route_output(struct mbuf *m, struct sock struct rtentry *rt = NULL; struct radix_node_head *rnh; struct rt_addrinfo info; + struct sockaddr_storage ss; int alloc_len = 0, len, error = 0, fibnum; struct ifnet *ifp = NULL; union sockaddr_union saun; @@ -1110,7 +1114,7 @@ rtsock_msg_buffer(int type, struct rt_ad { caddr_t cp = NULL; struct rt_msghdr *rtm = NULL; - int len, i, second_time = 0; + int len, i, buflen = 0; switch (type) { Modified: user/ae/inet6/sys/netinet/sctp_asconf.c ============================================================================== --- user/ae/inet6/sys/netinet/sctp_asconf.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctp_asconf.c Mon Sep 15 23:43:01 2014 (r271652) @@ -1884,7 +1884,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb * #ifdef INET6 case AF_INET6: if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &ifa->address.sin6.sin6_addr) != 0) { + &ifa->address.sin6) != 0) { return; } break; @@ -2121,7 +2121,7 @@ sctp_asconf_iterator_stcb(struct sctp_in continue; } if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { @@ -2509,7 +2509,7 @@ sctp_find_valid_localaddr(struct sctp_tc continue; } if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (stcb->asoc.scope.local_scope == 0 && @@ -3129,7 +3129,7 @@ sctp_check_address_list_all(struct sctp_ case AF_INET6: sin6 = &sctp_ifa->address.sin6; if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if ((local_scope == 0) && @@ -3433,7 +3433,7 @@ sctp_asconf_send_nat_state_update(struct case AF_INET6: to6 = &sctp_ifap->address.sin6; if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred, - &to6->sin6_addr) != 0) { + to6) != 0) { continue; } if (IN6_IS_ADDR_LOOPBACK(&to6->sin6_addr)) { Modified: user/ae/inet6/sys/netinet/sctp_output.c ============================================================================== --- user/ae/inet6/sys/netinet/sctp_output.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctp_output.c Mon Sep 15 23:43:01 2014 (r271652) @@ -2072,7 +2072,7 @@ sctp_add_addresses_to_i_ia(struct sctp_i #ifdef INET6 if ((sctp_ifap->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifap->address.sin6.sin6_addr) != 0)) { + &sctp_ifap->address.sin6) != 0)) { continue; } #endif @@ -2115,7 +2115,7 @@ skip_count: #ifdef INET6 if ((sctp_ifap->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifap->address.sin6.sin6_addr) != 0)) { + &sctp_ifap->address.sin6) != 0)) { continue; } #endif @@ -2493,7 +2493,7 @@ sctp_choose_boundspecific_inp(struct sct #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { continue; } #endif @@ -2630,7 +2630,7 @@ sctp_choose_boundspecific_stcb(struct sc #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { continue; } #endif @@ -2664,7 +2664,7 @@ sctp_choose_boundspecific_stcb(struct sc #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { continue; } #endif @@ -2804,7 +2804,7 @@ sctp_select_nth_preferred_addr_from_ifn_ #ifdef INET6 if ((ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &ifa->address.sin6.sin6_addr) != 0)) { + &ifa->address.sin6) != 0)) { continue; } #endif @@ -2915,7 +2915,7 @@ sctp_count_num_preferred_boundall(struct if ((ifa->address.sa.sa_family == AF_INET6) && (stcb != NULL) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &ifa->address.sin6.sin6_addr) != 0)) { + &ifa->address.sin6) != 0)) { continue; } #endif @@ -3125,7 +3125,7 @@ again_with_private_addresses_allowed: #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { SCTPDBG(SCTP_DEBUG_OUTPUT2, "Jailed\n"); continue; } @@ -3190,7 +3190,7 @@ plan_d: #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { continue; } #endif @@ -3254,7 +3254,7 @@ out: #ifdef INET6 if ((sctp_ifa->address.sa.sa_family == AF_INET6) && (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sctp_ifa->address.sin6.sin6_addr) != 0)) { + &sctp_ifa->address.sin6) != 0)) { continue; } #endif Modified: user/ae/inet6/sys/netinet/sctp_pcb.c ============================================================================== --- user/ae/inet6/sys/netinet/sctp_pcb.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctp_pcb.c Mon Sep 15 23:43:01 2014 (r271652) @@ -920,7 +920,7 @@ sctp_does_stcb_own_this_addr(struct sctp sin6 = &sctp_ifa->address.sin6; rsin6 = (struct sockaddr_in6 *)to; if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { @@ -1092,7 +1092,7 @@ sctp_tcb_special_locate(struct sctp_inpc sin6 = (struct sockaddr_in6 *)to; if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { SCTP_INP_RUNLOCK(inp); continue; } @@ -1701,7 +1701,7 @@ sctp_endpoint_probe(struct sockaddr *nam continue; } if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { SCTP_INP_RUNLOCK(inp); continue; } Modified: user/ae/inet6/sys/netinet/sctp_sysctl.c ============================================================================== --- user/ae/inet6/sys/netinet/sctp_sysctl.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctp_sysctl.c Mon Sep 15 23:43:01 2014 (r271652) @@ -275,7 +275,7 @@ sctp_sysctl_copy_out_local_addresses(str if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) continue; if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { Modified: user/ae/inet6/sys/netinet/sctp_usrreq.c ============================================================================== --- user/ae/inet6/sys/netinet/sctp_usrreq.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctp_usrreq.c Mon Sep 15 23:43:01 2014 (r271652) @@ -1243,7 +1243,7 @@ sctp_fill_up_addresses_vrf(struct sctp_i continue; } if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { @@ -5526,7 +5526,7 @@ sctp_setopt(struct socket *so, int optna sin6 = (struct sockaddr_in6 *)&sspp->sspp_addr; if (prison_check_ip6(inp->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); error = EINVAL; goto out_of_it; Modified: user/ae/inet6/sys/netinet/sctputil.c ============================================================================== --- user/ae/inet6/sys/netinet/sctputil.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet/sctputil.c Mon Sep 15 23:43:01 2014 (r271652) @@ -6743,7 +6743,7 @@ sctp_local_addr_count(struct sctp_tcb *s continue; } if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred, - &sin6->sin6_addr) != 0) { + sin6) != 0) { continue; } if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { Modified: user/ae/inet6/sys/netinet6/in6_src.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_src.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netinet6/in6_src.c Mon Sep 15 23:43:01 2014 (r271652) @@ -169,9 +169,11 @@ struct dstaddr_props { #define REPLACE(r) { rule = r; goto replace; } #define NEXT(r) { rule = r; goto next; } -#ifndef IPV6SASDEBUG + +#ifndef IPV6_SASDEBUG #define IPV6SASDEBUG(fmt, ...) #else +#define IPV6SASDEBUG(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__) static char *srcrule_str[IP6S_RULESMAX] = { "Rule 0: first candidate", "Rule 1: prefer same address", @@ -197,7 +199,7 @@ srcaddrcmp(struct srcaddr_choice *c, str struct dstaddr_props *dst, struct ucred *cred, struct ip6_pktopts *opts) { -#if defined(IPV6SASDEBUG) +#ifdef IPV6_SASDEBUG char buf[INET6_ADDRSTRLEN]; #endif int srcscope, rule, label, prefer_tempaddr, prefixlen; @@ -496,7 +498,7 @@ in6_selectsrc(struct sockaddr_in6 *dst, struct inpcb *inp, struct route_in6 *ro, struct ucred *cred, struct ifnet **ifpp, struct in6_addr *srcp) { -#if defined(IPV6SASDEBUG) +#ifdef IPV6_SASDEBUG char buf[INET6_ADDRSTRLEN]; #endif struct route_in6 ro6; Modified: user/ae/inet6/sys/netipsec/xform_ipip.c ============================================================================== --- user/ae/inet6/sys/netipsec/xform_ipip.c Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/sys/netipsec/xform_ipip.c Mon Sep 15 23:43:01 2014 (r271652) @@ -487,7 +487,7 @@ ipip_output( ip6o->ip6_src = saidx->src.sin6.sin6_addr; /* Fix payload length */ - ip6o->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6)); + ip6o->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6o)); switch (tp) { #ifdef INET Modified: user/ae/inet6/tools/tools/ipv6sasdebug/stub.h ============================================================================== --- user/ae/inet6/tools/tools/ipv6sasdebug/stub.h Mon Sep 15 23:21:57 2014 (r271651) +++ user/ae/inet6/tools/tools/ipv6sasdebug/stub.h Mon Sep 15 23:43:01 2014 (r271652) @@ -161,7 +161,7 @@ struct in6_addrpolicy { struct ucred { }; -#define IPV6SASDEBUG(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__) +#define IPV6_SASDEBUG #define KASSERT(exp, msg) #define RO_RTFREE(ro) #define RTFREE(rt)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409152343.s8FNh1Tb083412>