-/* depend: */
-/* cflags: */
-/* linker: color.o debug.o */
-
#include <assert.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
-//#include <sys/types.h>
-//#include <sys/socket.h>
#include <sys/select.h>
#endif
#include <unistd.h>
#include "server.h"
-/* compat */
+/* types */
#ifdef _WIN32 /* Windows */
-#define PF_INET AF_INET
-#define ERRNO (WSAGetLastError ())
+typedef SOCKET socket_t;
#else /* Posix */
-#define closesocket close
-#define ERRNO errno
-#define SOCKET_ERROR -1
+typedef int socket_t;
#endif
-/* types */
-
/* constants */
#define BACKLOG 5
/* macros */
+#ifdef _WIN32 /* Windows */
+#define PF_INET AF_INET
+#define ERRNO (WSAGetLastError ())
+#else /* Posix */
+#define closesocket close
+#define ERRNO errno
+#define SOCKET_ERROR -1
+#define INVALID_SOCKET -1
+#endif
+
/* gobal variables */
+socket_t sock = INVALID_SOCKET;
+socket_t conn = INVALID_SOCKET;
+
+/* stop server */
+
+void stop_server (int sig)
+{
+ VERBOSE (INFO, PRINT ("Signal: %d\n", sig));
+ terminate_network_context ();
+ exit (0);
+}
+
/* init network context */
void init_network_context (void)
#ifdef _WIN32 /* Windows */
WSADATA WSAData;
WSAStartup (MAKEWORD(2,0), &WSAData);
+
assert (INVALID_SOCKET == (socket_t)-1);
assert (SOCKET_ERROR == -1);
#endif
+
+ signal (SIGINT, &stop_server);
+ signal (SIGQUIT, &stop_server);
+ signal (SIGABRT, &stop_server);
+ signal (SIGSEGV, &stop_server);
+ signal (SIGTERM, &stop_server);
}
/* terminate network context */
void terminate_network_context (void)
{
+ closesocket (sock);
+ closesocket (conn);
#ifdef _WIN32 /* Windows */
WSACleanup ();
#endif
/* open listening socket */
-socket_t open_listening_socket (int port)
+int open_listening_socket (int port)
{
int val = 1;
VERBOSE (DEBUG, PRINT ("Opening socket\n"));
//socket_t sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
- socket_t sock = socket (AF_INET, SOCK_STREAM, 0);
+ if (sock != INVALID_SOCKET) {
+ int rc = closesocket (sock);
+ if (rc == SOCKET_ERROR) {
+ VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
+ }
+ sock = INVALID_SOCKET;
+ }
+ sock = socket (AF_INET, SOCK_STREAM, 0);
if (sock == INVALID_SOCKET) {
- return -1;
+ return 0;
}
struct sockaddr_in addr = {0};
if (rc == SOCKET_ERROR) {
VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
}
- return -1;
+ sock = INVALID_SOCKET;
+ return 0;
}
VERBOSE (DEBUG, PRINT ("Configuring socket\n"));
if (rc == SOCKET_ERROR) {
VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
}
- return -1;
+ sock = INVALID_SOCKET;
+ return 0;
}
rc = listen (sock, BACKLOG);
if (rc == SOCKET_ERROR) {
VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
}
- return -1;
+ sock = INVALID_SOCKET;
+ return 0;
}
- return sock;
+ return 1;
}
/* accept incomming connection */
-socket_t accept_incoming_connection (socket_t sock)
+int accept_incoming_connection (void)
{
- socket_t connection = accept (sock, NULL, 0);
- if (connection == INVALID_SOCKET) {
- return INVALID_SOCKET;
+ if (sock == INVALID_SOCKET) {
+ VERBOSE (ERROR, PERROR ("Can't accept connection from closed socket\n"));
+ return 0;
+ }
+
+ if (conn != INVALID_SOCKET) {
+ int rc = closesocket (conn);
+ if (rc == SOCKET_ERROR) {
+ VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
+ }
+ conn = INVALID_SOCKET;
+ }
+ conn = accept (sock, NULL, 0);
+ if (conn == INVALID_SOCKET) {
+ return 0;
}
#ifndef _WIN32 /* POSIX */
- fcntl (connection, F_SETFL, O_NONBLOCK);
+ fcntl (conn, F_SETFL, O_NONBLOCK);
#endif
int val = 1;
- int rc = setsockopt (connection, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
+ int rc = setsockopt (conn, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
if (rc < 0) {
VERBOSE (ERROR, PERROR ("error: %s\n", "setsockopt/TCP_NODELAY"));
- closesocket (connection);
+ closesocket (conn);
if (rc == SOCKET_ERROR) {
VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO));
}
- return INVALID_SOCKET;
+ conn = INVALID_SOCKET;
+ return 0;
}
- return connection;
+ return 1;
}
-/* close listening socket */
+/* close connection socket */
-void close_socket (socket_t sock)
+void close_connection (void)
{
- int rc = closesocket (sock);
+ int rc = closesocket (conn);
if (rc == SOCKET_ERROR) {
VERBOSE (ERROR, PERROR ("error: %d\n", ERRNO));
}
+ conn = INVALID_SOCKET;
}
/* receive data from socket */
-int receive_data (socket_t sock, unsigned char **pdata)
+int receive_data (unsigned char **pdata)
{
unsigned char buffer[BUFFER_SIZE] = {0};
unsigned char *data = NULL;
int len = 0;
+ if (conn == INVALID_SOCKET) {
+ VERBOSE (ERROR, PERROR ("Can't read data from closed socket\n"));
+ return 0;
+ }
+
while (1) {
/* timeout management */
fd_set rfds;
struct timeval tv = { 0, TIMEOUT };
FD_ZERO (&rfds);
- FD_SET (sock, &rfds);
+ FD_SET (conn, &rfds);
- int retval = select (sock + 1, &rfds, NULL, NULL, &tv);
+ int retval = select (conn + 1, &rfds, NULL, NULL, &tv);
if (retval != 1) { /* 0 or SOCKET_ERROR */
break;
}
/* read from socket */
- int rc = read (sock, buffer, BUFFER_SIZE);
+ int rc = read (conn, buffer, BUFFER_SIZE);
if (rc == 0) { /* sock closed */
if (data) {
/* send data onto socket */
-int send_data (socket_t sock, unsigned char *data, int len)
+int send_data (unsigned char *data, int len)
{
int index = 0;
+ if (conn == INVALID_SOCKET) {
+ VERBOSE (ERROR, PERROR ("Can't read data from closed socket\n"));
+ return 0;
+ }
+
while (index < len) {
- int rc = write (sock, data + index, len - index);
+ int rc = write (conn, data + index, len - index);
if (rc == 0) { /* sock closed */
index = 0;
/* depend: */
/* cflags: */
-/* linker: color.o debug.o http.o server.o signal.o */
+/* linker: color.o debug.o http.o server.o */
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <signal.h>
#include "debug.h"
#include "http.h"
#include "server.h"
-#include "signal.h"
/* types */
char *progname = NULL;
int port = 8080;
-socket_t sock = INVALID_SOCKET;
-socket_t conn = INVALID_SOCKET;
/* help function */
return ret;
}
-void stop_server (__attribute__((unused)) int sig)
-{
- if (conn != INVALID_SOCKET) {
- close_socket (conn);
- }
- if (sock != INVALID_SOCKET) {
- close_socket (sock);
- }
- terminate_network_context ();
- exit (0);
-}
-
/* main function */
int main (int argc, char *argv[])
VERBOSE (DEBUG, PRINT ("Initializing socket\n"));
init_network_context ();
- sock = open_listening_socket (port);
- if (sock == INVALID_SOCKET) {
+ if (open_listening_socket (port) == 0) {
VERBOSE (ERROR, PERROR ("Can't open listening socket\n"));
return 1;
}
VERBOSE (INFO, PRINT ("Listening socket on port %d\n", port));
- signal (SIGTERM, &stop_server);
-
/* main loop */
while (1) {
- conn = accept_incoming_connection (sock);
- if (conn == INVALID_SOCKET) {
+ if (accept_incoming_connection () == 0) {
usleep (1e5);
continue;
}
unsigned char *data = {0};
- int len = receive_data (conn, &data);
+ int len = receive_data (&data);
if (len == 0) {
VERBOSE (WARNING, PRINT ("Connection closed by peer (rx)\n"));
} else if (len < 0) {
VERBOSE (DEBUG, PRINT ("Processing %s\n", data));
len = processing (data, len, &data);
- int rc = send_data (conn, data, len);
+ int rc = send_data (data, len);
if (rc == 0) {
VERBOSE (WARNING, PRINT ("Connection closed by peer (tx)\n"));
} else if (rc < 0) {
if (data) {
free (data);
}
- close_socket (conn);
- conn = INVALID_SOCKET;
+ close_connection ();
}
VERBOSE (DEBUG, PRINT ("Closing socket\n"));
- close_socket (sock);
terminate_network_context ();
return 2;
// test: webserver.exe -v 2>&1 | grep -q 'missing verbose level'
// test: webserver.exe -p 2>&1 | grep -q 'missing port number'
// test: webserver.exe -p -1 2>&1 | grep -q 'incorrect port number'
-// test: webserver.exe > test.log & pid=$!; sleep 1; kill -9 $pid; grep -q 'Listening socket on port 8080' test.log
-// test: webserver.exe -p 8000 > test.log & pid=$!; sleep 1; kill -9 $pid; grep -q 'Listening socket on port 8000' test.log
+// test: webserver.exe > test.log & pid=$!; sleep 1; kill -QUIT $pid; grep -q 'Listening socket on port 8080' test.log
+// test: webserver.exe -p 8000 > test.log & pid=$!; sleep 1; kill -ABRT $pid; grep -q 'Listening socket on port 8000' test.log
// test: webserver.exe & pid=$!; sleep 1; kill -TERM $pid; ps aux | grep -q [w]ebserver.exe && kill -9 $pid || rc=1; test x$rc = x1
/* vim: set ts=4 sw=4 et: */
Soft'N'Design Software / projects / webserver.git / commitdiff
