Skip to content

Commit

Permalink
update the __TFW_HTTP_MSG_M_CONN_MASK name to conform usual name scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
vankoven committed Dec 28, 2018
1 parent 5a0b6f3 commit 1a6d783
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions tempesta_fw/http.c
Original file line number Diff line number Diff line change
Expand Up @@ -1985,8 +1985,8 @@ tfw_http_set_hdr_date(TfwHttpMsg *hm)
static int
tfw_http_set_hdr_connection(TfwHttpMsg *hm, unsigned long conn_flg)
{
BUILD_BUG_ON(BIT_WORD(__TFW_HTTP_MSG_M_CONN_MASK) != 0);
if (((hm->flags[0] & __TFW_HTTP_MSG_M_CONN_MASK) == conn_flg)
BUILD_BUG_ON(BIT_WORD(__TFW_HTTP_MSG_M_CONN) != 0);
if (((hm->flags[0] & __TFW_HTTP_MSG_M_CONN) == conn_flg)
&& (!TFW_STR_EMPTY(&hm->h_tbl->tbl[TFW_HTTP_HDR_CONNECTION]))
&& !test_bit(TFW_HTTP_B_CONN_EXTRA, hm->flags))
return 0;
Expand All @@ -2012,8 +2012,8 @@ tfw_http_set_hdr_keep_alive(TfwHttpMsg *hm, unsigned long conn_flg)
{
int r;

BUILD_BUG_ON(BIT_WORD(__TFW_HTTP_MSG_M_CONN_MASK) != 0);
if ((hm->flags[0] & __TFW_HTTP_MSG_M_CONN_MASK) == conn_flg)
BUILD_BUG_ON(BIT_WORD(__TFW_HTTP_MSG_M_CONN) != 0);
if ((hm->flags[0] & __TFW_HTTP_MSG_M_CONN) == conn_flg)
return 0;

switch (conn_flg) {
Expand Down
2 changes: 1 addition & 1 deletion tempesta_fw/http.h
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ enum {
_TFW_HTTP_FLAGS_NUM
};

#define __TFW_HTTP_MSG_M_CONN_MASK \
#define __TFW_HTTP_MSG_M_CONN \
(BIT(TFW_HTTP_B_CONN_CLOSE) | BIT(TFW_HTTP_B_CONN_KA))

/**
Expand Down

0 comments on commit 1a6d783

Please sign in to comment.