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

CLEANUP: log-forward: rename all occurrences of stconn "cs" to "sc"

Browse Source 
In the log-forwarding applet, function arguments and local variables
called "cs" were renamed to "sc" to avoid future confusion.
This commit is contained in:
Willy Tarreau 2022-05-27 10:36:36 +02:00
parent 3e7be363c4
commit 270a4574a4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/log.c
View File

@ -3559,8 +3559,8 @@ out:
static void syslog_io_handler(struct appctx *appctx) static void syslog_io_handler(struct appctx *appctx)
{ {
static THREAD_LOCAL struct ist metadata[LOG_META_FIELDS]; static THREAD_LOCAL struct ist metadata[LOG_META_FIELDS];
struct stconn *cs = appctx_cs(appctx); struct stconn *sc = appctx_cs(appctx);
struct stream *s = __sc_strm(cs); struct stream *s = __sc_strm(sc);
struct proxy *frontend = strm_fe(s); struct proxy *frontend = strm_fe(s);
struct listener *l = strm_li(s); struct listener *l = strm_li(s);
struct buffer *buf = get_trash_chunk(); struct buffer *buf = get_trash_chunk();
@ -3572,14 +3572,14 @@ static void syslog_io_handler(struct appctx *appctx)
size_t size; size_t size;
max_accept = l->maxaccept ? l->maxaccept : 1; max_accept = l->maxaccept ? l->maxaccept : 1;
while (co_data(sc_oc(cs))) { while (co_data(sc_oc(sc))) {
char c; char c;
if (max_accept <= 0) if (max_accept <= 0)
goto missing_budget; goto missing_budget;
max_accept--; max_accept--;
to_skip = co_getchar(sc_oc(cs), &c); to_skip = co_getchar(sc_oc(sc), &c);
if (!to_skip) if (!to_skip)
goto missing_data; goto missing_data;
else if (to_skip < 0) else if (to_skip < 0)
@ -3589,7 +3589,7 @@ static void syslog_io_handler(struct appctx *appctx)
/* rfc-6587, Non-Transparent-Framing: messages separated by /* rfc-6587, Non-Transparent-Framing: messages separated by
* a trailing LF or CR LF * a trailing LF or CR LF
*/ */
to_skip = co_getline(sc_oc(cs), buf->area, buf->size); to_skip = co_getline(sc_oc(sc), buf->area, buf->size);
if (!to_skip) if (!to_skip)
goto missing_data; goto missing_data;
else if (to_skip < 0) else if (to_skip < 0)
@ -3613,7 +3613,7 @@ static void syslog_io_handler(struct appctx *appctx)
char *p = NULL; char *p = NULL;
int msglen; int msglen;
to_skip = co_getword(sc_oc(cs), buf->area, buf->size, ' '); to_skip = co_getword(sc_oc(sc), buf->area, buf->size, ' ');
if (!to_skip) if (!to_skip)
goto missing_data; goto missing_data;
else if (to_skip < 0) else if (to_skip < 0)
@ -3630,7 +3630,7 @@ static void syslog_io_handler(struct appctx *appctx)
if (msglen > buf->size) if (msglen > buf->size)
goto parse_error; goto parse_error;
msglen = co_getblk(sc_oc(cs), buf->area, msglen, to_skip); msglen = co_getblk(sc_oc(sc), buf->area, msglen, to_skip);
if (!msglen) if (!msglen)
goto missing_data; goto missing_data;
else if (msglen < 0) else if (msglen < 0)
@ -3643,7 +3643,7 @@ static void syslog_io_handler(struct appctx *appctx)
else else
goto parse_error; goto parse_error;
co_skip(sc_oc(cs), to_skip); co_skip(sc_oc(sc), to_skip);
/* update counters */ /* update counters */
_HA_ATOMIC_INC(&cum_log_messages); _HA_ATOMIC_INC(&cum_log_messages);
@ -3657,7 +3657,7 @@ static void syslog_io_handler(struct appctx *appctx)
missing_data: missing_data:
/* we need more data to read */ /* we need more data to read */
sc_oc(cs)->flags |= CF_READ_DONTWAIT; sc_oc(sc)->flags |= CF_READ_DONTWAIT;
return; return;
@ -3680,10 +3680,10 @@ cli_abort:
_HA_ATOMIC_INC(&frontend->fe_counters.cli_aborts); _HA_ATOMIC_INC(&frontend->fe_counters.cli_aborts);
close: close:
sc_shutw(cs); sc_shutw(sc);
sc_shutr(cs); sc_shutr(sc);
sc_ic(cs)->flags |= CF_READ_NULL; sc_ic(sc)->flags |= CF_READ_NULL;
return; return;
} }