mirror of
https://github.com/clearml/dropbear
synced 2025-02-07 05:17:28 +00:00
Merge netio changes
This commit is contained in:
commit
ebb4018889
9
netio.c
9
netio.c
@ -377,7 +377,7 @@ void set_sock_priority(int sock, enum dropbear_prio prio) {
|
|||||||
/* Don't log ENOTSOCK errors so that this can harmlessly be called
|
/* Don't log ENOTSOCK errors so that this can harmlessly be called
|
||||||
* on a client '-J' proxy pipe */
|
* on a client '-J' proxy pipe */
|
||||||
|
|
||||||
#ifdef IPTOS_DSCP_AF21
|
#ifdef IP_TOS
|
||||||
/* Set the DSCP field for outbound IP packet priority.
|
/* Set the DSCP field for outbound IP packet priority.
|
||||||
rfc4594 has some guidance to meanings.
|
rfc4594 has some guidance to meanings.
|
||||||
|
|
||||||
@ -389,9 +389,12 @@ void set_sock_priority(int sock, enum dropbear_prio prio) {
|
|||||||
|
|
||||||
Old Dropbear/OpenSSH and Debian/Ubuntu OpenSSH (at Jan 2022) use
|
Old Dropbear/OpenSSH and Debian/Ubuntu OpenSSH (at Jan 2022) use
|
||||||
IPTOS_LOWDELAY/IPTOS_THROUGHPUT
|
IPTOS_LOWDELAY/IPTOS_THROUGHPUT
|
||||||
|
|
||||||
|
DSCP constants are from Linux headers, applicable to other platforms
|
||||||
|
such as macos.
|
||||||
*/
|
*/
|
||||||
if (prio == DROPBEAR_PRIO_LOWDELAY) {
|
if (prio == DROPBEAR_PRIO_LOWDELAY) {
|
||||||
val = IPTOS_DSCP_AF21;
|
val = 0x48; /* IPTOS_DSCP_AF21 */
|
||||||
} else {
|
} else {
|
||||||
val = 0; /* default */
|
val = 0; /* default */
|
||||||
}
|
}
|
||||||
@ -405,7 +408,7 @@ void set_sock_priority(int sock, enum dropbear_prio prio) {
|
|||||||
if (rc < 0 && errno != ENOTSOCK) {
|
if (rc < 0 && errno != ENOTSOCK) {
|
||||||
TRACE(("Couldn't set IP_TOS (%s)", strerror(errno)));
|
TRACE(("Couldn't set IP_TOS (%s)", strerror(errno)));
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* IP_TOS */
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_PKT_SCHED_H
|
#ifdef HAVE_LINUX_PKT_SCHED_H
|
||||||
/* Set scheduling priority within the local Linux network stack */
|
/* Set scheduling priority within the local Linux network stack */
|
||||||
|
Loading…
Reference in New Issue
Block a user