diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-07-14 16:47:09 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-07-14 16:47:09 -0400 |
| commit | 5600327322a78a3a803368c0fe4f923cf14a4cf7 (patch) | |
| tree | 67e3774f33391e09e703073b68ed46f57ccca599 /support/nfs/getport.c | |
| parent | 23c1a452afce5726cfe661a4d7ac14a1883ecb55 (diff) | |
| download | nfs-utils-5600327322a78a3a803368c0fe4f923cf14a4cf7.tar.gz nfs-utils-5600327322a78a3a803368c0fe4f923cf14a4cf7.tar.xz nfs-utils-5600327322a78a3a803368c0fe4f923cf14a4cf7.zip | |
support: Introduce sockaddr helpers to get and set IP port numbers
Introduce address family-agnostic functions that get and set IP port
numbers in socket addresses. We can already replace a few similar
functions in the mount command, and a few more will come up with
statd and sm-notify.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/nfs/getport.c')
| -rw-r--r-- | support/nfs/getport.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/support/nfs/getport.c b/support/nfs/getport.c index f5ba4ef..4d4b1c4 100644 --- a/support/nfs/getport.c +++ b/support/nfs/getport.c @@ -113,24 +113,6 @@ static int nfs_gp_loopback_address(struct sockaddr *sap, socklen_t *salen) } /* - * Plant port number in @sap. @port is already in network byte order. - */ -static void nfs_gp_set_port(struct sockaddr *sap, const in_port_t port) -{ - struct sockaddr_in *sin = (struct sockaddr_in *)sap; - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap; - - switch (sap->sa_family) { - case AF_INET: - sin->sin_port = port; - break; - case AF_INET6: - sin6->sin6_port = port; - break; - } -} - -/* * Look up a network service in /etc/services and return the * network-order port number of that service. */ @@ -210,7 +192,7 @@ static CLIENT *nfs_gp_get_rpcbclient(struct sockaddr *sap, rpcprog_t rpcb_prog = nfs_getrpcbyname(RPCBPROG, rpcb_pgmtbl); CLIENT *clnt; - nfs_gp_set_port(sap, nfs_gp_get_rpcb_port(transport)); + nfs_set_port(sap, ntohs(nfs_gp_get_rpcb_port(transport))); clnt = nfs_get_rpcclient(sap, salen, transport, rpcb_prog, version, timeout); nfs_gp_map_tcp_errorcodes(transport); @@ -773,7 +755,7 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen, struct sockaddr *saddr = (struct sockaddr *)&address; memcpy(saddr, sap, (size_t)salen); - nfs_gp_set_port(saddr, htons(port)); + nfs_set_port(saddr, port); nfs_clear_rpc_createerr(); @@ -787,7 +769,7 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen, } if (result) - nfs_gp_set_port(sap, htons(port)); + nfs_set_port(sap, port); return result; } |