Skip to content
This repository has been archived by the owner on Feb 27, 2020. It is now read-only.

Remove connection pooling #1947

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Remove connection pooling #1947

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d914ae
Remove Bono connection pooling -- need to fix UTs and test
MatMeredith Sep 28, 2017
4cb23bf
Tidy up a bit
MatMeredith Sep 29, 2017
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
36 changes: 0 additions & 36 deletions src/bono.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ static ACRFactory* icscf_acr_factory;

static bool edge_proxy;
static pjsip_uri* upstream_proxy;
static SIPConnectionPool* upstream_conn_pool = NULL;

static SNMP::IPCountTable* sprout_ip_tbl = NULL;
static SNMP::U32Scalar* flow_count = NULL;

static FlowTable* flow_table;
Expand Down Expand Up @@ -989,18 +987,6 @@ static void proxy_route_upstream(pjsip_rx_data* rdata,
pj_strdup2(tdata->pool, &orig_param->value, "");
pj_list_insert_after(&upstream_uri->other_param, orig_param);
}

// Select a transport for the request.
if (upstream_conn_pool != NULL)
{
target_p->transport = upstream_conn_pool->get_connection();
if (target_p->transport != NULL)
{
pj_memcpy(&target_p->remote_addr,
&target_p->transport->key.rem_addr,
sizeof(pj_sockaddr));
}
}
}

TRC_INFO("Route request to upstream proxy %s",
Expand Down Expand Up @@ -3259,24 +3245,6 @@ pj_status_t init_stateful_proxy(SubscriberDataManager* reg_sdm,
// Create a dialog tracker to count dialogs on each flow
dialog_tracker = new DialogTracker(flow_table);

// Create a connection pool to the upstream proxy.
if (upstream_proxy_connections > 0)
{
pjsip_host_port pool_target;
pool_target.host = pj_strdup3(stack_data.pool, upstream_proxy_arg.c_str());
pool_target.port = upstream_proxy_port;
sprout_ip_tbl = SNMP::IPCountTable::create("bono_connected_sprouts",
".1.2.826.0.1.1578918.9.2.3.1");
upstream_conn_pool = new SIPConnectionPool(&pool_target,
upstream_proxy_connections,
upstream_proxy_recycle,
stack_data.pool,
stack_data.endpt,
stack_data.pcscf_trusted_tcp_factory,
sprout_ip_tbl);
upstream_conn_pool->init();
}

ibcf = enable_ibcf;
if (ibcf)
{
Expand Down Expand Up @@ -3361,10 +3329,6 @@ pj_status_t init_stateful_proxy(SubscriberDataManager* reg_sdm,
void destroy_stateful_proxy()
{
assert(edge_proxy);
// Destroy the upstream connection pool. This will quiesce all the TCP
// connections.
delete upstream_conn_pool; upstream_conn_pool = NULL;
delete sprout_ip_tbl; sprout_ip_tbl = NULL;

// Destroy the flow table.
delete flow_count;
Expand Down