Commit d0b698ca authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: remove multi addresses in PM 



This patch dropped the member rm_id of struct mptcp_pm_data. Use
rm_list_rx in mptcp_pm_nl_rm_addr_received instead of using rm_id.

In mptcp_pm_nl_rm_addr_received, iterated each address id from
pm.rm_list_rx, then shut down and closed each address id's subsocket.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5c55f33

net/mptcp/pm_netlink.c

+20 −16
Original line number Diff line number Diff line
@@ -575,24 +575,27 @@ static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) 
{

	struct mptcp_subflow_context *subflow, *tmp;

	struct sock *sk = (struct sock *)msk;

	u8 i;



	pr_debug("address rm_id %d", msk->pm.rm_id);

	pr_debug("address rm_list_nr %d", msk->pm.rm_list_rx.nr);



	msk_owned_by_me(msk);



	if (!msk->pm.rm_id)

	if (!msk->pm.rm_list_rx.nr)

		return;



	if (list_empty(&msk->conn_list))

		return;



	for (i = 0; i < msk->pm.rm_list_rx.nr; i++) {

		list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {

			struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;



		if (msk->pm.rm_id != subflow->remote_id)

			if (msk->pm.rm_list_rx.ids[i] != subflow->remote_id)

				continue;



			pr_debug(" -> address rm_list_ids[%d]=%u", i, msk->pm.rm_list_rx.ids[i]);

			spin_unlock_bh(&msk->pm.lock);

			mptcp_subflow_shutdown(sk, ssk, how);

			mptcp_close_ssk(sk, ssk, subflow);
@@ -607,6 +610,7 @@ static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) 
			break;

		}

	}

}



void mptcp_pm_nl_work(struct mptcp_sock *msk)

{

net/mptcp/protocol.h

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ struct mptcp_pm_data { 
	u8		status;

	struct mptcp_rm_list rm_list_tx;

	struct mptcp_rm_list rm_list_rx;

	u8		rm_id;

};



struct mptcp_data_frag {