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

Fix #1175: Add synchronization of disconnect procedure for server con… #1179

Merged
merged 6 commits into from
Feb 14, 2019
Merged

Fix #1175: Add synchronization of disconnect procedure for server con… #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
889ccc4
Fix #1175: Add synchronization of disconnect procedure for server con…
aleksostapenko Feb 8, 2019
5de6538
Avoid infinite cycle during srv connection stop on shutdown (#1175).
aleksostapenko Feb 10, 2019
0fc370f
Some simplifications (#1175).
aleksostapenko Feb 10, 2019
55a1bf2
Changes according review comments (#1175).
aleksostapenko Feb 12, 2019
973ecc7
Additional changes (#1175):
aleksostapenko Feb 12, 2019
fc9da84
Reconnect on failed socket creation due to OOM (#1175).
aleksostapenko Feb 14, 2019
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
2 changes: 1 addition & 1 deletion tempesta_fw/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Generic connection management.
*
* Copyright (C) 2014 NatSys Lab. (info@natsys-lab.com).
* Copyright (C) 2015-2018 Tempesta Technologies, Inc.
* Copyright (C) 2015-2019 Tempesta Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
Expand Down
6 changes: 4 additions & 2 deletions tempesta_fw/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Definitions for generic connection management at OSI level 6 (presentation).
*
* Copyright (C) 2014 NatSys Lab. (info@natsys-lab.com).
* Copyright (C) 2015-2018 Tempesta Technologies, Inc.
* Copyright (C) 2015-2019 Tempesta Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -195,7 +195,9 @@ enum {
/* Remove connection */
TFW_CONN_B_DEL,
/* Connection is in use or at least scheduled to be established. */
TFW_CONN_B_ACTIVE
TFW_CONN_B_ACTIVE,
/* Connection is disconnected and stopped. */
TFW_CONN_B_STOPPED
};

/**
Expand Down
4 changes: 2 additions & 2 deletions tempesta_fw/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Servers handling.
*
* Copyright (C) 2014 NatSys Lab. (info@natsys-lab.com).
* Copyright (C) 2015-2018 Tempesta Technologies, Inc.
* Copyright (C) 2015-2019 Tempesta Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -344,7 +344,7 @@ __tfw_sg_del_srv(TfwSrvGroup *sg, TfwServer *srv, bool lock)
/*
* Don't remove srv->sg reference, it's not supposed, that a server can
* change it's group on the fly.
*/
*/

TFW_DBG2("Remove backend server from group '%s'\n", sg->name);

Expand Down
4 changes: 1 addition & 3 deletions tempesta_fw/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Tempesta FW
*
* Copyright (C) 2014 NatSys Lab. (info@natsys-lab.com).
* Copyright (C) 2015-2018 Tempesta Technologies, Inc.
* Copyright (C) 2015-2019 Tempesta Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -202,8 +202,6 @@ TfwServer *tfw_server_lookup(TfwSrvGroup *sg, TfwAddr *addr);
int tfw_server_start_sched(TfwServer *srv);
void tfw_server_stop_sched(TfwServer *srv);

void tfw_srv_conn_release(TfwSrvConn *srv_conn);

static inline bool
tfw_server_live(TfwServer *srv)
{
Expand Down
Loading