--- lbbs/src/net_server.c 2004/11/30 07:10:32 1.8 +++ lbbs/src/net_server.c 2005/03/20 17:37:14 1.10 @@ -19,6 +19,7 @@ #include "io.h" #include #include +#include int net_server (const char *hostaddr, unsigned int port) @@ -40,10 +41,10 @@ net_server (const char *hostaddr, unsign (strlen (hostaddr) > 0 ? inet_addr (hostaddr) : INADDR_ANY); sin.sin_port = htons (port); - if (bind (socket_server, (struct sockaddr *)&sin, sizeof(sin)) < 0) + if (bind (socket_server, (struct sockaddr *) &sin, sizeof (sin)) < 0) { log_error ("Bind address %s:%u failed\n", - inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + inet_ntoa (sin.sin_addr), ntohs (sin.sin_port)); exit (2); } @@ -53,39 +54,41 @@ net_server (const char *hostaddr, unsign exit (3); } - strcpy(hostaddr_server,(const char *)inet_ntoa(sin.sin_addr)); - port_server = ntohs(sin.sin_port); - + strcpy (hostaddr_server, inet_ntoa (sin.sin_addr)); + port_server = ntohs (sin.sin_port); + log_std ("Listening at %s:%d\n", hostaddr_server, port_server); namelen = sizeof (sin); - while(1) + while (1) { - if ((socket_client = accept (socket_server, (struct sockaddr *) &sin, &namelen)) < 0) - { - log_error ("Accept connection error\n"); - continue; - } - - strcpy (hostaddr_client, (const char *)inet_ntoa(sin.sin_addr)); - port_client = ntohs(sin.sin_port); - - log_std ("Accept connection from %s:%d\n", hostaddr_client, port_client); - - if (fork_server()<0) - { - log_error ("Fork error\n"); - } - - if (close(socket_client) == -1) - { - log_error("Close client socket failed\n"); - } + if ((socket_client = + accept (socket_server, (struct sockaddr *) &sin, &namelen)) < 0) + { + log_error ("Accept connection error\n"); + continue; + } + + strcpy (hostaddr_client, (const char *) inet_ntoa (sin.sin_addr)); + port_client = ntohs (sin.sin_port); + + log_std ("Accept connection from %s:%d\n", hostaddr_client, + port_client); + + if (fork_server () < 0) + { + log_error ("Fork error\n"); + } + + if (close (socket_client) == -1) + { + log_error ("Close client socket failed\n"); + } } - if (close(socket_server) == -1) + if (close (socket_server) == -1) { - log_error("Close server socket failed\n"); + log_error ("Close server socket failed\n"); } return 0;