konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: dns: rename all occurrences of stconn "cs" to "sc"

Browse Source 
This concerns the DNS client 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:33:42 +02:00
parent c5ddd9fd80
commit d7950ad447
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dns.c
View File

@ -438,7 +438,7 @@ out:
*/
static void dns_session_io_handler(struct appctx *appctx)
{
struct stconn *cs = appctx_cs(appctx);
struct stconn *sc = appctx_cs(appctx);
struct dns_session *ds = appctx->svcctx;
struct ring *ring = &ds->ring;
struct buffer *buf = &ring->buf;
@ -460,18 +460,18 @@ static void dns_session_io_handler(struct appctx *appctx)
goto close;
/* an error was detected */
if (unlikely(sc_ic(cs)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
if (unlikely(sc_ic(sc)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
goto close;
/* con closed by server side, we will skip data write and drain data from channel */
if ((sc_oc(cs)->flags & CF_SHUTW)) {
if ((sc_oc(sc)->flags & CF_SHUTW)) {
goto read;
}
/* if the connection is not established, inform the stream that we want
* to be notified whenever the connection completes.
*/
if (sc_opposite(cs)->state < SC_ST_EST) {
if (sc_opposite(sc)->state < SC_ST_EST) {
applet_need_more_data(appctx);
se_need_remote_conn(appctx->sedesc);
applet_have_more_data(appctx);
@ -506,7 +506,7 @@ static void dns_session_io_handler(struct appctx *appctx)
* the message so that we can take our reference there if we have to
* stop before the end (ret=0).
*/
if (sc_opposite(cs)->state == SC_ST_EST) {
if (sc_opposite(sc)->state == SC_ST_EST) {
/* we were already there, adjust the offset to be relative to
* the buffer's head and remove us from the counter.
*/
@ -528,7 +528,7 @@ static void dns_session_io_handler(struct appctx *appctx)
BUG_ON(msg_len + ofs + cnt + 1 > b_data(buf));
/* retrieve available room on output channel */
available_room = channel_recv_max(sc_ic(cs));
available_room = channel_recv_max(sc_ic(sc));
/* tx_msg_offset null means we are at the start of a new message */
if (!ds->tx_msg_offset) {
@ -536,7 +536,7 @@ static void dns_session_io_handler(struct appctx *appctx)
/* check if there is enough room to put message len and query id */
if (available_room < sizeof(slen) + sizeof(new_qid)) {
sc_need_room(cs);
sc_need_room(sc);
ret = 0;
break;
}
@ -594,7 +594,7 @@ static void dns_session_io_handler(struct appctx *appctx)
/* check if it remains available room on output chan */
if (unlikely(!available_room)) {
sc_need_room(cs);
sc_need_room(sc);
ret = 0;
break;
}
@ -629,7 +629,7 @@ static void dns_session_io_handler(struct appctx *appctx)
if (ds->tx_msg_offset) {
/* msg was not fully processed, we must be awake to drain pending data */
sc_need_room(cs);
sc_need_room(sc);
ret = 0;
break;
}
@ -669,35 +669,35 @@ read:
if (!ds->rx_msg.len) {
/* next message len is not fully available into the channel */
if (co_data(sc_oc(cs)) < 2)
if (co_data(sc_oc(sc)) < 2)
break;
/* retrieve message len */
co_getblk(sc_oc(cs), (char *)&msg_len, 2, 0);
co_getblk(sc_oc(sc), (char *)&msg_len, 2, 0);
/* mark as consumed */
co_skip(sc_oc(cs), 2);
co_skip(sc_oc(sc), 2);
/* store message len */
ds->rx_msg.len = ntohs(msg_len);
}
if (!co_data(sc_oc(cs))) {
if (!co_data(sc_oc(sc))) {
/* we need more data but nothing is available */
break;
}
if (co_data(sc_oc(cs)) + ds->rx_msg.offset < ds->rx_msg.len) {
if (co_data(sc_oc(sc)) + ds->rx_msg.offset < ds->rx_msg.len) {
/* message only partially available */
/* read available data */
co_getblk(sc_oc(cs), ds->rx_msg.area + ds->rx_msg.offset, co_data(sc_oc(cs)), 0);
co_getblk(sc_oc(sc), ds->rx_msg.area + ds->rx_msg.offset, co_data(sc_oc(sc)), 0);
/* update message offset */
ds->rx_msg.offset += co_data(sc_oc(cs));
ds->rx_msg.offset += co_data(sc_oc(sc));
/* consume all pending data from the channel */
co_skip(sc_oc(cs), co_data(sc_oc(cs)));
co_skip(sc_oc(sc), co_data(sc_oc(sc)));
/* we need to wait for more data */
break;
@ -706,10 +706,10 @@ read:
/* enough data is available into the channel to read the message until the end */
/* read from the channel until the end of the message */
co_getblk(sc_oc(cs), ds->rx_msg.area + ds->rx_msg.offset, ds->rx_msg.len - ds->rx_msg.offset, 0);
co_getblk(sc_oc(sc), ds->rx_msg.area + ds->rx_msg.offset, ds->rx_msg.len - ds->rx_msg.offset, 0);
/* consume all data until the end of the message from the channel */
co_skip(sc_oc(cs), ds->rx_msg.len - ds->rx_msg.offset);
co_skip(sc_oc(sc), ds->rx_msg.len - ds->rx_msg.offset);
/* reset reader offset to 0 for next message reand */
ds->rx_msg.offset = 0;
@ -755,7 +755,7 @@ read:
if (!LIST_INLIST(&ds->waiter)) {
/* there is no more pending data to read and the con was closed by the server side */
if (!co_data(sc_oc(cs)) && (sc_oc(cs)->flags & CF_SHUTW)) {
if (!co_data(sc_oc(sc)) && (sc_oc(sc)->flags & CF_SHUTW)) {
goto close;
}
}
@ -764,9 +764,9 @@ read:
return;
close:
sc_shutw(cs);
sc_shutr(cs);
sc_ic(cs)->flags |= CF_READ_NULL;
sc_shutw(sc);
sc_shutr(sc);
sc_ic(sc)->flags |= CF_READ_NULL;
}
void dns_queries_flush(struct dns_session *ds)