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 2020/10/27 15:30:48 UTC
[qpid-dispatch] branch dev-protocol-adaptors-2 updated:
DISPATCH-1813: Renamed qd_http_lsnr to qd_http_listener. This closes #894.
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch dev-protocol-adaptors-2
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/dev-protocol-adaptors-2 by this push:
new 50c7a69 DISPATCH-1813: Renamed qd_http_lsnr to qd_http_listener. This closes #894.
50c7a69 is described below
commit 50c7a699ff16e4005365a5318aa0f26729fb27d2
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Mon Oct 26 12:24:05 2020 -0400
DISPATCH-1813: Renamed qd_http_lsnr to qd_http_listener. This closes #894.
---
python/qpid_dispatch_internal/dispatch.py | 2 +-
python/qpid_dispatch_internal/management/agent.py | 2 +-
src/adaptors/http1/http1_adaptor.c | 2 +-
src/adaptors/http1/http1_client.c | 10 +++++-----
src/adaptors/http1/http1_private.h | 2 +-
src/adaptors/http2/http2_adaptor.c | 14 +++++++-------
src/adaptors/http2/http2_adaptor.h | 4 ----
src/adaptors/http_common.c | 22 +++++++++++-----------
src/adaptors/http_common.h | 22 +++++++++++-----------
9 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/python/qpid_dispatch_internal/dispatch.py b/python/qpid_dispatch_internal/dispatch.py
index f5bd91a..7434365 100644
--- a/python/qpid_dispatch_internal/dispatch.py
+++ b/python/qpid_dispatch_internal/dispatch.py
@@ -69,7 +69,7 @@ class QdDll(ctypes.PyDLL):
self._prototype(self.qd_dispatch_configure_sasl_plugin, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
self._prototype(self.qd_dispatch_configure_tcp_listener, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
self._prototype(self.qd_dispatch_configure_tcp_connector, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
- self._prototype(self.qd_dispatch_configure_http_lsnr, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
+ self._prototype(self.qd_dispatch_configure_http_listener, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
self._prototype(self.qd_dispatch_configure_http_connector, ctypes.c_void_p, [self.qd_dispatch_p, py_object])
self._prototype(self.qd_connection_manager_delete_listener, None, [self.qd_dispatch_p, ctypes.c_void_p])
self._prototype(self.qd_connection_manager_delete_connector, None, [self.qd_dispatch_p, ctypes.c_void_p])
diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py
index ec5696c..275ee59 100644
--- a/python/qpid_dispatch_internal/management/agent.py
+++ b/python/qpid_dispatch_internal/management/agent.py
@@ -575,7 +575,7 @@ class BindingEntity(EntityAdapter):
class HttpListenerEntity(EntityAdapter):
def create(self):
- return self._qd.qd_dispatch_configure_http_lsnr(self._dispatch, self)
+ return self._qd.qd_dispatch_configure_http_listener(self._dispatch, self)
def _identifier(self):
return _host_port_name_identifier(self)
diff --git a/src/adaptors/http1/http1_adaptor.c b/src/adaptors/http1/http1_adaptor.c
index afeef5a..2207478 100644
--- a/src/adaptors/http1/http1_adaptor.c
+++ b/src/adaptors/http1/http1_adaptor.c
@@ -682,7 +682,7 @@ static void qd_http1_adaptor_final(void *adaptor_context)
qdr_http1_adaptor_t *adaptor = (qdr_http1_adaptor_t*) adaptor_context;
qdr_protocol_adaptor_free(adaptor->core, adaptor->adaptor);
- qd_http_lsnr_t *li = DEQ_HEAD(adaptor->listeners);
+ qd_http_listener_t *li = DEQ_HEAD(adaptor->listeners);
while (li) {
qd_http1_delete_listener(0, li);
li = DEQ_HEAD(adaptor->listeners);
diff --git a/src/adaptors/http1/http1_client.c b/src/adaptors/http1/http1_client.c
index 06753a4..708d2a9 100644
--- a/src/adaptors/http1/http1_client.c
+++ b/src/adaptors/http1/http1_client.c
@@ -115,7 +115,7 @@ static void _write_pending_response(_client_request_t *req);
// Listener received connection request from client
//
-static qdr_http1_connection_t *_create_client_connection(qd_http_lsnr_t *li)
+static qdr_http1_connection_t *_create_client_connection(qd_http_listener_t *li)
{
qdr_http1_connection_t *hconn = new_qdr_http1_connection_t();
@@ -172,7 +172,7 @@ static qdr_http1_connection_t *_create_client_connection(qd_http_lsnr_t *li)
static void _handle_listener_events(pn_event_t *e, qd_server_t *qd_server, void *context)
{
qd_log_source_t *log = qdr_http1_adaptor->log;
- qd_http_lsnr_t *li = (qd_http_lsnr_t*) context;
+ qd_http_listener_t *li = (qd_http_listener_t*) context;
const char *host_port = li->config.host_port;
qd_log(log, QD_LOG_DEBUG, "HTTP/1.x Client Listener Event %s\n", pn_event_type_name(pn_event_type(e)));
@@ -219,9 +219,9 @@ static void _handle_listener_events(pn_event_t *e, qd_server_t *qd_server, void
// Management Agent API - Create
//
-qd_http_lsnr_t *qd_http1_configure_listener(qd_dispatch_t *qd, const qd_http_bridge_config_t *config, qd_entity_t *entity)
+qd_http_listener_t *qd_http1_configure_listener(qd_dispatch_t *qd, const qd_http_bridge_config_t *config, qd_entity_t *entity)
{
- qd_http_lsnr_t *li = qd_http_lsnr(qd->server, &_handle_listener_events);
+ qd_http_listener_t *li = qd_http_listener(qd->server, &_handle_listener_events);
if (!li) {
qd_log(qdr_http1_adaptor->log, QD_LOG_ERROR, "Unable to create http listener: no memory");
return 0;
@@ -242,7 +242,7 @@ qd_http_lsnr_t *qd_http1_configure_listener(qd_dispatch_t *qd, const qd_http_bri
// Management Agent API - Delete
//
-void qd_http1_delete_listener(qd_dispatch_t *ignore, qd_http_lsnr_t *li)
+void qd_http1_delete_listener(qd_dispatch_t *ignore, qd_http_listener_t *li)
{
if (li) {
if (li->pn_listener) {
diff --git a/src/adaptors/http1/http1_private.h b/src/adaptors/http1/http1_private.h
index 2c1f998..d0d2306 100644
--- a/src/adaptors/http1/http1_private.h
+++ b/src/adaptors/http1/http1_private.h
@@ -49,7 +49,7 @@ typedef struct qdr_http1_adaptor_t {
qdr_protocol_adaptor_t *adaptor;
qd_log_source_t *log;
sys_mutex_t *lock; // for the lists and activation
- qd_http_lsnr_list_t listeners;
+ qd_http_listener_list_t listeners;
qd_http_connector_list_t connectors;
qdr_http1_connection_list_t connections;
} qdr_http1_adaptor_t;
diff --git a/src/adaptors/http2/http2_adaptor.c b/src/adaptors/http2/http2_adaptor.c
index 8c2f4a3..5c94830 100644
--- a/src/adaptors/http2/http2_adaptor.c
+++ b/src/adaptors/http2/http2_adaptor.c
@@ -54,7 +54,7 @@ ALLOC_DEFINE(qd_http2_buffer_t);
typedef struct qdr_http2_adaptor_t {
qdr_core_t *core;
qdr_protocol_adaptor_t *adaptor;
- qd_http_lsnr_list_t listeners; // A list of all http2 listeners
+ qd_http_listener_list_t listeners; // A list of all http2 listeners
qd_http_connector_list_t connectors; // A list of all http2 connectors
qd_log_source_t *log_source;
void *callbacks;
@@ -1094,7 +1094,7 @@ ssize_t read_data_callback(nghttp2_session *session,
-qdr_http2_connection_t *qdr_http_connection_ingress(qd_http_lsnr_t* listener)
+qdr_http2_connection_t *qdr_http_connection_ingress(qd_http_listener_t* listener)
{
qdr_http2_connection_t* ingress_http_conn = new_qdr_http2_connection_t();
ZERO(ingress_http_conn);
@@ -2040,7 +2040,7 @@ static void handle_connection_event(pn_event_t *e, qd_server_t *qd_server, void
static void handle_listener_event(pn_event_t *e, qd_server_t *qd_server, void *context) {
qd_log_source_t *log = http2_adaptor->log_source;
- qd_http_lsnr_t *li = (qd_http_lsnr_t*) context;
+ qd_http_listener_t *li = (qd_http_listener_t*) context;
const char *host_port = li->config.host_port;
switch (pn_event_type(e)) {
@@ -2082,7 +2082,7 @@ void qd_http2_delete_connector(qd_dispatch_t *qd, qd_http_connector_t *connector
/**
* Delete listener via Management request
*/
-void qd_http2_delete_listener(qd_dispatch_t *qd, qd_http_lsnr_t *li)
+void qd_http2_delete_listener(qd_dispatch_t *qd, qd_http_listener_t *li)
{
if (li) {
if (li->pn_listener) {
@@ -2099,9 +2099,9 @@ void qd_http2_delete_listener(qd_dispatch_t *qd, qd_http_lsnr_t *li)
}
-qd_http_lsnr_t *qd_http2_configure_listener(qd_dispatch_t *qd, const qd_http_bridge_config_t *config, qd_entity_t *entity)
+qd_http_listener_t *qd_http2_configure_listener(qd_dispatch_t *qd, const qd_http_bridge_config_t *config, qd_entity_t *entity)
{
- qd_http_lsnr_t *li = qd_http_lsnr(qd->server, &handle_listener_event);
+ qd_http_listener_t *li = qd_http_listener(qd->server, &handle_listener_event);
if (!li) {
qd_log(http2_adaptor->log_source, QD_LOG_ERROR, "Unable to create http listener: no memory");
return 0;
@@ -2136,7 +2136,7 @@ static void qdr_http2_adaptor_final(void *adaptor_context)
qdr_protocol_adaptor_free(adaptor->core, adaptor->adaptor);
// Free all http listeners
- qd_http_lsnr_t *li = DEQ_HEAD(adaptor->listeners);
+ qd_http_listener_t *li = DEQ_HEAD(adaptor->listeners);
while (li) {
qd_http2_delete_listener(0, li);
li = DEQ_HEAD(adaptor->listeners);
diff --git a/src/adaptors/http2/http2_adaptor.h b/src/adaptors/http2/http2_adaptor.h
index 729bf73..2fe08c3 100644
--- a/src/adaptors/http2/http2_adaptor.h
+++ b/src/adaptors/http2/http2_adaptor.h
@@ -35,10 +35,6 @@ size_t MAX_BUFFERS = 16;
size_t HTTP2_DATA_FRAME_HEADER_LENGTH = 9;
-// We already have a qd_http_listener_t defined in http-libwebsockets.c
-// We will call this as qd_http_lsnr_t in order to avoid a clash.
-// At a later point in time, we will handle websocket here as well
-// and get rid of http-libwebsockets.c and rename this as qd_http_listener_t
typedef struct qdr_http2_session_data_t qdr_http2_session_data_t;
typedef struct qdr_http2_stream_data_t qdr_http2_stream_data_t;
typedef struct qdr_http2_connection_t qdr_http2_connection_t;
diff --git a/src/adaptors/http_common.c b/src/adaptors/http_common.c
index b47f83b..09fb165 100644
--- a/src/adaptors/http_common.c
+++ b/src/adaptors/http_common.c
@@ -23,8 +23,8 @@
#include <stdio.h>
-ALLOC_DECLARE(qd_http_lsnr_t);
-ALLOC_DEFINE(qd_http_lsnr_t);
+ALLOC_DECLARE(qd_http_listener_t);
+ALLOC_DEFINE(qd_http_listener_t);
ALLOC_DECLARE(qd_http_connector_t);
ALLOC_DEFINE(qd_http_connector_t);
@@ -84,9 +84,9 @@ void qd_http_free_bridge_config(qd_http_bridge_config_t *config)
//
-qd_http_lsnr_t *qd_dispatch_configure_http_lsnr(qd_dispatch_t *qd, qd_entity_t *entity)
+qd_http_listener_t *qd_dispatch_configure_http_listener(qd_dispatch_t *qd, qd_entity_t *entity)
{
- qd_http_lsnr_t *listener = 0;
+ qd_http_listener_t *listener = 0;
qd_http_bridge_config_t config;
if (load_bridge_config(qd, &config, entity) != QD_ERROR_NONE) {
@@ -113,7 +113,7 @@ qd_http_lsnr_t *qd_dispatch_configure_http_lsnr(qd_dispatch_t *qd, qd_entity_t *
void qd_dispatch_delete_http_listener(qd_dispatch_t *qd, void *impl)
{
- qd_http_lsnr_t *listener = (qd_http_lsnr_t*) impl;
+ qd_http_listener_t *listener = (qd_http_listener_t*) impl;
if (listener) {
switch (listener->config.version) {
case VERSION_HTTP1:
@@ -187,19 +187,19 @@ qd_error_t qd_entity_refresh_httpConnector(qd_entity_t* entity, void *impl)
}
//
-// qd_http_lsnr_t constructor
+// qd_http_listener_t constructor
//
-qd_http_lsnr_t *qd_http_lsnr(qd_server_t *server, qd_server_event_handler_t handler)
+qd_http_listener_t *qd_http_listener(qd_server_t *server, qd_server_event_handler_t handler)
{
- qd_http_lsnr_t *li = new_qd_http_lsnr_t();
+ qd_http_listener_t *li = new_qd_http_listener_t();
if (!li)
return 0;
ZERO(li);
li->pn_listener = pn_listener();
if (!li->pn_listener) {
- free_qd_http_lsnr_t(li);
+ free_qd_http_listener_t(li);
return 0;
}
@@ -212,11 +212,11 @@ qd_http_lsnr_t *qd_http_lsnr(qd_server_t *server, qd_server_event_handler_t hand
return li;
}
-void qd_http_listener_decref(qd_http_lsnr_t* li)
+void qd_http_listener_decref(qd_http_listener_t* li)
{
if (li && sys_atomic_dec(&li->ref_count) == 1) {
qd_http_free_bridge_config(&li->config);
- free_qd_http_lsnr_t(li);
+ free_qd_http_listener_t(li);
}
}
diff --git a/src/adaptors/http_common.h b/src/adaptors/http_common.h
index 0948f1d..09b178c 100644
--- a/src/adaptors/http_common.h
+++ b/src/adaptors/http_common.h
@@ -46,19 +46,19 @@ typedef struct qd_http_bridge_config_t {
void qd_http_free_bridge_config(qd_http_bridge_config_t *config);
-typedef struct qd_http_lsnr_t qd_http_lsnr_t;
-struct qd_http_lsnr_t {
+typedef struct qd_http_listener_t qd_http_listener_t;
+struct qd_http_listener_t {
qd_http_bridge_config_t config;
qd_handler_context_t context;
sys_atomic_t ref_count;
qd_server_t *server;
pn_listener_t *pn_listener;
- DEQ_LINKS(qd_http_lsnr_t);
+ DEQ_LINKS(qd_http_listener_t);
};
-DEQ_DECLARE(qd_http_lsnr_t, qd_http_lsnr_list_t);
+DEQ_DECLARE(qd_http_listener_t, qd_http_listener_list_t);
-qd_http_lsnr_t *qd_http_lsnr(qd_server_t *server, qd_server_event_handler_t handler);
-void qd_http_listener_decref(qd_http_lsnr_t* li);
+qd_http_listener_t *qd_http_listener(qd_server_t *server, qd_server_event_handler_t handler);
+void qd_http_listener_decref(qd_http_listener_t* li);
typedef struct qd_http_connector_t qd_http_connector_t;
struct qd_http_connector_t {
@@ -82,7 +82,7 @@ void qd_http_connector_decref(qd_http_connector_t* c);
// Management Entity Interfaces (see HttpListenerEntity and HttpConnectorEntity in agent.py)
//
-qd_http_lsnr_t *qd_dispatch_configure_http_lsnr(qd_dispatch_t *qd, qd_entity_t *entity);
+qd_http_listener_t *qd_dispatch_configure_http_listener(qd_dispatch_t *qd, qd_entity_t *entity);
void qd_dispatch_delete_http_listener(qd_dispatch_t *qd, void *impl);
qd_error_t qd_entity_refresh_httpListener(qd_entity_t* entity, void *impl);
@@ -110,11 +110,11 @@ void qd_http_record_request(qdr_core_t *core, const char * method, uint32_t stat
// These functions are defined in their respective HTTP adaptors:
//
-qd_http_lsnr_t *qd_http1_configure_listener(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
-qd_http_lsnr_t *qd_http2_configure_listener(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
+qd_http_listener_t *qd_http1_configure_listener(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
+qd_http_listener_t *qd_http2_configure_listener(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
-void qd_http1_delete_listener(qd_dispatch_t *, qd_http_lsnr_t *);
-void qd_http2_delete_listener(qd_dispatch_t *, qd_http_lsnr_t *);
+void qd_http1_delete_listener(qd_dispatch_t *, qd_http_listener_t *);
+void qd_http2_delete_listener(qd_dispatch_t *, qd_http_listener_t *);
qd_http_connector_t *qd_http1_configure_connector(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
qd_http_connector_t *qd_http2_configure_connector(qd_dispatch_t *, const qd_http_bridge_config_t *, qd_entity_t *);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org