Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Listeners reconfig #1613

Merged
merged 3 commits into from
Apr 29, 2022
Merged

Listeners reconfig #1613

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b0492
listeners reconfig
avbelov23 Apr 14, 2022
beecd92
binary search of listeners and bitmap of ports for classifier
avbelov23 Apr 25, 2022
15faf90
fix review comments
avbelov23 Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 65 additions & 15 deletions fw/sock_clnt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ typedef struct {
* stopped, and not changed in between. Therefore, no locking is required.
*/
static LIST_HEAD(tfw_listen_socks);
static LIST_HEAD(tfw_listen_socks_reconf);

/**
* Allocate a new TfwListenSock and add it to the global list of sockets.
Expand All @@ -385,7 +386,7 @@ tfw_listen_sock_add(const TfwAddr *addr, int type)
return -EINVAL;

/* Is there such an address on the list already? */
list_for_each_entry(ls, &tfw_listen_socks, list) {
list_for_each_entry(ls, &tfw_listen_socks_reconf, list) {
if (tfw_addr_eq(addr, &ls->addr)) {
T_LOG_ADDR("Duplicate listener with", addr,
TFW_WITH_PORT);
Expand All @@ -404,11 +405,9 @@ tfw_listen_sock_add(const TfwAddr *addr, int type)
ss_proto_init(&ls->proto, &tfw_sock_tls_clnt_ss_hooks,
Conn_HttpsClnt);

list_add(&ls->list, &tfw_listen_socks);
list_add(&ls->list, &tfw_listen_socks_reconf);
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
ls->addr = *addr;

tfw_classifier_add_inport(tfw_addr_port(addr));

return 0;
}

Expand Down Expand Up @@ -490,7 +489,7 @@ tfw_sock_check_lst(TfwServer *srv)
TfwListenSock *ls;

T_DBG3("Checking server....\n");
list_for_each_entry(ls, &tfw_listen_socks, list) {
list_for_each_entry(ls, &tfw_listen_socks_reconf, list) {
T_DBG3("Iterating listener\n");
if (tfw_addr_ifmatch(&srv->addr, &ls->addr))
return -EINVAL;
Expand Down Expand Up @@ -627,21 +626,71 @@ tfw_sock_clnt_cfgend(void)
static int
tfw_sock_clnt_start(void)
{
int r;
int r = 0;
TfwListenSock *ls;
TfwListenSock *ls_reconf;
TfwListenSock *tmp;
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved

if (tfw_runstate_is_reconfig())
return 0;
tfw_classifier_cleanup_inport();
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
list_for_each_entry(ls_reconf, &tfw_listen_socks_reconf, list) {
bool found = false;

list_for_each_entry(ls, &tfw_listen_socks, list) {
if (tfw_addr_eq(&ls_reconf->addr, &ls->addr)) {
found = true;
break;
}
}

list_for_each_entry(ls, &tfw_listen_socks, list) {
if ((r = tfw_listen_sock_start(ls))) {
T_ERR_ADDR("can't start listening on", &ls->addr,
TFW_WITH_PORT);
goto err;
if (!found) {
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
ls = kzalloc(sizeof(*ls), GFP_KERNEL);
if (!ls) {
r = -ENOMEM;
goto err;
}
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved

ss_proto_init(&ls->proto, ls_reconf->proto.hooks, ls_reconf->proto.type);
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved

list_add(&ls->list, &tfw_listen_socks);
ls->addr = ls_reconf->addr;

if ((r = tfw_listen_sock_start(ls))) {
T_ERR_ADDR("can't start listening on", &ls_reconf->addr,
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
TFW_WITH_PORT);
goto err;
}
}

}

return 0;
list_for_each_entry_safe(ls, tmp, &tfw_listen_socks, list) {
bool found = false;

list_for_each_entry(ls_reconf, &tfw_listen_socks_reconf, list) {
if (tfw_addr_eq(&ls_reconf->addr, &ls->addr)) {
found = true;
break;
}
}

if (!found) {
list_del(&ls->list);
if (!ls->sk)
continue;
ss_release(ls->sk);
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
ls->sk = NULL;
kfree(ls);
} else {
tfw_classifier_add_inport(tfw_addr_port(&ls->addr));
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved
}
}

done:
list_for_each_entry_safe(ls, tmp, &tfw_listen_socks_reconf, list)
kfree(ls);
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved

INIT_LIST_HEAD(&tfw_listen_socks_reconf);
return r;

err:
list_for_each_entry(ls, &tfw_listen_socks, list) {
Expand All @@ -651,7 +700,7 @@ tfw_sock_clnt_start(void)
ls->sk = NULL;
}
krizhanovsky marked this conversation as resolved.
Show resolved Hide resolved

return r;
goto done;
}

static void
Expand Down Expand Up @@ -702,6 +751,7 @@ static TfwCfgSpec tfw_sock_clnt_specs[] = {
.handler = tfw_cfgop_listen,
.cleanup = tfw_cfgop_cleanup_sock_clnt,
.allow_repeat = true,
.allow_reconfig = true,
},
{
.name = "keepalive_timeout",
Expand Down