Now copy the listener port to the client address, as the client port is

not being initialized properly by accept() for some reason...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@289 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/client.c b/scheduler/client.c
index bfdd7af874925499d67f5ae52a06e153dcc03cd5..cb3cc97b274412ed6d18a0c9a2310feb2864cb3c 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.16 1999/04/28 15:53:51 mike Exp $"
+ * "$Id: client.c,v 1.17 1999/05/03 18:35:35 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -89,12 +89,15 @@ AcceptClient(listener_t *lis)       /* I - Listener socket */
 
   val = sizeof(struct sockaddr_in);
 
-  if ((con->http.fd = accept(lis->fd, (struct sockaddr *)&(con->http.hostaddr), &val)) < 0)
+  if ((con->http.fd = accept(lis->fd, (struct sockaddr *)&(con->http.hostaddr),
+                             &val)) < 0)
   {
     LogMessage(LOG_ERROR, "accept() failed - %s.", strerror(errno));
     return;
   }
 
+  con->http.hostaddr.sin_port = lis->address.sin_port;
+
  /*
   * Get the hostname or format the IP address as needed...
   */
@@ -116,7 +119,8 @@ AcceptClient(listener_t *lis)       /* I - Listener socket */
   else
     strncpy(con->http.hostname, host->h_name, sizeof(con->http.hostname) - 1);
 
-  LogMessage(LOG_INFO, "accept() %d from %s.", con->http.fd, con->http.hostname);
+  LogMessage(LOG_INFO, "accept() %d from %s:%d.", con->http.fd,
+             con->http.hostname, ntohs(con->http.hostaddr.sin_port));
 
  /*
   * Add the socket to the select() input mask.
@@ -1548,5 +1552,5 @@ pipe_command(client_t *con,       /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.16 1999/04/28 15:53:51 mike Exp $".
+ * End of "$Id: client.c,v 1.17 1999/05/03 18:35:35 mike Exp $".
  */