| Message ID | ea7d8eb1-5484-09dc-aa53-cf839b93bc73@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2] mptcp: make sure flag signal is set when add addr with port | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hi David, Thank you for maintaining iproute2-next! On 23/04/2021 12:24, Jianguo Wu wrote: > From: Jianguo Wu <wujianguo@chinatelecom.cn> > > When add address with port, it is mean to send an ADD_ADDR to remote, > so it must have flag signal set. > > Fixes: 42fbca91cd61 ("mptcp: add support for port based endpoint") > Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> I see on patchwork[1] that this patch is marked as "Accepted". But I cannot find it in 'main' branches from iproute2-next.git and iproute2.git repos. Did I miss it somewhere? If it is not too late, here is a ACK from MPTCP team: Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> Thanks Jianguo for this patch! Cheers, Matt [1] https://patchwork.kernel.org/project/netdevbpf/patch/ea7d8eb1-5484-09dc-aa53-cf839b93bc73@163.com/
On 4/30/21 3:35 AM, Matthieu Baerts wrote: > On 23/04/2021 12:24, Jianguo Wu wrote: >> From: Jianguo Wu <wujianguo@chinatelecom.cn> >> >> When add address with port, it is mean to send an ADD_ADDR to remote, >> so it must have flag signal set. >> >> Fixes: 42fbca91cd61 ("mptcp: add support for port based endpoint") >> Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> > > I see on patchwork[1] that this patch is marked as "Accepted". But I > cannot find it in 'main' branches from iproute2-next.git and > iproute2.git repos. > > Did I miss it somewhere? no idea what happened > > If it is not too late, here is a ACK from MPTCP team: > > Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> > I'll add the Ack and apply.
On 30/04/2021 16:27, David Ahern wrote: > On 4/30/21 3:35 AM, Matthieu Baerts wrote: >> On 23/04/2021 12:24, Jianguo Wu wrote: >>> From: Jianguo Wu <wujianguo@chinatelecom.cn> >>> >>> When add address with port, it is mean to send an ADD_ADDR to remote, >>> so it must have flag signal set. >>> >>> Fixes: 42fbca91cd61 ("mptcp: add support for port based endpoint") >>> Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> >> >> I see on patchwork[1] that this patch is marked as "Accepted". But I >> cannot find it in 'main' branches from iproute2-next.git and >> iproute2.git repos. >> >> Did I miss it somewhere? > > no idea what happened > >> >> If it is not too late, here is a ACK from MPTCP team: >> >> Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> >> > > I'll add the Ack and apply. Thank you for your help! Cheers, Matt
diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index 5f490f0..44af723 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -143,6 +143,9 @@ static int mptcp_parse_opt(int argc, char **argv, struct nlmsghdr *n, if (!id_set && !adding) missarg("ID"); + if (port && !(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) + invarg("flags must have signal when using port", "port"); + attr_addr = addattr_nest(n, MPTCP_BUFLEN, MPTCP_PM_ATTR_ADDR | NLA_F_NESTED); if (id_set)