CLEANUP: peers: remove unused peer_session_target()

Since commit 7293eb68 ("MEDIUM: peers: use server as stream target") peer
session target always point to server in order to benefit from existing
server transport options.

Thanks to that, it is no longer necessary to have peer_session_target()
helper function, because all it does is return the pointer to the
server object. Let's get rid of that

diff --git a/include/haproxy/peers.h b/include/haproxy/peers.h
index d100c0c24575d53150b1ab6cd89b131e7b5bb213..3dfa8c9025ed73ddd979feb478223a84129f45ba 100644 (file)
--- a/include/haproxy/peers.h
+++ b/include/haproxy/peers.h
@@ -40,10 +40,5 @@ int peers_register_table(struct peers *, struct stktable *table);
 void peers_setup_frontend(struct proxy *fe);
 void peers_register_keywords(struct peers_kw_list *pkwl);
 
-static inline enum obj_type *peer_session_target(struct peer *p, struct stream *s)
-{
-       return &p->srv->obj_type;
-}
-
 #endif /* _HAPROXY_PEERS_H */
 

diff --git a/src/peers.c b/src/peers.c
index e116e2fdd3ac6c45ebb5b9363f02f1007e610826..efb2ac0a68499dffbbc0f9ea321ce805f331cb9e 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -1080,7 +1080,7 @@ static int peer_session_init(struct appctx *appctx)
        s->scb->dst = addr;
        s->scb->flags |= (SC_FL_RCV_ONCE|SC_FL_NOLINGER);
        s->flags = SF_ASSIGNED;
-       s->target = peer_session_target(peer, s);
+       s->target = &peer->srv->obj_type;
 
        s->do_log = NULL;
        s->uniq_id = 0;