d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

divert: merge div_output() into div_send()

Browse Source 
No functional change intended.
This commit is contained in:
Gleb Smirnoff 2022-08-29 19:15:01 -07:00
parent 244e1aeaec
commit 8fc8063849
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/netinet/ip_divert.c
View File

@ -293,18 +293,25 @@ divert_packet(struct mbuf *m, bool incoming)
* the interface with that address.
*/
static int
div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin,
struct mbuf *control)
div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
struct mbuf *control, struct thread *td)
{
struct epoch_tracker et;
struct sockaddr_in *sin = (struct sockaddr_in *)nam;
const struct ip *ip;
struct m_tag *mtag;
struct ipfw_rule_ref *dt;
int error, family;
if (control) {
m_freem(control); /* XXX */
control = NULL;
if (control)
m_freem(control);
/* Packet must have a header (but that's about it) */
if (m->m_len < sizeof (struct ip) &&
(m = m_pullup(m, sizeof (struct ip))) == NULL) {
KMOD_IPSTAT_INC(ips_toosmall);
m_freem(m);
return (EINVAL);
}
if (sin != NULL) {
@ -634,25 +641,6 @@ div_shutdown(struct socket *so)
return 0;
}
static int
div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
struct mbuf *control, struct thread *td)
{
/* Packet must have a header (but that's about it) */
if (m->m_len < sizeof (struct ip) &&
(m = m_pullup(m, sizeof (struct ip))) == NULL) {
KMOD_IPSTAT_INC(ips_toosmall);
if (control != NULL)
m_freem(control);
m_freem(m);
return EINVAL;
}
/* Send packet */
return div_output(so, m, (struct sockaddr_in *)nam, control);
}
static int
div_pcblist(SYSCTL_HANDLER_ARGS)
{