<ItemGroup>
<ClCompile Include="src\blade.c" />
<ClCompile Include="src\blade_connection.c" />
+ <ClCompile Include="src\blade_connectionmgr.c" />
<ClCompile Include="src\blade_identity.c" />
+ <ClCompile Include="src\blade_mastermgr.c" />
+ <ClCompile Include="src\blade_routemgr.c" />
<ClCompile Include="src\blade_rpc.c" />
<ClCompile Include="src\blade_protocol.c" />
+ <ClCompile Include="src\blade_rpcmgr.c" />
+ <ClCompile Include="src\blade_sessionmgr.c" />
<ClCompile Include="src\blade_subscription.c" />
+ <ClCompile Include="src\blade_subscriptionmgr.c" />
+ <ClCompile Include="src\blade_transportmgr.c" />
<ClCompile Include="src\blade_transport_wss.c" />
<ClCompile Include="src\blade_session.c" />
<ClCompile Include="src\blade_stack.c" />
<ClCompile Include="src\blade_transport.c" />
+ <ClCompile Include="src\blade_upstreammgr.c" />
<ClCompile Include="src\unqlite.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\include\blade.h" />
<ClInclude Include="src\include\blade_connection.h" />
+ <ClInclude Include="src\include\blade_connectionmgr.h" />
<ClInclude Include="src\include\blade_identity.h" />
+ <ClInclude Include="src\include\blade_mastermgr.h" />
+ <ClInclude Include="src\include\blade_routemgr.h" />
<ClInclude Include="src\include\blade_rpc.h" />
<ClInclude Include="src\include\blade_protocol.h" />
+ <ClInclude Include="src\include\blade_rpcmgr.h" />
+ <ClInclude Include="src\include\blade_sessionmgr.h" />
<ClInclude Include="src\include\blade_subscription.h" />
+ <ClInclude Include="src\include\blade_subscriptionmgr.h" />
+ <ClInclude Include="src\include\blade_transportmgr.h" />
<ClInclude Include="src\include\blade_transport_wss.h" />
<ClInclude Include="src\include\blade_session.h" />
<ClInclude Include="src\include\blade_stack.h" />
<ClInclude Include="src\include\blade_transport.h" />
<ClInclude Include="src\include\blade_types.h" />
+ <ClInclude Include="src\include\blade_upstreammgr.h" />
<ClInclude Include="src\include\unqlite.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\blade_subscription.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\blade_transportmgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_rpcmgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_routemgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_subscriptionmgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_upstreammgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_mastermgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_connectionmgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\blade_sessionmgr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\include\unqlite.h">
<ClInclude Include="src\include\blade_subscription.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\include\blade_transportmgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_rpcmgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_routemgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_subscriptionmgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_upstreammgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_mastermgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_connectionmgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\include\blade_sessionmgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
ks_assert(bc);
- blade_handle_connections_remove(bc);
+ blade_connectionmgr_connection_remove(blade_handle_connectionmgr_get(bc->handle), bc);
while (ks_q_trypop(bc->sending, (void **)&json) == KS_STATUS_SUCCESS && json) cJSON_Delete(json);
else if (hook == BLADE_CONNECTION_STATE_HOOK_SUCCESS) {
// @todo this is adding a second lock, since we keep it locked in the callback to allow finishing, we don't want get locking here...
// or just unlock twice...
- blade_session_t *bs = blade_handle_sessions_lookup(bc->handle, bc->session);
+ blade_session_t *bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bc->handle), bc->session);
ks_assert(bs); // should not happen because bs should still be locked
blade_session_connection_set(bs, bc->id);
if (callback) callback(bc, BLADE_CONNECTION_STATE_CONDITION_POST);
if (bc->session) {
- blade_session_t *bs = blade_handle_sessions_lookup(bc->handle, bc->session);
+ blade_session_t *bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bc->handle), bc->session);
ks_assert(bs);
blade_session_connection_set(bs, NULL);
if (!(done = (json == NULL))) {
if (!bs) {
- bs = blade_handle_sessions_lookup(bc->handle, bc->session);
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bc->handle), bc->session);
ks_assert(bs);
}
blade_session_receiving_push(bs, json);
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_connectionmgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *connections; // id, blade_connection_t*
+};
+
+
+static void blade_connectionmgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_connectionmgr_t *bcmgr = (blade_connectionmgr_t *)ptr;
+
+ //ks_assert(bcmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_connectionmgr_create(blade_connectionmgr_t **bcmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_connectionmgr_t *bcmgr = NULL;
+
+ ks_assert(bcmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ bcmgr = ks_pool_alloc(pool, sizeof(blade_connectionmgr_t));
+ bcmgr->handle = bh;
+ bcmgr->pool = pool;
+
+ ks_hash_create(&bcmgr->connections, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bcmgr->pool);
+ ks_assert(bcmgr->connections);
+
+ ks_pool_set_cleanup(pool, bcmgr, NULL, blade_connectionmgr_cleanup);
+
+ *bcmgrP = bcmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_connectionmgr_destroy(blade_connectionmgr_t **bcmgrP)
+{
+ blade_connectionmgr_t *bcmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bcmgrP);
+ ks_assert(*bcmgrP);
+
+ bcmgr = *bcmgrP;
+ *bcmgrP = NULL;
+
+ ks_assert(bcmgr);
+
+ pool = bcmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_connectionmgr_handle_get(blade_connectionmgr_t *bcmgr)
+{
+ ks_assert(bcmgr);
+ return bcmgr->handle;
+}
+
+KS_DECLARE(ks_status_t) blade_connectionmgr_shutdown(blade_connectionmgr_t *bcmgr)
+{
+ ks_hash_iterator_t *it = NULL;
+
+ ks_assert(bcmgr);
+
+ ks_hash_read_lock(bcmgr->connections);
+ for (it = ks_hash_first(bcmgr->connections, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ blade_connection_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+
+ blade_connection_disconnect(value);
+ }
+ ks_hash_read_unlock(bcmgr->connections);
+ while (ks_hash_count(bcmgr->connections) > 0) ks_sleep_ms(100);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_connection_t *) blade_connectionmgr_connection_lookup(blade_connectionmgr_t *bcmgr, const char *id)
+{
+ blade_connection_t *bc = NULL;
+
+ ks_assert(bcmgr);
+ ks_assert(id);
+
+ bc = ks_hash_search(bcmgr->connections, (void *)id, KS_READLOCKED);
+ if (bc) blade_connection_read_lock(bc, KS_TRUE);
+ ks_hash_read_unlock(bcmgr->connections);
+
+ return bc;
+}
+
+KS_DECLARE(ks_status_t) blade_connectionmgr_connection_add(blade_connectionmgr_t *bcmgr, blade_connection_t *bc)
+{
+ char *key = NULL;
+
+ ks_assert(bcmgr);
+ ks_assert(bc);
+
+ key = ks_pstrdup(bcmgr->pool, blade_connection_id_get(bc));
+ ks_hash_insert(bcmgr->connections, (void *)key, bc);
+
+ ks_log(KS_LOG_DEBUG, "Connection Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_connectionmgr_connection_remove(blade_connectionmgr_t *bcmgr, blade_connection_t *bc)
+{
+ const char *id = NULL;
+
+ ks_assert(bcmgr);
+ ks_assert(bc);
+
+ blade_connection_write_lock(bc, KS_TRUE);
+
+ id = blade_connection_id_get(bc);
+ ks_hash_remove(bcmgr->connections, (void *)id);
+
+ blade_connection_write_unlock(bc);
+
+ ks_log(KS_LOG_DEBUG, "Connection Removed: %s\n", id);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_mastermgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ // @todo how does "exclusive" play into the controllers, does "exclusive" mean only one provider can exist for a given protocol and realm? what does non exclusive mean?
+ ks_hash_t *protocols; // protocols that have been published with blade.publish, and the details to locate a protocol provider with blade.locate
+ ks_hash_t *protocols_cleanup; // keyed by the nodeid, each value is a hash_t* of which contains string keys matching the "protocol@realm" keys to remove each nodeid from as a provider during cleanup
+};
+
+
+static void blade_mastermgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_mastermgr_t *bmmgr = (blade_mastermgr_t *)ptr;
+
+ //ks_assert(bmmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_mastermgr_create(blade_mastermgr_t **bmmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_mastermgr_t *bmmgr = NULL;
+
+ ks_assert(bmmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ bmmgr = ks_pool_alloc(pool, sizeof(blade_mastermgr_t));
+ bmmgr->handle = bh;
+ bmmgr->pool = pool;
+
+ ks_hash_create(&bmmgr->protocols, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bmmgr->pool);
+ ks_assert(bmmgr->protocols);
+
+ ks_hash_create(&bmmgr->protocols_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bmmgr->pool);
+ ks_assert(bmmgr->protocols_cleanup);
+
+ ks_pool_set_cleanup(pool, bmmgr, NULL, blade_mastermgr_cleanup);
+
+ *bmmgrP = bmmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_mastermgr_destroy(blade_mastermgr_t **bmmgrP)
+{
+ blade_mastermgr_t *bmmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bmmgrP);
+ ks_assert(*bmmgrP);
+
+ bmmgr = *bmmgrP;
+ *bmmgrP = NULL;
+
+ ks_assert(bmmgr);
+
+ pool = bmmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_mastermgr_handle_get(blade_mastermgr_t *bmmgr)
+{
+ ks_assert(bmmgr);
+
+ return bmmgr->handle;
+}
+
+KS_DECLARE(blade_protocol_t *) blade_mastermgr_protocol_lookup(blade_mastermgr_t *bmmgr, const char *protocol, const char *realm)
+{
+ blade_protocol_t *bp = NULL;
+ char *key = NULL;
+
+ ks_assert(bmmgr);
+ ks_assert(protocol);
+ ks_assert(realm);
+
+ key = ks_psprintf(bmmgr->pool, "%s@%s", protocol, realm);
+
+ bp = (blade_protocol_t *)ks_hash_search(bmmgr->protocols, (void *)key, KS_READLOCKED);
+ // @todo if (bp) blade_protocol_read_lock(bp);
+ ks_hash_read_unlock(bmmgr->protocols);
+
+ return bp;
+}
+
+KS_DECLARE(ks_status_t) blade_mastermgr_controller_add(blade_mastermgr_t *bmmgr, const char *protocol, const char *realm, const char *controller)
+{
+ blade_protocol_t *bp = NULL;
+ char *key = NULL;
+ ks_hash_t *cleanup = NULL;
+
+ ks_assert(bmmgr);
+ ks_assert(protocol);
+ ks_assert(realm);
+ ks_assert(controller);
+
+ key = ks_psprintf(bmmgr->pool, "%s@%s", protocol, realm);
+
+ ks_hash_write_lock(bmmgr->protocols);
+
+ bp = (blade_protocol_t *)ks_hash_search(bmmgr->protocols, (void *)key, KS_UNLOCKED);
+ if (bp) {
+ // @todo deal with exclusive stuff when the protocol is already registered
+ }
+
+ if (!bp) {
+ blade_protocol_create(&bp, bmmgr->pool, protocol, realm);
+ ks_assert(bp);
+
+ ks_log(KS_LOG_DEBUG, "Protocol Added: %s\n", key);
+ ks_hash_insert(bmmgr->protocols, (void *)ks_pstrdup(bmmgr->pool, key), bp);
+ }
+
+ cleanup = (ks_hash_t *)ks_hash_search(bmmgr->protocols_cleanup, (void *)controller, KS_UNLOCKED);
+ if (!cleanup) {
+ ks_hash_create(&cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bmmgr->pool);
+ ks_assert(cleanup);
+
+ ks_hash_insert(bmmgr->protocols_cleanup, (void *)ks_pstrdup(bmmgr->pool, controller), cleanup);
+ }
+ ks_hash_insert(cleanup, (void *)ks_pstrdup(bmmgr->pool, key), (void *)KS_TRUE);
+ blade_protocol_controllers_add(bp, controller);
+ ks_log(KS_LOG_DEBUG, "Protocol Controller Added: %s to %s\n", controller, key);
+
+ ks_hash_write_unlock(bmmgr->protocols);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_mastermgr_controller_remove(blade_mastermgr_t *bmmgr, const char *controller)
+{
+ ks_hash_t *cleanup = NULL;
+
+ ks_assert(bmmgr);
+ ks_assert(controller);
+
+ ks_hash_write_lock(bmmgr->protocols);
+ cleanup = (ks_hash_t *)ks_hash_search(bmmgr->protocols_cleanup, (void *)controller, KS_UNLOCKED);
+ if (cleanup) {
+ for (ks_hash_iterator_t *it = ks_hash_first(cleanup, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ void *value = NULL;
+ blade_protocol_t *bp = NULL;
+ ks_hash_t *controllers = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, &value);
+
+ bp = (blade_protocol_t *)ks_hash_search(bmmgr->protocols, key, KS_UNLOCKED);
+ ks_assert(bp); // should not happen when a cleanup still has a provider tracked for a protocol
+
+ ks_log(KS_LOG_DEBUG, "Protocol Controller Removed: %s from %s\n", controller, key);
+ blade_protocol_controllers_remove(bp, controller);
+
+ controllers = blade_protocol_controllers_get(bp);
+ if (ks_hash_count(controllers) == 0) {
+ // @note this depends on locking something outside of the protocol that won't be destroyed, like the top level
+ // protocols hash, but assumes then that any reader keeps the top level hash read locked while using the protocol
+ // so it cannot be deleted
+ ks_log(KS_LOG_DEBUG, "Protocol Removed: %s\n", key);
+ ks_hash_remove(bmmgr->protocols, key);
+ }
+ }
+ ks_hash_remove(bmmgr->protocols_cleanup, (void *)controller);
+ }
+ ks_hash_write_unlock(bmmgr->protocols);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
const char *name;
const char *realm;
- ks_hash_t *providers;
+ ks_hash_t *controllers;
// @todo descriptors (schema, etc) for each method within a protocol
};
case KS_MPCL_TEARDOWN:
if (bp->name) ks_pool_free(bp->pool, &bp->name);
if (bp->realm) ks_pool_free(bp->pool, &bp->realm);
- if (bp->providers) ks_hash_destroy(&bp->providers);
+ if (bp->controllers) ks_hash_destroy(&bp->controllers);
break;
case KS_MPCL_DESTROY:
break;
bp->name = ks_pstrdup(pool, name);
bp->realm = ks_pstrdup(pool, realm);
- ks_hash_create(&bp->providers, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_NOLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bp->pool);
- ks_assert(bp->providers);
+ ks_hash_create(&bp->controllers, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_NOLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bp->pool);
+ ks_assert(bp->controllers);
ks_pool_set_cleanup(pool, bp, NULL, blade_protocol_cleanup);
return KS_STATUS_SUCCESS;
}
-KS_DECLARE(ks_hash_t *) blade_protocol_providers_get(blade_protocol_t *bp)
+KS_DECLARE(ks_hash_t *) blade_protocol_controllers_get(blade_protocol_t *bp)
{
ks_assert(bp);
-
- return bp->providers;
+ return bp->controllers;
}
-KS_DECLARE(ks_status_t) blade_protocol_providers_add(blade_protocol_t *bp, const char *nodeid)
+KS_DECLARE(ks_status_t) blade_protocol_controllers_add(blade_protocol_t *bp, const char *nodeid)
{
char *key = NULL;
ks_assert(nodeid);
key = ks_pstrdup(bp->pool, nodeid);
- ks_hash_insert(bp->providers, (void *)key, (void *)KS_TRUE);
+ ks_hash_insert(bp->controllers, (void *)key, (void *)KS_TRUE);
return KS_STATUS_SUCCESS;
}
-KS_DECLARE(ks_status_t) blade_protocol_providers_remove(blade_protocol_t *bp, const char *nodeid)
+KS_DECLARE(ks_status_t) blade_protocol_controllers_remove(blade_protocol_t *bp, const char *nodeid)
{
ks_assert(bp);
ks_assert(nodeid);
- ks_hash_remove(bp->providers, (void *)nodeid);
+ ks_hash_remove(bp->controllers, (void *)nodeid);
return KS_STATUS_SUCCESS;
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_routemgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *routes; // id, id
+};
+
+
+static void blade_routemgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_routemgr_t *brmgr = (blade_routemgr_t *)ptr;
+
+ //ks_assert(brmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_routemgr_create(blade_routemgr_t **brmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_routemgr_t *brmgr = NULL;
+
+ ks_assert(brmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ brmgr = ks_pool_alloc(pool, sizeof(blade_routemgr_t));
+ brmgr->handle = bh;
+ brmgr->pool = pool;
+
+ // @note can let removes free keys and values for routes, both are strings and allocated from the same pool as the hash itself
+ ks_hash_create(&brmgr->routes, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, brmgr->pool);
+ ks_assert(brmgr->routes);
+
+ ks_pool_set_cleanup(pool, brmgr, NULL, blade_routemgr_cleanup);
+
+ *brmgrP = brmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_routemgr_destroy(blade_routemgr_t **brmgrP)
+{
+ blade_routemgr_t *brmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(brmgrP);
+ ks_assert(*brmgrP);
+
+ brmgr = *brmgrP;
+ *brmgrP = NULL;
+
+ ks_assert(brmgr);
+
+ pool = brmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_routemgr_handle_get(blade_routemgr_t *brmgr)
+{
+ ks_assert(brmgr);
+
+ return brmgr->handle;
+}
+
+KS_DECLARE(blade_session_t *) blade_routemgr_route_lookup(blade_routemgr_t *brmgr, const char *target)
+{
+ blade_session_t *bs = NULL;
+ const char *router = NULL;
+
+ ks_assert(brmgr);
+ ks_assert(target);
+
+ router = (const char *)ks_hash_search(brmgr->routes, (void *)target, KS_READLOCKED);
+ if (router) bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(brmgr->handle), router);
+ ks_hash_read_unlock(brmgr->routes);
+
+ return bs;
+}
+
+KS_DECLARE(ks_status_t) blade_routemgr_route_add(blade_routemgr_t *brmgr, const char *target, const char *router)
+{
+ char *key = NULL;
+ char *value = NULL;
+
+ ks_assert(brmgr);
+ ks_assert(target);
+ ks_assert(router);
+
+ key = ks_pstrdup(brmgr->pool, target);
+ value = ks_pstrdup(brmgr->pool, router);
+
+ ks_hash_insert(brmgr->routes, (void *)key, (void *)value);
+
+ ks_log(KS_LOG_DEBUG, "Route Added: %s through %s\n", key, value);
+
+ blade_protocol_register(brmgr->handle, target, KS_FALSE, NULL, NULL);
+
+ return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_routemgr_route_remove(blade_routemgr_t *brmgr, const char *target)
+{
+ ks_assert(brmgr);
+ ks_assert(target);
+
+ ks_hash_remove(brmgr->routes, (void *)target);
+
+ ks_log(KS_LOG_DEBUG, "Route Removed: %s\n", target);
+
+ blade_protocol_register(brmgr->handle, target, KS_TRUE, NULL, NULL);
+
+ // @note protocols are cleaned up here because routes can be removed that are not locally connected with a session but still
+ // have protocols published to the master node from further downstream, in which case if a route is announced upstream to be
+ // removed, a master node is still able to catch that here even when there is no direct session, but is also hit when there
+ // is a direct session being terminated
+
+ blade_mastermgr_controller_remove(blade_handle_mastermgr_get(brmgr->handle), target);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_rpcmgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *corerpcs; // method, blade_rpc_t*
+ ks_hash_t *protocolrpcs; // method, blade_rpc_t*
+
+ ks_hash_t *requests; // id, KS_TRUE
+};
+
+
+static void blade_rpcmgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ blade_rpcmgr_t *brpcmgr = (blade_rpcmgr_t *)ptr;
+ ks_hash_iterator_t *it = NULL;
+
+ ks_assert(brpcmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ while ((it = ks_hash_first(brpcmgr->protocolrpcs, KS_UNLOCKED)) != NULL) {
+ void *key = NULL;
+ blade_rpc_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+ ks_hash_remove(brpcmgr->protocolrpcs, key);
+
+ blade_rpc_destroy(&value); // must call destroy to close the rpc pool, using FREE_VALUE on the hash would attempt to free the rpc from the wrong pool
+ }
+ while ((it = ks_hash_first(brpcmgr->corerpcs, KS_UNLOCKED)) != NULL) {
+ void *key = NULL;
+ blade_rpc_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+ ks_hash_remove(brpcmgr->corerpcs, key);
+
+ blade_rpc_destroy(&value); // must call destroy to close the rpc pool, using FREE_VALUE on the hash would attempt to free the rpc from the wrong pool
+ }
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_create(blade_rpcmgr_t **brpcmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_rpcmgr_t *brpcmgr = NULL;
+
+ ks_assert(brpcmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ brpcmgr = ks_pool_alloc(pool, sizeof(blade_rpcmgr_t));
+ brpcmgr->handle = bh;
+ brpcmgr->pool = pool;
+
+ ks_hash_create(&brpcmgr->corerpcs, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, brpcmgr->pool);
+ ks_assert(brpcmgr->corerpcs);
+
+ ks_hash_create(&brpcmgr->protocolrpcs, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, brpcmgr->pool);
+ ks_assert(brpcmgr->protocolrpcs);
+
+ ks_hash_create(&brpcmgr->requests, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, brpcmgr->pool);
+ ks_assert(brpcmgr->requests);
+
+ ks_pool_set_cleanup(pool, brpcmgr, NULL, blade_rpcmgr_cleanup);
+
+ *brpcmgrP = brpcmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_destroy(blade_rpcmgr_t **brpcmgrP)
+{
+ blade_rpcmgr_t *brpcmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(brpcmgrP);
+ ks_assert(*brpcmgrP);
+
+ brpcmgr = *brpcmgrP;
+ *brpcmgrP = NULL;
+
+ ks_assert(brpcmgr);
+
+ pool = brpcmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_rpcmgr_handle_get(blade_rpcmgr_t *brpcmgr)
+{
+ ks_assert(brpcmgr);
+
+ return brpcmgr->handle;
+}
+
+KS_DECLARE(blade_rpc_t *) blade_rpcmgr_corerpc_lookup(blade_rpcmgr_t *brpcmgr, const char *method)
+{
+ blade_rpc_t *brpc = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(method);
+
+ brpc = (blade_rpc_t *)ks_hash_search(brpcmgr->corerpcs, (void *)method, KS_READLOCKED);
+ // @todo if (brpc) blade_rpc_read_lock(brpc);
+ ks_hash_read_unlock(brpcmgr->corerpcs);
+
+ return brpc;
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_corerpc_add(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc)
+{
+ char *key = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpc);
+
+ key = ks_pstrdup(brpcmgr->pool, blade_rpc_method_get(brpc));
+ ks_hash_insert(brpcmgr->corerpcs, (void *)key, (void *)brpc);
+
+ ks_log(KS_LOG_DEBUG, "CoreRPC Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_corerpc_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc)
+{
+ const char *method = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpc);
+
+ method = blade_rpc_method_get(brpc);
+ ks_hash_remove(brpcmgr->corerpcs, (void *)method);
+
+ ks_log(KS_LOG_DEBUG, "CoreRPC Removed: %s\n", method);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_rpc_t *) blade_rpcmgr_protocolrpc_lookup(blade_rpcmgr_t *brpcmgr, const char *method, const char *protocol, const char *realm)
+{
+ blade_rpc_t *brpc = NULL;
+ char *key = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(method);
+ ks_assert(protocol);
+ ks_assert(realm);
+
+ key = ks_psprintf(brpcmgr->pool, "%s@%s/%s", protocol, realm, method);
+ brpc = ks_hash_search(brpcmgr->protocolrpcs, (void *)key, KS_READLOCKED);
+ // @todo if (brpc) blade_rpc_read_lock(brpc);
+ ks_hash_read_unlock(brpcmgr->protocolrpcs);
+
+ ks_pool_free(brpcmgr->pool, &key);
+
+ return brpc;
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_protocolrpc_add(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc)
+{
+ const char *method = NULL;
+ const char *protocol = NULL;
+ const char *realm = NULL;
+ char *key = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpc);
+
+ method = blade_rpc_method_get(brpc);
+ ks_assert(method);
+
+ protocol = blade_rpc_protocol_get(brpc);
+ ks_assert(protocol);
+
+ realm = blade_rpc_realm_get(brpc);
+ ks_assert(realm);
+
+ key = ks_psprintf(brpcmgr->pool, "%s@%s/%s", protocol, realm, method);
+ ks_assert(key);
+
+ ks_hash_insert(brpcmgr->protocolrpcs, (void *)key, (void *)brpc);
+
+ ks_log(KS_LOG_DEBUG, "ProtocolRPC Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_protocolrpc_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc)
+{
+ const char *method = NULL;
+ const char *protocol = NULL;
+ const char *realm = NULL;
+ char *key = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpc);
+
+ method = blade_rpc_method_get(brpc);
+ ks_assert(method);
+
+ protocol = blade_rpc_protocol_get(brpc);
+ ks_assert(protocol);
+
+ realm = blade_rpc_realm_get(brpc);
+ ks_assert(realm);
+
+ key = ks_psprintf(brpcmgr->pool, "%s@%s/%s", protocol, realm, method);
+ ks_assert(key);
+
+ ks_hash_remove(brpcmgr->protocolrpcs, (void *)key);
+
+ ks_log(KS_LOG_DEBUG, "ProtocolRPC Removed: %s\n", key);
+
+ ks_pool_free(brpcmgr->pool, &key);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_rpc_request_t *) blade_rpcmgr_request_lookup(blade_rpcmgr_t *brpcmgr, const char *id)
+{
+ blade_rpc_request_t *brpcreq = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(id);
+
+ brpcreq = (blade_rpc_request_t *)ks_hash_search(brpcmgr->requests, (void *)id, KS_READLOCKED);
+ // @todo if (brpcreq) blade_rpc_request_read_lock(brpcreq);
+ ks_hash_read_unlock(brpcmgr->requests);
+
+ return brpcreq;
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_request_add(blade_rpcmgr_t *brpcmgr, blade_rpc_request_t *brpcreq)
+{
+ char *key = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpcreq);
+
+ key = ks_pstrdup(brpcmgr->pool, blade_rpc_request_messageid_get(brpcreq));
+ ks_hash_insert(brpcmgr->requests, (void *)key, (void *)brpcreq);
+
+ ks_log(KS_LOG_DEBUG, "Request Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_rpcmgr_request_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_request_t *brpcreq)
+{
+ const char *id = NULL;
+
+ ks_assert(brpcmgr);
+ ks_assert(brpcreq);
+
+ id = blade_rpc_request_messageid_get(brpcreq);
+ ks_hash_remove(brpcmgr->requests, (void *)id);
+
+ ks_log(KS_LOG_DEBUG, "Request Removed: %s\n", id);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
ks_hash_this(it, (const void **)&key, NULL, &value);
- blade_handle_route_remove(bs->handle, (const char *)key);
+ blade_routemgr_route_remove(blade_handle_routemgr_get(bs->handle), (const char *)key);
}
ks_hash_read_unlock(bs->routes);
- // this will also clear the identities and realms in the handle if this is the upstream session
- blade_handle_sessions_remove(bs);
+ // this will also clear the local id, master id and realms in the handle if this is the upstream session
+ blade_sessionmgr_session_remove(blade_handle_sessionmgr_get(bs->handle), bs);
while (ks_q_trypop(bs->sending, (void **)&json) == KS_STATUS_SUCCESS && json) cJSON_Delete(json);
while (ks_q_trypop(bs->receiving, (void **)&json) == KS_STATUS_SUCCESS && json) cJSON_Delete(json);
ks_cond_lock(bs->cond);
bs->state = state;
- blade_handle_session_state_callbacks_execute(bs, BLADE_SESSION_STATE_CONDITION_PRE);
+ blade_sessionmgr_callback_execute(blade_handle_sessionmgr_get(bs->handle), bs, BLADE_SESSION_STATE_CONDITION_PRE);
ks_cond_unlock(bs->cond);
ks_cond_try_signal(bs->cond);
state = bs->state;
if (bs->connection) {
- blade_connection_t *bc = blade_handle_connections_lookup(bs->handle, bs->connection);
+ blade_connection_t *bc = blade_connectionmgr_connection_lookup(blade_handle_connectionmgr_get(bs->handle), bs->connection);
if (bc) {
// @note in order for this to work on session reconnecting, the assumption is that as soon as a session has a connection set,
// we can start stuffing any messages queued for output on the session straight to the connection right away, may need to only
}
// @todo evolve this system, it's probably not the best way to handle receiving session state updates externally
- blade_handle_session_state_callbacks_execute(bs, BLADE_SESSION_STATE_CONDITION_POST);
+ blade_sessionmgr_callback_execute(blade_handle_sessionmgr_get(bs->handle), bs, BLADE_SESSION_STATE_CONDITION_POST);
switch (state) {
case BLADE_SESSION_STATE_STARTUP:
blade_session_state_set(bs, BLADE_SESSION_STATE_CLEANUP);
if (bs->connection) {
- blade_connection_t *bc = blade_handle_connections_lookup(bs->handle, bs->connection);
+ blade_connection_t *bc = blade_connectionmgr_connection_lookup(blade_handle_connectionmgr_get(bs->handle), bs->connection);
if (bc) {
blade_connection_disconnect(bc);
blade_connection_read_unlock(bc);
ks_assert(brpcreq);
// @todo set request TTL and figure out when requests are checked for expiration (separate thread in the handle?)
- blade_handle_requests_add(brpcreq);
+ blade_rpcmgr_request_add(blade_handle_rpcmgr_get(bs->handle), brpcreq);
} else {
// @note This is scenario 3
// 3) Sending a response or error (server: method callee or provider)
if (!bs->connection) {
blade_session_sending_push(bs, json);
} else {
- blade_connection_t *bc = blade_handle_connections_lookup(bs->handle, bs->connection);
+ blade_connection_t *bc = blade_connectionmgr_connection_lookup(blade_handle_connectionmgr_get(bs->handle), bs->connection);
if (!bc) {
blade_session_sending_push(bs, json);
return KS_STATUS_FAIL;
if (params) {
const char *params_requester_nodeid = cJSON_GetObjectCstr(params, "requester-nodeid");
const char *params_responder_nodeid = cJSON_GetObjectCstr(params, "responder-nodeid");
- if (params_requester_nodeid && params_responder_nodeid && !blade_handle_local_nodeid_compare(bh, params_responder_nodeid)) {
+ if (params_requester_nodeid && params_responder_nodeid && !blade_upstreammgr_localid_compare(blade_handle_upstreammgr_get(bh), params_responder_nodeid)) {
// not meant for local processing, continue with standard unicast routing for requests
- blade_session_t *bs_router = blade_handle_route_lookup(bh, params_responder_nodeid);
+ blade_session_t *bs_router = blade_routemgr_route_lookup(blade_handle_routemgr_get(bh), params_responder_nodeid);
if (!bs_router) {
- bs_router = blade_handle_sessions_upstream(bh);
+ bs_router = blade_upstreammgr_session_get(blade_handle_upstreammgr_get(bh));
if (!bs_router) {
cJSON *res = NULL;
cJSON *res_error = NULL;
}
// reach here if the request was not captured for routing, this SHOULD always mean the message is to be processed by local handlers
- brpc = blade_handle_corerpc_lookup(bs->handle, method);
+ brpc = blade_rpcmgr_corerpc_lookup(blade_handle_rpcmgr_get(bs->handle), method);
if (!brpc) {
ks_log(KS_LOG_DEBUG, "Received unknown rpc method %s\n", method);
if (object) {
const char *object_requester_nodeid = cJSON_GetObjectCstr(object, "requester-nodeid");
const char *object_responder_nodeid = cJSON_GetObjectCstr(object, "responder-nodeid");
- if (object_requester_nodeid && object_responder_nodeid && !blade_handle_local_nodeid_compare(bh, object_requester_nodeid)) {
+ if (object_requester_nodeid && object_responder_nodeid && !blade_upstreammgr_localid_compare(blade_handle_upstreammgr_get(bh), object_requester_nodeid)) {
// not meant for local processing, continue with standard unicast routing for responses
- blade_session_t *bs_router = blade_handle_route_lookup(bh, object_requester_nodeid);
+ blade_session_t *bs_router = blade_routemgr_route_lookup(blade_handle_routemgr_get(bh), object_requester_nodeid);
if (!bs_router) {
- bs_router = blade_handle_sessions_upstream(bh);
+ bs_router = blade_upstreammgr_session_get(blade_handle_upstreammgr_get(bh));
if (!bs_router) {
ks_log(KS_LOG_DEBUG, "Session (%s) response (%s <= %s) but upstream session unavailable\n", blade_session_id_get(bs), object_requester_nodeid, object_responder_nodeid);
return KS_STATUS_DISCONNECTED;
}
}
- brpcreq = blade_handle_requests_lookup(bs->handle, id);
+ brpcreq = blade_rpcmgr_request_lookup(blade_handle_rpcmgr_get(bs->handle), id);
if (!brpcreq) {
// @todo hangup session entirely?
return KS_STATUS_FAIL;
}
- blade_handle_requests_remove(brpcreq);
+ blade_rpcmgr_request_remove(blade_handle_rpcmgr_get(bs->handle), brpcreq);
callback = blade_rpc_request_callback_get(brpcreq);
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_sessionmgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *sessions; // id, blade_session_t*
+ ks_hash_t *callbacks; // id, blade_session_callback_data_t*
+};
+
+struct blade_session_callback_data_s {
+ ks_pool_t *pool;
+
+ const char *id;
+ void *data;
+ blade_session_callback_t callback;
+};
+
+
+static void blade_sessionmgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_sessionmgr_t *bsmgr = (blade_sessionmgr_t *)ptr;
+
+ //ks_assert(bsmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+static void blade_session_callback_data_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ blade_session_callback_data_t *bscd = (blade_session_callback_data_t *)ptr;
+
+ ks_assert(bscd);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ ks_pool_free(bscd->pool, &bscd->id);
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_create(blade_sessionmgr_t **bsmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_sessionmgr_t *bsmgr = NULL;
+
+ ks_assert(bsmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ bsmgr = ks_pool_alloc(pool, sizeof(blade_sessionmgr_t));
+ bsmgr->handle = bh;
+ bsmgr->pool = pool;
+
+ ks_hash_create(&bsmgr->sessions, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bsmgr->pool);
+ ks_assert(bsmgr->sessions);
+
+ ks_hash_create(&bsmgr->callbacks, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bsmgr->pool);
+ ks_assert(bsmgr->callbacks);
+
+ ks_pool_set_cleanup(pool, bsmgr, NULL, blade_sessionmgr_cleanup);
+
+ *bsmgrP = bsmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_destroy(blade_sessionmgr_t **bsmgrP)
+{
+ blade_sessionmgr_t *bsmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bsmgrP);
+ ks_assert(*bsmgrP);
+
+ bsmgr = *bsmgrP;
+ *bsmgrP = NULL;
+
+ ks_assert(bsmgr);
+
+ pool = bsmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_sessionmgr_handle_get(blade_sessionmgr_t *bsmgr)
+{
+ ks_assert(bsmgr);
+ return bsmgr->handle;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_shutdown(blade_sessionmgr_t *bsmgr)
+{
+ ks_hash_iterator_t *it = NULL;
+
+ ks_assert(bsmgr);
+
+ ks_hash_read_lock(bsmgr->sessions);
+ for (it = ks_hash_first(bsmgr->sessions, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ blade_session_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+
+ blade_session_hangup(value);
+ }
+ ks_hash_read_unlock(bsmgr->sessions);
+ while (ks_hash_count(bsmgr->sessions) > 0) ks_sleep_ms(100);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_session_t *) blade_sessionmgr_session_lookup(blade_sessionmgr_t *bsmgr, const char *id)
+{
+ blade_session_t *bs = NULL;
+
+ ks_assert(bsmgr);
+ ks_assert(id);
+
+ bs = ks_hash_search(bsmgr->sessions, (void *)id, KS_READLOCKED);
+ if (bs) blade_session_read_lock(bs, KS_TRUE);
+ ks_hash_read_unlock(bsmgr->sessions);
+
+ return bs;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_session_add(blade_sessionmgr_t *bsmgr, blade_session_t *bs)
+{
+ char *key = NULL;
+
+ ks_assert(bsmgr);
+ ks_assert(bs);
+
+ key = ks_pstrdup(bsmgr->pool, blade_session_id_get(bs));
+ ks_hash_insert(bsmgr->sessions, (void *)key, bs);
+
+ ks_log(KS_LOG_DEBUG, "Session Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_session_remove(blade_sessionmgr_t *bsmgr, blade_session_t *bs)
+{
+ const char *id = NULL;
+
+ ks_assert(bsmgr);
+ ks_assert(bs);
+
+ blade_session_write_lock(bs, KS_TRUE);
+
+ id = blade_session_id_get(bs);
+ ks_hash_remove(bsmgr->sessions, (void *)id);
+
+ ks_log(KS_LOG_DEBUG, "Session Removed: %s\n", id);
+
+ blade_subscriptionmgr_subscriber_cleanup(blade_handle_subscriptionmgr_get(bsmgr->handle), id);
+
+ if (blade_upstreammgr_localid_compare(blade_handle_upstreammgr_get(bsmgr->handle), id)) {
+ blade_upstreammgr_localid_set(blade_handle_upstreammgr_get(bsmgr->handle), NULL);
+ blade_upstreammgr_masterid_set(blade_handle_upstreammgr_get(bsmgr->handle), NULL);
+ blade_upstreammgr_realm_clear(blade_handle_upstreammgr_get(bsmgr->handle));
+ }
+
+ blade_session_write_unlock(bs);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_callback_add(blade_sessionmgr_t *bsmgr, void *data, blade_session_callback_t callback, const char **id)
+{
+ blade_session_callback_data_t *bscd = NULL;
+ uuid_t uuid;
+
+ ks_assert(bsmgr);
+ ks_assert(callback);
+ ks_assert(id);
+
+ ks_uuid(&uuid);
+
+ bscd = ks_pool_alloc(bsmgr->pool, sizeof(blade_session_callback_data_t));
+ bscd->pool = bsmgr->pool;
+ bscd->id = ks_uuid_str(bsmgr->pool, &uuid);
+ bscd->data = data;
+ bscd->callback = callback;
+
+ ks_pool_set_cleanup(bsmgr->pool, bscd, NULL, blade_session_callback_data_cleanup);
+
+ ks_hash_insert(bsmgr->callbacks, (void *)ks_pstrdup(bscd->pool, bscd->id), bscd);
+
+ *id = bscd->id;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_sessionmgr_callback_remove(blade_sessionmgr_t *bsmgr, const char *id)
+{
+ ks_assert(bsmgr);
+ ks_assert(id);
+
+ ks_hash_remove(bsmgr->callbacks, (void *)id);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(void) blade_sessionmgr_callback_execute(blade_sessionmgr_t *bsmgr, blade_session_t *bs, blade_session_state_condition_t condition)
+{
+ ks_assert(bsmgr);
+ ks_assert(bs);
+
+ if (blade_session_state_get(bs) == BLADE_SESSION_STATE_NONE) return;
+
+ ks_hash_read_lock(bsmgr->callbacks);
+ for (ks_hash_iterator_t *it = ks_hash_first(bsmgr->callbacks, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ blade_session_callback_data_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+
+ value->callback(bs, condition, value->data);
+ }
+ ks_hash_read_unlock(bsmgr->callbacks);
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
#include "blade.h"
-typedef enum {
- BH_NONE = 0,
-} bhpvt_flag_t;
-
struct blade_handle_s {
- bhpvt_flag_t flags;
ks_pool_t *pool;
ks_thread_pool_t *tpool;
- // local nodeid, can also be used to get the upstream session, and is provided by upstream session "blade.connect" response
- const char *local_nodeid;
- ks_rwl_t *local_nodeid_rwl;
-
- // master router nodeid, provided by upstream session "blade.connect" response
- const char *master_nodeid;
- ks_rwl_t *master_nodeid_rwl;
-
- // realms for new nodes, these originate from the master, and are provided by upstream session "blade.connect" response
- ks_hash_t *realms;
-
- // routes to reach any downstream node, keyed by nodeid of the target node with a value of the nodeid for the locally connected session
- // which is the next step from this node to the target node
- ks_hash_t *routes;
-
- ks_hash_t *transports; // registered blade_transport_t
- blade_transport_t *default_transport; // default wss transport
-
- ks_hash_t *corerpcs; // registered blade_rpc_t, for locally processing core blade.xxxx messages, keyed by the rpc method
- ks_hash_t *requests; // outgoing corerpc requests waiting for a response, keyed by the message id
-
- ks_hash_t *protocolrpcs; // registered blade_rpc_t, for locally processing protocol messages, keyed by the rpc method
-
- ks_hash_t *subscriptions; // registered blade_subscription_t, subscribers may include the local node
- ks_hash_t *subscriptions_cleanup; // cleanup for subscriptions, keyed by the downstream subscriber nodeid, each value is a hash_t* of which contains string keys matching the "protocol@realm/event" keys to remove each nodeid from as a subscriber during cleanup
-
- ks_hash_t *connections; // active connections keyed by connection id
-
- ks_hash_t *sessions; // active sessions keyed by session id (which comes from the nodeid of the downstream side of the session, thus an upstream session is keyed under the local_nodeid)
-
- ks_hash_t *session_state_callbacks;
-
- // @note everything below this point is exclusively for the master node
-
- // @todo how does "exclusive" play into the providers, does "exclusive" mean only one provider can exist for a given protocol and realm?
- ks_hash_t *protocols; // master only: protocols that have been published with blade.publish, and the details to locate a protocol provider with blade.locate
- ks_hash_t *protocols_cleanup; // master only: keyed by the nodeid, each value is a hash_t* of which contains string keys matching the "protocol@realm" keys to remove each nodeid from as a provider during cleanup
-
+ blade_transportmgr_t *transportmgr;
+ blade_rpcmgr_t *rpcmgr;
+ blade_routemgr_t *routemgr;
+ blade_subscriptionmgr_t *subscriptionmgr;
+ blade_upstreammgr_t *upstreammgr;
+ blade_mastermgr_t *mastermgr;
+ blade_connectionmgr_t *connectionmgr;
+ blade_sessionmgr_t *sessionmgr;
};
ks_bool_t blade_protocol_broadcast_request_handler(blade_rpc_request_t *brpcreq, void *data);
-typedef struct blade_handle_session_state_callback_registration_s blade_handle_session_state_callback_registration_t;
-struct blade_handle_session_state_callback_registration_s {
- ks_pool_t *pool;
-
- const char *id;
- void *data;
- blade_session_state_callback_t callback;
-};
-
-static void blade_handle_session_state_callback_registration_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
-{
- blade_handle_session_state_callback_registration_t *bhsscr = (blade_handle_session_state_callback_registration_t *)ptr;
-
- ks_assert(bhsscr);
-
- switch (action) {
- case KS_MPCL_ANNOUNCE:
- break;
- case KS_MPCL_TEARDOWN:
- ks_pool_free(bhsscr->pool, &bhsscr->id);
- break;
- case KS_MPCL_DESTROY:
- break;
- }
-}
-
-ks_status_t blade_handle_session_state_callback_registration_create(blade_handle_session_state_callback_registration_t **bhsscrP,
- ks_pool_t *pool,
- void *data,
- blade_session_state_callback_t callback)
-{
- blade_handle_session_state_callback_registration_t *bhsscr = NULL;
- uuid_t uuid;
-
- ks_assert(bhsscrP);
- ks_assert(pool);
- ks_assert(callback);
-
- ks_uuid(&uuid);
-
- bhsscr = ks_pool_alloc(pool, sizeof(blade_handle_session_state_callback_registration_t));
- bhsscr->pool = pool;
- bhsscr->id = ks_uuid_str(pool, &uuid);
- bhsscr->data = data;
- bhsscr->callback = callback;
-
- ks_pool_set_cleanup(pool, bhsscr, NULL, blade_handle_session_state_callback_registration_cleanup);
-
- *bhsscrP = bhsscr;
-
- return KS_STATUS_SUCCESS;
-}
-
static void blade_handle_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
{
blade_handle_t *bh = (blade_handle_t *)ptr;
- ks_hash_iterator_t *it = NULL;
ks_assert(bh);
-
+
switch (action) {
case KS_MPCL_ANNOUNCE:
break;
case KS_MPCL_TEARDOWN:
- while ((it = ks_hash_first(bh->transports, KS_UNLOCKED)) != NULL) {
- void *key = NULL;
- blade_transport_t *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
- ks_hash_remove(bh->transports, key);
-
- blade_transport_destroy(&value); // must call destroy to close the transport pool, using FREE_VALUE on the hash would attempt to free the transport from the wrong pool
- }
- while ((it = ks_hash_first(bh->corerpcs, KS_UNLOCKED)) != NULL) {
- void *key = NULL;
- blade_rpc_t *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
- ks_hash_remove(bh->corerpcs, key);
-
- blade_rpc_destroy(&value); // must call destroy to close the rpc pool, using FREE_VALUE on the hash would attempt to free the rpc from the wrong pool
- }
- while ((it = ks_hash_first(bh->protocolrpcs, KS_UNLOCKED)) != NULL) {
- void *key = NULL;
- blade_rpc_t *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
- ks_hash_remove(bh->protocolrpcs, key);
-
- blade_rpc_destroy(&value); // must call destroy to close the rpc pool, using FREE_VALUE on the hash would attempt to free the rpc from the wrong pool
- }
+ blade_transportmgr_destroy(&bh->transportmgr);
+ blade_rpcmgr_destroy(&bh->rpcmgr);
+ blade_routemgr_destroy(&bh->routemgr);
+ blade_subscriptionmgr_destroy(&bh->subscriptionmgr);
+ blade_upstreammgr_destroy(&bh->upstreammgr);
+ blade_mastermgr_destroy(&bh->mastermgr);
+ blade_connectionmgr_destroy(&bh->connectionmgr);
+ blade_sessionmgr_destroy(&bh->sessionmgr);
ks_thread_pool_destroy(&bh->tpool);
break;
KS_DECLARE(ks_status_t) blade_handle_create(blade_handle_t **bhP)
{
- bhpvt_flag_t newflags = BH_NONE;
blade_handle_t *bh = NULL;
ks_pool_t *pool = NULL;
ks_thread_pool_t *tpool = NULL;
ks_thread_pool_create(&tpool, BLADE_HANDLE_TPOOL_MIN, BLADE_HANDLE_TPOOL_MAX, BLADE_HANDLE_TPOOL_STACK, KS_PRI_NORMAL, BLADE_HANDLE_TPOOL_IDLE);
ks_assert(tpool);
- bh = ks_pool_alloc(pool, sizeof(blade_handle_t));
- bh->flags = newflags;
- bh->pool = pool;
- bh->tpool = tpool;
-
- ks_rwl_create(&bh->local_nodeid_rwl, bh->pool);
- ks_assert(bh->local_nodeid_rwl);
-
- ks_rwl_create(&bh->master_nodeid_rwl, bh->pool);
- ks_assert(bh->master_nodeid_rwl);
-
- ks_hash_create(&bh->realms, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bh->realms);
-
- // @note can let removes free keys and values for routes, both are strings and allocated from the same pool as the hash itself
- ks_hash_create(&bh->routes, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->routes);
-
- ks_hash_create(&bh->transports, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bh->transports);
-
- ks_hash_create(&bh->corerpcs, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bh->corerpcs);
-
- ks_hash_create(&bh->requests, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bh->requests);
-
- ks_hash_create(&bh->protocolrpcs, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bh->protocolrpcs);
-
- ks_hash_create(&bh->subscriptions, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->subscriptions);
-
- ks_hash_create(&bh->subscriptions_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->subscriptions_cleanup);
-
- ks_hash_create(&bh->connections, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, bh->pool);
- ks_assert(bh->connections);
-
- ks_hash_create(&bh->sessions, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, bh->pool);
- ks_assert(bh->sessions);
-
- ks_hash_create(&bh->session_state_callbacks, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->session_state_callbacks);
-
- ks_hash_create(&bh->protocols, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->protocols);
-
- ks_hash_create(&bh->protocols_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bh->pool);
- ks_assert(bh->protocols_cleanup);
-
- ks_pool_set_cleanup(pool, bh, NULL, blade_handle_cleanup);
-
- *bhP = bh;
-
- ks_log(KS_LOG_DEBUG, "Created\n");
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_destroy(blade_handle_t **bhP)
-{
- blade_handle_t *bh = NULL;
- ks_pool_t *pool;
-
- ks_assert(bhP);
-
- bh = *bhP;
- *bhP = NULL;
-
- ks_assert(bh);
-
- pool = bh->pool;
-
- // shutdown cannot happen inside of the cleanup callback because it'll lock a mutex for the pool during cleanup callbacks which connections and sessions need to finish their cleanup
- // and more importantly, memory needs to remain intact until shutdown is completed to avoid various things hitting teardown before shutdown runs
- blade_handle_shutdown(bh);
-
- ks_pool_close(&pool);
-
- return KS_STATUS_SUCCESS;
-}
-
-ks_status_t blade_handle_config(blade_handle_t *bh, config_setting_t *config)
-{
- config_setting_t *master = NULL;
- config_setting_t *master_nodeid = NULL;
- config_setting_t *master_realms = NULL;
- const char *nodeid = NULL;
- int32_t realms_length = 0;
-
- ks_assert(bh);
-
- if (!config) return KS_STATUS_FAIL;
- if (!config_setting_is_group(config)) {
- ks_log(KS_LOG_DEBUG, "!config_setting_is_group(config)\n");
- return KS_STATUS_FAIL;
- }
-
- master = config_setting_get_member(config, "master");
- if (master) {
- master_nodeid = config_lookup_from(master, "nodeid");
- if (master_nodeid) {
- if (config_setting_type(master_nodeid) != CONFIG_TYPE_STRING) return KS_STATUS_FAIL;
- nodeid = config_setting_get_string(master_nodeid);
-
- blade_handle_local_nodeid_set(bh, nodeid);
- blade_handle_master_nodeid_set(bh, nodeid);
- }
- master_realms = config_lookup_from(master, "realms");
- if (master_realms) {
- if (config_setting_type(master_realms) != CONFIG_TYPE_LIST) return KS_STATUS_FAIL;
- realms_length = config_setting_length(master_realms);
- if (realms_length > 0) {
- for (int32_t index = 0; index < realms_length; ++index) {
- const char *realm = config_setting_get_string_elem(master_realms, index);
- if (!realm) return KS_STATUS_FAIL;
- blade_handle_realm_register(bh, realm);
- }
- }
- }
- }
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_startup(blade_handle_t *bh, config_setting_t *config)
-{
- blade_rpc_t *brpc = NULL;
- blade_transport_t *bt = NULL;
- ks_hash_iterator_t *it = NULL;
-
- ks_assert(bh);
-
- if (blade_handle_config(bh, config) != KS_STATUS_SUCCESS) {
- ks_log(KS_LOG_DEBUG, "blade_handle_config failed\n");
- return KS_STATUS_FAIL;
- }
-
- // register internal core rpcs for blade.xxx
- blade_rpc_create(&brpc, bh, "blade.register", NULL, NULL, blade_protocol_register_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- blade_rpc_create(&brpc, bh, "blade.publish", NULL, NULL, blade_protocol_publish_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- blade_rpc_create(&brpc, bh, "blade.locate", NULL, NULL, blade_protocol_locate_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- blade_rpc_create(&brpc, bh, "blade.execute", NULL, NULL, blade_protocol_execute_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- blade_rpc_create(&brpc, bh, "blade.subscribe", NULL, NULL, blade_protocol_subscribe_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- blade_rpc_create(&brpc, bh, "blade.broadcast", NULL, NULL, blade_protocol_broadcast_request_handler, NULL);
- blade_handle_corerpc_register(brpc);
-
- // register internal transport for secure websockets
- blade_transport_wss_create(&bt, bh);
- ks_assert(bt);
- bh->default_transport = bt;
- blade_handle_transport_register(bt);
-
- for (it = ks_hash_first(bh->transports, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- blade_transport_t *value = NULL;
- blade_transport_callbacks_t *callbacks = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
-
- callbacks = blade_transport_callbacks_get(value);
- ks_assert(callbacks);
-
- if (callbacks->onstartup) callbacks->onstartup(value, config);
- }
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_shutdown(blade_handle_t *bh)
-{
- ks_hash_iterator_t *it = NULL;
-
- ks_assert(bh);
-
- ks_hash_read_lock(bh->transports);
- for (it = ks_hash_first(bh->transports, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- blade_transport_t *value = NULL;
- blade_transport_callbacks_t *callbacks = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
-
- callbacks = blade_transport_callbacks_get(value);
- ks_assert(callbacks);
-
- if (callbacks->onshutdown) callbacks->onshutdown(value);
- }
- ks_hash_read_unlock(bh->transports);
-
- ks_hash_read_lock(bh->connections);
- for (it = ks_hash_first(bh->connections, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- blade_connection_t *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
-
- blade_connection_disconnect(value);
- }
- ks_hash_read_unlock(bh->connections);
- while (ks_hash_count(bh->connections) > 0) ks_sleep_ms(100);
-
- ks_hash_read_lock(bh->sessions);
- for (it = ks_hash_first(bh->sessions, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- blade_session_t *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
-
- blade_session_hangup(value);
- }
- ks_hash_read_unlock(bh->sessions);
- while (ks_hash_count(bh->sessions) > 0) ks_sleep_ms(100);
-
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_pool_t *) blade_handle_pool_get(blade_handle_t *bh)
-{
- ks_assert(bh);
- return bh->pool;
-}
-
-KS_DECLARE(ks_thread_pool_t *) blade_handle_tpool_get(blade_handle_t *bh)
-{
- ks_assert(bh);
- return bh->tpool;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_local_nodeid_set(blade_handle_t *bh, const char *nodeid)
-{
- ks_status_t ret = KS_STATUS_SUCCESS;
-
- ks_assert(bh);
-
- ks_rwl_write_lock(bh->local_nodeid_rwl);
- if (bh->local_nodeid && nodeid) {
- ret = KS_STATUS_NOT_ALLOWED;
- goto done;
- }
- if (!bh->local_nodeid && !nodeid) {
- ret = KS_STATUS_DISCONNECTED;
- goto done;
- }
-
- if (bh->local_nodeid) ks_pool_free(bh->pool, &bh->local_nodeid);
- if (nodeid) bh->local_nodeid = ks_pstrdup(bh->pool, nodeid);
-
- ks_log(KS_LOG_DEBUG, "Local NodeID: %s\n", nodeid);
-
-done:
- ks_rwl_write_unlock(bh->local_nodeid_rwl);
- return ret;
-}
-
-KS_DECLARE(ks_bool_t) blade_handle_local_nodeid_compare(blade_handle_t *bh, const char *nodeid)
-{
- ks_bool_t ret = KS_FALSE;
-
- ks_assert(bh);
- ks_assert(nodeid);
-
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- ret = ks_safe_strcasecmp(bh->local_nodeid, nodeid) == 0;
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
-
- return ret;
-}
-
-KS_DECLARE(const char *) blade_handle_master_nodeid_copy(blade_handle_t *bh, ks_pool_t *pool)
-{
- const char *nodeid = NULL;
-
- ks_assert(bh);
- ks_assert(pool);
-
- ks_rwl_write_lock(bh->master_nodeid_rwl);
- if (bh->master_nodeid) nodeid = ks_pstrdup(pool, bh->master_nodeid);
- ks_rwl_write_unlock(bh->master_nodeid_rwl);
-
- return nodeid;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_master_nodeid_set(blade_handle_t *bh, const char *nodeid)
-{
- ks_assert(bh);
-
- ks_rwl_write_lock(bh->master_nodeid_rwl);
- if (bh->master_nodeid) ks_pool_free(bh->pool, &bh->master_nodeid);
- if (nodeid) bh->master_nodeid = ks_pstrdup(bh->pool, nodeid);
- ks_rwl_write_unlock(bh->master_nodeid_rwl);
-
- ks_log(KS_LOG_DEBUG, "Master NodeID: %s\n", nodeid);
-
-return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_bool_t) blade_handle_master_nodeid_compare(blade_handle_t *bh, const char *nodeid)
-{
- ks_bool_t ret = KS_FALSE;
-
- ks_assert(bh);
- ks_assert(nodeid);
-
- ks_rwl_read_lock(bh->master_nodeid_rwl);
- ret = ks_safe_strcasecmp(bh->master_nodeid, nodeid) == 0;
- ks_rwl_read_unlock(bh->master_nodeid_rwl);
-
- return ret;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_realm_register(blade_handle_t *bh, const char *realm)
-{
- char *key = NULL;
-
- ks_assert(bh);
- ks_assert(realm);
-
- key = ks_pstrdup(bh->pool, realm);
- ks_hash_insert(bh->realms, (void *)key, (void *)KS_TRUE);
-
- ks_log(KS_LOG_DEBUG, "Realm Registered: %s\n", key);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_realm_unregister(blade_handle_t *bh, const char *realm)
-{
- ks_assert(bh);
- ks_assert(realm);
-
- ks_log(KS_LOG_DEBUG, "Realm Unregistered: %s\n", realm);
-
- ks_hash_remove(bh->realms, (void *)realm);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_hash_t *) blade_handle_realms_get(blade_handle_t *bh)
-{
- ks_assert(bh);
- return bh->realms;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_route_add(blade_handle_t *bh, const char *nodeid, const char *sessionid)
-{
- char *key = NULL;
- char *value = NULL;
-
- ks_assert(bh);
- ks_assert(nodeid);
- ks_assert(sessionid);
-
- key = ks_pstrdup(bh->pool, nodeid);
- value = ks_pstrdup(bh->pool, sessionid);
-
- ks_hash_insert(bh->routes, (void *)key, (void *)value);
-
- ks_log(KS_LOG_DEBUG, "Route Added: %s through %s\n", key, value);
-
- blade_protocol_register(bh, nodeid, KS_FALSE, NULL, NULL);
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_route_remove(blade_handle_t *bh, const char *nodeid)
-{
- ks_hash_t *protocols = NULL;
-
- ks_assert(bh);
- ks_assert(nodeid);
-
- ks_log(KS_LOG_DEBUG, "Route Removed: %s\n", nodeid);
-
- ks_hash_remove(bh->routes, (void *)nodeid);
-
- blade_protocol_register(bh, nodeid, KS_TRUE, NULL, NULL);
-
- // @note everything below here is for master-only cleanup when a node is no longer routable
-
- // @note protocols are cleaned up here because routes can be removed that are not locally connected with a session but still
- // have protocols published to the master node from further downstream, in which case if a route is announced upstream to be
- // removed, a master node is still able to catch that here even when there is no direct session, but is also hit when there
- // is a direct session being terminated
- ks_hash_write_lock(bh->protocols);
- protocols = (ks_hash_t *)ks_hash_search(bh->protocols_cleanup, (void *)nodeid, KS_UNLOCKED);
- if (protocols) {
- for (ks_hash_iterator_t *it = ks_hash_first(protocols, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- void *value = NULL;
- blade_protocol_t *bp = NULL;
- ks_hash_t *providers = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, &value);
-
- bp = (blade_protocol_t *)ks_hash_search(bh->protocols, key, KS_UNLOCKED);
- ks_assert(bp); // should not happen when a cleanup still has a provider tracked for a protocol
-
- ks_log(KS_LOG_DEBUG, "Protocol (%s) provider (%s) removed\n", key, nodeid);
- blade_protocol_providers_remove(bp, nodeid);
-
- providers = blade_protocol_providers_get(bp);
- if (ks_hash_count(providers) == 0) {
- // @note this depends on locking something outside of the protocol that won't be destroyed, like the top level
- // protocols hash, but assumes then that any reader keeps the top level hash read locked while using the protocol
- // so it cannot be deleted
- ks_log(KS_LOG_DEBUG, "Protocol (%s) removed\n", key);
- ks_hash_remove(bh->protocols, key);
- }
- }
- ks_hash_remove(bh->protocols_cleanup, (void *)nodeid);
- }
- ks_hash_write_unlock(bh->protocols);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(blade_session_t *) blade_handle_route_lookup(blade_handle_t *bh, const char *nodeid)
-{
- blade_session_t *bs = NULL;
- const char *sessionid = NULL;
-
- ks_assert(bh);
- ks_assert(nodeid);
-
- sessionid = ks_hash_search(bh->routes, (void *)nodeid, KS_READLOCKED);
- if (sessionid) bs = blade_handle_sessions_lookup(bh, sessionid);
- ks_hash_read_unlock(bh->routes);
-
- return bs;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_transport_register(blade_transport_t *bt)
-{
- blade_handle_t *bh = NULL;
- char *key = NULL;
-
- ks_assert(bt);
-
- bh = blade_transport_handle_get(bt);
- ks_assert(bh);
-
- key = ks_pstrdup(bh->pool, blade_transport_name_get(bt));
- ks_assert(key);
-
- ks_hash_insert(bh->transports, (void *)key, bt);
-
- ks_log(KS_LOG_DEBUG, "Transport Registered: %s\n", key);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_transport_unregister(blade_transport_t *bt)
-{
- blade_handle_t *bh = NULL;
- const char *name = NULL;
-
- ks_assert(bt);
-
- bh = blade_transport_handle_get(bt);
- ks_assert(bh);
-
- name = blade_transport_name_get(bt);
- ks_assert(name);
-
- ks_log(KS_LOG_DEBUG, "Transport Unregistered: %s\n", name);
-
- ks_hash_remove(bh->transports, (void *)name);
-
- return KS_STATUS_SUCCESS;
-}
-
-
-KS_DECLARE(ks_status_t) blade_handle_corerpc_register(blade_rpc_t *brpc)
-{
- blade_handle_t *bh = NULL;
- char *key = NULL;
-
- ks_assert(brpc);
-
- bh = blade_rpc_handle_get(brpc);
- ks_assert(bh);
-
- key = ks_pstrdup(bh->pool, blade_rpc_method_get(brpc));
- ks_assert(key);
-
- ks_hash_insert(bh->corerpcs, (void *)key, brpc);
-
- ks_log(KS_LOG_DEBUG, "CoreRPC Registered: %s\n", key);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_corerpc_unregister(blade_rpc_t *brpc)
-{
- blade_handle_t *bh = NULL;
- const char *method = NULL;
-
- ks_assert(brpc);
-
- bh = blade_rpc_handle_get(brpc);
- ks_assert(bh);
-
- method = blade_rpc_method_get(brpc);
- ks_assert(method);
-
- ks_log(KS_LOG_DEBUG, "CoreRPC Unregistered: %s\n", method);
-
- ks_hash_remove(bh->corerpcs, (void *)method);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(blade_rpc_t *) blade_handle_corerpc_lookup(blade_handle_t *bh, const char *method)
-{
- blade_rpc_t *brpc = NULL;
-
- ks_assert(bh);
- ks_assert(method);
-
- brpc = ks_hash_search(bh->corerpcs, (void *)method, KS_READLOCKED);
- ks_hash_read_unlock(bh->corerpcs);
-
- return brpc;
-}
-
-
-KS_DECLARE(ks_status_t) blade_handle_requests_add(blade_rpc_request_t *brpcreq)
-{
- blade_handle_t *bh = NULL;
- const char *key = NULL;
-
- ks_assert(brpcreq);
-
- bh = blade_rpc_request_handle_get(brpcreq);
- ks_assert(bh);
-
- key = ks_pstrdup(bh->pool, blade_rpc_request_messageid_get(brpcreq));
- ks_assert(key);
-
- ks_hash_insert(bh->requests, (void *)key, brpcreq);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_requests_remove(blade_rpc_request_t *brpcreq)
-{
- blade_handle_t *bh = NULL;
- const char *id = NULL;
-
- ks_assert(brpcreq);
-
- bh = blade_rpc_request_handle_get(brpcreq);
- ks_assert(bh);
-
- id = blade_rpc_request_messageid_get(brpcreq);
- ks_assert(id);
-
- ks_hash_remove(bh->requests, (void *)id);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(blade_rpc_request_t *) blade_handle_requests_lookup(blade_handle_t *bh, const char *id)
-{
- blade_rpc_request_t *brpcreq = NULL;
-
- ks_assert(bh);
- ks_assert(id);
-
- brpcreq = ks_hash_search(bh->requests, (void *)id, KS_READLOCKED);
- ks_hash_read_unlock(bh->requests);
-
- return brpcreq;
-}
-
-
-KS_DECLARE(ks_status_t) blade_handle_protocolrpc_register(blade_rpc_t *brpc)
-{
- blade_handle_t *bh = NULL;
- const char *method = NULL;
- const char *protocol = NULL;
- const char *realm = NULL;
- char *key = NULL;
-
- ks_assert(brpc);
-
- bh = blade_rpc_handle_get(brpc);
- ks_assert(bh);
-
- method = blade_rpc_method_get(brpc);
- ks_assert(method);
-
- protocol = blade_rpc_protocol_get(brpc);
- ks_assert(protocol);
-
- realm = blade_rpc_realm_get(brpc);
- ks_assert(realm);
-
- key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, method);
- ks_assert(key);
-
- ks_hash_insert(bh->protocolrpcs, (void *)key, brpc);
-
- ks_log(KS_LOG_DEBUG, "ProtocolRPC Registered: %s\n", key);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(ks_status_t) blade_handle_protocolrpc_unregister(blade_rpc_t *brpc)
-{
- blade_handle_t *bh = NULL;
- const char *method = NULL;
- const char *protocol = NULL;
- const char *realm = NULL;
- char *key = NULL;
-
- ks_assert(brpc);
-
- bh = blade_rpc_handle_get(brpc);
- ks_assert(bh);
-
- method = blade_rpc_method_get(brpc);
- ks_assert(method);
-
- protocol = blade_rpc_protocol_get(brpc);
- ks_assert(protocol);
-
- realm = blade_rpc_realm_get(brpc);
- ks_assert(realm);
-
- key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, method);
- ks_assert(key);
-
- ks_log(KS_LOG_DEBUG, "ProtocolRPC Unregistered: %s\n", key);
-
- ks_hash_remove(bh->protocolrpcs, (void *)key);
-
- ks_pool_free(bh->pool, &key);
-
- return KS_STATUS_SUCCESS;
-}
-
-KS_DECLARE(blade_rpc_t *) blade_handle_protocolrpc_lookup(blade_handle_t *bh, const char *method, const char *protocol, const char *realm)
-{
- blade_rpc_t *brpc = NULL;
- char *key = NULL;
-
- ks_assert(bh);
- ks_assert(method);
- ks_assert(protocol);
- ks_assert(realm);
-
- key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, method);
- brpc = ks_hash_search(bh->protocolrpcs, (void *)key, KS_READLOCKED);
- ks_hash_read_unlock(bh->protocolrpcs);
-
- ks_pool_free(bh->pool, &key);
-
- return brpc;
-}
-
-KS_DECLARE(ks_bool_t) blade_handle_subscriber_add(blade_handle_t *bh, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *nodeid)
-{
- char *key = NULL;
- blade_subscription_t *bsub = NULL;
- ks_hash_t *bsub_cleanup = NULL;
- ks_bool_t propagate = KS_FALSE;
-
- ks_assert(bh);
- ks_assert(event);
- ks_assert(protocol);
- ks_assert(realm);
- ks_assert(nodeid);
-
- key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, event);
-
- ks_hash_write_lock(bh->subscriptions);
-
- bsub = (blade_subscription_t *)ks_hash_search(bh->subscriptions, (void *)key, KS_UNLOCKED);
-
- if (!bsub) {
- blade_subscription_create(&bsub, bh->pool, event, protocol, realm);
- ks_assert(bsub);
-
- ks_hash_insert(bh->subscriptions, (void *)ks_pstrdup(bh->pool, key), bsub);
- propagate = KS_TRUE;
- }
-
- bsub_cleanup = (ks_hash_t *)ks_hash_search(bh->subscriptions_cleanup, (void *)nodeid, KS_UNLOCKED);
- if (!bsub_cleanup) {
- ks_hash_create(&bsub_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bsub_cleanup);
-
- ks_log(KS_LOG_DEBUG, "Subscription (%s) added\n", key);
- ks_hash_insert(bh->subscriptions_cleanup, (void *)ks_pstrdup(bh->pool, nodeid), bsub_cleanup);
- }
- ks_hash_insert(bsub_cleanup, (void *)ks_pstrdup(bh->pool, key), (void *)KS_TRUE);
-
- blade_subscription_subscribers_add(bsub, nodeid);
-
- ks_hash_write_unlock(bh->subscriptions);
-
- ks_log(KS_LOG_DEBUG, "Subscription (%s) subscriber (%s) added\n", key, nodeid);
-
- ks_pool_free(bh->pool, &key);
-
- if (bsubP) *bsubP = bsub;
-
- return propagate;
-}
-
-KS_DECLARE(ks_bool_t) blade_handle_subscriber_remove(blade_handle_t *bh, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *nodeid)
-{
- char *key = NULL;
- blade_subscription_t *bsub = NULL;
- ks_hash_t *bsub_cleanup = NULL;
- ks_bool_t propagate = KS_FALSE;
-
- ks_assert(bh);
- ks_assert(event);
- ks_assert(protocol);
- ks_assert(realm);
- ks_assert(nodeid);
-
- key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, event);
-
- ks_hash_write_lock(bh->subscriptions);
-
- bsub = (blade_subscription_t *)ks_hash_search(bh->subscriptions, (void *)key, KS_UNLOCKED);
-
- if (bsub) {
- bsub_cleanup = (ks_hash_t *)ks_hash_search(bh->subscriptions_cleanup, (void *)nodeid, KS_UNLOCKED);
- ks_assert(bsub_cleanup);
- ks_hash_remove(bsub_cleanup, key);
-
- if (ks_hash_count(bsub_cleanup) == 0) {
- ks_hash_remove(bh->subscriptions_cleanup, (void *)nodeid);
- }
-
- ks_log(KS_LOG_DEBUG, "Subscription (%s) subscriber (%s) removed\n", key, nodeid);
- blade_subscription_subscribers_remove(bsub, nodeid);
-
- if (ks_hash_count(blade_subscription_subscribers_get(bsub)) == 0) {
- ks_log(KS_LOG_DEBUG, "Subscription (%s) removed\n", key);
- ks_hash_remove(bh->subscriptions, (void *)key);
- propagate = KS_TRUE;
- }
- }
-
- ks_hash_write_unlock(bh->subscriptions);
-
- ks_pool_free(bh->pool, &key);
-
- if (bsubP) *bsubP = bsub;
-
- return propagate;
-}
-
-
-
-KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id)
-{
- ks_status_t ret = KS_STATUS_SUCCESS;
- blade_transport_t *bt = NULL;
- blade_transport_callbacks_t *callbacks = NULL;
- const char *tname = NULL;
-
- ks_assert(bh);
- ks_assert(target);
-
- // @todo better locking here
- if (bh->local_nodeid) return KS_STATUS_DUPLICATE_OPERATION;
+ bh = ks_pool_alloc(pool, sizeof(blade_handle_t));
+ bh->pool = pool;
+ bh->tpool = tpool;
- ks_hash_read_lock(bh->transports);
+ blade_transportmgr_create(&bh->transportmgr, bh);
+ ks_assert(bh->transportmgr);
- tname = blade_identity_parameter_get(target, "transport");
- if (tname) {
- bt = ks_hash_search(bh->transports, (void *)tname, KS_UNLOCKED);
- }
- ks_hash_read_unlock(bh->transports);
+ blade_rpcmgr_create(&bh->rpcmgr, bh);
+ ks_assert(bh->rpcmgr);
- if (!bt) bt = bh->default_transport;
+ blade_routemgr_create(&bh->routemgr, bh);
+ ks_assert(bh->routemgr);
- callbacks = blade_transport_callbacks_get(bt);
+ blade_subscriptionmgr_create(&bh->subscriptionmgr, bh);
+ ks_assert(bh->subscriptionmgr);
- if (callbacks->onconnect) ret = callbacks->onconnect(bcP, bt, target, session_id);
+ blade_upstreammgr_create(&bh->upstreammgr, bh);
+ ks_assert(bh->upstreammgr);
- return ret;
-}
+ blade_mastermgr_create(&bh->mastermgr, bh);
+ ks_assert(bh->mastermgr);
+ blade_connectionmgr_create(&bh->connectionmgr, bh);
+ ks_assert(bh->connectionmgr);
-KS_DECLARE(ks_status_t) blade_handle_connections_add(blade_connection_t *bc)
-{
- ks_status_t ret = KS_STATUS_SUCCESS;
- blade_handle_t *bh = NULL;
+ blade_sessionmgr_create(&bh->sessionmgr, bh);
+ ks_assert(bh->sessionmgr);
- ks_assert(bc);
- bh = blade_connection_handle_get(bc);
- ks_assert(bh);
+ ks_pool_set_cleanup(pool, bh, NULL, blade_handle_cleanup);
- ks_hash_write_lock(bh->connections);
- ret = ks_hash_insert(bh->connections, (void *)blade_connection_id_get(bc), bc);
- ks_hash_write_unlock(bh->connections);
+ *bhP = bh;
- return ret;
+ ks_log(KS_LOG_DEBUG, "Created\n");
+
+ return KS_STATUS_SUCCESS;
}
-KS_DECLARE(ks_status_t) blade_handle_connections_remove(blade_connection_t *bc)
+KS_DECLARE(ks_status_t) blade_handle_destroy(blade_handle_t **bhP)
{
- ks_status_t ret = KS_STATUS_SUCCESS;
blade_handle_t *bh = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bhP);
- ks_assert(bc);
+ bh = *bhP;
+ *bhP = NULL;
- bh = blade_connection_handle_get(bc);
ks_assert(bh);
- blade_connection_write_lock(bc, KS_TRUE);
+ pool = bh->pool;
- ks_hash_write_lock(bh->connections);
- if (ks_hash_remove(bh->connections, (void *)blade_connection_id_get(bc)) == NULL) ret = KS_STATUS_FAIL;
- ks_hash_write_unlock(bh->connections);
+ // shutdown cannot happen inside of the cleanup callback because it'll lock a mutex for the pool during cleanup callbacks which connections and sessions need to finish their cleanup
+ // and more importantly, memory needs to remain intact until shutdown is completed to avoid various things hitting teardown before shutdown runs
+ blade_handle_shutdown(bh);
- blade_connection_write_unlock(bc);
+ ks_pool_close(&pool);
- return ret;
+ return KS_STATUS_SUCCESS;
}
-KS_DECLARE(blade_connection_t *) blade_handle_connections_lookup(blade_handle_t *bh, const char *id)
+ks_status_t blade_handle_config(blade_handle_t *bh, config_setting_t *config)
{
- blade_connection_t *bc = NULL;
+ config_setting_t *master = NULL;
+ config_setting_t *master_nodeid = NULL;
+ config_setting_t *master_realms = NULL;
+ const char *nodeid = NULL;
+ int32_t realms_length = 0;
ks_assert(bh);
- ks_assert(id);
-
- ks_hash_read_lock(bh->connections);
- bc = ks_hash_search(bh->connections, (void *)id, KS_UNLOCKED);
- if (bc && blade_connection_read_lock(bc, KS_FALSE) != KS_STATUS_SUCCESS) bc = NULL;
- ks_hash_read_unlock(bh->connections);
- return bc;
-}
-
-
-KS_DECLARE(ks_status_t) blade_handle_sessions_add(blade_session_t *bs)
-{
- ks_status_t ret = KS_STATUS_SUCCESS;
- blade_handle_t *bh = NULL;
-
- ks_assert(bs);
+ if (!config) return KS_STATUS_FAIL;
+ if (!config_setting_is_group(config)) {
+ ks_log(KS_LOG_DEBUG, "!config_setting_is_group(config)\n");
+ return KS_STATUS_FAIL;
+ }
- bh = blade_session_handle_get(bs);
- ks_assert(bh);
+ master = config_setting_get_member(config, "master");
+ if (master) {
+ master_nodeid = config_lookup_from(master, "nodeid");
+ if (master_nodeid) {
+ if (config_setting_type(master_nodeid) != CONFIG_TYPE_STRING) return KS_STATUS_FAIL;
+ nodeid = config_setting_get_string(master_nodeid);
- ks_hash_write_lock(bh->sessions);
- ret = ks_hash_insert(bh->sessions, (void *)blade_session_id_get(bs), bs);
- ks_hash_write_unlock(bh->sessions);
+ blade_upstreammgr_localid_set(bh->upstreammgr, nodeid);
+ blade_upstreammgr_masterid_set(bh->upstreammgr, nodeid);
+ }
+ master_realms = config_lookup_from(master, "realms");
+ if (master_realms) {
+ if (config_setting_type(master_realms) != CONFIG_TYPE_LIST) return KS_STATUS_FAIL;
+ realms_length = config_setting_length(master_realms);
+ if (realms_length > 0) {
+ for (int32_t index = 0; index < realms_length; ++index) {
+ const char *realm = config_setting_get_string_elem(master_realms, index);
+ if (!realm) return KS_STATUS_FAIL;
+ blade_upstreammgr_realm_add(bh->upstreammgr, realm);
+ }
+ }
+ }
+ }
- return ret;
+ return KS_STATUS_SUCCESS;
}
-KS_DECLARE(ks_status_t) blade_handle_sessions_remove(blade_session_t *bs)
+KS_DECLARE(ks_status_t) blade_handle_startup(blade_handle_t *bh, config_setting_t *config)
{
- ks_status_t ret = KS_STATUS_SUCCESS;
- blade_handle_t *bh = NULL;
- ks_pool_t *pool = NULL;
- const char *id = NULL;
- ks_hash_iterator_t *it = NULL;
- ks_bool_t upstream = KS_FALSE;
- ks_bool_t unsubbed = KS_FALSE;
-
- ks_assert(bs);
+ blade_rpc_t *brpc = NULL;
+ blade_transport_t *bt = NULL;
- bh = blade_session_handle_get(bs);
ks_assert(bh);
- pool = blade_handle_pool_get(bh);
- ks_assert(pool);
-
- blade_session_write_lock(bs, KS_TRUE);
-
- id = blade_session_id_get(bs);
- ks_assert(id);
-
- // @todo this cleanup is a bit messy, move to using the combined key rather than passing around all 3 parts would make this cleaner
- while (!unsubbed) {
- ks_hash_t *subscriptions = NULL;
- const char *event = NULL;
- const char *protocol = NULL;
- const char *realm = NULL;
-
- ks_hash_read_lock(bh->subscriptions);
- subscriptions = (ks_hash_t *)ks_hash_search(bh->subscriptions_cleanup, (void *)id, KS_UNLOCKED);
- if (!subscriptions) unsubbed = KS_TRUE;
- else {
- void *key = NULL;
- void *value = NULL;
- blade_subscription_t *bsub = NULL;
+ if (blade_handle_config(bh, config) != KS_STATUS_SUCCESS) {
+ ks_log(KS_LOG_DEBUG, "blade_handle_config failed\n");
+ return KS_STATUS_FAIL;
+ }
- it = ks_hash_first(subscriptions, KS_UNLOCKED);
- ks_assert(it);
+ // register internal transport for secure websockets
+ blade_transport_wss_create(&bt, bh);
+ ks_assert(bt);
+ blade_transportmgr_default_set(bh->transportmgr, bt);
+ blade_transportmgr_transport_add(bh->transportmgr, bt);
- ks_hash_this(it, (const void **)&key, NULL, &value);
- bsub = (blade_subscription_t *)ks_hash_search(bh->subscriptions, key, KS_UNLOCKED);
- ks_assert(bsub);
+ // register internal core rpcs for blade.xxx
+ blade_rpc_create(&brpc, bh, "blade.register", NULL, NULL, blade_protocol_register_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- // @note allocate these to avoid lifecycle issues when the last subscriber is removed causing the subscription to be removed
- event = ks_pstrdup(bh->pool, blade_subscription_event_get(bsub));
- protocol = ks_pstrdup(bh->pool, blade_subscription_protocol_get(bsub));
- realm = ks_pstrdup(bh->pool, blade_subscription_realm_get(bsub));
- }
- ks_hash_read_unlock(bh->subscriptions);
+ blade_rpc_create(&brpc, bh, "blade.publish", NULL, NULL, blade_protocol_publish_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- if (!unsubbed) {
- if (blade_handle_subscriber_remove(bh, NULL, event, protocol, realm, id)) {
- blade_protocol_subscribe_raw(bh, event, protocol, realm, KS_TRUE, NULL, NULL);
- }
- ks_pool_free(bh->pool, &event);
- ks_pool_free(bh->pool, &protocol);
- ks_pool_free(bh->pool, &realm);
- }
- }
+ blade_rpc_create(&brpc, bh, "blade.locate", NULL, NULL, blade_protocol_locate_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- ks_hash_write_lock(bh->sessions);
- if (ks_hash_remove(bh->sessions, (void *)id) == NULL) ret = KS_STATUS_FAIL;
+ blade_rpc_create(&brpc, bh, "blade.execute", NULL, NULL, blade_protocol_execute_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- upstream = bh->local_nodeid && !ks_safe_strcasecmp(bh->local_nodeid, id);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
+ blade_rpc_create(&brpc, bh, "blade.subscribe", NULL, NULL, blade_protocol_subscribe_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- if (upstream) {
- blade_handle_local_nodeid_set(bh, NULL);
- blade_handle_master_nodeid_set(bh, NULL);
- while ((it = ks_hash_first(bh->realms, KS_UNLOCKED))) {
- void *key = NULL;
- void *value = NULL;
- ks_hash_this(it, (const void **)&key, NULL, &value);
- ks_hash_remove(bh->realms, key);
- }
- }
+ blade_rpc_create(&brpc, bh, "blade.broadcast", NULL, NULL, blade_protocol_broadcast_request_handler, NULL);
+ blade_rpcmgr_corerpc_add(bh->rpcmgr, brpc);
- ks_hash_write_unlock(bh->sessions);
- blade_session_write_unlock(bs);
+ blade_transportmgr_startup(bh->transportmgr, config);
- return ret;
+ return KS_STATUS_SUCCESS;
}
-KS_DECLARE(blade_session_t *) blade_handle_sessions_lookup(blade_handle_t *bh, const char *id)
+KS_DECLARE(ks_status_t) blade_handle_shutdown(blade_handle_t *bh)
{
- blade_session_t *bs = NULL;
-
ks_assert(bh);
- ks_assert(id);
- ks_hash_read_lock(bh->sessions);
- bs = ks_hash_search(bh->sessions, (void *)id, KS_UNLOCKED);
- if (bs && blade_session_read_lock(bs, KS_FALSE) != KS_STATUS_SUCCESS) bs = NULL;
- ks_hash_read_unlock(bh->sessions);
+ blade_transportmgr_shutdown(bh->transportmgr);
- return bs;
+ blade_connectionmgr_shutdown(bh->connectionmgr);
+
+ blade_sessionmgr_shutdown(bh->sessionmgr);
+
+ return KS_STATUS_SUCCESS;
}
-KS_DECLARE(blade_session_t *) blade_handle_sessions_upstream(blade_handle_t *bh)
+KS_DECLARE(ks_pool_t *) blade_handle_pool_get(blade_handle_t *bh)
{
- blade_session_t *bs = NULL;
-
ks_assert(bh);
-
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- if (bh->local_nodeid) bs = blade_handle_sessions_lookup(bh, bh->local_nodeid);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
-
- return bs;
+ return bh->pool;
}
-KS_DECLARE(void) blade_handle_sessions_send(blade_handle_t *bh, ks_list_t *sessions, const char *exclude, cJSON *json)
+KS_DECLARE(ks_thread_pool_t *) blade_handle_tpool_get(blade_handle_t *bh)
{
- blade_session_t *bs = NULL;
-
ks_assert(bh);
- ks_assert(sessions);
- ks_assert(json);
-
- ks_list_iterator_start(sessions);
- while (ks_list_iterator_hasnext(sessions)) {
- const char *sessionid = ks_list_iterator_next(sessions);
- if (exclude && !strcmp(exclude, sessionid)) continue;
- bs = blade_handle_sessions_lookup(bh, sessionid);
- if (!bs) {
- ks_log(KS_LOG_DEBUG, "This should not happen\n");
- continue;
- }
- blade_session_send(bs, json, NULL, NULL);
- blade_session_read_unlock(bs);
- }
- ks_list_iterator_stop(sessions);
+ return bh->tpool;
}
-KS_DECLARE(ks_status_t) blade_handle_session_state_callback_register(blade_handle_t *bh, void *data, blade_session_state_callback_t callback, const char **id)
+KS_DECLARE(blade_transportmgr_t *) blade_handle_transportmgr_get(blade_handle_t *bh)
{
- blade_handle_session_state_callback_registration_t *bhsscr = NULL;
-
ks_assert(bh);
- ks_assert(callback);
- ks_assert(id);
-
- blade_handle_session_state_callback_registration_create(&bhsscr, blade_handle_pool_get(bh), data, callback);
- ks_assert(bhsscr);
+ return bh->transportmgr;
+}
- ks_hash_insert(bh->session_state_callbacks, (void *)bhsscr->id, bhsscr);
+KS_DECLARE(blade_rpcmgr_t *) blade_handle_rpcmgr_get(blade_handle_t *bh)
+{
+ ks_assert(bh);
+ return bh->rpcmgr;
+}
- *id = bhsscr->id;
+KS_DECLARE(blade_routemgr_t *) blade_handle_routemgr_get(blade_handle_t *bh)
+{
+ ks_assert(bh);
+ return bh->routemgr;
+}
- return KS_STATUS_SUCCESS;
+KS_DECLARE(blade_subscriptionmgr_t *) blade_handle_subscriptionmgr_get(blade_handle_t *bh)
+{
+ ks_assert(bh);
+ return bh->subscriptionmgr;
}
-KS_DECLARE(ks_status_t) blade_handle_session_state_callback_unregister(blade_handle_t *bh, const char *id)
+KS_DECLARE(blade_upstreammgr_t *) blade_handle_upstreammgr_get(blade_handle_t *bh)
{
ks_assert(bh);
- ks_assert(id);
+ return bh->upstreammgr;
+}
- ks_hash_remove(bh->session_state_callbacks, (void *)id);
+KS_DECLARE(blade_mastermgr_t *) blade_handle_mastermgr_get(blade_handle_t *bh)
+{
+ ks_assert(bh);
+ return bh->mastermgr;
+}
- return KS_STATUS_SUCCESS;
+KS_DECLARE(blade_connectionmgr_t *) blade_handle_connectionmgr_get(blade_handle_t *bh)
+{
+ ks_assert(bh);
+ return bh->connectionmgr;
}
-KS_DECLARE(void) blade_handle_session_state_callbacks_execute(blade_session_t *bs, blade_session_state_condition_t condition)
+KS_DECLARE(blade_sessionmgr_t *) blade_handle_sessionmgr_get(blade_handle_t *bh)
{
- blade_handle_t *bh = NULL;
- ks_hash_iterator_t *it = NULL;
+ ks_assert(bh);
+ return bh->sessionmgr;
+}
- ks_assert(bs);
- if (blade_session_state_get(bs) == BLADE_SESSION_STATE_NONE) return;
+KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id)
+{
+ ks_status_t ret = KS_STATUS_SUCCESS;
+ blade_transport_t *bt = NULL;
+ blade_transport_callbacks_t *callbacks = NULL;
- bh = blade_session_handle_get(bs);
ks_assert(bh);
+ ks_assert(target);
- ks_hash_read_lock(bh->session_state_callbacks);
- for (it = ks_hash_first(bh->session_state_callbacks, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- blade_handle_session_state_callback_registration_t *value = NULL;
+ // @todo mini state machine to deal with upstream establishment to avoid attempting multiple upstream connects at the same time
+ if (blade_upstreammgr_session_established(bh->upstreammgr)) return KS_STATUS_DUPLICATE_OPERATION;
- ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+ bt = blade_transportmgr_transport_lookup(bh->transportmgr, blade_identity_parameter_get(target, "transport"), KS_TRUE);
+ ks_assert(bt);
- value->callback(bs, condition, value->data);
- }
- ks_hash_read_unlock(bh->session_state_callbacks);
+ callbacks = blade_transport_callbacks_get(bt);
+ ks_assert(callbacks);
+
+ if (callbacks->onconnect) ret = callbacks->onconnect(bcP, bt, target, session_id);
+
+ return ret;
}
ks_assert(bh);
ks_assert(nodeid);
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(bh->sessionmgr, blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
if (remove) {
blade_session_route_remove(bs, req_params_nodeid);
- blade_handle_route_remove(bh, req_params_nodeid);
+ blade_routemgr_route_remove(blade_handle_routemgr_get(bh), req_params_nodeid);
} else {
blade_session_route_add(bs, req_params_nodeid);
- blade_handle_route_add(bh, req_params_nodeid, blade_session_id_get(bs));
+ blade_routemgr_route_add(blade_handle_routemgr_get(bh), req_params_nodeid, blade_session_id_get(bs));
}
blade_rpc_response_raw_create(&res, &res_result, blade_rpc_request_messageid_get(brpcreq));
ks_pool_t *pool = NULL;
cJSON *req = NULL;
cJSON *req_params = NULL;
+ const char *id = NULL;
ks_assert(bh);
ks_assert(name);
ks_assert(realm);
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ // @todo consideration for the Master trying to publish a protocol, with no upstream
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
cJSON_AddStringToObject(req_params, "protocol", name);
cJSON_AddStringToObject(req_params, "realm", realm);
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- cJSON_AddStringToObject(req_params, "requester-nodeid", bh->local_nodeid);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
+ blade_upstreammgr_localid_copy(bh->upstreammgr, pool, &id);
+ ks_assert(id);
+
+ cJSON_AddStringToObject(req_params, "requester-nodeid", id);
+ ks_pool_free(pool, &id);
- ks_rwl_read_lock(bh->master_nodeid_rwl);
- cJSON_AddStringToObject(req_params, "responder-nodeid", bh->master_nodeid);
- ks_rwl_read_unlock(bh->master_nodeid_rwl);
+ blade_upstreammgr_masterid_copy(bh->upstreammgr, pool, &id);
+ ks_assert(id);
+
+ cJSON_AddStringToObject(req_params, "responder-nodeid", id);
+ ks_pool_free(pool, &id);
// @todo add a parameter containing a block of json for schema definitions for each of the methods being published
const char *req_params_responder_nodeid = NULL;
cJSON *res = NULL;
cJSON *res_result = NULL;
- blade_protocol_t *bp = NULL;
- const char *bp_key = NULL;
- ks_hash_t *bp_cleanup = NULL;
ks_assert(brpcreq);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
goto done;
}
- if (!blade_handle_master_nodeid_compare(bh, req_params_responder_nodeid)) {
+ if (!blade_upstreammgr_masterid_compare(bh->upstreammgr, req_params_responder_nodeid)) {
ks_log(KS_LOG_DEBUG, "Session (%s) publish request invalid 'responder-nodeid' (%s)\n", blade_session_id_get(bs), req_params_responder_nodeid);
blade_rpc_error_raw_create(&res, NULL, blade_rpc_request_messageid_get(brpcreq), -32602, "Invalid params responder-nodeid");
blade_session_send(bs, res, NULL, NULL);
ks_log(KS_LOG_DEBUG, "Session (%s) publish request (%s to %s) processing\n", blade_session_id_get(bs), req_params_requester_nodeid, req_params_responder_nodeid);
- bp_key = ks_psprintf(bh->pool, "%s@%s", req_params_protocol, req_params_realm);
-
- ks_hash_write_lock(bh->protocols);
-
- bp = (blade_protocol_t *)ks_hash_search(bh->protocols, (void *)bp_key, KS_UNLOCKED);
- if (bp) {
- // @todo deal with exclusive stuff when the protocol is already registered
- }
-
- if (!bp) {
- blade_protocol_create(&bp, bh->pool, req_params_protocol, req_params_realm);
- ks_assert(bp);
-
- ks_log(KS_LOG_DEBUG, "Protocol (%s) added\n", bp_key);
- ks_hash_insert(bh->protocols, (void *)ks_pstrdup(bh->pool, bp_key), bp);
- }
-
- bp_cleanup = (ks_hash_t *)ks_hash_search(bh->protocols_cleanup, (void *)req_params_requester_nodeid, KS_UNLOCKED);
- if (!bp_cleanup) {
- ks_hash_create(&bp_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bh->pool);
- ks_assert(bp_cleanup);
-
- ks_hash_insert(bh->protocols_cleanup, (void *)ks_pstrdup(bh->pool, req_params_requester_nodeid), bp_cleanup);
- }
- ks_hash_insert(bp_cleanup, (void *)ks_pstrdup(bh->pool, bp_key), (void *)KS_TRUE);
- blade_protocol_providers_add(bp, req_params_requester_nodeid);
- ks_log(KS_LOG_DEBUG, "Protocol (%s) provider (%s) added\n", bp_key, req_params_requester_nodeid);
-
- ks_hash_write_unlock(bh->protocols);
-
+ blade_mastermgr_controller_add(bh->mastermgr, req_params_protocol, req_params_realm, req_params_requester_nodeid);
// build the actual response finally
blade_rpc_response_raw_create(&res, &res_result, blade_rpc_request_messageid_get(brpcreq));
// blade.locate request generator
// @todo discuss system to support caching locate results, and internally subscribing to receive event updates related to protocols which have been located
-// to ensure local caches remain synced when protocol providers change, but this requires additional filters for event propagating to avoid broadcasting
+// to ensure local caches remain synced when protocol controllers change, but this requires additional filters for event propagating to avoid broadcasting
// every protocol update to everyone which may actually be a better way than an explicit locate request
KS_DECLARE(ks_status_t) blade_protocol_locate(blade_handle_t *bh, const char *name, const char *realm, blade_rpc_response_callback_t callback, void *data)
{
ks_pool_t *pool = NULL;
cJSON *req = NULL;
cJSON *req_params = NULL;
+ const char *id = NULL;
ks_assert(bh);
ks_assert(name);
ks_assert(realm);
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
cJSON_AddStringToObject(req_params, "protocol", name);
cJSON_AddStringToObject(req_params, "realm", realm);
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- cJSON_AddStringToObject(req_params, "requester-nodeid", bh->local_nodeid);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
+ blade_upstreammgr_localid_copy(bh->upstreammgr, pool, &id);
+ ks_assert(id);
+
+ cJSON_AddStringToObject(req_params, "requester-nodeid", id);
+ ks_pool_free(pool, &id);
- ks_rwl_read_lock(bh->master_nodeid_rwl);
- cJSON_AddStringToObject(req_params, "responder-nodeid", bh->master_nodeid);
- ks_rwl_read_unlock(bh->master_nodeid_rwl);
+ blade_upstreammgr_masterid_copy(bh->upstreammgr, pool, &id);
+ ks_assert(id);
+
+ cJSON_AddStringToObject(req_params, "responder-nodeid", id);
+ ks_pool_free(pool, &id);
ks_log(KS_LOG_DEBUG, "Session (%s) locate request started\n", blade_session_id_get(bs));
const char *req_params_responder_nodeid = NULL;
cJSON *res = NULL;
cJSON *res_result = NULL;
- cJSON *res_result_providers;
+ cJSON *res_result_controllers;
blade_protocol_t *bp = NULL;
const char *bp_key = NULL;
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
goto done;
}
- if (!blade_handle_master_nodeid_compare(bh, req_params_responder_nodeid)) {
+ if (!blade_upstreammgr_masterid_compare(bh->upstreammgr, req_params_responder_nodeid)) {
ks_log(KS_LOG_DEBUG, "Session (%s) locate request invalid 'responder-nodeid' (%s)\n", blade_session_id_get(bs), req_params_responder_nodeid);
blade_rpc_error_raw_create(&res, NULL, blade_rpc_request_messageid_get(brpcreq), -32602, "Invalid params responder-nodeid");
blade_session_send(bs, res, NULL, NULL);
ks_log(KS_LOG_DEBUG, "Session (%s) locate request (%s to %s) processing\n", blade_session_id_get(bs), req_params_requester_nodeid, req_params_responder_nodeid);
- res_result_providers = cJSON_CreateObject();
+ res_result_controllers = cJSON_CreateObject();
bp_key = ks_psprintf(bh->pool, "%s@%s", req_params_protocol, req_params_realm);
- ks_hash_read_lock(bh->protocols);
-
- bp = (blade_protocol_t *)ks_hash_search(bh->protocols, (void *)bp_key, KS_UNLOCKED);
+ bp = blade_mastermgr_protocol_lookup(bh->mastermgr, req_params_protocol, req_params_realm);
if (bp) {
- ks_hash_t *providers = blade_protocol_providers_get(bp);
- for (ks_hash_iterator_t *it = ks_hash_first(providers, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ ks_hash_t *controllers = blade_protocol_controllers_get(bp);
+ for (ks_hash_iterator_t *it = ks_hash_first(controllers, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
const char *key = NULL;
void *value = NULL;
ks_hash_this(it, (const void **)&key, NULL, &value);
- cJSON_AddItemToArray(res_result_providers, cJSON_CreateString(key));
+ cJSON_AddItemToArray(res_result_controllers, cJSON_CreateString(key));
}
}
- ks_hash_read_unlock(bh->protocols);
-
// build the actual response finally
blade_rpc_response_raw_create(&res, &res_result, blade_rpc_request_messageid_get(brpcreq));
cJSON_AddStringToObject(res_result, "realm", req_params_realm);
cJSON_AddStringToObject(res_result, "requester-nodeid", req_params_requester_nodeid);
cJSON_AddStringToObject(res_result, "responder-nodeid", req_params_responder_nodeid);
- cJSON_AddItemToObject(res_result, "providers", res_result_providers);
+ cJSON_AddItemToObject(res_result, "controllers", res_result_controllers);
// request was just received on a session that is already read locked, so we can assume the response goes back on the same session without further lookup
blade_session_send(bs, res, NULL, NULL);
ks_pool_t *pool = NULL;
cJSON *req = NULL;
cJSON *req_params = NULL;
+ const char *localid = NULL;
ks_assert(bh);
ks_assert(nodeid);
ks_assert(protocol);
ks_assert(realm);
- if (!(bs = blade_handle_route_lookup(bh, nodeid))) {
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ if (!(bs = blade_routemgr_route_lookup(blade_handle_routemgr_get(bh), nodeid))) {
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
cJSON_AddStringToObject(req_params, "protocol", protocol);
cJSON_AddStringToObject(req_params, "realm", realm);
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- cJSON_AddStringToObject(req_params, "requester-nodeid", bh->local_nodeid);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
+ blade_upstreammgr_localid_copy(bh->upstreammgr, pool, &localid);
+ ks_assert(localid);
+
+ cJSON_AddStringToObject(req_params, "requester-nodeid", localid);
+ ks_pool_free(pool, &localid);
- ks_rwl_read_lock(bh->master_nodeid_rwl);
cJSON_AddStringToObject(req_params, "responder-nodeid", nodeid);
- ks_rwl_read_unlock(bh->master_nodeid_rwl);
if (params) cJSON_AddItemToObject(req_params, "params", cJSON_Duplicate(params, 1));
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
// @todo pull out nested params block if it exists and check against schema later, so blade_rpc_t should be able to carry a schema with it, even though blade.xxx may not associate one
- brpc = blade_handle_protocolrpc_lookup(bh, req_params_method, req_params_protocol, req_params_realm);
+ brpc = blade_rpcmgr_protocolrpc_lookup(blade_handle_rpcmgr_get(bh), req_params_method, req_params_protocol, req_params_realm);
if (!brpc) {
ks_log(KS_LOG_DEBUG, "Session (%s) execute request unknown method\n", blade_session_id_get(bs));
blade_rpc_error_raw_create(&res, NULL, blade_rpc_request_messageid_get(brpcreq), -32602, "Unknown params method");
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
{
ks_status_t ret = KS_STATUS_SUCCESS;
blade_session_t *bs = NULL;
+ const char *localid = NULL;
ks_bool_t propagate = KS_FALSE;
blade_subscription_t *bsub = NULL;
ks_assert(protocol);
ks_assert(realm);
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
+ blade_upstreammgr_localid_copy(bh->upstreammgr, bh->pool, &localid);
+ ks_assert(localid);
+
if (remove) {
- propagate = blade_handle_subscriber_remove(bh, &bsub, event, protocol, realm, bh->local_nodeid);
+ propagate = blade_subscriptionmgr_subscriber_remove(bh->subscriptionmgr, &bsub, event, protocol, realm, localid);
} else {
- propagate = blade_handle_subscriber_add(bh, &bsub, event, protocol, realm, bh->local_nodeid);
+ propagate = blade_subscriptionmgr_subscriber_add(bh->subscriptionmgr, &bsub, event, protocol, realm, localid);
ks_assert(event_callback);
}
+ ks_pool_free(bh->pool, &localid);
+
if (bsub) {
blade_subscription_callback_set(bsub, event_callback);
blade_subscription_callback_data_set(bsub, event_data);
ks_assert(protocol);
ks_assert(realm);
- if (!(bs = blade_handle_sessions_upstream(bh))) {
+ if (!(bs = blade_upstreammgr_session_get(bh->upstreammgr))) {
ret = KS_STATUS_DISCONNECTED;
goto done;
}
pool = blade_handle_pool_get(bh);
ks_assert(pool);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
ks_log(KS_LOG_DEBUG, "Session (%s) subscribe request processing\n", blade_session_id_get(bs));
if (remove) {
- propagate = blade_handle_subscriber_remove(bh, NULL, req_params_event, req_params_protocol, req_params_realm, blade_session_id_get(bs));
+ propagate = blade_subscriptionmgr_subscriber_remove(bh->subscriptionmgr, NULL, req_params_event, req_params_protocol, req_params_realm, blade_session_id_get(bs));
} else {
- propagate = blade_handle_subscriber_add(bh, NULL, req_params_event, req_params_protocol, req_params_realm, blade_session_id_get(bs));
+ propagate = blade_subscriptionmgr_subscriber_add(bh->subscriptionmgr, NULL, req_params_event, req_params_protocol, req_params_realm, blade_session_id_get(bs));
}
if (propagate) blade_protocol_subscribe_raw(bh, req_params_event, req_params_protocol, req_params_realm, remove, NULL, NULL);
KS_DECLARE(ks_status_t) blade_protocol_broadcast(blade_handle_t *bh, const char *broadcaster_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data)
{
ks_status_t ret = KS_STATUS_SUCCESS;
+ ks_pool_t *pool = NULL;
+ const char *localid = NULL;
ks_assert(bh);
ks_assert(event);
ks_assert(realm);
// this will ensure any downstream subscriber sessions, and upstream session if available will be broadcasted to
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- if (!broadcaster_nodeid) broadcaster_nodeid = bh->local_nodeid;
- ret = blade_protocol_broadcast_raw(bh, broadcaster_nodeid, NULL, event, protocol, realm, params, callback, data);
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
-
- // @todo must check if the local node is also subscribed to receive the event, this is a special edge case which has some extra considerations
- // if the local node is subscribed to receive the event, it should be received here as a special case, otherwise the broadcast request handler
- // is where this normally occurs
-
- return ret;
-}
-
-KS_DECLARE(ks_status_t) blade_protocol_broadcast_raw(blade_handle_t *bh, const char *broadcaster_nodeid, const char *excluded_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data)
-{
- const char *bsub_key = NULL;
- blade_subscription_t *bsub = NULL;
- blade_session_t *bs = NULL;
-
- ks_assert(bh);
- ks_assert(broadcaster_nodeid);
- ks_assert(event);
- ks_assert(protocol);
- ks_assert(realm);
-
- bsub_key = ks_psprintf(bh->pool, "%s@%s/%s", protocol, realm, event);
-
- ks_hash_read_lock(bh->subscriptions);
-
- bsub = (blade_subscription_t *)ks_hash_search(bh->subscriptions, (void *)bsub_key, KS_UNLOCKED);
- if (bsub) {
- ks_hash_t *subscribers = blade_subscription_subscribers_get(bsub);
-
- ks_assert(subscribers);
-
- for (ks_hash_iterator_t *it = ks_hash_first(subscribers, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- void *value = NULL;
- cJSON *req = NULL;
- cJSON *req_params = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, &value);
-
- if (excluded_nodeid && !ks_safe_strcasecmp(excluded_nodeid, (const char *)key)) continue;
-
- if (blade_handle_local_nodeid_compare(bh, (const char *)key)) continue;
-
- bs = blade_handle_sessions_lookup(bh, (const char *)key);
- if (bs) {
- ks_log(KS_LOG_DEBUG, "Session (%s) broadcast request started\n", blade_session_id_get(bs));
-
- blade_rpc_request_raw_create(bh->pool, &req, &req_params, NULL, "blade.broadcast");
-
- cJSON_AddStringToObject(req_params, "broadcaster-nodeid", broadcaster_nodeid);
- cJSON_AddStringToObject(req_params, "event", event);
- cJSON_AddStringToObject(req_params, "protocol", protocol);
- cJSON_AddStringToObject(req_params, "realm", realm);
-
- if (params) cJSON_AddItemToObject(req_params, "params", cJSON_Duplicate(params, 1));
-
- blade_session_send(bs, req, callback, data);
-
- cJSON_Delete(req);
+ pool = blade_handle_pool_get(bh);
- blade_session_read_unlock(bs);
- }
- }
+ if (!broadcaster_nodeid) {
+ blade_upstreammgr_localid_copy(bh->upstreammgr, pool, &localid);
+ ks_assert(localid);
+ broadcaster_nodeid = localid;
}
- ks_hash_read_unlock(bh->subscriptions);
-
- ks_pool_free(bh->pool, &bsub_key);
+ ret = blade_subscriptionmgr_broadcast(bh->subscriptionmgr, broadcaster_nodeid, NULL, event, protocol, realm, params, callback, data);
- bs = blade_handle_sessions_upstream(bh);
- if (bs) {
- if (!excluded_nodeid || ks_safe_strcasecmp(blade_session_id_get(bs), excluded_nodeid)) {
- cJSON *req = NULL;
- cJSON *req_params = NULL;
+ if (localid) ks_pool_free(pool, &localid);
- ks_log(KS_LOG_DEBUG, "Session (%s) broadcast request started\n", blade_session_id_get(bs));
-
- blade_rpc_request_raw_create(bh->pool, &req, &req_params, NULL, "blade.broadcast");
-
- cJSON_AddStringToObject(req_params, "broadcaster-nodeid", broadcaster_nodeid);
- cJSON_AddStringToObject(req_params, "event", event);
- cJSON_AddStringToObject(req_params, "protocol", protocol);
- cJSON_AddStringToObject(req_params, "realm", realm);
-
- if (params) cJSON_AddItemToObject(req_params, "params", cJSON_Duplicate(params, 1));
-
- blade_session_send(bs, req, callback, data);
-
- cJSON_Delete(req);
- }
+ // @todo must check if the local node is also subscribed to receive the event, this is a special edge case which has some extra considerations
+ // if the local node is subscribed to receive the event, it should be received here as a special case, otherwise the broadcast request handler
+ // is where this normally occurs, however this is not a simple case as the callback expects a blade_rpc_request_t parameter containing context
- blade_session_read_unlock(bs);
- }
- return KS_STATUS_SUCCESS;
+ return ret;
}
// blade.broadcast request handler
const char *req_params_protocol = NULL;
const char *req_params_realm = NULL;
cJSON *req_params_params = NULL;
- const char *bsub_key = NULL;
blade_subscription_t *bsub = NULL;
blade_rpc_request_callback_t callback = NULL;
cJSON *res = NULL;
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
req = blade_rpc_request_message_get(brpcreq);
req_params_params = cJSON_GetObjectItem(req_params, "params");
+ blade_subscriptionmgr_broadcast(bh->subscriptionmgr, req_params_broadcaster_nodeid, blade_session_id_get(bs), req_params_event, req_params_protocol, req_params_realm, req_params_params, NULL, NULL);
- blade_protocol_broadcast_raw(bh, req_params_broadcaster_nodeid, blade_session_id_get(bs), req_params_event, req_params_protocol, req_params_realm, req_params_params, NULL, NULL);
-
+ bsub = blade_subscriptionmgr_subscription_lookup(bh->subscriptionmgr, req_params_event, req_params_protocol, req_params_realm);
+ if (bsub) {
+ const char *localid = NULL;
+ ks_pool_t *pool = NULL;
- bsub_key = ks_psprintf(bh->pool, "%s@%s/%s", req_params_protocol, req_params_realm, req_params_event);
+ pool = blade_handle_pool_get(bh);
- ks_hash_read_lock(bh->subscriptions);
+ blade_upstreammgr_localid_copy(bh->upstreammgr, pool, &localid);
+ ks_assert(localid);
- bsub = (blade_subscription_t *)ks_hash_search(bh->subscriptions, (void *)bsub_key, KS_UNLOCKED);
- if (bsub) {
- ks_rwl_read_lock(bh->local_nodeid_rwl);
- if (ks_hash_search(blade_subscription_subscribers_get(bsub), (void *)bh->local_nodeid, KS_UNLOCKED)) {
+ if (ks_hash_search(blade_subscription_subscribers_get(bsub), (void *)localid, KS_UNLOCKED)) {
callback = blade_subscription_callback_get(bsub);
if (callback) ret = callback(brpcreq, blade_subscription_callback_data_get(bsub));
}
- ks_rwl_read_unlock(bh->local_nodeid_rwl);
+ ks_pool_free(pool, &localid);
}
- ks_hash_read_unlock(bh->subscriptions);
-
- ks_pool_free(bh->pool, &bsub_key);
-
// build the actual response finally
blade_rpc_response_raw_create(&res, &res_result, blade_rpc_request_messageid_get(brpcreq));
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_subscriptionmgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *subscriptions; // key, blade_subscription_t*
+ ks_hash_t *subscriptions_cleanup; // target, ks_hash_t*
+
+};
+
+
+static void blade_subscriptionmgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_routemgr_t *brmgr = (blade_routemgr_t *)ptr;
+
+ //ks_assert(brmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_create(blade_subscriptionmgr_t **bsmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_subscriptionmgr_t *bsmgr = NULL;
+
+ ks_assert(bsmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ bsmgr = ks_pool_alloc(pool, sizeof(blade_subscriptionmgr_t));
+ bsmgr->handle = bh;
+ bsmgr->pool = pool;
+
+ // @note can let removes free keys and values for subscriptions, both are allocated from the same pool as the hash itself
+ ks_hash_create(&bsmgr->subscriptions, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bsmgr->pool);
+ ks_assert(bsmgr->subscriptions);
+
+ ks_hash_create(&bsmgr->subscriptions_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bsmgr->pool);
+ ks_assert(bsmgr->subscriptions_cleanup);
+
+ ks_pool_set_cleanup(pool, bsmgr, NULL, blade_subscriptionmgr_cleanup);
+
+ *bsmgrP = bsmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_destroy(blade_subscriptionmgr_t **bsmgrP)
+{
+ blade_subscriptionmgr_t *bsmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bsmgrP);
+ ks_assert(*bsmgrP);
+
+ bsmgr = *bsmgrP;
+ *bsmgrP = NULL;
+
+ ks_assert(bsmgr);
+
+ pool = bsmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_subscriptionmgr_handle_get(blade_subscriptionmgr_t *bsmgr)
+{
+ ks_assert(bsmgr);
+ return bsmgr->handle;
+}
+
+//KS_DECLARE(blade_session_t *) blade_subscriptionmgr_route_lookup(blade_routemgr_t *brmgr, const char *target)
+//{
+// blade_session_t *bs = NULL;
+// const char *router = NULL;
+//
+// ks_assert(brmgr);
+// ks_assert(target);
+//
+// router = (const char *)ks_hash_search(brmgr->routes, (void *)target, KS_READLOCKED);
+// if (router) bs = blade_handle_sessions_lookup(brmgr->handle, router);
+// ks_hash_read_unlock(brmgr->routes);
+//
+// return bs;
+//}
+
+KS_DECLARE(blade_subscription_t *) blade_subscriptionmgr_subscription_lookup(blade_subscriptionmgr_t *bsmgr, const char *event, const char *protocol, const char *realm)
+{
+ blade_subscription_t *bsub = NULL;
+ char *key = NULL;
+
+ ks_assert(bsmgr);
+ ks_assert(event);
+ ks_assert(protocol);
+ ks_assert(realm);
+
+ key = ks_psprintf(bsmgr->pool, "%s@%s/%s", protocol, realm, event);
+
+ bsub = (blade_subscription_t *)ks_hash_search(bsmgr->subscriptions, (void *)key, KS_READLOCKED);
+ // @todo if (bsub) blade_subscription_read_lock(bsub);
+ ks_hash_read_unlock(bsmgr->subscriptions);
+
+ ks_pool_free(bsmgr->pool, &key);
+
+ return bsub;
+}
+
+KS_DECLARE(ks_bool_t) blade_subscriptionmgr_subscriber_add(blade_subscriptionmgr_t *bsmgr, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *target)
+{
+ char *key = NULL;
+ blade_subscription_t *bsub = NULL;
+ ks_hash_t *bsub_cleanup = NULL;
+ ks_bool_t propagate = KS_FALSE;
+
+ ks_assert(bsmgr);
+ ks_assert(event);
+ ks_assert(protocol);
+ ks_assert(realm);
+ ks_assert(target);
+
+ key = ks_psprintf(bsmgr->pool, "%s@%s/%s", protocol, realm, event);
+
+ ks_hash_write_lock(bsmgr->subscriptions);
+
+ bsub = (blade_subscription_t *)ks_hash_search(bsmgr->subscriptions, (void *)key, KS_UNLOCKED);
+
+ if (!bsub) {
+ blade_subscription_create(&bsub, bsmgr->pool, event, protocol, realm);
+ ks_assert(bsub);
+
+ ks_hash_insert(bsmgr->subscriptions, (void *)ks_pstrdup(bsmgr->pool, key), bsub);
+ propagate = KS_TRUE;
+ }
+
+ bsub_cleanup = (ks_hash_t *)ks_hash_search(bsmgr->subscriptions_cleanup, (void *)target, KS_UNLOCKED);
+ if (!bsub_cleanup) {
+ ks_hash_create(&bsub_cleanup, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bsmgr->pool);
+ ks_assert(bsub_cleanup);
+
+ ks_log(KS_LOG_DEBUG, "Subscription Added: %s\n", key);
+ ks_hash_insert(bsmgr->subscriptions_cleanup, (void *)ks_pstrdup(bsmgr->pool, target), (void *)bsub_cleanup);
+ }
+ ks_hash_insert(bsub_cleanup, (void *)ks_pstrdup(bsmgr->pool, key), (void *)KS_TRUE);
+
+ blade_subscription_subscribers_add(bsub, target);
+
+ ks_hash_write_unlock(bsmgr->subscriptions);
+
+ ks_log(KS_LOG_DEBUG, "Subscriber Added: %s to %s\n", target, key);
+
+ ks_pool_free(bsmgr->pool, &key);
+
+ if (bsubP) *bsubP = bsub;
+
+ return propagate;
+}
+
+KS_DECLARE(ks_bool_t) blade_subscriptionmgr_subscriber_remove(blade_subscriptionmgr_t *bsmgr, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *target)
+{
+ char *key = NULL;
+ blade_subscription_t *bsub = NULL;
+ ks_hash_t *bsub_cleanup = NULL;
+ ks_bool_t propagate = KS_FALSE;
+
+ ks_assert(bsmgr);
+ ks_assert(event);
+ ks_assert(protocol);
+ ks_assert(realm);
+ ks_assert(target);
+
+ key = ks_psprintf(bsmgr->pool, "%s@%s/%s", protocol, realm, event);
+
+ ks_hash_write_lock(bsmgr->subscriptions);
+
+ bsub = (blade_subscription_t *)ks_hash_search(bsmgr->subscriptions, (void *)key, KS_UNLOCKED);
+
+ if (bsub) {
+ bsub_cleanup = (ks_hash_t *)ks_hash_search(bsmgr->subscriptions_cleanup, (void *)target, KS_UNLOCKED);
+ ks_assert(bsub_cleanup);
+ ks_hash_remove(bsub_cleanup, key);
+
+ if (ks_hash_count(bsub_cleanup) == 0) {
+ ks_hash_remove(bsmgr->subscriptions_cleanup, (void *)target);
+ }
+
+ ks_log(KS_LOG_DEBUG, "Subscriber Removed: %s from %s\n", target, key);
+ blade_subscription_subscribers_remove(bsub, target);
+
+ if (ks_hash_count(blade_subscription_subscribers_get(bsub)) == 0) {
+ ks_log(KS_LOG_DEBUG, "Subscription Removed: %s\n", key);
+ ks_hash_remove(bsmgr->subscriptions, (void *)key);
+ propagate = KS_TRUE;
+ }
+ }
+
+ ks_hash_write_unlock(bsmgr->subscriptions);
+
+ ks_pool_free(bsmgr->pool, &key);
+
+ if (bsubP) *bsubP = bsub;
+
+ return propagate;
+}
+
+KS_DECLARE(void) blade_subscriptionmgr_subscriber_cleanup(blade_subscriptionmgr_t *bsmgr, const char *target)
+{
+ ks_bool_t unsubbed = KS_FALSE;
+
+ ks_assert(bsmgr);
+ ks_assert(target);
+
+ while (!unsubbed) {
+ ks_hash_t *subscriptions = NULL;
+ const char *event = NULL;
+ const char *protocol = NULL;
+ const char *realm = NULL;
+
+ ks_hash_read_lock(bsmgr->subscriptions);
+ subscriptions = (ks_hash_t *)ks_hash_search(bsmgr->subscriptions_cleanup, (void *)target, KS_UNLOCKED);
+ if (!subscriptions) unsubbed = KS_TRUE;
+ else {
+ void *key = NULL;
+ void *value = NULL;
+ blade_subscription_t *bsub = NULL;
+
+ ks_hash_iterator_t *it = ks_hash_first(subscriptions, KS_UNLOCKED);
+ ks_assert(it);
+
+ ks_hash_this(it, (const void **)&key, NULL, &value);
+
+ bsub = (blade_subscription_t *)ks_hash_search(bsmgr->subscriptions, key, KS_UNLOCKED);
+ ks_assert(bsub);
+
+ // @note allocate these to avoid lifecycle issues when the last subscriber is removed causing the subscription to be removed
+ event = ks_pstrdup(bsmgr->pool, blade_subscription_event_get(bsub));
+ protocol = ks_pstrdup(bsmgr->pool, blade_subscription_protocol_get(bsub));
+ realm = ks_pstrdup(bsmgr->pool, blade_subscription_realm_get(bsub));
+ }
+ ks_hash_read_unlock(bsmgr->subscriptions);
+
+ if (!unsubbed) {
+ if (blade_subscriptionmgr_subscriber_remove(bsmgr, NULL, event, protocol, realm, target)) {
+ blade_protocol_subscribe_raw(bsmgr->handle, event, protocol, realm, KS_TRUE, NULL, NULL);
+ }
+ ks_pool_free(bsmgr->pool, &event);
+ ks_pool_free(bsmgr->pool, &protocol);
+ ks_pool_free(bsmgr->pool, &realm);
+ }
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_broadcast(blade_subscriptionmgr_t *bsmgr, const char *broadcaster_nodeid, const char *excluded_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data)
+{
+ const char *bsub_key = NULL;
+ blade_subscription_t *bsub = NULL;
+ blade_session_t *bs = NULL;
+
+ ks_assert(bsmgr);
+ ks_assert(broadcaster_nodeid);
+ ks_assert(event);
+ ks_assert(protocol);
+ ks_assert(realm);
+
+ bsub_key = ks_psprintf(bsmgr->pool, "%s@%s/%s", protocol, realm, event);
+
+ ks_hash_read_lock(bsmgr->subscriptions);
+
+ bsub = (blade_subscription_t *)ks_hash_search(bsmgr->subscriptions, (void *)bsub_key, KS_UNLOCKED);
+ if (bsub) {
+ ks_hash_t *subscribers = blade_subscription_subscribers_get(bsub);
+
+ ks_assert(subscribers);
+
+ for (ks_hash_iterator_t *it = ks_hash_first(subscribers, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ void *value = NULL;
+ cJSON *req = NULL;
+ cJSON *req_params = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, &value);
+
+ if (excluded_nodeid && !ks_safe_strcasecmp(excluded_nodeid, (const char *)key)) continue;
+
+ if (blade_upstreammgr_localid_compare(blade_handle_upstreammgr_get(bsmgr->handle), (const char *)key)) continue;
+
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bsmgr->handle), (const char *)key);
+ if (bs) {
+ ks_log(KS_LOG_DEBUG, "Session (%s) broadcast request started\n", blade_session_id_get(bs));
+
+ blade_rpc_request_raw_create(bsmgr->pool, &req, &req_params, NULL, "blade.broadcast");
+
+ cJSON_AddStringToObject(req_params, "broadcaster-nodeid", broadcaster_nodeid);
+ cJSON_AddStringToObject(req_params, "event", event);
+ cJSON_AddStringToObject(req_params, "protocol", protocol);
+ cJSON_AddStringToObject(req_params, "realm", realm);
+
+ if (params) cJSON_AddItemToObject(req_params, "params", cJSON_Duplicate(params, 1));
+
+ blade_session_send(bs, req, callback, data);
+
+ cJSON_Delete(req);
+
+ blade_session_read_unlock(bs);
+ }
+ }
+ }
+
+ ks_hash_read_unlock(bsmgr->subscriptions);
+
+ ks_pool_free(bsmgr->pool, &bsub_key);
+
+ bs = blade_upstreammgr_session_get(blade_handle_upstreammgr_get(bsmgr->handle));
+ if (bs) {
+ if (!excluded_nodeid || ks_safe_strcasecmp(blade_session_id_get(bs), excluded_nodeid)) {
+ cJSON *req = NULL;
+ cJSON *req_params = NULL;
+
+ ks_log(KS_LOG_DEBUG, "Session (%s) broadcast request started\n", blade_session_id_get(bs));
+
+ blade_rpc_request_raw_create(bsmgr->pool, &req, &req_params, NULL, "blade.broadcast");
+
+ cJSON_AddStringToObject(req_params, "broadcaster-nodeid", broadcaster_nodeid);
+ cJSON_AddStringToObject(req_params, "event", event);
+ cJSON_AddStringToObject(req_params, "protocol", protocol);
+ cJSON_AddStringToObject(req_params, "realm", realm);
+
+ if (params) cJSON_AddItemToObject(req_params, "params", cJSON_Duplicate(params, 1));
+
+ blade_session_send(bs, req, callback, data);
+
+ cJSON_Delete(req);
+ }
+
+ blade_session_read_unlock(bs);
+ }
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
}
ks_log(KS_LOG_DEBUG, "Connection (%s) started\n", blade_connection_id_get(bc));
- blade_handle_connections_add(bc);
+ blade_connectionmgr_connection_add(blade_handle_connectionmgr_get(btwss->handle), bc);
blade_connection_state_set(bc, BLADE_CONNECTION_STATE_STARTUP);
}
ks_log(KS_LOG_DEBUG, "Connection (%s) started\n", blade_connection_id_get(bc));
- blade_handle_connections_add(bc);
+ blade_connectionmgr_connection_add(blade_handle_connectionmgr_get(btwss->handle), bc);
blade_connection_state_set(bc, BLADE_CONNECTION_STATE_STARTUP);
}
if (nodeid) {
- bs = blade_handle_sessions_lookup(bh, nodeid); // bs comes out read locked if not null to prevent it being cleaned up before we are done
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), nodeid); // bs comes out read locked if not null to prevent it being cleaned up before we are done
if (bs) {
if (blade_session_terminating(bs)) {
blade_session_read_unlock(bs);
// This is an inbound connection, thus it is always creating a downstream session
ks_log(KS_LOG_DEBUG, "Session (%s) started\n", nodeid);
- blade_handle_sessions_add(bs);
+ blade_sessionmgr_session_add(blade_handle_sessionmgr_get(bh), bs);
// This is primarily to cleanup the routes added to the blade_handle for main routing when a session terminates, these don't have a lot of use otherwise but it will keep the main route table
// from having long running write locks when a session cleans up
blade_session_route_add(bs, nodeid);
- // This is the main routing entry to make an identity routable through a session when a message is received for a given identity in this table, these allow efficiently determine which session
- // a message should pass through when it does not match the local node identities from blade_handle_identity_register(), and must be matched with a call to blade_session_route_add() for cleanup,
- // additionally when a "blade.register" is received the identity it carries affects these routes along with the sessionid of the downstream session it came through, and "blade.register" would also
+ // This is the main routing entry to make an identity routable through a session when a message is received for a given identity in this table, these allow to efficiently determine which session
+ // a message should pass through when it does not match the local node id from blade_upstreammgr_t, and must be matched with a call to blade_session_route_add() for cleanup, additionally when
+ // a "blade.register" is received the identity it carries affects these routes along with the sessionid of the downstream session it came through, and "blade.register" would also
// result in the new identities being added as routes however new entire wildcard subrealm registration would require a special process for matching any identities from those subrealms
- blade_handle_route_add(bh, nodeid, nodeid);
+ blade_routemgr_route_add(blade_handle_routemgr_get(bh), nodeid, nodeid);
- // iterate the realms from the handle ultimately provided by the master router node, and obtained when establishing upstream sessions (see outbound handler), for each of
- // these realms an identity based on the sessionid will be created, in the future this process can be adjusted based on authentication which is currently skipped
- // so for now if a master node provides more than a single realm, all provided realms will be used in addition to any additionally registered identities or entire subrealms
- realms = blade_handle_realms_get(bh);
- ks_hash_read_lock(realms);
- for (it = ks_hash_first(realms, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
- void *key = NULL;
- void *value = NULL;
-
- ks_hash_this(it, (const void **)&key, NULL, &value);
-
- blade_session_realm_add(bs, (const char *)key);
- }
- ks_hash_read_unlock(realms);
+ // iterate and copy the realms ultimately provided by the master router node to the new downstream session, realms are obtained when establishing upstream sessions (see outbound handler), in
+ // the future this process can be adjusted based on authentication which is currently skipped, so for now if a master node provides more than a single realm then all provided realms will be
+ // acceptable for protocol publishing and passing to downstream sessions for their realms
+ blade_upstreammgr_realm_propagate(blade_handle_upstreammgr_get(bh), bs);
}
blade_rpc_response_raw_create(&json_res, &json_result, id);
cJSON_AddStringToObject(json_result, "nodeid", nodeid);
pool = blade_handle_pool_get(bh);
- master_nodeid = blade_handle_master_nodeid_copy(bh, pool);
+ blade_upstreammgr_masterid_copy(blade_handle_upstreammgr_get(bh), pool, &master_nodeid);
if (!master_nodeid) {
ks_log(KS_LOG_DEBUG, "Master nodeid unavailable\n");
blade_transport_wss_rpc_error_send(bc, id, -32602, "Master nodeid unavailable");
// @todo validate uuid format by parsing, not currently available in uuid functions
- bs = blade_handle_sessions_lookup(bh, nodeid); // bs comes out read locked if not null to prevent it being cleaned up before we are done
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), nodeid); // bs comes out read locked if not null to prevent it being cleaned up before we are done
if (bs) {
ks_log(KS_LOG_DEBUG, "Session (%s) located\n", blade_session_id_get(bs));
}
// This is an outbound connection, thus it is always creating an upstream session, defined by the sessionid matching the local_nodeid in the handle
- if (blade_handle_local_nodeid_set(bh, nodeid) != KS_STATUS_SUCCESS) {
+ if (blade_upstreammgr_localid_set(blade_handle_upstreammgr_get(bh), nodeid) != KS_STATUS_SUCCESS) {
ks_log(KS_LOG_DEBUG, "Session (%s) abandoned, upstream already available\n", blade_session_id_get(bs));
blade_session_read_unlock(bs);
blade_session_hangup(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) started\n", blade_session_id_get(bs));
- blade_handle_sessions_add(bs);
+ blade_sessionmgr_session_add(blade_handle_sessionmgr_get(bh), bs);
- blade_handle_master_nodeid_set(bh, master_nodeid);
+ blade_upstreammgr_masterid_set(blade_handle_upstreammgr_get(bh), master_nodeid);
// iterate realms and register to handle as permitted realms for future registrations
for (int index = 0; index < json_result_realms_size; ++index) {
cJSON *elem = cJSON_GetArrayItem(json_result_realms, index);
- blade_handle_realm_register(bh, elem->valuestring);
+ blade_upstreammgr_realm_add(blade_handle_upstreammgr_get(bh), elem->valuestring);
}
}
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_transportmgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ ks_hash_t *transports; // name, blade_transport_t*
+ blade_transport_t *default_transport; // default wss transport
+};
+
+
+static void blade_transportmgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ blade_transportmgr_t *btmgr = (blade_transportmgr_t *)ptr;
+ ks_hash_iterator_t *it = NULL;
+
+ ks_assert(btmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ while ((it = ks_hash_first(btmgr->transports, KS_UNLOCKED)) != NULL) {
+ void *key = NULL;
+ blade_transport_t *value = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+ ks_hash_remove(btmgr->transports, key);
+
+ blade_transport_destroy(&value); // must call destroy to close the transport pool, using FREE_VALUE on the hash would attempt to free the transport from the wrong pool
+ }
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_create(blade_transportmgr_t **btmgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_transportmgr_t *btmgr = NULL;
+
+ ks_assert(btmgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ btmgr = ks_pool_alloc(pool, sizeof(blade_transportmgr_t));
+ btmgr->handle = bh;
+ btmgr->pool = pool;
+
+ ks_hash_create(&btmgr->transports, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, btmgr->pool);
+ ks_assert(btmgr->transports);
+
+ ks_pool_set_cleanup(pool, btmgr, NULL, blade_transportmgr_cleanup);
+
+ *btmgrP = btmgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_destroy(blade_transportmgr_t **btmgrP)
+{
+ blade_transportmgr_t *btmgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(btmgrP);
+ ks_assert(*btmgrP);
+
+ btmgr = *btmgrP;
+ *btmgrP = NULL;
+
+ ks_assert(btmgr);
+
+ pool = btmgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_startup(blade_transportmgr_t *btmgr, config_setting_t *config)
+{
+ ks_assert(btmgr);
+
+ for (ks_hash_iterator_t *it = ks_hash_first(btmgr->transports, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ blade_transport_t *value = NULL;
+ blade_transport_callbacks_t *callbacks = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+
+ callbacks = blade_transport_callbacks_get(value);
+ ks_assert(callbacks);
+
+ if (callbacks->onstartup) callbacks->onstartup(value, config);
+ }
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_shutdown(blade_transportmgr_t *btmgr)
+{
+ ks_assert(btmgr);
+
+ ks_hash_read_lock(btmgr->transports);
+ for (ks_hash_iterator_t *it = ks_hash_first(btmgr->transports, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ blade_transport_t *value = NULL;
+ blade_transport_callbacks_t *callbacks = NULL;
+
+ ks_hash_this(it, (const void **)&key, NULL, (void **)&value);
+
+ callbacks = blade_transport_callbacks_get(value);
+ ks_assert(callbacks);
+
+ if (callbacks->onshutdown) callbacks->onshutdown(value);
+ }
+ ks_hash_read_unlock(btmgr->transports);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_transportmgr_handle_get(blade_transportmgr_t *btmgr)
+{
+ ks_assert(btmgr);
+
+ return btmgr->handle;
+}
+
+KS_DECLARE(blade_transport_t *) blade_transportmgr_default_get(blade_transportmgr_t *btmgr)
+{
+ ks_assert(btmgr);
+
+ return btmgr->default_transport;
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_default_set(blade_transportmgr_t *btmgr, blade_transport_t *bt)
+{
+ ks_assert(btmgr);
+ ks_assert(bt);
+
+ btmgr->default_transport = bt;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_transport_t *) blade_transportmgr_transport_lookup(blade_transportmgr_t *btmgr, const char *name, ks_bool_t ordefault)
+{
+ blade_transport_t *bt = NULL;
+
+ ks_assert(btmgr);
+
+ if (name && name[0]) bt = (blade_transport_t *)ks_hash_search(btmgr->transports, (void *)name, KS_READLOCKED);
+ if (!bt && ordefault) bt = btmgr->default_transport;
+ // @todo if (bt) blade_transport_read_lock(bt);
+ ks_hash_read_unlock(btmgr->transports);
+
+ return bt;
+
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_transport_add(blade_transportmgr_t *btmgr, blade_transport_t *bt)
+{
+ char *key = NULL;
+
+ ks_assert(btmgr);
+ ks_assert(bt);
+
+ key = ks_pstrdup(btmgr->pool, blade_transport_name_get(bt));
+ ks_hash_insert(btmgr->transports, (void *)key, (void *)bt);
+
+ ks_log(KS_LOG_DEBUG, "Transport Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+
+}
+
+KS_DECLARE(ks_status_t) blade_transportmgr_transport_remove(blade_transportmgr_t *btmgr, blade_transport_t *bt)
+{
+ const char *name = NULL;
+
+ ks_assert(btmgr);
+ ks_assert(bt);
+
+ name = blade_transport_name_get(bt);
+ ks_hash_remove(btmgr->transports, (void *)name);
+
+ ks_log(KS_LOG_DEBUG, "Transport Removed: %s\n", name);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+struct blade_upstreammgr_s {
+ blade_handle_t *handle;
+ ks_pool_t *pool;
+
+ // local node id, can be used to get the upstream session, provided by upstream "blade.connect" response
+ const char *localid;
+ ks_rwl_t *localid_rwl;
+
+ // master node id, provided by upstream "blade.connect" response
+ const char *masterid;
+ ks_rwl_t *masterid_rwl;
+
+ // realms for new nodes, these originate from the master, and are provided by upstream session "blade.connect" response
+ ks_hash_t *realms;
+};
+
+
+static void blade_upstreammgr_cleanup(ks_pool_t *pool, void *ptr, void *arg, ks_pool_cleanup_action_t action, ks_pool_cleanup_type_t type)
+{
+ //blade_upstreammgr_t *bumgr = (blade_upstreammgr_t *)ptr;
+
+ //ks_assert(brmgr);
+
+ switch (action) {
+ case KS_MPCL_ANNOUNCE:
+ break;
+ case KS_MPCL_TEARDOWN:
+ break;
+ case KS_MPCL_DESTROY:
+ break;
+ }
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_create(blade_upstreammgr_t **bumgrP, blade_handle_t *bh)
+{
+ ks_pool_t *pool = NULL;
+ blade_upstreammgr_t *bumgr = NULL;
+
+ ks_assert(bumgrP);
+
+ ks_pool_open(&pool);
+ ks_assert(pool);
+
+ bumgr = ks_pool_alloc(pool, sizeof(blade_upstreammgr_t));
+ bumgr->handle = bh;
+ bumgr->pool = pool;
+
+ //ks_hash_create(&bumgr->routes, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY | KS_HASH_FLAG_FREE_VALUE, bumgr->pool);
+ //ks_assert(bumgr->routes);
+ ks_rwl_create(&bumgr->localid_rwl, bumgr->pool);
+ ks_assert(bumgr->localid_rwl);
+
+ ks_rwl_create(&bumgr->masterid_rwl, bumgr->pool);
+ ks_assert(bumgr->masterid_rwl);
+
+ ks_hash_create(&bumgr->realms, KS_HASH_MODE_CASE_INSENSITIVE, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK | KS_HASH_FLAG_FREE_KEY, bumgr->pool);
+ ks_assert(bumgr->realms);
+
+ ks_pool_set_cleanup(pool, bumgr, NULL, blade_upstreammgr_cleanup);
+
+ *bumgrP = bumgr;
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_destroy(blade_upstreammgr_t **bumgrP)
+{
+ blade_upstreammgr_t *bumgr = NULL;
+ ks_pool_t *pool;
+
+ ks_assert(bumgrP);
+ ks_assert(*bumgrP);
+
+ bumgr = *bumgrP;
+ *bumgrP = NULL;
+
+ ks_assert(bumgr);
+
+ pool = bumgr->pool;
+
+ ks_pool_close(&pool);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(blade_handle_t *) blade_upstreammgr_handle_get(blade_upstreammgr_t *bumgr)
+{
+ ks_assert(bumgr);
+ return bumgr->handle;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_localid_set(blade_upstreammgr_t *bumgr, const char *id)
+{
+ ks_status_t ret = KS_STATUS_SUCCESS;
+
+ ks_assert(bumgr);
+
+ ks_rwl_write_lock(bumgr->localid_rwl);
+ if (bumgr->localid && id) {
+ ret = KS_STATUS_NOT_ALLOWED;
+ goto done;
+ }
+ if (!bumgr->localid && !id) {
+ ret = KS_STATUS_DISCONNECTED;
+ goto done;
+ }
+
+ if (bumgr->localid) ks_pool_free(bumgr->pool, &bumgr->localid);
+ if (id) bumgr->localid = ks_pstrdup(bumgr->pool, id);
+
+ ks_log(KS_LOG_DEBUG, "LocalID: %s\n", id);
+
+done:
+ ks_rwl_write_unlock(bumgr->localid_rwl);
+ return ret;
+}
+
+KS_DECLARE(ks_bool_t) blade_upstreammgr_localid_compare(blade_upstreammgr_t *bumgr, const char *id)
+{
+ ks_bool_t ret = KS_FALSE;
+
+ ks_assert(bumgr);
+ ks_assert(id);
+
+ ks_rwl_read_lock(bumgr->localid_rwl);
+ ret = ks_safe_strcasecmp(bumgr->localid, id) == 0;
+ ks_rwl_read_unlock(bumgr->localid_rwl);
+
+ return ret;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_localid_copy(blade_upstreammgr_t *bumgr, ks_pool_t *pool, const char **id)
+{
+ ks_assert(bumgr);
+ ks_assert(pool);
+ ks_assert(id);
+
+ *id = NULL;
+
+ ks_rwl_read_lock(bumgr->localid_rwl);
+ if (bumgr->localid) *id = ks_pstrdup(pool, bumgr->localid);
+ ks_rwl_read_unlock(bumgr->localid_rwl);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_bool_t) blade_upstreammgr_session_established(blade_upstreammgr_t *bumgr)
+{
+ ks_bool_t ret = KS_FALSE;
+
+ ks_assert(bumgr);
+
+ ks_rwl_read_lock(bumgr->localid_rwl);
+ ret = bumgr->localid != NULL;
+ ks_rwl_read_unlock(bumgr->localid_rwl);
+
+ return ret;
+}
+
+KS_DECLARE(blade_session_t *) blade_upstreammgr_session_get(blade_upstreammgr_t *bumgr)
+{
+ blade_session_t *bs = NULL;
+
+ ks_assert(bumgr);
+
+ ks_rwl_read_lock(bumgr->localid_rwl);
+ if (bumgr->localid) bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bumgr->handle), bumgr->localid);
+ ks_rwl_read_unlock(bumgr->localid_rwl);
+
+ return bs;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_masterid_set(blade_upstreammgr_t *bumgr, const char *id)
+{
+ ks_status_t ret = KS_STATUS_SUCCESS;
+
+ ks_assert(bumgr);
+
+ ks_rwl_write_lock(bumgr->masterid_rwl);
+ if (bumgr->masterid) ks_pool_free(bumgr->pool, &bumgr->masterid);
+ if (id) bumgr->masterid = ks_pstrdup(bumgr->pool, id);
+
+ ks_log(KS_LOG_DEBUG, "MasterID: %s\n", id);
+
+ ks_rwl_write_unlock(bumgr->masterid_rwl);
+ return ret;
+}
+
+KS_DECLARE(ks_bool_t) blade_upstreammgr_masterid_compare(blade_upstreammgr_t *bumgr, const char *id)
+{
+ ks_bool_t ret = KS_FALSE;
+
+ ks_assert(bumgr);
+ ks_assert(id);
+
+ ks_rwl_read_lock(bumgr->masterid_rwl);
+ ret = ks_safe_strcasecmp(bumgr->masterid, id) == 0;
+ ks_rwl_read_unlock(bumgr->masterid_rwl);
+
+ return ret;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_masterid_copy(blade_upstreammgr_t *bumgr, ks_pool_t *pool, const char **id)
+{
+ ks_assert(bumgr);
+ ks_assert(pool);
+ ks_assert(id);
+
+ *id = NULL;
+
+ ks_rwl_read_lock(bumgr->masterid_rwl);
+ if (bumgr->masterid) *id = ks_pstrdup(pool, bumgr->masterid);
+ ks_rwl_read_unlock(bumgr->masterid_rwl);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_add(blade_upstreammgr_t *bumgr, const char *realm)
+{
+ char *key = NULL;
+
+ ks_assert(bumgr);
+ ks_assert(realm);
+
+ key = ks_pstrdup(bumgr->pool, realm);
+ ks_hash_insert(bumgr->realms, (void *)key, (void *)KS_TRUE);
+
+ ks_log(KS_LOG_DEBUG, "Realm Added: %s\n", key);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_remove(blade_upstreammgr_t *bumgr, const char *realm)
+{
+ ks_assert(bumgr);
+ ks_assert(realm);
+
+ ks_hash_remove(bumgr->realms, (void *)realm);
+
+ ks_log(KS_LOG_DEBUG, "Realm Removed: %s\n", realm);
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_clear(blade_upstreammgr_t *bumgr)
+{
+ ks_hash_iterator_t *it = NULL;
+
+ ks_assert(bumgr);
+
+ while ((it = ks_hash_first(bumgr->realms, KS_UNLOCKED))) {
+ void *key = NULL;
+ void *value = NULL;
+ ks_hash_this(it, (const void **)&key, NULL, &value);
+ ks_log(KS_LOG_DEBUG, "Realm Removed: %s\n", key);
+ ks_hash_remove(bumgr->realms, key);
+ }
+
+ return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_propagate(blade_upstreammgr_t *bumgr, blade_session_t *bs)
+{
+ ks_assert(bumgr);
+ ks_assert(bs);
+
+ ks_hash_read_lock(bumgr->realms);
+ for (ks_hash_iterator_t *it = ks_hash_first(bumgr->realms, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
+ void *key = NULL;
+ void *value = NULL;
+ ks_hash_this(it, (const void **)&key, NULL, &value);
+ blade_session_realm_add(bs, (const char *)key);
+ }
+ ks_hash_read_unlock(bumgr->realms);
+
+ return KS_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
#include "blade_protocol.h"
#include "blade_subscription.h"
+#include "blade_transportmgr.h"
+#include "blade_rpcmgr.h"
+#include "blade_routemgr.h"
+#include "blade_subscriptionmgr.h"
+#include "blade_upstreammgr.h"
+#include "blade_mastermgr.h"
+#include "blade_connectionmgr.h"
+#include "blade_sessionmgr.h"
+
#include "blade_transport_wss.h"
KS_BEGIN_EXTERN_C
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_CONNECTIONMGR_H_
+#define _BLADE_CONNECTIONMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_connectionmgr_create(blade_connectionmgr_t **bcmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_connectionmgr_destroy(blade_connectionmgr_t **bcmgrP);
+KS_DECLARE(blade_handle_t *) blade_connectionmgr_handle_get(blade_connectionmgr_t *bcmgr);
+KS_DECLARE(ks_status_t) blade_connectionmgr_shutdown(blade_connectionmgr_t *bcmgr);
+KS_DECLARE(blade_connection_t *) blade_connectionmgr_connection_lookup(blade_connectionmgr_t *bcmgr, const char *id);
+KS_DECLARE(ks_status_t) blade_connectionmgr_connection_add(blade_connectionmgr_t *bcmgr, blade_connection_t *bc);
+KS_DECLARE(ks_status_t) blade_connectionmgr_connection_remove(blade_connectionmgr_t *bcmgr, blade_connection_t *bc);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_MASTERMGR_H_
+#define _BLADE_MASTERMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_mastermgr_create(blade_mastermgr_t **bmmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_mastermgr_destroy(blade_mastermgr_t **bmmgrP);
+KS_DECLARE(blade_handle_t *) blade_mastermgr_handle_get(blade_mastermgr_t *bmmgr);
+KS_DECLARE(blade_protocol_t *) blade_mastermgr_protocol_lookup(blade_mastermgr_t *bmmgr, const char *protocol, const char *realm);
+KS_DECLARE(ks_status_t) blade_mastermgr_controller_add(blade_mastermgr_t *bmmgr, const char *protocol, const char *realm, const char *controller);
+KS_DECLARE(ks_status_t) blade_mastermgr_controller_remove(blade_mastermgr_t *bmmgr, const char *controller);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
KS_BEGIN_EXTERN_C
KS_DECLARE(ks_status_t) blade_protocol_create(blade_protocol_t **bpP, ks_pool_t *pool, const char *name, const char *realm);
KS_DECLARE(ks_status_t) blade_protocol_destroy(blade_protocol_t **bpP);
-KS_DECLARE(ks_hash_t *) blade_protocol_providers_get(blade_protocol_t *bp);
-KS_DECLARE(ks_status_t) blade_protocol_providers_add(blade_protocol_t *bp, const char *nodeid);
-KS_DECLARE(ks_status_t) blade_protocol_providers_remove(blade_protocol_t *bp, const char *nodeid);
+KS_DECLARE(ks_hash_t *) blade_protocol_controllers_get(blade_protocol_t *bp);
+KS_DECLARE(ks_status_t) blade_protocol_controllers_add(blade_protocol_t *bp, const char *nodeid);
+KS_DECLARE(ks_status_t) blade_protocol_controllers_remove(blade_protocol_t *bp, const char *nodeid);
KS_END_EXTERN_C
#endif
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_ROUTEMGR_H_
+#define _BLADE_ROUTEMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_routemgr_create(blade_routemgr_t **brmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_routemgr_destroy(blade_routemgr_t **brmgrP);
+KS_DECLARE(blade_handle_t *) blade_routemgr_handle_get(blade_routemgr_t *brmgr);
+KS_DECLARE(blade_session_t *) blade_routemgr_route_lookup(blade_routemgr_t *brmgr, const char *target);
+KS_DECLARE(ks_status_t) blade_routemgr_route_add(blade_routemgr_t *brmgr, const char *target, const char *router);
+KS_DECLARE(ks_status_t) blade_routemgr_route_remove(blade_routemgr_t *brmgr, const char *target);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_RPCMGR_H_
+#define _BLADE_RPCMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_rpcmgr_create(blade_rpcmgr_t **brpcmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_rpcmgr_destroy(blade_rpcmgr_t **brpcmgrP);
+KS_DECLARE(blade_handle_t *) blade_rpcmgr_handle_get(blade_rpcmgr_t *brpcmgr);
+KS_DECLARE(blade_rpc_t *) blade_rpcmgr_corerpc_lookup(blade_rpcmgr_t *brpcmgr, const char *method);
+KS_DECLARE(ks_status_t) blade_rpcmgr_corerpc_add(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc);
+KS_DECLARE(ks_status_t) blade_rpcmgr_corerpc_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc);
+KS_DECLARE(blade_rpc_t *) blade_rpcmgr_protocolrpc_lookup(blade_rpcmgr_t *brpcmgr, const char *method, const char *protocol, const char *realm);
+KS_DECLARE(ks_status_t) blade_rpcmgr_protocolrpc_add(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc);
+KS_DECLARE(ks_status_t) blade_rpcmgr_protocolrpc_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_t *brpc);
+KS_DECLARE(blade_rpc_request_t *) blade_rpcmgr_request_lookup(blade_rpcmgr_t *brpcmgr, const char *id);
+KS_DECLARE(ks_status_t) blade_rpcmgr_request_add(blade_rpcmgr_t *brpcmgr, blade_rpc_request_t *brpcreq);
+KS_DECLARE(ks_status_t) blade_rpcmgr_request_remove(blade_rpcmgr_t *brpcmgr, blade_rpc_request_t *brpcreq);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_SESSIONMGR_H_
+#define _BLADE_SESSIONMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_sessionmgr_create(blade_sessionmgr_t **bsmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_sessionmgr_destroy(blade_sessionmgr_t **bsmgrP);
+KS_DECLARE(blade_handle_t *) blade_sessionmgr_handle_get(blade_sessionmgr_t *bsmgr);
+KS_DECLARE(ks_status_t) blade_sessionmgr_shutdown(blade_sessionmgr_t *bsmgr);
+KS_DECLARE(blade_session_t *) blade_sessionmgr_session_lookup(blade_sessionmgr_t *bsmgr, const char *id);
+KS_DECLARE(ks_status_t) blade_sessionmgr_session_add(blade_sessionmgr_t *bsmgr, blade_session_t *bs);
+KS_DECLARE(ks_status_t) blade_sessionmgr_session_remove(blade_sessionmgr_t *bsmgr, blade_session_t *bs);
+KS_DECLARE(ks_status_t) blade_sessionmgr_callback_add(blade_sessionmgr_t *bsmgr, void *data, blade_session_callback_t callback, const char **id);
+KS_DECLARE(ks_status_t) blade_sessionmgr_callback_remove(blade_sessionmgr_t *bsmgr, const char *id);
+KS_DECLARE(void) blade_sessionmgr_callback_execute(blade_sessionmgr_t *bsmgr, blade_session_t *bs, blade_session_state_condition_t condition);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
KS_DECLARE(ks_pool_t *) blade_handle_pool_get(blade_handle_t *bh);
KS_DECLARE(ks_thread_pool_t *) blade_handle_tpool_get(blade_handle_t *bh);
-KS_DECLARE(ks_status_t) blade_handle_local_nodeid_set(blade_handle_t *bh, const char *nodeid);
-KS_DECLARE(ks_bool_t) blade_handle_local_nodeid_compare(blade_handle_t *bh, const char *nodeid);
-
-KS_DECLARE(const char *) blade_handle_master_nodeid_copy(blade_handle_t *bh, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) blade_handle_master_nodeid_set(blade_handle_t *bh, const char *nodeid);
-KS_DECLARE(ks_bool_t) blade_handle_master_nodeid_compare(blade_handle_t *bh, const char *nodeid);
-
-KS_DECLARE(ks_status_t) blade_handle_realm_register(blade_handle_t *bh, const char *realm);
-KS_DECLARE(ks_status_t) blade_handle_realm_unregister(blade_handle_t *bh, const char *realm);
-KS_DECLARE(ks_hash_t *) blade_handle_realms_get(blade_handle_t *bh);
-
-KS_DECLARE(ks_status_t) blade_handle_route_add(blade_handle_t *bh, const char *nodeid, const char *sessionid);
-KS_DECLARE(ks_status_t) blade_handle_route_remove(blade_handle_t *bh, const char *nodeid);
-KS_DECLARE(blade_session_t *) blade_handle_route_lookup(blade_handle_t *bh, const char *nodeid);
-
-KS_DECLARE(ks_status_t) blade_handle_transport_register(blade_transport_t *bt);
-KS_DECLARE(ks_status_t) blade_handle_transport_unregister(blade_transport_t *bt);
-
-KS_DECLARE(ks_status_t) blade_handle_corerpc_register(blade_rpc_t *brpc);
-KS_DECLARE(ks_status_t) blade_handle_corerpc_unregister(blade_rpc_t *brpc);
-KS_DECLARE(blade_rpc_t *) blade_handle_corerpc_lookup(blade_handle_t *bh, const char *method);
-
-KS_DECLARE(ks_status_t) blade_handle_requests_add(blade_rpc_request_t *brpcreq);
-KS_DECLARE(ks_status_t) blade_handle_requests_remove(blade_rpc_request_t *brpcreq);
-KS_DECLARE(blade_rpc_request_t *) blade_handle_requests_lookup(blade_handle_t *bh, const char *id);
-
-KS_DECLARE(ks_status_t) blade_handle_protocolrpc_register(blade_rpc_t *brpc);
-KS_DECLARE(ks_status_t) blade_handle_protocolrpc_unregister(blade_rpc_t *brpc);
-KS_DECLARE(blade_rpc_t *) blade_handle_protocolrpc_lookup(blade_handle_t *bh, const char *method, const char *protocol, const char *realm);
-
-KS_DECLARE(ks_bool_t) blade_handle_subscriber_add(blade_handle_t *bh, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *nodeid);
-KS_DECLARE(ks_bool_t) blade_handle_subscriber_remove(blade_handle_t *bh, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *nodeid);
-
+KS_DECLARE(blade_transportmgr_t *) blade_handle_transportmgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_rpcmgr_t *) blade_handle_rpcmgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_routemgr_t *) blade_handle_routemgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_subscriptionmgr_t *) blade_handle_subscriptionmgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_upstreammgr_t *) blade_handle_upstreammgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_mastermgr_t *) blade_handle_mastermgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_connectionmgr_t *) blade_handle_connectionmgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_sessionmgr_t *) blade_handle_sessionmgr_get(blade_handle_t *bh);
KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id);
-KS_DECLARE(ks_status_t) blade_handle_connections_add(blade_connection_t *bc);
-KS_DECLARE(ks_status_t) blade_handle_connections_remove(blade_connection_t *bc);
-KS_DECLARE(blade_connection_t *) blade_handle_connections_lookup(blade_handle_t *bh, const char *id);
-
-KS_DECLARE(ks_status_t) blade_handle_sessions_add(blade_session_t *bs);
-KS_DECLARE(ks_status_t) blade_handle_sessions_remove(blade_session_t *bs);
-KS_DECLARE(blade_session_t *) blade_handle_sessions_lookup(blade_handle_t *bh, const char *id);
-KS_DECLARE(blade_session_t *) blade_handle_sessions_upstream(blade_handle_t *bh);
-KS_DECLARE(void) blade_handle_sessions_send(blade_handle_t *bh, ks_list_t *sessions, const char *exclude, cJSON *json);
-
-KS_DECLARE(ks_status_t) blade_handle_session_state_callback_register(blade_handle_t *bh, void *data, blade_session_state_callback_t callback, const char **id);
-KS_DECLARE(ks_status_t) blade_handle_session_state_callback_unregister(blade_handle_t *bh, const char *id);
-KS_DECLARE(void) blade_handle_session_state_callbacks_execute(blade_session_t *bs, blade_session_state_condition_t condition);
-
KS_DECLARE(ks_status_t) blade_protocol_register(blade_handle_t *bh, const char *nodeid, ks_bool_t remove, blade_rpc_response_callback_t callback, void *data);
KS_DECLARE(ks_status_t) blade_protocol_publish(blade_handle_t *bh, const char *name, const char *realm, blade_rpc_response_callback_t callback, void *data);
KS_DECLARE(ks_status_t) blade_protocol_subscribe_raw(blade_handle_t *bh, const char *event, const char *protocol, const char *realm, ks_bool_t remove, blade_rpc_response_callback_t callback, void *data);
KS_DECLARE(ks_status_t) blade_protocol_broadcast(blade_handle_t *bh, const char *broadcaster_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data);
-KS_DECLARE(ks_status_t) blade_protocol_broadcast_raw(blade_handle_t *bh, const char *broadcaster_nodeid, const char *excluded_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data);
KS_DECLARE(const char *) blade_protocol_broadcast_request_broadcaster_nodeid_get(blade_rpc_request_t *brpcreq);
KS_DECLARE(cJSON *) blade_protocol_broadcast_request_params_get(blade_rpc_request_t *brpcreq);
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_SUBSCRIPTIONMGR_H_
+#define _BLADE_SUBSCRIPTIONMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_create(blade_subscriptionmgr_t **bsmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_destroy(blade_subscriptionmgr_t **bsmgrP);
+KS_DECLARE(blade_handle_t *) blade_subscriptionmgr_handle_get(blade_subscriptionmgr_t *bsmgr);
+KS_DECLARE(blade_subscription_t *) blade_subscriptionmgr_subscription_lookup(blade_subscriptionmgr_t *bsmgr, const char *event, const char *protocol, const char *realm);
+KS_DECLARE(ks_bool_t) blade_subscriptionmgr_subscriber_add(blade_subscriptionmgr_t *bsmgr, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *target);
+KS_DECLARE(ks_bool_t) blade_subscriptionmgr_subscriber_remove(blade_subscriptionmgr_t *bsmgr, blade_subscription_t **bsubP, const char *event, const char *protocol, const char *realm, const char *target);
+KS_DECLARE(void) blade_subscriptionmgr_subscriber_cleanup(blade_subscriptionmgr_t *bsmgr, const char *target);
+KS_DECLARE(ks_status_t) blade_subscriptionmgr_broadcast(blade_subscriptionmgr_t *bsmgr, const char *broadcaster_nodeid, const char *excluded_nodeid, const char *event, const char *protocol, const char *realm, cJSON *params, blade_rpc_response_callback_t callback, void *data);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _BLADE_MODULE_WSS_H_
-#define _BLADE_MODULE_WSS_H_
+#ifndef _BLADE_TRANSPORT_WSS_H_
+#define _BLADE_TRANSPORT_WSS_H_
#include <blade.h>
KS_BEGIN_EXTERN_C
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_TRANSPORTMGR_H_
+#define _BLADE_TRANSPORTMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_transportmgr_create(blade_transportmgr_t **btmgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_transportmgr_destroy(blade_transportmgr_t **btmgrP);
+KS_DECLARE(ks_status_t) blade_transportmgr_startup(blade_transportmgr_t *btmgr, config_setting_t *config);
+KS_DECLARE(ks_status_t) blade_transportmgr_shutdown(blade_transportmgr_t *btmgr);
+KS_DECLARE(blade_handle_t *) blade_transportmgr_handle_get(blade_transportmgr_t *btmgr);
+KS_DECLARE(blade_transport_t *) blade_transportmgr_default_get(blade_transportmgr_t *btmgr);
+KS_DECLARE(ks_status_t) blade_transportmgr_default_set(blade_transportmgr_t *btmgr, blade_transport_t *bt);
+KS_DECLARE(blade_transport_t *) blade_transportmgr_transport_lookup(blade_transportmgr_t *btmgr, const char *name, ks_bool_t ordefault);
+KS_DECLARE(ks_status_t) blade_transportmgr_transport_add(blade_transportmgr_t *btmgr, blade_transport_t *bt);
+KS_DECLARE(ks_status_t) blade_transportmgr_transport_remove(blade_transportmgr_t *btmgr, blade_transport_t *bt);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
typedef struct blade_session_callbacks_s blade_session_callbacks_t;
typedef struct blade_protocol_s blade_protocol_t;
typedef struct blade_subscription_s blade_subscription_t;
-//typedef struct blade_protocol_realm_s blade_protocol_realm_t;
-//typedef struct blade_protocol_method_s blade_protocol_method_t;
+typedef struct blade_transportmgr_s blade_transportmgr_t;
+typedef struct blade_rpcmgr_s blade_rpcmgr_t;
+typedef struct blade_routemgr_s blade_routemgr_t;
+typedef struct blade_subscriptionmgr_s blade_subscriptionmgr_t;
+typedef struct blade_upstreammgr_s blade_upstreammgr_t;
+typedef struct blade_mastermgr_s blade_mastermgr_t;
+typedef struct blade_connectionmgr_s blade_connectionmgr_t;
+typedef struct blade_sessionmgr_s blade_sessionmgr_t;
+typedef struct blade_session_callback_data_s blade_session_callback_data_t;
typedef ks_bool_t (*blade_rpc_request_callback_t)(blade_rpc_request_t *brpcreq, void *data);
typedef ks_bool_t (*blade_rpc_response_callback_t)(blade_rpc_response_t *brpcres, void *data);
blade_transport_state_callback_t onstate_run_outbound;
};
-typedef void (*blade_session_state_callback_t)(blade_session_t *bs, blade_session_state_condition_t condition, void *data);
+typedef void (*blade_session_callback_t)(blade_session_t *bs, blade_session_state_condition_t condition, void *data);
KS_END_EXTERN_C
--- /dev/null
+/*
+ * Copyright (c) 2017, Shane Bryldt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_UPSTREAMMGR_H_
+#define _BLADE_UPSTREAMMGR_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_upstreammgr_create(blade_upstreammgr_t **bumgrP, blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_upstreammgr_destroy(blade_upstreammgr_t **bumgrP);
+KS_DECLARE(blade_handle_t *) blade_upstreammgr_handle_get(blade_upstreammgr_t *bumgr);
+KS_DECLARE(ks_status_t) blade_upstreammgr_localid_set(blade_upstreammgr_t *bumgr, const char *id);
+KS_DECLARE(ks_bool_t) blade_upstreammgr_localid_compare(blade_upstreammgr_t *bumgr, const char *id);
+KS_DECLARE(ks_status_t) blade_upstreammgr_localid_copy(blade_upstreammgr_t *bumgr, ks_pool_t *pool, const char **id);
+KS_DECLARE(ks_bool_t) blade_upstreammgr_session_established(blade_upstreammgr_t *bumgr);
+KS_DECLARE(blade_session_t *) blade_upstreammgr_session_get(blade_upstreammgr_t *bumgr);
+KS_DECLARE(ks_status_t) blade_upstreammgr_masterid_set(blade_upstreammgr_t *bumgr, const char *id);
+KS_DECLARE(ks_bool_t) blade_upstreammgr_masterid_compare(blade_upstreammgr_t *bumgr, const char *id);
+KS_DECLARE(ks_status_t) blade_upstreammgr_masterid_copy(blade_upstreammgr_t *bumgr, ks_pool_t *pool, const char **id);
+//KS_DECLARE(ks_hash_t *) blade_upstreammgr_realm_lookup(blade_handle_t *bh);
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_add(blade_upstreammgr_t *bumgr, const char *realm);
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_remove(blade_upstreammgr_t *bumgr, const char *realm);
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_clear(blade_upstreammgr_t *bumgr);
+KS_DECLARE(ks_status_t) blade_upstreammgr_realm_propagate(blade_upstreammgr_t *bumgr, blade_session_t *bs);
+
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
result = blade_protocol_execute_response_result_get(brpcres);
const char *nodeid = NULL;
cJSON *res = NULL;
cJSON *res_result = NULL;
- cJSON *res_result_providers = NULL;
+ cJSON *res_result_controllers = NULL;
const char *res_result_protocol = NULL;
const char *res_result_realm = NULL;
cJSON *params = NULL;
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
res = blade_rpc_response_message_get(brpcres);
res_result_realm = cJSON_GetObjectCstr(res_result, "realm");
ks_assert(res_result_realm);
- res_result_providers = cJSON_GetObjectItem(res_result, "providers");
- ks_assert(res_result_providers);
+ res_result_controllers = cJSON_GetObjectItem(res_result, "controllers");
+ ks_assert(res_result_controllers);
ks_log(KS_LOG_DEBUG, "Session (%s) blade.locate response processing\n", blade_session_id_get(bs));
- for (int index = 0; index < cJSON_GetArraySize(res_result_providers); ++index) {
- cJSON *elem = cJSON_GetArrayItem(res_result_providers, index);
+ for (int index = 0; index < cJSON_GetArraySize(res_result_controllers); ++index) {
+ cJSON *elem = cJSON_GetArrayItem(res_result_controllers, index);
if (elem->type == cJSON_String) {
ks_log(KS_LOG_DEBUG, "Session (%s) blade.locate (%s@%s) provider (%s)\n", blade_session_id_get(bs), res_result_protocol, res_result_realm, elem->valuestring);
nodeid = elem->valuestring;
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) blade.subscribe response processing\n", blade_session_id_get(bs));
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) test.event request processing\n", blade_session_id_get(bs));
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) blade.publish response processing\n", blade_session_id_get(bs));
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
// @todo get the inner parameters of a blade.execute request for protocolrpcs
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) test.event response processing\n", blade_session_id_get(bs));
ks_assert(args);
blade_rpc_create(&brpc, bh, "test.echo", "test", "mydomain.com", test_echo_request_handler, NULL);
- blade_handle_protocolrpc_register(brpc);
+ blade_rpcmgr_protocolrpc_add(blade_handle_rpcmgr_get(bh), brpc);
// @todo build up json-based method schema for each protocolrpc registered above, and pass into blade_protocol_publish() to attach to the request, to be stored in the blade_protocol_t tracked by the master node
blade_protocol_publish(bh, "test", "mydomain.com", blade_publish_response_handler, NULL);
const char *nodeid = NULL;
cJSON *res = NULL;
cJSON *res_result = NULL;
- cJSON *res_result_providers = NULL;
+ cJSON *res_result_controllers = NULL;
const char *res_result_protocol = NULL;
const char *res_result_realm = NULL;
//cJSON *params = NULL;
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
res = blade_rpc_response_message_get(brpcres);
res_result_realm = cJSON_GetObjectCstr(res_result, "realm");
ks_assert(res_result_realm);
- res_result_providers = cJSON_GetObjectItem(res_result, "providers");
- ks_assert(res_result_providers);
+ res_result_controllers = cJSON_GetObjectItem(res_result, "controllers");
+ ks_assert(res_result_controllers);
ks_log(KS_LOG_DEBUG, "Session (%s) locate (%s@%s) response processing\n", blade_session_id_get(bs), res_result_protocol, res_result_realm);
- for (int index = 0; index < cJSON_GetArraySize(res_result_providers); ++index) {
- cJSON *elem = cJSON_GetArrayItem(res_result_providers, index);
+ for (int index = 0; index < cJSON_GetArraySize(res_result_controllers); ++index) {
+ cJSON *elem = cJSON_GetArrayItem(res_result_controllers, index);
if (elem->type == cJSON_String) {
nodeid = elem->valuestring;
}
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
result = blade_protocol_execute_response_result_get(brpcres);
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
result = blade_protocol_execute_response_result_get(brpcres);
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
result = blade_protocol_execute_response_result_get(brpcres);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
params = blade_protocol_broadcast_request_params_get(brpcreq);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
params = blade_protocol_broadcast_request_params_get(brpcreq);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
broadcaster_nodeid = blade_protocol_broadcast_request_broadcaster_nodeid_get(brpcreq);
bh = blade_rpc_response_handle_get(brpcres);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_response_sessionid_get(brpcres));
ks_assert(bs);
ks_log(KS_LOG_DEBUG, "Session (%s) publish response processing\n", blade_session_id_get(bs));
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
requester_nodeid = blade_protocol_execute_request_requester_nodeid_get(brpcreq);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
requester_nodeid = blade_protocol_execute_request_requester_nodeid_get(brpcreq);
bh = blade_rpc_request_handle_get(brpcreq);
ks_assert(bh);
- bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
+ bs = blade_sessionmgr_session_lookup(blade_handle_sessionmgr_get(bh), blade_rpc_request_sessionid_get(brpcreq));
ks_assert(bs);
requester_nodeid = blade_protocol_execute_request_requester_nodeid_get(brpcreq);
ks_sleep_ms(3000);
blade_rpc_create(&brpc, bh, "test.join", "test", "mydomain.com", test_join_request_handler, test);
- blade_handle_protocolrpc_register(brpc);
+ blade_rpcmgr_protocolrpc_add(blade_handle_rpcmgr_get(bh), brpc);
blade_rpc_create(&brpc, bh, "test.leave", "test", "mydomain.com", test_leave_request_handler, test);
- blade_handle_protocolrpc_register(brpc);
+ blade_rpcmgr_protocolrpc_add(blade_handle_rpcmgr_get(bh), brpc);
blade_rpc_create(&brpc, bh, "test.talk", "test", "mydomain.com", test_talk_request_handler, test);
- blade_handle_protocolrpc_register(brpc);
+ blade_rpcmgr_protocolrpc_add(blade_handle_rpcmgr_get(bh), brpc);
blade_protocol_publish(bh, "test", "mydomain.com", test_publish_response_handler, test);
}
projects / thirdparty / freeswitch.git / commitdiff
