Page MenuHomeFreeBSD
Differential D40960

www/tomcat9: Updated to 9.0.78
ClosedPublic
Actions

Authored by vvd on Jul 10 2023, 4:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Feb 23, 6:33 AM
Unknown Object (File)
Thu, Feb 20, 6:45 PM
Unknown Object (File)
Feb 13 2025, 10:16 PM
Unknown Object (File)
Feb 3 2025, 5:51 AM
Unknown Object (File)
Feb 2 2025, 9:44 PM
Unknown Object (File)
Feb 2 2025, 9:38 PM
Unknown Object (File)
Feb 2 2025, 7:01 PM
Unknown Object (File)
Dec 21 2024, 1:52 AM
View All Files
Subscribers
None

Details

Reviewers
arrowd
tcberner
adamw
Commits
R11:3583eb3c253d: www/tomcat9: update to 9.0.78
R11:1595d14911e5: www/tomcat9: update to 9.0.78
Summary

Tested build in poudriere 13.2 amd64 and on live 13.2 amd64.
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.78_(remm)

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

vvd requested review of this revision.Jul 10 2023, 4:43 PM
vvd created this revision.
tcberner accepted this revision.Jul 10 2023, 5:24 PM

lgtm (assuming you verfified there is no plist change).

This revision is now accepted and ready to land.Jul 10 2023, 5:24 PM
vvd added a comment.Jul 10 2023, 5:34 PM
In D40960#932334, @tcberner wrote:

lgtm (assuming you verfified there is no plist change).

Ofc I tested make check-plist.

Closed by commit R11:1595d14911e5: www/tomcat9: update to 9.0.78 (authored by vvd). · Explain WhyJul 10 2023, 5:42 PM
This revision was automatically updated to reflect the committed changes.
vvd added a commit: R11:1595d14911e5: www/tomcat9: update to 9.0.78.
vvd added a commit: R11:3583eb3c253d: www/tomcat9: update to 9.0.78.

Revision Contents
Changeset List

PathSize
www/
tomcat9/
2 lines
6 lines

Diff 124445

View Options

www/tomcat9/Makefile

Context not available.
static void tcp_usrclosed(struct tcpcb *); static void tcp_usrclosed(struct tcpcb *);
static void tcp_fill_info(struct tcpcb *, struct tcp_info *); static void tcp_fill_info(struct tcpcb *, struct tcp_info *);
static int tcp_options_support(struct tcpcb *tp, int flags);
#ifdef TCPDEBUG #ifdef TCPDEBUG
#define TCPDEBUG0 int ostate = 0 #define TCPDEBUG0 int ostate = 0
#define TCPDEBUG1() ostate = tp ? tp->t_state : 0 #define TCPDEBUG1() ostate = tp ? tp->t_state : 0
Context not available.
goto out; goto out;
} }
tp = intotcpcb(inp); tp = intotcpcb(inp);
if (flags & PRUS_OOB) {
rscheffUnsubmitted
Not Done
Inline Actions

the socket MSG_OOB flag is directly mapped into protocol PRU_OOB flag, not? (they also happen to be numeric identical). Conceptually, the protocol itself should be checking the PRUS_* flags, not the MSG_* flags.

uipc_socket.c:1499: (flags & MSG_OOB) ? PRUS_OOB :
uipc_socket.c:1729: pru_flag = (flags & MSG_OOB) ? PRUS_OOB :

rscheff: the socket MSG_OOB flag is directly mapped into protocol PRU_OOB flag, not? (they also happen…
rrsAuthorUnsubmitted
Done
Inline Actions

The problem here can be found in uipc_socket.c. Before this function became the pru_send routine we "used" to
use sosend_generric() or maybe sosend_stream(), go look at these two functions (in fact look too at sosend_dgram)
*all* of them map

MSG_OOB -> PRUS_OOB
and
MSG_EOF -> PRUS_EOF

But now, since this function *is* what is called that is not happening, since this function does nto
have the proper mapping.

Yes conceptually the protocol needs to use PRUS_... but someone must do the translation from
the socket level to the protocol level. And that *used* to be done in sosend_xxxx() function which now
is no longer called. It most likely should be done here.

rrs: The problem here can be found in uipc_socket.c. Before this function became the pru_send…
rscheffUnsubmitted
Not Done
Inline Actions

Then I must be missing some context here.

Are you saying that you are bypassing the socket interface, and instead are calling tcp_usr_send() directly in some deployments, where the MSG_ flags are used instead of the PRUS_ flags?

kern_sendfile.c has vn_sendfile, this however doesn't support OOB either apparently.

rscheff: Then I must be missing some context here. Are you saying that you are bypassing the socket…
rscheffUnsubmitted
Not Done
Inline Actions

see transport@; I believe you missed that sosend() is calling the pru_sosend() pointer, and not the pru_send() pointer. So the socket API for TCP still runs thought either sosend_generic (default) or sosend_stream (sysctl selectable), both of which do the conversion from MSG_OOB / MSG_EOF in the "correct" layer - and TCP here only has to care about the PRU_ type flags.

rscheff: see transport@; I believe you missed that sosend() is calling the pru_sosend() pointer, and not…
rrsAuthorUnsubmitted
Done
Inline Actions

Yeah I had missed the so

rrs: Yeah I had missed the so
if ((error = tcp_options_support(tp, PRUS_OOB)) != 0) {
if (control)
m_freem(control);
if (m && (flags & PRUS_NOTREADY) == 0)
m_freem(m);
error = ECONNRESET;
goto out;
}
}
tuexenUnsubmitted
Not Done
Inline Actions

I think letting tcp_options_support() return the error and lateron overwriting it is not optimal. What about letting tcp_options_support() return a bool, and replace the above with:

if (flags & PRUS_OOB && !tcp_options_support(tp, PRUS_OOB)) {
	if (control)
		m_freem(control);
	if (m && (flags & PRUS_NOTREADY) == 0)
		m_freem(m);
	error = EINVAL;
	goto out;
}
tuexen: I think letting `tcp_options_support()` return the error and lateron overwriting it is not…
rrsAuthorUnsubmitted
Done
Inline Actions

That was a code cloning error...

The error = CONNRESET

should not be present.

and I prefer not to make it a bool, but to have the stack return
0 = I support it
ERRNO = I don't support it and here is the error.

The overwrite was just a mistake.

rrs: That was a code cloning error... The error = CONNRESET should not be present. and I prefer…
TCPDEBUG1(); TCPDEBUG1();
if (nam != NULL && tp->t_state < TCPS_SYN_SENT) { if (nam != NULL && tp->t_state < TCPS_SYN_SENT) {
switch (nam->sa_family) { switch (nam->sa_family) {
Context not available.
NET_EPOCH_EXIT(et); NET_EPOCH_EXIT(et);
} }
static int
tcp_options_support(struct tcpcb *tp, int flags)
tuexenUnsubmitted
Not Done
Inline Actions

Maybe let it return a bool? Maybe call it something like tcp_pru_options_support() or so? TCP options rings other bells...

tuexen: Maybe let it return a `bool`? Maybe call it something like `tcp_pru_options_support()` or so?
rrsAuthorUnsubmitted
Done
Inline Actions

sure

rrs: sure
{
/*
* For now we say we support anything, we
* need to change this so that we ask the
* specific stack and let it decide if
* it supports PRUS_OOB or possibly other
* flags in the future.
*/
return (0);
}
/* /*
* Receive out-of-band data. * Receive out-of-band data.
*/ */
Context not available.
goto out; goto out;
} }
tp = intotcpcb(inp); tp = intotcpcb(inp);
error = tcp_options_support(tp, PRUS_OOB);
if (error) {
goto out;
tuexenUnsubmitted
Not Done
Inline Actions

If we use a bool, we want to set error to something....

tuexen: If we use a bool, we want to set error to something....
rrsAuthorUnsubmitted
Done
Inline Actions

I do not want to use bool here

rrs: I do not want to use bool here
}
TCPDEBUG1(); TCPDEBUG1();
if ((so->so_oobmark == 0 && if ((so->so_oobmark == 0 &&
(so->so_rcv.sb_state & SBS_RCVATMARK) == 0) || (so->so_rcv.sb_state & SBS_RCVATMARK) == 0) ||
Context not available.
View Options

www/tomcat9/distinfo

Context not available.
static void tcp_usrclosed(struct tcpcb *); static void tcp_usrclosed(struct tcpcb *);
static void tcp_fill_info(struct tcpcb *, struct tcp_info *); static void tcp_fill_info(struct tcpcb *, struct tcp_info *);
static int tcp_options_support(struct tcpcb *tp, int flags);
#ifdef TCPDEBUG #ifdef TCPDEBUG
#define TCPDEBUG0 int ostate = 0 #define TCPDEBUG0 int ostate = 0
#define TCPDEBUG1() ostate = tp ? tp->t_state : 0 #define TCPDEBUG1() ostate = tp ? tp->t_state : 0
Context not available.
goto out; goto out;
} }
tp = intotcpcb(inp); tp = intotcpcb(inp);
if (flags & PRUS_OOB) {
rscheffUnsubmitted
Not Done
Inline Actions

the socket MSG_OOB flag is directly mapped into protocol PRU_OOB flag, not? (they also happen to be numeric identical). Conceptually, the protocol itself should be checking the PRUS_* flags, not the MSG_* flags.

uipc_socket.c:1499: (flags & MSG_OOB) ? PRUS_OOB :
uipc_socket.c:1729: pru_flag = (flags & MSG_OOB) ? PRUS_OOB :

rscheff: the socket MSG_OOB flag is directly mapped into protocol PRU_OOB flag, not? (they also happen…
rrsAuthorUnsubmitted
Done
Inline Actions

The problem here can be found in uipc_socket.c. Before this function became the pru_send routine we "used" to
use sosend_generric() or maybe sosend_stream(), go look at these two functions (in fact look too at sosend_dgram)
*all* of them map

MSG_OOB -> PRUS_OOB
and
MSG_EOF -> PRUS_EOF

But now, since this function *is* what is called that is not happening, since this function does nto
have the proper mapping.

Yes conceptually the protocol needs to use PRUS_... but someone must do the translation from
the socket level to the protocol level. And that *used* to be done in sosend_xxxx() function which now
is no longer called. It most likely should be done here.

rrs: The problem here can be found in uipc_socket.c. Before this function became the pru_send…
rscheffUnsubmitted
Not Done
Inline Actions

Then I must be missing some context here.

Are you saying that you are bypassing the socket interface, and instead are calling tcp_usr_send() directly in some deployments, where the MSG_ flags are used instead of the PRUS_ flags?

kern_sendfile.c has vn_sendfile, this however doesn't support OOB either apparently.

rscheff: Then I must be missing some context here. Are you saying that you are bypassing the socket…
rscheffUnsubmitted
Not Done
Inline Actions

see transport@; I believe you missed that sosend() is calling the pru_sosend() pointer, and not the pru_send() pointer. So the socket API for TCP still runs thought either sosend_generic (default) or sosend_stream (sysctl selectable), both of which do the conversion from MSG_OOB / MSG_EOF in the "correct" layer - and TCP here only has to care about the PRU_ type flags.

rscheff: see transport@; I believe you missed that sosend() is calling the pru_sosend() pointer, and not…
rrsAuthorUnsubmitted
Done
Inline Actions

Yeah I had missed the so

rrs: Yeah I had missed the so
if ((error = tcp_options_support(tp, PRUS_OOB)) != 0) {
if (control)
m_freem(control);
if (m && (flags & PRUS_NOTREADY) == 0)
m_freem(m);
error = ECONNRESET;
goto out;
}
}
tuexenUnsubmitted
Not Done
Inline Actions

I think letting tcp_options_support() return the error and lateron overwriting it is not optimal. What about letting tcp_options_support() return a bool, and replace the above with:

if (flags & PRUS_OOB && !tcp_options_support(tp, PRUS_OOB)) {
	if (control)
		m_freem(control);
	if (m && (flags & PRUS_NOTREADY) == 0)
		m_freem(m);
	error = EINVAL;
	goto out;
}
tuexen: I think letting `tcp_options_support()` return the error and lateron overwriting it is not…
rrsAuthorUnsubmitted
Done
Inline Actions

That was a code cloning error...

The error = CONNRESET

should not be present.

and I prefer not to make it a bool, but to have the stack return
0 = I support it
ERRNO = I don't support it and here is the error.

The overwrite was just a mistake.

rrs: That was a code cloning error... The error = CONNRESET should not be present. and I prefer…
TCPDEBUG1(); TCPDEBUG1();
if (nam != NULL && tp->t_state < TCPS_SYN_SENT) { if (nam != NULL && tp->t_state < TCPS_SYN_SENT) {
switch (nam->sa_family) { switch (nam->sa_family) {
Context not available.
NET_EPOCH_EXIT(et); NET_EPOCH_EXIT(et);
} }
static int
tcp_options_support(struct tcpcb *tp, int flags)
tuexenUnsubmitted
Not Done
Inline Actions

Maybe let it return a bool? Maybe call it something like tcp_pru_options_support() or so? TCP options rings other bells...

tuexen: Maybe let it return a `bool`? Maybe call it something like `tcp_pru_options_support()` or so?
rrsAuthorUnsubmitted
Done
Inline Actions

sure

rrs: sure
{
/*
* For now we say we support anything, we
* need to change this so that we ask the
* specific stack and let it decide if
* it supports PRUS_OOB or possibly other
* flags in the future.
*/
return (0);
}
/* /*
* Receive out-of-band data. * Receive out-of-band data.
*/ */
Context not available.
goto out; goto out;
} }
tp = intotcpcb(inp); tp = intotcpcb(inp);
error = tcp_options_support(tp, PRUS_OOB);
if (error) {
goto out;
tuexenUnsubmitted
Not Done
Inline Actions

If we use a bool, we want to set error to something....

tuexen: If we use a bool, we want to set error to something....
rrsAuthorUnsubmitted
Done
Inline Actions

I do not want to use bool here

rrs: I do not want to use bool here
}
TCPDEBUG1(); TCPDEBUG1();
if ((so->so_oobmark == 0 && if ((so->so_oobmark == 0 &&
(so->so_rcv.sb_state & SBS_RCVATMARK) == 0) || (so->so_rcv.sb_state & SBS_RCVATMARK) == 0) ||
Context not available.