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 2018/03/08 16:33:43 UTC

[1/2] qpid-dispatch git commit: NO-JIRA - Reveerted an earlier change that changed Proton API calls. We want dispatch to be able to compile with already released versions of Proton. Hence this revert.

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master d11e709ec -> dd8948e4d


NO-JIRA - Reveerted an earlier change that changed Proton API calls. We want dispatch to be able to compile with already released versions of Proton. Hence this revert.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/caa554d2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/caa554d2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/caa554d2

Branch: refs/heads/master
Commit: caa554d2e7e253ee0afd9a43f023f17f7123eeec
Parents: d11e709
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Thu Mar 8 11:29:11 2018 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Thu Mar 8 11:29:11 2018 -0500

----------------------------------------------------------------------
 src/server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/caa554d2/src/server.c
----------------------------------------------------------------------
diff --git a/src/server.c b/src/server.c
index 8e65b07..d27260d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -579,8 +579,8 @@ void connect_fail(qd_connection_t *ctx, const char *name, const char *descriptio
 /* Get the host IP address for the remote end */
 static void set_rhost_port(qd_connection_t *ctx) {
     pn_transport_t *tport  = pn_connection_transport(ctx->pn_conn);
-    const struct sockaddr* sa = pn_netaddr_sockaddr(pn_transport_remote_addr(tport));
-    size_t salen = pn_netaddr_socklen(pn_transport_remote_addr(tport));
+    const struct sockaddr* sa = pn_netaddr_sockaddr(pn_netaddr_remote(tport));
+    size_t salen = pn_netaddr_socklen(pn_netaddr_remote(tport));
     if (sa && salen) {
         char rport[NI_MAXSERV] = "";
         int err = getnameinfo(sa, salen,
@@ -707,7 +707,7 @@ static void handle_listener(pn_event_t *e, qd_server_t *qd_server) {
         if (strcmp(port, "0") == 0) {
             // If a 0 (zero) is specified for a port, get the actual listening port from the listener.
             pn_listener_t *l = pn_event_listener(e);
-            const pn_netaddr_t *na = pn_listener_addr(l);
+            const pn_netaddr_t *na = pn_netaddr_listening(l);
             char str[PN_MAX_ADDR] = "";
             pn_netaddr_str(na, str, sizeof(str));
             // "str" contains the host and port on which this listener is listening.


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


[2/2] qpid-dispatch git commit: NO-JIRA - Removed CMake option that failed a build if there were any warnings. Proton has a new feature wherein it throws warnings on use of deprecated functions. We want to continue to use the deprecated functions for the

Posted by gm...@apache.org.
NO-JIRA - Removed CMake option that failed a build if there were any warnings. Proton has a new feature wherein it throws warnings on use of deprecated functions. We want to continue to use the deprecated functions for the time beiong


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/dd8948e4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/dd8948e4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/dd8948e4

Branch: refs/heads/master
Commit: dd8948e4dd344b05625038493a82fc59289836fd
Parents: caa554d
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Thu Mar 8 11:32:43 2018 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Thu Mar 8 11:32:43 2018 -0500

----------------------------------------------------------------------
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/dd8948e4/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55c6e5f..d9eea53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,7 +162,7 @@ include_directories(
     )
 
 if (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS)
- add_compile_options(-Werror)
+ #add_compile_options(-Werror)
  add_compile_options(-Wall)
  include(CheckCCompilerFlag)
  check_c_compiler_flag(-Wpedantic HAS_PEDANTIC_FLAG)


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