| Message ID | 20201022172925.22770-2-pablo@netfilter.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 79dce09ab02729a90cf6ce49c9aaaf17aa0d21db |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/7] ipvs: adjust the debug info in function set_tcp_state | expand |
Hello: This series was applied to netdev/net.git (refs/heads/master): On Thu, 22 Oct 2020 19:29:19 +0200 you wrote: > From: "longguang.yue" <bigclouds@163.com> > > Outputting client,virtual,dst addresses info when tcp state changes, > which makes the connection debug more clear > > Signed-off-by: longguang.yue <bigclouds@163.com> > Acked-by: Julian Anastasov <ja@ssi.bg> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > [...] Here is the summary with links: - [1/7] ipvs: adjust the debug info in function set_tcp_state https://git.kernel.org/netdev/net/c/79dce09ab027 - [2/7] netfilter: conntrack: connection timeout after re-register https://git.kernel.org/netdev/net/c/4f25434bccc2 - [3/7] netfilter: Drop fragmented ndisc packets assembled in netfilter https://git.kernel.org/netdev/net/c/68f9f9c2c3b6 - [4/7] netfilter: ebtables: Fixes dropping of small packets in bridge nat https://git.kernel.org/netdev/net/c/63137bc5882a - [5/7] docs: nf_flowtable: fix typo. https://git.kernel.org/netdev/net/c/64747d5ed199 - [6/7] netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create https://git.kernel.org/netdev/net/c/31cc578ae2de - [7/7] netfilter: nf_fwd_netdev: clear timestamp in forwarding path https://git.kernel.org/netdev/net/c/c77761c8a594 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c index dc2e7da2742a..7da51390cea6 100644 --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c @@ -539,8 +539,8 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, if (new_state != cp->state) { struct ip_vs_dest *dest = cp->dest; - IP_VS_DBG_BUF(8, "%s %s [%c%c%c%c] %s:%d->" - "%s:%d state: %s->%s conn->refcnt:%d\n", + IP_VS_DBG_BUF(8, "%s %s [%c%c%c%c] c:%s:%d v:%s:%d " + "d:%s:%d state: %s->%s conn->refcnt:%d\n", pd->pp->name, ((state_off == TCP_DIR_OUTPUT) ? "output " : "input "), @@ -548,10 +548,12 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, th->fin ? 'F' : '.', th->ack ? 'A' : '.', th->rst ? 'R' : '.', - IP_VS_DBG_ADDR(cp->daf, &cp->daddr), - ntohs(cp->dport), IP_VS_DBG_ADDR(cp->af, &cp->caddr), ntohs(cp->cport), + IP_VS_DBG_ADDR(cp->af, &cp->vaddr), + ntohs(cp->vport), + IP_VS_DBG_ADDR(cp->daf, &cp->daddr), + ntohs(cp->dport), tcp_state_name(cp->state), tcp_state_name(new_state), refcount_read(&cp->refcnt));