You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2018/02/01 02:32:46 UTC
qpid-proton git commit: PROTON-1757: Fix pn_netaddr_socklen for
FreeBSD
Repository: qpid-proton
Updated Branches:
refs/heads/master 8cd001759 -> 61073481b
PROTON-1757: Fix pn_netaddr_socklen for FreeBSD
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/61073481
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/61073481
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/61073481
Branch: refs/heads/master
Commit: 61073481bd37db59cfe310b0a3f3555b34805211
Parents: 8cd0017
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Jan 29 16:32:50 2018 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Jan 31 21:32:30 2018 -0500
----------------------------------------------------------------------
proton-c/src/proactor/netaddr-internal.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/61073481/proton-c/src/proactor/netaddr-internal.h
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/netaddr-internal.h b/proton-c/src/proactor/netaddr-internal.h
index 16e406c..c1013da 100644
--- a/proton-c/src/proactor/netaddr-internal.h
+++ b/proton-c/src/proactor/netaddr-internal.h
@@ -34,7 +34,12 @@ const struct sockaddr *pn_netaddr_sockaddr(const pn_netaddr_t *na) {
}
size_t pn_netaddr_socklen(const pn_netaddr_t *na) {
- return sizeof(na->ss);
+ if (!na) return 0;
+ switch (na->ss.ss_family) {
+ case AF_INET: return sizeof(struct sockaddr_in);
+ case AF_INET6: return sizeof(struct sockaddr_in6);
+ default: return sizeof(na->ss);
+ }
}
const pn_netaddr_t *pn_netaddr_next(const pn_netaddr_t *na) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org