You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2017/01/03 15:25:53 UTC
qpid-dispatch git commit: DISPATCH-557 - Addtional fix. Added type,
ssl and opened fields to the management connection response. These
fields were present in the connection that was managed by the Python agent
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 3a20b5055 -> 1a3775066
DISPATCH-557 - Addtional fix. Added type, ssl and opened fields to the management connection response. These fields were present in the connection that was managed by the Python agent
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1a377506
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1a377506
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1a377506
Branch: refs/heads/master
Commit: 1a3775066d5a13f1a37da55148718bd0ae5070ef
Parents: 3a20b50
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Tue Jan 3 10:25:27 2017 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Tue Jan 3 10:25:27 2017 -0500
----------------------------------------------------------------------
include/qpid/dispatch/router_core.h | 3 ++-
src/router_core/agent_connection.c | 22 ++++++++++++++++++++--
src/router_core/agent_connection.h | 2 +-
src/router_core/connections.c | 4 +++-
src/router_core/router_core_private.h | 1 +
src/router_node.c | 5 ++++-
6 files changed, 31 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/include/qpid/dispatch/router_core.h
----------------------------------------------------------------------
diff --git a/include/qpid/dispatch/router_core.h b/include/qpid/dispatch/router_core.h
index b7cb224..63088ae 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -706,6 +706,7 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted,
char *user,
const char *container,
pn_data_t *connection_properties,
- int ssl_ssf);
+ int ssl_ssf,
+ bool ssl);
#endif
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/src/router_core/agent_connection.c
----------------------------------------------------------------------
diff --git a/src/router_core/agent_connection.c b/src/router_core/agent_connection.c
index ad5bff2..6bd3546 100644
--- a/src/router_core/agent_connection.c
+++ b/src/router_core/agent_connection.c
@@ -37,6 +37,9 @@
#define QDR_CONNECTION_PROPERTIES 12
#define QDR_CONNECTION_SSLSSF 13
#define QDR_CONNECTION_TENANT 14
+#define QDR_CONNECTION_TYPE 15
+#define QDR_CONNECTION_SSL 16
+#define QDR_CONNECTION_OPENED 17
const char * const QDR_CONNECTION_DIR_IN = "in";
const char * const QDR_CONNECTION_DIR_OUT = "out";
@@ -64,9 +67,12 @@ const char *qdr_connection_columns[] =
"properties",
"sslSsf",
"tenant",
+ "type",
+ "ssl",
+ "opened",
0};
-const char *CONFIG_CONNECTION_TYPE = "org.apache.qpid.dispatch.connection";
+const char *CONNECTION_TYPE = "org.apache.qpid.dispatch.connection";
static void qd_get_next_pn_data(pn_data_t **data, const char **d, int *d1)
{
@@ -172,6 +178,18 @@ static void qdr_connection_insert_column_CT(qdr_connection_t *conn, int col, qd_
qd_compose_insert_null(body);
break;
+ case QDR_CONNECTION_TYPE:
+ qd_compose_insert_string(body, CONNECTION_TYPE);
+ break;
+
+ case QDR_CONNECTION_SSL:
+ qd_compose_insert_bool(body, conn->connection_info->ssl);
+ break;
+
+ case QDR_CONNECTION_OPENED:
+ qd_compose_insert_bool(body, conn->connection_info->opened);
+ break;
+
case QDR_CONNECTION_PROPERTIES: {
pn_data_t *data = conn->connection_info->connection_properties;
qd_compose_start_map(body);
@@ -351,7 +369,7 @@ void qdra_connection_get_CT(qdr_core_t *core,
if (!identity) {
query->status = QD_AMQP_BAD_REQUEST;
query->status.description = "Name not supported. Identity required";
- qd_log(core->agent_log, QD_LOG_ERROR, "Error performing READ of %s: %s", CONFIG_CONNECTION_TYPE, query->status.description);
+ qd_log(core->agent_log, QD_LOG_ERROR, "Error performing READ of %s: %s", CONNECTION_TYPE, query->status.description);
}
else {
conn = qdr_connection_find_by_identity_CT(core, identity);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/src/router_core/agent_connection.h
----------------------------------------------------------------------
diff --git a/src/router_core/agent_connection.h b/src/router_core/agent_connection.h
index 230149b..c701fb0 100644
--- a/src/router_core/agent_connection.h
+++ b/src/router_core/agent_connection.h
@@ -30,7 +30,7 @@ void qdra_connection_get_CT(qdr_core_t *core,
const char *qdr_connection_columns[]);
-#define QDR_CONNECTION_COLUMN_COUNT 15
+#define QDR_CONNECTION_COLUMN_COUNT 18
const char *qdr_connection_columns[QDR_CONNECTION_COLUMN_COUNT + 1];
#endif
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/src/router_core/connections.c
----------------------------------------------------------------------
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index 6175b85..a359f6a 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -131,7 +131,8 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted,
char *user,
const char *container,
pn_data_t *connection_properties,
- int ssl_ssf)
+ int ssl_ssf,
+ bool ssl)
{
qdr_connection_info_t *connection_info = new_qdr_connection_info_t();
connection_info->is_encrypted = is_encrypted;
@@ -171,6 +172,7 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted,
connection_info->connection_properties = qdr_conn_properties;
connection_info->ssl_ssf = ssl_ssf;
+ connection_info->ssl = ssl;
return connection_info;
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/src/router_core/router_core_private.h
----------------------------------------------------------------------
diff --git a/src/router_core/router_core_private.h b/src/router_core/router_core_private.h
index 00f4ff3..2f9f6a3 100644
--- a/src/router_core/router_core_private.h
+++ b/src/router_core/router_core_private.h
@@ -454,6 +454,7 @@ struct qdr_connection_info_t {
qd_direction_t dir;
qdr_connection_role_t role;
pn_data_t *connection_properties;
+ bool ssl;
int ssl_ssf; //ssl strength factor
};
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1a377506/src/router_node.c
----------------------------------------------------------------------
diff --git a/src/router_node.c b/src/router_node.c
index 75d2101..c24efd3 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -676,11 +676,13 @@ static void AMQP_opened_handler(qd_router_t *router, qd_connection_t *conn, bool
memset(cipher, 0, 50);
int ssl_ssf = 0;
+ bool is_ssl = false;
if (ssl) {
pn_ssl_get_protocol_name(ssl, proto, 50);
pn_ssl_get_cipher_name(ssl, cipher, 50);
ssl_ssf = pn_ssl_get_ssf(ssl);
+ is_ssl = true;
}
@@ -695,7 +697,8 @@ static void AMQP_opened_handler(qd_router_t *router, qd_connection_t *conn, bool
(char *)user,
container,
props,
- ssl_ssf);
+ ssl_ssf,
+ is_ssl);
qdr_connection_t *qdrc = qdr_connection_opened(router->router_core, inbound, role, cost, connection_id, name,
pn_connection_remote_container(pn_conn),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org