Re: [PATCH v3] ipvs: adjust the debug info in function set_tcp_state

[Julian Anastasov <ja@xxxxxx>]

        Hello,

On Sun, 27 Sep 2020, yue longguang wrote:

> Hi, could you all give me some feedback?

        Feedback is same, patch is malformed on sending.
Download it from list, apply it and see what happens.

# cat /tmp/file.patch | patch -p1 --dry-run
checking file net/netfilter/ipvs/ip_vs_proto_tcp.c
patch: **** malformed patch at line 17: ip_vs_conn *cp,

        If you can not resolve it, we can fix it...

> thanks
> 
> On Fri, Sep 25, 2020 at 8:09 PM yue longguang <yuelongguang@xxxxxxxxx> wrote:
> >
> > From: "longguang.yue" <yuelongguang@xxxxxxxxx>
> >
> >    outputting client,virtual,dst addresses info when tcp state changes,
> >    which makes the connection debug more clear
> >
> > Signed-off-by: longguang.yue <yuelongguang@xxxxxxxxx>
> > ---
> > net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > 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));
> > --
> > 2.20.1 (Apple Git-117)

Regards

--
Julian Anastasov <ja@xxxxxx>