mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

REORG: stream-int: Move si_is_conn_error() in the header file

Browse Source 
To ease next changes, this function is moved in the header file. It is a
transient commit.
This commit is contained in:
Christopher Faulet 2022-04-01 13:56:30 +02:00
parent 9b7a9b400d
commit dde33046bd
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/haproxy/stream_interface.h
View File

@ -313,6 +313,24 @@ static inline void si_update(struct stream_interface *si)
si_update_tx(si);
}
/* The stream interface is only responsible for the connection during the early
* states, before plugging a mux. Thus it should only care about CO_FL_ERROR
* before CS_ST_EST, and after that it must absolutely ignore it since the mux
* may hold pending data. This function returns true if such an error was
* reported. Both the CS and the CONN must be valid.
*/
static inline int si_is_conn_error(const struct stream_interface *si)
{
struct connection *conn;
if (si->cs->state >= CS_ST_EST)
return 0;
conn = __cs_conn(si->cs);
BUG_ON(!conn);
return !!(conn->flags & CO_FL_ERROR);
}
#endif /* _HAPROXY_STREAM_INTERFACE_H */
/*

18
src/stream_interface.c
View File

@ -395,24 +395,6 @@ static void stream_int_notify(struct stream_interface *si)
ic->flags &= ~CF_READ_DONTWAIT;
}
/* The stream interface is only responsible for the connection during the early
* states, before plugging a mux. Thus it should only care about CO_FL_ERROR
* before CS_ST_EST, and after that it must absolutely ignore it since the mux
* may hold pending data. This function returns true if such an error was
* reported. Both the CS and the CONN must be valid.
*/
static inline int si_is_conn_error(const struct stream_interface *si)
{
struct connection *conn;
if (si->cs->state >= CS_ST_EST)
return 0;
conn = __cs_conn(si->cs);
BUG_ON(!conn);
return !!(conn->flags & CO_FL_ERROR);
}
/* Called by I/O handlers after completion.. It propagates
* connection flags to the stream interface, updates the stream (which may or
* may not take this opportunity to try to forward data), then update the