Page MenuHomeFreeBSD
Differential D3686 Diff 8813 sys/netinet6/udp6_usrreq.c

Changeset View

Standalone View

View Options

sys/netinet6/udp6_usrreq.c

Context not available.
plen = ntohs(ip6->ip6_plen) - off + sizeof(*ip6); plen = ntohs(ip6->ip6_plen) - off + sizeof(*ip6);
ulen = ntohs((u_short)uh->uh_ulen); ulen = ntohs((u_short)uh->uh_ulen);
nxt = ip6->ip6_nxt; nxt = proto;
cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0; cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0;
if (nxt == IPPROTO_UDPLITE) { if (nxt == IPPROTO_UDPLITE) {
/* Zero means checksum over the complete packet. */ /* Zero means checksum over the complete packet. */
Context not available.
return (error); return (error);
} }
nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
IPPROTO_UDP : IPPROTO_UDPLITE;
if (control) { if (control) {
if ((error = ip6_setpktopts(control, &opt, if ((error = ip6_setpktopts(control, &opt,
inp->in6p_outputopts, td->td_ucred, IPPROTO_UDP)) != 0) inp->in6p_outputopts, td->td_ucred, nxt)) != 0)
goto release; goto release;
optp = &opt; optp = &opt;
} else } else
Context not available.
/* /*
* Stuff checksum and output datagram. * Stuff checksum and output datagram.
*/ */
nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
IPPROTO_UDP : IPPROTO_UDPLITE;
udp6 = (struct udphdr *)(mtod(m, caddr_t) + hlen); udp6 = (struct udphdr *)(mtod(m, caddr_t) + hlen);
udp6->uh_sport = inp->inp_lport; /* lport is always set in the PCB */ udp6->uh_sport = inp->inp_lport; /* lport is always set in the PCB */
udp6->uh_dport = fport; udp6->uh_dport = fport;
Context not available.
} }
if (hasv4addr) { if (hasv4addr) {
struct pr_usrreqs *pru; struct pr_usrreqs *pru;
uint8_t nxt;
nxt = (inp->inp_socket->so_proto->pr_protocol ==
IPPROTO_UDP) ? IPPROTO_UDP : IPPROTO_UDPLITE;
/* /*
* XXXRW: We release UDP-layer locks before calling * XXXRW: We release UDP-layer locks before calling
* udp_send() in order to avoid recursion. However, * udp_send() in order to avoid recursion. However,
Context not available.
INP_WUNLOCK(inp); INP_WUNLOCK(inp);
if (sin6) if (sin6)
in6_sin6_2_sin_in_sock(addr); in6_sin6_2_sin_in_sock(addr);
pru = inetsw[ip_protox[IPPROTO_UDP]].pr_usrreqs; pru = inetsw[ip_protox[nxt]].pr_usrreqs;
btwUnsubmitted
Done
Inline Actions

If we are going to replace the hard-coded UDP used in ip_protox[]
with UDP or UDP-Lite switching protocols, should we do that in all
cases? (I know UDP and UDP-Lite share udp_usrreqs)

Such as these codes:

static void
udp6_abort(struct socket *so)
{
	......

#ifdef INET
	if (inp->inp_vflag & INP_IPV4) {
		struct pr_usrreqs *pru;

		pru = inetsw[ip_protox[IPPROTO_UDP]].pr_usrreqs;
		(*pru->pru_abort)(so);
		return;
	}
#endif
	......
}

static void
udp6_close(struct socket *so)
{
	......

#ifdef INET
	if (inp->inp_vflag & INP_IPV4) {
		struct pr_usrreqs *pru;

		pru = inetsw[ip_protox[IPPROTO_UDP]].pr_usrreqs;
		(*pru->pru_disconnect)(so);
		return;
	}
#endif

	......
}

static int
udp6_disconnect(struct socket *so)
{
	......

#ifdef INET
	if (inp->inp_vflag & INP_IPV4) {
		struct pr_usrreqs *pru;

		pru = inetsw[ip_protox[IPPROTO_UDP]].pr_usrreqs;
		(void)(*pru->pru_disconnect)(so);
		return (0);
	}
#endif

	......

}

Thanks! :-)

btw: If we are going to replace the hard-coded UDP used in `ip_protox[]` with UDP or UDP-Lite…
/* addr will just be freed in sendit(). */ /* addr will just be freed in sendit(). */
return ((*pru->pru_send)(so, flags, m, addr, control, return ((*pru->pru_send)(so, flags, m, addr, control,
td)); td));
Context not available.