/*
- * Copyright (c) 2000-2019 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2020 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <netinet/in_systm.h>
#include <netinet/in_pcb.h>
#include <netinet/in_var.h>
-#if INET6
#include <netinet6/in6_pcb.h>
-#endif
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
#include <netinet/tcp_cache.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcp_cc.h>
-#if INET6
#include <netinet6/tcp6_var.h>
-#endif
#include <netinet/tcpip.h>
#if TCPDEBUG
#include <netinet/tcp_debug.h>
return error;
}
- tt = s * TCP_RETRANSHZ / 1000;
+ tt = temp * TCP_RETRANSHZ / 1000;
if (tt < 1 || tt > INT_MAX) {
return EINVAL;
}
err = sysctl_io_number(req, tcp_change_mss_recommended,
sizeof(int32_t), &i, &changed);
if (changed) {
+ if (i < 0 || i > UINT16_MAX) {
+ return EINVAL;
+ }
ifnet_head_lock_shared();
TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
if (IFNET_IS_CELLULAR(ifp)) {
/* Set MSS recommended */
new_cell_sr->valid_bitmask |= IF_CELL_UL_MSS_RECOMMENDED_VALID;
- new_cell_sr->mss_recommended = i;
+ new_cell_sr->mss_recommended = (uint16_t)i;
err = ifnet_link_status_report(ifp, new_cell_sr, sizeof(new_cell_sr));
if (err == 0) {
tcp_change_mss_recommended = i;
socket_post_kev_msg_closed(tp->t_inpcb->inp_socket);
}
+ tcp_del_fsw_flow(tp);
+
/* 19182803: Notify nstat that connection is closing before waiting. */
nstat_pcb_detach(tp->t_inpcb);
if (inp->inp_state != INPCB_STATE_DEAD) {
/* Become a regular mutex */
lck_mtx_convert_spin(&inp->inpcb_mtx);
-#if INET6
if (SOCK_CHECK_DOM(so, PF_INET6)) {
in6_pcbdetach(inp);
- } else
-#endif /* INET6 */
- in_pcbdetach(inp);
+ } else {
+ in_pcbdetach(inp);
+ }
}
VERIFY(so->so_usecount > 0);
so->so_usecount--;
}
if (inp->inp_state != INPCB_STATE_DEAD) {
-#if INET6
if (SOCK_CHECK_DOM(so, PF_INET6)) {
in6_pcbdetach(inp);
- } else
-#endif /* INET6 */
- in_pcbdetach(inp);
+ } else {
+ in_pcbdetach(inp);
+ }
}
if (mp_so) {
tcp_update_mss_locked(tp->t_inpcb->inp_socket, NULL);
}
+static uint32_t
+tcp_pmtud_black_holed_next_mss(struct tcpcb *tp)
+{
+ /* Reduce the MSS to intermediary value */
+ if (tp->t_maxopd > tcp_pmtud_black_hole_mss) {
+ return tcp_pmtud_black_hole_mss;
+ } else {
+ if (tp->t_inpcb->inp_vflag & INP_IPV4) {
+ return tcp_mssdflt;
+ } else {
+ return tcp_v6mssdflt;
+ }
+ }
+}
+
/*
* TCP timer processing.
*/
#if TCPDEBUG
int ostate;
#endif
-
-#if INET6
- int isipv6 = (tp->t_inpcb->inp_vflag & INP_IPV4) == 0;
-#endif /* INET6 */
u_int64_t accsleep_ms;
- u_int32_t last_sleep_ms = 0;
+ u_int64_t last_sleep_ms = 0;
so = tp->t_inpcb->inp_socket;
idle_time = tcp_now - tp->t_rcvtime;
}
}
tp->t_rxtshift = TCP_MAXRXTSHIFT;
- postevent(so, 0, EV_TIMEOUT);
soevent(so,
(SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));
!(tp->t_flagsext & TF_NOBLACKHOLE_DETECTION) &&
(tp->t_state == TCPS_ESTABLISHED)) {
if ((tp->t_flags & TF_PMTUD) &&
- ((tp->t_flags & TF_MAXSEGSNT)
- || tp->t_pmtud_lastseg_size > tcp_pmtud_black_hole_mss) &&
+ tp->t_pmtud_lastseg_size > tcp_pmtud_black_holed_next_mss(tp) &&
tp->t_rxtshift == 2) {
/*
* Enter Path MTU Black-hole Detection mechanism:
tp->t_pmtud_start_ts++;
}
/* Reduce the MSS to intermediary value */
- if (tp->t_maxopd > tcp_pmtud_black_hole_mss) {
- tp->t_maxopd = tcp_pmtud_black_hole_mss;
- } else {
- tp->t_maxopd = /* use the default MSS */
-#if INET6
- isipv6 ? tcp_v6mssdflt :
-#endif /* INET6 */
- tcp_mssdflt;
- }
+ tp->t_maxopd = tcp_pmtud_black_holed_next_mss(tp);
tp->t_maxseg = tp->t_maxopd - optlen;
/*
* retransmit times until then.
*/
if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
-#if INET6
- if (isipv6) {
+ if (!(tp->t_inpcb->inp_vflag & INP_IPV4)) {
in6_losing(tp->t_inpcb);
- } else
-#endif /* INET6 */
- in_losing(tp->t_inpcb);
+ } else {
+ in_losing(tp->t_inpcb);
+ }
tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
tp->t_srtt = 0;
}
((tp->t_persist_stop != 0) &&
TSTMP_LEQ(tp->t_persist_stop, tcp_now))) {
tcpstat.tcps_persistdrop++;
- postevent(so, 0, EV_TIMEOUT);
soevent(so,
(SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));
tp = tcp_drop(tp, ETIMEDOUT);
* or drop connection if idle for too long.
*/
case TCPT_KEEP:
+#if FLOW_DIVERT
+ if (tp->t_inpcb->inp_socket->so_flags & SOF_FLOW_DIVERT) {
+ break;
+ }
+#endif /* FLOW_DIVERT */
+
tcpstat.tcps_keeptimeo++;
#if MPTCP
/*
}
tcp_reset_stretch_ack(tp);
}
+ tp->t_forced_acks = TCP_FORCED_ACKS_COUNT;
/*
* If we are measuring inter packet arrival jitter
CLEAR_IAJ_STATE(tp);
tcpstat.tcps_delack++;
+ tp->t_stat.delayed_acks_sent++;
(void) tcp_output(tp);
}
break;
(tp->t_mpflags & TMPF_JOINED_FLOW)) {
if (++tp->t_mprxtshift > TCP_MAXRXTSHIFT) {
tcpstat.tcps_timeoutdrop++;
- postevent(so, 0, EV_TIMEOUT);
soevent(so,
(SO_FILT_HINT_LOCKED |
SO_FILT_HINT_TIMEOUT));
tp->t_rxtshift > 0 ||
tp->snd_max == tp->snd_una ||
!SACK_ENABLED(tp) ||
- !TAILQ_EMPTY(&tp->snd_holes) ||
+ (tcp_do_better_lr != 1 && !TAILQ_EMPTY(&tp->snd_holes)) ||
IN_FASTRECOVERY(tp)) &&
!(tp->t_flagsext & TF_IF_PROBING)) {
break;
break;
dropit:
tcpstat.tcps_keepdrops++;
- postevent(so, 0, EV_TIMEOUT);
soevent(so,
(SO_FILT_HINT_LOCKED | SO_FILT_HINT_TIMEOUT));
tp = tcp_drop(tp, ETIMEDOUT);
}
if (!LIST_EMPTY(&listp->lhead)) {
- u_int16_t next_mode = 0;
+ uint32_t next_mode = 0;
if ((list_mode & TCP_TIMERLIST_10MS_MODE) ||
(listp->pref_mode & TCP_TIMERLIST_10MS_MODE)) {
next_mode = TCP_TIMERLIST_10MS_MODE;
/* send packet loss rate, shift by 10 for precision */
if (tcpstat.tcps_sndpack > 0 && tcpstat.tcps_sndrexmitpack > 0) {
var = tcpstat.tcps_sndrexmitpack << 10;
- stat.send_plr = (var * 100) / tcpstat.tcps_sndpack;
+ stat.send_plr = (uint32_t)((var * 100) / tcpstat.tcps_sndpack);
}
/* recv packet loss rate, shift by 10 for precision */
if (tcpstat.tcps_rcvpack > 0 && tcpstat.tcps_recovered_pkts > 0) {
var = tcpstat.tcps_recovered_pkts << 10;
- stat.recv_plr = (var * 100) / tcpstat.tcps_rcvpack;
+ stat.recv_plr = (uint32_t)((var * 100) / tcpstat.tcps_rcvpack);
}
/* RTO after tail loss, shift by 10 for precision */
&& tcpstat.tcps_tailloss_rto > 0) {
var = tcpstat.tcps_tailloss_rto << 10;
stat.send_tlrto_rate =
- (var * 100) / tcpstat.tcps_sndrexmitpack;
+ (uint32_t)((var * 100) / tcpstat.tcps_sndrexmitpack);
}
/* packet reordering */
if (tcpstat.tcps_sndpack > 0 && tcpstat.tcps_reordered_pkts > 0) {
var = tcpstat.tcps_reordered_pkts << 10;
stat.send_reorder_rate =
- (var * 100) / tcpstat.tcps_sndpack;
+ (uint32_t)((var * 100) / tcpstat.tcps_sndpack);
}
if (tcp_ecn_outbound == 1) {
projects / apple / xnu.git / blobdiff