[qpid-proton] branch master updated: PROTON-2257: Add back in aliases for renamed functions - This keeps the shared library compatible and so not to change the major version

[astitcher]

This is an automated email from the ASF dual-hosted git repository.

astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f8c814  PROTON-2257: Add back in aliases for renamed functions - This 
keeps the shared library compatible and so not to change the major version
7f8c814 is described below

commit 7f8c8144af3629cf363d68262856f12a99b39a28
Author: Andrew Stitcher <astitc...@apache.org>
AuthorDate: Tue Nov 10 13:49:11 2020 -0500

    PROTON-2257: Add back in aliases for renamed functions
    - This keeps the shared library compatible and so not to change the major 
version
---
 c/src/proactor/epoll.c       |  2 +-
 c/src/proactor/epoll_timer.c |  1 -
 c/src/sasl/sasl.c            | 11 +++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index 30ef5f1..d2822b4 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -1985,6 +1985,7 @@ void pn_proactor_free(pn_proactor_t *p) {
   p->eventfd = -1;
   close(p->interruptfd);
   p->interruptfd = -1;
+  pni_timer_manager_finalize(&p->timer_manager);
   while (p->contexts) {
     pcontext_t *ctx = p->contexts;
     p->contexts = ctx->next;
@@ -2000,7 +2001,6 @@ void pn_proactor_free(pn_proactor_t *p) {
     }
   }
 
-  pni_timer_manager_finalize(&p->timer_manager);
   pn_collector_free(p->collector);
   pmutex_finalize(&p->tslot_mutex);
   pmutex_finalize(&p->sched_mutex);
diff --git a/c/src/proactor/epoll_timer.c b/c/src/proactor/epoll_timer.c
index 6c7c3db..58f0211 100644
--- a/c/src/proactor/epoll_timer.c
+++ b/c/src/proactor/epoll_timer.c
@@ -287,7 +287,6 @@ void pni_timer_set(pni_timer_t *timer, uint64_t deadline) {
 
 pn_event_batch_t *pni_timer_manager_process(pni_timer_manager_t *tm, bool 
timeout, bool wake) {
   uint64_t now = pn_proactor_now_64();
-  lock(&tm->context.mutex);
   tm->context.working = true;
   if (timeout)
     tm->timerfd_deadline = 0;
diff --git a/c/src/sasl/sasl.c b/c/src/sasl/sasl.c
index e239e0c..dfb4530 100644
--- a/c/src/sasl/sasl.c
+++ b/c/src/sasl/sasl.c
@@ -184,6 +184,17 @@ void pnx_sasl_set_default_implementation(const 
pnx_sasl_implementation* impl)
   global_sasl_impl = impl;
 }
 
+// Aliases for linkage compatibility in face of renamings
+PN_EXTERN bool  pnx_sasl_is_included_mech(pn_transport_t *transport, 
pn_bytes_t s)
+{ return pnx_sasl_is_mechanism_included(transport, s); }
+PN_EXTERN bool  pnx_sasl_get_allow_insecure_mechs(pn_transport_t *transport)
+{ return pnx_sasl_get_allow_insecure_mechanisms(transport); }
+PN_EXTERN bool  pnx_sasl_get_auth_required(pn_transport_t *transport)
+{ return pnx_sasl_get_authentication_required(transport); }
+PN_EXTERN void  pnx_sasl_succeed_authentication(pn_transport_t *transport, 
const char *username, const char *authzid)
+{ pnx_sasl_set_succeeded(transport, username, authzid);}
+PN_EXTERN void  pnx_sasl_fail_authentication(pn_transport_t *transport)
+{pnx_sasl_set_failed(transport); }
 
 //-----------------------------------------------------------------------------
 // pni_sasl_impl: Abstract the entry points to the SASL implementation 
(virtual function calls)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org