mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2021-06-17 17:14:54 +08:00
commit 853b7f00ca
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.sh
View file

@ -484,6 +484,7 @@ else
scripts/feeds install -a -d y -f -p openmptcprouter scripts/feeds install -a -d y -f -p openmptcprouter
fi fi
cp .config.keep .config cp .config.keep .config
scripts/feeds install kmod-macremapper
echo "Done" echo "Done"
if [ ! -f "../../$OMR_TARGET_CONFIG" ]; then if [ ! -f "../../$OMR_TARGET_CONFIG" ]; then

10
root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
View file

@ -11843,7 +11843,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_ctrl.c linux-5.4.64.mptcp/net/mptcp/mptc
+#endif +#endif
+ } + }
+drop: +drop:
+ __NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS); + NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
+ return 0; + return 0;
+} +}
+ +
@ -14734,7 +14734,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_input.c linux-5.4.64.mptcp/net/mptcp/mpt
+ meta_tp->rcv_nxt))) { + meta_tp->rcv_nxt))) {
+ mptcp_send_active_reset(meta_sk, GFP_ATOMIC); + mptcp_send_active_reset(meta_sk, GFP_ATOMIC);
+ tcp_done(meta_sk); + tcp_done(meta_sk);
+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); + NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA);
+ return -1; + return -1;
+ } + }
+ +
@ -14775,7 +14775,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_input.c linux-5.4.64.mptcp/net/mptcp/mpt
+ if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq && + if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq &&
+ after(TCP_SKB_CB(skb)->end_seq - th->fin, tp->rcv_nxt) && + after(TCP_SKB_CB(skb)->end_seq - th->fin, tp->rcv_nxt) &&
+ !mptcp_is_data_fin2(skb, tp)) { + !mptcp_is_data_fin2(skb, tp)) {
+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA); + NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPABORTONDATA);
+ mptcp_send_active_reset(meta_sk, GFP_ATOMIC); + mptcp_send_active_reset(meta_sk, GFP_ATOMIC);
+ tcp_reset(meta_sk); + tcp_reset(meta_sk);
+ return -1; + return -1;
@ -21440,7 +21440,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_output.c linux-5.4.64.mptcp/net/mptcp/mp
+ return 0; + return 0;
+ +
+failed: +failed:
+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPRETRANSFAIL); + NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPRETRANSFAIL);
+ return err; + return err;
+} +}
+ +
@ -21499,7 +21499,7 @@ diff -aurN linux-5.4.64/net/mptcp/mptcp_output.c linux-5.4.64.mptcp/net/mptcp/mp
+ return; + return;
+ +
+ if (meta_icsk->icsk_retransmits == 0) + if (meta_icsk->icsk_retransmits == 0)
+ __NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPTIMEOUTS); + NET_INC_STATS(sock_net(meta_sk), LINUX_MIB_TCPTIMEOUTS);
+ +
+ meta_icsk->icsk_ca_state = TCP_CA_Loss; + meta_icsk->icsk_ca_state = TCP_CA_Loss;
+ +