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

mptcp: move to next addr when subflow creation fail 



When an invalid address was announced, the subflow couldn't be created
for this address. Therefore mptcp_pm_nl_subflow_established couldn't be
invoked. Then the next addresses in the local address list didn't have a
chance to be announced.

This patch invokes the new function mptcp_pm_add_addr_echoed when the
address is echoed. In it, use mptcp_lookup_anno_list_by_saddr to check
whether this address is in the anno_list. If it is, PM schedules the
status MPTCP_PM_SUBFLOW_ESTABLISHED to invoke
mptcp_pm_create_subflow_or_signal_addr to deal with the next address in
the local address list.

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 d88c476f

net/mptcp/options.c

+1 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) 
			mptcp_pm_add_addr_received(msk, &addr);

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDR);

		} else {

			mptcp_pm_add_addr_echoed(msk, &addr);

			mptcp_pm_del_add_timer(msk, &addr);

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADD);

		}

net/mptcp/pm.c

+15 −0
Original line number Diff line number Diff line
@@ -196,6 +196,21 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, 
	spin_unlock_bh(&pm->lock);

}



void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,

			      struct mptcp_addr_info *addr)

{

	struct mptcp_pm_data *pm = &msk->pm;



	pr_debug("msk=%p", msk);



	spin_lock_bh(&pm->lock);



	if (mptcp_lookup_anno_list_by_saddr(msk, addr) && READ_ONCE(pm->work_pending))

		mptcp_pm_schedule_work(msk, MPTCP_PM_SUBFLOW_ESTABLISHED);



	spin_unlock_bh(&pm->lock);

}



void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk)

{

	if (!mptcp_pm_should_add_signal(msk))

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -647,6 +647,8 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk); 
void mptcp_pm_subflow_closed(struct mptcp_sock *msk, u8 id);

void mptcp_pm_add_addr_received(struct mptcp_sock *msk,

				const struct mptcp_addr_info *addr);

void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,

			      struct mptcp_addr_info *addr);

void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,

			       const struct mptcp_rm_list *rm_list);