retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-10167: Updating to build clean on linux

This commit is contained in:
Shane Bryldt 2017-07-03 13:57:47 -05:00
parent 3687a5a0a5
commit f9d23ccadd
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/libblade/Makefile.am
View File

@ -12,6 +12,8 @@ libunqlite_la_LIBADD = -lpthread
lib_LTLIBRARIES = libblade.la
libblade_la_SOURCES = src/blade.c src/blade_stack.c
libblade_la_SOURCES += src/blade_transportmgr.c src/blade_rpcmgr.c src/blade_routemgr.c src/blade_subscriptionmgr.c
libblade_la_SOURCES += src/blade_upstreammgr.c src/blade_mastermgr.c src/blade_connectionmgr.c src/blade_sessionmgr.c
libblade_la_SOURCES += src/blade_identity.c src/blade_rpc.c src/blade_connection.c src/blade_session.c
libblade_la_SOURCES += src/blade_protocol.c src/blade_subscription.c
libblade_la_SOURCES += src/blade_transport.c src/blade_transport_wss.c
@ -22,6 +24,8 @@ libblade_la_LIBADD = libunqlite.la
library_includedir = $(prefix)/include
library_include_HEADERS = src/include/blade.h src/include/blade_types.h src/include/blade_stack.h
library_include_HEADERS += src/include/blade_transportmgr.h src/include/blade_rpcmgr.h src/include/blade_routemgr.h src/include/blade_subscriptionmgr.h
library_include_HEADERS += src/include/blade_upstreammgr.h src/include/blade_mastermgr.h src/include/blade_connectionmgr.h src/include/blade_sessionmgr.h
library_include_HEADERS += src/include/blade_identity.h src/include/blade_rpc.h src/include/blade_connection.h src/include/blade_session.h
library_include_HEADERS += src/include/blade_protocol.h src/include/blade_subscription.h
library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h

5
libs/libblade/src/blade_stack.c
View File

@ -61,7 +61,7 @@ static void blade_handle_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_
blade_handle_t *bh = (blade_handle_t *)ptr;
ks_assert(bh);
switch (action) {
case KS_MPCL_ANNOUNCE:
break;
@ -670,7 +670,6 @@ ks_bool_t blade_protocol_locate_request_handler(blade_rpc_request_t *brpcreq, vo
cJSON *res_result = NULL;
cJSON *res_result_controllers;
blade_protocol_t *bp = NULL;
const char *bp_key = NULL;
ks_assert(brpcreq);
@ -736,8 +735,6 @@ ks_bool_t blade_protocol_locate_request_handler(blade_rpc_request_t *brpcreq, vo
res_result_controllers = cJSON_CreateObject();
bp_key = ks_psprintf(bh->pool, "%s@%s", req_params_protocol, req_params_realm);
bp = blade_mastermgr_protocol_lookup(bh->mastermgr, req_params_protocol, req_params_realm);
if (bp) {
ks_hash_t *controllers = blade_protocol_controllers_get(bp);

11
libs/libblade/test/testcli.c
View File

@ -165,7 +165,7 @@ ks_bool_t test_join_broadcast_handler(blade_rpc_request_t *brpcreq, void *data)
blade_session_t *bs = NULL;
const char *broadcaster_nodeid = NULL;
cJSON *params = NULL;
cJSON *result = NULL;
//cJSON *result = NULL;
ks_assert(brpcreq);
@ -194,7 +194,7 @@ ks_bool_t test_leave_broadcast_handler(blade_rpc_request_t *brpcreq, void *data)
blade_session_t *bs = NULL;
const char *broadcaster_nodeid = NULL;
cJSON *params = NULL;
cJSON *result = NULL;
//cJSON *result = NULL;
ks_assert(brpcreq);
@ -223,7 +223,7 @@ ks_bool_t test_talk_broadcast_handler(blade_rpc_request_t *brpcreq, void *data)
blade_session_t *bs = NULL;
const char *broadcaster_nodeid = NULL;
cJSON *params = NULL;
cJSON *result = NULL;
//cJSON *result = NULL;
ks_assert(brpcreq);
@ -292,17 +292,16 @@ int main(int argc, char **argv)
if (autoconnect) {
blade_connection_t *bc = NULL;
blade_identity_t *target = NULL;
ks_bool_t connected = KS_FALSE;
blade_identity_create(&target, blade_handle_pool_get(bh));
if (blade_identity_parse(target, autoconnect) == KS_STATUS_SUCCESS) connected = blade_handle_connect(bh, &bc, target, NULL) == KS_STATUS_SUCCESS;
if (blade_identity_parse(target, autoconnect) == KS_STATUS_SUCCESS) blade_handle_connect(bh, &bc, target, NULL);
blade_identity_destroy(&target);
ks_sleep_ms(3000);
}
loop(bh);
blade_handle_destroy(&bh);

14
libs/libblade/test/testcon.c
View File

@ -73,7 +73,7 @@ ks_status_t testproto_create(testproto_t **testP, blade_handle_t *bh)
ks_status_t testproto_destroy(testproto_t **testP)
{
testproto_t *test = NULL;
ks_pool_t *pool = NULL;
//ks_pool_t *pool = NULL;
ks_assert(testP);
ks_assert(*testP);
@ -87,14 +87,14 @@ ks_status_t testproto_destroy(testproto_t **testP)
ks_bool_t test_publish_response_handler(blade_rpc_response_t *brpcres, void *data)
{
testproto_t *test = NULL;
//testproto_t *test = NULL;
blade_handle_t *bh = NULL;
blade_session_t *bs = NULL;
ks_assert(brpcres);
ks_assert(data);
test = (testproto_t *)data;
//test = (testproto_t *)data;
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
@ -140,7 +140,7 @@ ks_bool_t test_join_request_handler(blade_rpc_request_t *brpcreq, void *data)
key = ks_pstrdup(test->pool, requester_nodeid);
ks_assert(key);
ks_hash_write_lock(test->participants);
ks_hash_insert(test->participants, (void *)key, (void *)KS_TRUE);
ks_hash_write_unlock(test->participants);
@ -164,7 +164,7 @@ ks_bool_t test_leave_request_handler(blade_rpc_request_t *brpcreq, void *data)
blade_handle_t *bh = NULL;
blade_session_t *bs = NULL;
const char *requester_nodeid = NULL;
const char *key = NULL;
//const char *key = NULL;
cJSON *params = NULL;
cJSON *result = NULL;
@ -206,7 +206,7 @@ ks_bool_t test_leave_request_handler(blade_rpc_request_t *brpcreq, void *data)
ks_bool_t test_talk_request_handler(blade_rpc_request_t *brpcreq, void *data)
{
testproto_t *test = NULL;
//testproto_t *test = NULL;
blade_handle_t *bh = NULL;
blade_session_t *bs = NULL;
const char *requester_nodeid = NULL;
@ -217,7 +217,7 @@ ks_bool_t test_talk_request_handler(blade_rpc_request_t *brpcreq, void *data)
ks_assert(brpcreq);
ks_assert(data);
test = (testproto_t *)data;
//test = (testproto_t *)data;
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);