[28437] in CVS-changelog-for-Kerberos-V5
krb5 commit: Add socket-utils.h helpers for ports
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Jun 27 22:37:24 2014
Date: Fri, 27 Jun 2014 22:37:15 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201406280237.s5S2bFJ3017174@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/ddc1c61566cc5ececc5678088f0761ce2da61ee4
commit ddc1c61566cc5ececc5678088f0761ce2da61ee4
Author: Greg Hudson <ghudson@mit.edu>
Date: Sat Jun 7 15:16:23 2014 -0400
Add socket-utils.h helpers for ports
Add sa_setport, sa_getport, and sa_is_inet helpers for conveniently
manipulating port numbers on IPv4 and IPv6 socket addresses.
src/include/socket-utils.h | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/include/socket-utils.h b/src/include/socket-utils.h
index 484e294..e3fa429 100644
--- a/src/include/socket-utils.h
+++ b/src/include/socket-utils.h
@@ -89,6 +89,36 @@ static inline struct sockaddr_in6 *ss2sin6 (struct sockaddr_storage *ss)
return (struct sockaddr_in6 *) ss;
}
+/* Set the IPv4 or IPv6 port on sa to port. Do nothing if sa is not an
+ * Internet socket. */
+static inline void
+sa_setport(struct sockaddr *sa, uint16_t port)
+{
+ if (sa->sa_family == AF_INET)
+ sa2sin(sa)->sin_port = htons(port);
+ else if (sa->sa_family == AF_INET6)
+ sa2sin6(sa)->sin6_port = htons(port);
+}
+
+/* Get the Internet port number of sa, or 0 if it is not an Internet socket. */
+static inline uint16_t
+sa_getport(struct sockaddr *sa)
+{
+ if (sa->sa_family == AF_INET)
+ return ntohs(sa2sin(sa)->sin_port);
+ else if (sa->sa_family == AF_INET6)
+ return ntohs(sa2sin6(sa)->sin6_port);
+ else
+ return 0;
+}
+
+/* Return true if sa is an IPv4 or IPv6 socket address. */
+static inline int
+sa_is_inet(struct sockaddr *sa)
+{
+ return sa->sa_family == AF_INET || sa->sa_family == AF_INET6;
+}
+
#if !defined (socklen)
/* socklen_t socklen (struct sockaddr *) */
# ifdef HAVE_SA_LEN
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
