Re: [PATCH 01/22] treewide: Use "our address" instead of "forwarding address"

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 4897 bytes --]

On Sun, Aug 18, 2024 at 05:44:51PM +0200, Stefano Brivio wrote:
> On Fri, 16 Aug 2024 15:39:42 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > The term "forwarding address" to indicate the local-to-passt address was
> > well-intentioned, but ends up being kinda confusing.  As discussed on a
> > recent call, let's try "our" instead.
> > 
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> >  flow.c         | 72 +++++++++++++++++++++++++-------------------------
> >  flow.h         | 18 ++++++-------
> >  fwd.c          | 70 ++++++++++++++++++++++++------------------------
> >  icmp.c         |  4 +--
> >  tcp.c          | 33 ++++++++++++-----------
> >  tcp_internal.h |  2 +-
> >  udp.c          | 12 ++++-----
> >  7 files changed, 106 insertions(+), 105 deletions(-)
> > 
> > diff --git a/flow.c b/flow.c
> > index 93b687dc..8915e366 100644
> > --- a/flow.c
> > +++ b/flow.c
> > @@ -127,18 +127,18 @@ static struct timespec flow_timer_run;
> >   * @af:		Address family (AF_INET or AF_INET6)
> >   * @eaddr:	Endpoint address (pointer to in_addr or in6_addr)
> >   * @eport:	Endpoint port
> > - * @faddr:	Forwarding address (pointer to in_addr or in6_addr)
> > - * @fport:	Forwarding port
> > + * @oaddr:	Our address (pointer to in_addr or in6_addr)
> > + * @oport:	Our port
> >   */
> >  static void flowside_from_af(struct flowside *side, sa_family_t af,
> >  			     const void *eaddr, in_port_t eport,
> > -			     const void *faddr, in_port_t fport)
> > +			     const void *oaddr, in_port_t oport)
> >  {
> > -	if (faddr)
> > -		inany_from_af(&side->faddr, af, faddr);
> > +	if (oaddr)
> > +		inany_from_af(&side->oaddr, af, oaddr);
> >  	else
> > -		side->faddr = inany_any6;
> > -	side->fport = fport;
> > +		side->oaddr = inany_any6;
> > +	side->oport = oport;
> >  
> >  	if (eaddr)
> >  		inany_from_af(&side->eaddr, af, eaddr);
> > @@ -193,8 +193,8 @@ static int flowside_sock_splice(void *arg)
> >   * @tgt:	Target flowside
> >   * @data:	epoll reference portion for protocol handlers
> >   *
> > - * Return: socket fd of protocol @proto bound to the forwarding address and port
> > - *         from @tgt (if specified).
> > + * Return: socket fd of protocol @proto bound to our address and port from @tgt
> > + *         (if specified).
> >   */
> >  int flowside_sock_l4(const struct ctx *c, enum epoll_type type, uint8_t pif,
> >  		     const struct flowside *tgt, uint32_t data)
> > @@ -205,11 +205,11 @@ int flowside_sock_l4(const struct ctx *c, enum epoll_type type, uint8_t pif,
> >  
> >  	ASSERT(pif_is_socket(pif));
> >  
> > -	pif_sockaddr(c, &sa, &sl, pif, &tgt->faddr, tgt->fport);
> > +	pif_sockaddr(c, &sa, &sl, pif, &tgt->oaddr, tgt->oport);
> >  
> >  	switch (pif) {
> >  	case PIF_HOST:
> > -		if (inany_is_loopback(&tgt->faddr))
> > +		if (inany_is_loopback(&tgt->oaddr))
> >  			ifname = NULL;
> >  		else if (sa.sa_family == AF_INET)
> >  			ifname = c->ip4.ifname_out;
> > @@ -309,11 +309,11 @@ static void flow_set_state(struct flow_common *f, enum flow_state state)
> >  			  pif_name(f->pif[INISIDE]),
> >  			  inany_ntop(&ini->eaddr, estr0, sizeof(estr0)),
> >  			  ini->eport,
> > -			  inany_ntop(&ini->faddr, fstr0, sizeof(fstr0)),
> > -			  ini->fport,
> > +			  inany_ntop(&ini->oaddr, fstr0, sizeof(fstr0)),
> > +			  ini->oport,
> >  			  pif_name(f->pif[TGTSIDE]),
> > -			  inany_ntop(&tgt->faddr, fstr1, sizeof(fstr1)),
> > -			  tgt->fport,
> > +			  inany_ntop(&tgt->oaddr, fstr1, sizeof(fstr1)),
> > +			  tgt->oport,
> >  			  inany_ntop(&tgt->eaddr, estr1, sizeof(estr1)),
> >  			  tgt->eport);
> >  	else if (MAX(state, oldstate) >= FLOW_STATE_INI)
> > @@ -321,8 +321,8 @@ static void flow_set_state(struct flow_common *f, enum flow_state state)
> >  			  pif_name(f->pif[INISIDE]),
> >  			  inany_ntop(&ini->eaddr, estr0, sizeof(estr0)),
> >  			  ini->eport,
> > -			  inany_ntop(&ini->faddr, fstr0, sizeof(fstr0)),
> > -			  ini->fport);
> > +			  inany_ntop(&ini->oaddr, fstr0, sizeof(fstr0)),
> > +			  ini->oport);
> >  }
> >  
> >  /**
> > @@ -347,7 +347,7 @@ static void flow_initiate_(union flow *flow, uint8_t pif)
> >   * flow_initiate_af() - Move flow to INI, setting INISIDE details
> >   * @flow:	Flow to change state
> >   * @pif:	pif of the initiating side
> > - * @af:		Address family of @eaddr and @faddr
> > + * @af:		Address family of @eaddr and @oaddr
> 
> Pre-existing, but this made me realise that flow_initiate_af() doesn't
> actually take @eaddr and @faddr at all (it's @saddr and @daddr instead).

Oops, yes.  I've folded a fix for that into this patch.

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]