summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faulet <cfaulet@haproxy.com>2020-09-30 14:08:30 +0200
committerChristopher Faulet <cfaulet@haproxy.com>2020-11-20 13:01:26 +0100
commitd62ba899692dcb4f7ad9e6d4bbcf11f31d395f17 (patch)
tree187f12c9b9e330f416a6cd9cb22e864e6a6679ff
parentb658cdba9dd070b7f3f6bc27d80901e73e26e8e3 (diff)
downloadhaproxy-d62ba899692dcb4f7ad9e6d4bbcf11f31d395f17.tar.gz
MINOR: muxes: Remove get_cs_info callback function now useless
This callback function was only defined by the mux-h1. But it has been removed in the previous commit because it is unused now. So, we can do a step forward removing the callback function from the mux definition and the cs_info structure.
-rw-r--r--include/haproxy/connection-t.h14
-rw-r--r--include/haproxy/stream_interface.h12
2 files changed, 0 insertions, 26 deletions
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index a40088011..61602e741 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -400,7 +400,6 @@ struct mux_ops {
int (*used_streams)(struct connection *conn); /* Returns the number of streams in use on a connection. */
void (*destroy)(void *ctx); /* Let the mux know one of its users left, so it may have to disappear */
void (*reset)(struct connection *conn); /* Reset the mux, because we're re-trying to connect */
- const struct cs_info *(*get_cs_info)(struct conn_stream *cs); /* Return info on the specified conn_stream or NULL if not defined */
int (*ctl)(struct connection *conn, enum mux_ctl_type mux_ctl, void *arg); /* Provides information about the mux */
int (*takeover)(struct connection *conn, int orig_tid); /* Attempts to migrate the connection to the current thread */
unsigned int flags; /* some flags characterizing the mux's capabilities (MX_FL_*) */
@@ -454,19 +453,6 @@ struct conn_stream {
void *ctx; /* mux-specific context */
};
-/*
- * This structure describes the info related to a conn_stream known by the mux
- * only but useful for the upper layer.
- * For now, only some dates and durations are reported. This structure will
- * envolved. But for now, only the bare minimum is referenced.
- */
-struct cs_info {
- struct timeval create_date; /* Creation date of the conn_stream in user date */
- struct timeval tv_create; /* Creation date of the conn_stream in internal date (monotonic) */
- long t_handshake; /* handshake duration, -1 if never occurs */
- long t_idle; /* idle duration, -1 if never occurs */
-};
-
/* This structure describes a connection with its methods and data.
* A connection may be performed to proxy or server via a local or remote
* socket, and can also be made to an internal applet. It can support
diff --git a/include/haproxy/stream_interface.h b/include/haproxy/stream_interface.h
index a81a84f54..0c2e17392 100644
--- a/include/haproxy/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -534,18 +534,6 @@ static inline void si_update(struct stream_interface *si)
si_update_tx(si);
}
-/* Returns info about the conn_stream <cs>, if not NULL. It call the mux layer's
- * get_cs_info() function, if it exists. On success, it returns a cs_info
- * structure. Otherwise, on error, if the mux does not implement get_cs_info()
- * or if conn_stream is NULL, NULL is returned.
- */
-static inline const struct cs_info *si_get_cs_info(struct conn_stream *cs)
-{
- if (cs && cs->conn->mux->get_cs_info)
- return cs->conn->mux->get_cs_info(cs);
- return NULL;
-}
-
/* for debugging, reports the stream interface state name */
static inline const char *si_state_str(int state)
{