diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-06-07 16:25:35 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-06-27 19:36:39 -0400 |
| commit | 7567f36f83bab47206c2ea85724c1e74c26ec0d6 (patch) | |
| tree | 9f62179c57bfb1d3a3504f8fa8fa2fe4eca34518 /src/lib/apputils | |
| parent | ddc1c61566cc5ececc5678088f0761ce2da61ee4 (diff) | |
| download | krb5-7567f36f83bab47206c2ea85724c1e74c26ec0d6.tar.gz krb5-7567f36f83bab47206c2ea85724c1e74c26ec0d6.tar.xz krb5-7567f36f83bab47206c2ea85724c1e74c26ec0d6.zip | |
Use sa_setport and sa_getport where appropriate
Use sa_setport and sa_getport in place of existing static helpers or
open-coded switch statements in net-server.c, fake-addrinfo.c, and
svc_tcp.c.
Diffstat (limited to 'src/lib/apputils')
| -rw-r--r-- | src/lib/apputils/net-server.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index d19d45a33..02b105865 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -66,22 +66,6 @@ static int tcp_or_rpc_data_counter; static int max_tcp_or_rpc_data_connections = 45; -/* Misc utility routines. */ -static void -set_sa_port(struct sockaddr *addr, int port) -{ - switch (addr->sa_family) { - case AF_INET: - sa2sin(addr)->sin_port = port; - break; - case AF_INET6: - sa2sin6(addr)->sin6_port = port; - break; - default: - break; - } -} - static int ipv6_enabled() { @@ -740,7 +724,7 @@ setup_tcp_listener_ports(struct socksetup *data) FOREACH_ELT (tcp_port_data, i, port) { int s4, s6; - set_sa_port((struct sockaddr *)&sin4, htons(port)); + sa_setport((struct sockaddr *)&sin4, port); if (!ipv6_enabled()) { s4 = setup_a_tcp_listener(data, (struct sockaddr *)&sin4); if (s4 < 0) @@ -749,7 +733,7 @@ setup_tcp_listener_ports(struct socksetup *data) } else { s4 = s6 = -1; - set_sa_port((struct sockaddr *)&sin6, htons(port)); + sa_setport((struct sockaddr *)&sin6, port); s6 = setup_a_tcp_listener(data, (struct sockaddr *)&sin6); if (s6 < 0) @@ -809,7 +793,7 @@ setup_rpc_listener_ports(struct socksetup *data) int s4; int s6; - set_sa_port((struct sockaddr *)&sin4, htons(svc.port)); + sa_setport((struct sockaddr *)&sin4, svc.port); s4 = create_server_socket(data, (struct sockaddr *)&sin4, SOCK_STREAM); if (s4 < 0) return -1; @@ -821,7 +805,7 @@ setup_rpc_listener_ports(struct socksetup *data) s4, paddr((struct sockaddr *)&sin4)); if (ipv6_enabled()) { - set_sa_port((struct sockaddr *)&sin6, htons(svc.port)); + sa_setport((struct sockaddr *)&sin6, svc.port); s6 = create_server_socket(data, (struct sockaddr *)&sin6, SOCK_STREAM); if (s6 < 0) @@ -903,7 +887,7 @@ setup_udp_port_1(struct socksetup *data, struct sockaddr *addr, u_short port; FOREACH_ELT (udp_port_data, i, port) { - set_sa_port(addr, htons(port)); + sa_setport(addr, port); sock = create_server_socket(data, addr, SOCK_DGRAM); if (sock == -1) return 1; |