diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-06-10 13:06:26 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-06-10 13:06:26 -0400 |
| commit | a013e2dbe99ce306e8f9d1baf18b188ccca96486 (patch) | |
| tree | e40dcb26b56391f63b66c958143cf89ae2331bda /src | |
| parent | 61031a84224acd373064c2f2a557279c250d6793 (diff) | |
- sort out host/network order for port numbers
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispatch.c | 8 | ||||
| -rw-r--r-- | src/plugin.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dispatch.c b/src/dispatch.c index 94a488b..69a8555 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -456,11 +456,11 @@ dispatch_dgram(struct plugin_state *state, int fd) struct sockaddr_in6 *sin6; case AF_INET: sin = (struct sockaddr_in *) &cdata.dgram.client_addr; - cdata.dgram.client_secure = sin->sin_port < 1024; + cdata.dgram.client_secure = ntohs(sin->sin_port) < 1024; break; case AF_INET6: sin6 = (struct sockaddr_in6 *) &cdata.dgram.client_addr; - cdata.dgram.client_secure = sin6->sin6_port < 1024; + cdata.dgram.client_secure = ntohs(sin6->sin6_port) < 1024; break; default: cdata.dgram.client_secure = FALSE; @@ -543,11 +543,11 @@ dispatch_accept_client(struct plugin_state *state, int fd) struct sockaddr_in6 *sin6; case AF_INET: sin = (struct sockaddr_in *) &client->client_addr; - client->client_secure = sin->sin_port < 1024; + client->client_secure = ntohs(sin->sin_port) < 1024; break; case AF_INET6: sin6 = (struct sockaddr_in6 *) &client->client_addr; - client->client_secure = sin6->sin6_port < 1024; + client->client_secure = ntohs(sin6->sin6_port) < 1024; break; default: client->client_secure = FALSE; diff --git a/src/plugin.c b/src/plugin.c index 1dc465b..831b89c 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -250,7 +250,7 @@ plugin_state_init(Slapi_PBlock *pb, struct plugin_state **lstate) * directory server's database. */ serv = getservbyname("ypserv", (i & 1) ? "tcp" : "udp"); if (serv != NULL) { - port = serv->s_port; + port = ntohs(serv->s_port); } if (port == 0) { ret = (pf == PF_INET6) ? bindresvport(sockfd, @@ -258,8 +258,8 @@ plugin_state_init(Slapi_PBlock *pb, struct plugin_state **lstate) bindresvport(sockfd, &sin); } else { - sin.sin_port = ntohs(port); - sin6.sin6_port = ntohs(port); + sin.sin_port = htons(port); + sin6.sin6_port = htons(port); ret = (pf == PF_INET6) ? bind(sockfd, (struct sockaddr*) &sin6, sizeof(sin6)) : @@ -277,8 +277,8 @@ plugin_state_init(Slapi_PBlock *pb, struct plugin_state **lstate) continue; } /* Pick out the port number that we got back. */ - port = (pf == PF_INET6) ? htons(sin6.sin6_port) : - htons(sin.sin_port); + port = (pf == PF_INET6) ? ntohs(sin6.sin6_port) : + ntohs(sin.sin_port); /* If it's a listening socket, let the kernel know that we're * ready to accept client connections. */ if (type == SOCK_STREAM) { |