I have reverted my earlier commit that changed the API functions that dispatch used. I have made another commit to not fail the dispatch build if there are warnings so dispatch will continue compiling when proton emits warnings.As soon as the next version of proton is released we will change dispatch master to use the new proton API functions and once again start to fail the dispatch build on warnings.
Thanks. On Thu, Mar 8, 2018 at 9:47 AM, Robbie Gemmell <robbie.gemm...@gmail.com> wrote: > I assume this is due to PROTON-1781, and means that Dispatch master > requries use of Proton master now. Is that desired, and if so is there > some version checking or documentation (e.g README) that maybe needs > updated now to reflect that? > > Robbie > > On 7 March 2018 at 13:53, <gmur...@apache.org> wrote: > > Repository: qpid-dispatch > > Updated Branches: > > refs/heads/master 35b1c3f83 -> 11181b878 > > > > > > NO-JIRA - Modified code in server.c to reflect changes in proton API > > > > > > Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo > > Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/ > commit/11181b87 > > Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/11181b87 > > Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/11181b87 > > > > Branch: refs/heads/master > > Commit: 11181b878265861308614dcb25c3021bf5887edc > > Parents: 35b1c3f > > Author: Ganesh Murthy <gmur...@redhat.com> > > Authored: Wed Mar 7 08:52:47 2018 -0500 > > Committer: Ganesh Murthy <gmur...@redhat.com> > > Committed: Wed Mar 7 08:52:47 2018 -0500 > > > > ---------------------------------------------------------------------- > > src/server.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ > 11181b87/src/server.c > > ---------------------------------------------------------------------- > > diff --git a/src/server.c b/src/server.c > > index d27260d..8e65b07 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_ > netaddr_remote(tport)); > > - size_t salen = pn_netaddr_socklen(pn_netaddr_remote(tport)); > > + const struct sockaddr* sa = pn_netaddr_sockaddr(pn_ > transport_remote_addr(tport)); > > + size_t salen = pn_netaddr_socklen(pn_transport_remote_addr(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_netaddr_listening(l); > > + const pn_netaddr_t *na = pn_listener_addr(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-unsubscr...@qpid.apache.org > > For additional commands, e-mail: commits-h...@qpid.apache.org > > >
