-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.12 2001/07/01 17:04:11 oes Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13 2001/07/15 13:56:57 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.13 2001/07/15 13:56:57 jongfoster
+ * Removing unused local variable.
+ *
* Revision 1.12 2001/07/01 17:04:11 oes
* Bugfix: accept_connection no longer uses the obsolete hstrerror() function
*
*********************************************************************/
int accept_connection(struct client_state * csp, int fd)
{
- struct sockaddr raddr, laddr;
- struct sockaddr_in *rap = (struct sockaddr_in *) &raddr;
- struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
+ struct sockaddr_in client, server;
struct hostent *host = NULL;
- int afd, raddrlen, laddrlen;
+ int afd, c_length, s_length;
+
+ c_length = s_length = sizeof(client);
- raddrlen = sizeof raddr;
do
{
- afd = accept (fd, &raddr, &raddrlen);
+ afd = accept (fd, (struct sockaddr *) &client, &c_length);
} while (afd < 1 && errno == EINTR);
if (afd < 0)
* Determine the IP-Adress that the client used to reach us
* and the hostname associated with that address
*/
- if (!getsockname(afd, &laddr, &laddrlen))
+ if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
{
- csp->my_ip_addr_str = strdup(inet_ntoa(lap->sin_addr));
+ csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
- host = gethostbyaddr(laddr.sa_data + 2, 4, AF_INET);
+ host = gethostbyaddr(&server.sin_addr, sizeof(server.sin_addr), AF_INET);
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
}
csp->cfd = afd;
- csp->ip_addr_str = strdup(inet_ntoa(rap->sin_addr));
- csp->ip_addr_long = ntohl(rap->sin_addr.s_addr);
+ csp->ip_addr_str = strdup(inet_ntoa(client.sin_addr));
+ csp->ip_addr_long = ntohl(client.sin_addr.s_addr);
return 1;