mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-27 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

test_upgrade: added detailed error reporting and add some check for return values

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2022-01-13 22:16:19 +03:00
parent b09dc37301
commit 376afc84c2
1 changed files with 262 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/test_upgrade.c
+262 -57
View File
@@ -59,6 +59,110 @@
#endif /* HAVE_FORK && HAVE_WAITPID */
#endif /* HTTPS_SUPPORT */
_MHD_NORETURN static void
_externalErrorExit_func (const char *errDesc, const char *funcName, int lineNum)
{
fflush (stdout);
if ((NULL != errDesc) && (0 != errDesc[0]))
fprintf (stderr, "%s", errDesc);
else
fprintf (stderr, "System or external library call failed");
if ((NULL != funcName) && (0 != funcName[0]))
fprintf (stderr, " in %s", funcName);
if (0 < lineNum)
fprintf (stderr, " at line %d", lineNum);
fprintf (stderr, ".\nLast errno value: %d (%s)\n", (int) errno,
strerror (errno));
#ifdef MHD_WINSOCK_SOCKETS
fprintf (stderr, "WSAGetLastError() value: %d\n", (int) WSAGetLastError ());
#endif /* MHD_WINSOCK_SOCKETS */
fflush (stderr);
exit (99);
}
_MHD_NORETURN static void
_mhdErrorExit_func (const char *errDesc, const char *funcName, int lineNum)
{
fflush (stdout);
if ((NULL != errDesc) && (0 != errDesc[0]))
fprintf (stderr, "%s", errDesc);
else
fprintf (stderr, "MHD unexpected error");
if ((NULL != funcName) && (0 != funcName[0]))
fprintf (stderr, " in %s", funcName);
if (0 < lineNum)
fprintf (stderr, " at line %d", lineNum);
fprintf (stderr, ".\nLast errno value: %d (%s)\n", (int) errno,
strerror (errno));
fflush (stderr);
exit (8);
}
static void
_testErrorLog_func (const char *errDesc, const char *funcName, int lineNum)
{
fflush (stdout);
if ((NULL != errDesc) && (0 != errDesc[0]))
fprintf (stderr, "%s", errDesc);
else
fprintf (stderr, "System or external library call resulted in error");
if ((NULL != funcName) && (0 != funcName[0]))
fprintf (stderr, " in %s", funcName);
if (0 < lineNum)
fprintf (stderr, " at line %d", lineNum);
fprintf (stderr, ".\nLast errno value: %d (%s)\n", (int) errno,
strerror (errno));
#ifdef MHD_WINSOCK_SOCKETS
fprintf (stderr, "WSAGetLastError() value: %d\n", (int) WSAGetLastError ());
#endif /* MHD_WINSOCK_SOCKETS */
fflush (stderr);
}
#if defined(HAVE___FUNC__)
#define externalErrorExit(ignore) \
_externalErrorExit_func(NULL, __func__, __LINE__)
#define externalErrorExitDesc(errDesc) \
_externalErrorExit_func(errDesc, __func__, __LINE__)
#define mhdErrorExit(ignore) \
_mhdErrorExit_func(NULL, __func__, __LINE__)
#define mhdErrorExitDesc(errDesc) \
_mhdErrorExit_func(errDesc, __func__, __LINE__)
#define testErrorLog(ignore) \
_testErrorLog_func(NULL, __func__, __LINE__)
#define testErrorLogDesc(errDesc) \
_testErrorLog_func(errDesc, __func__, __LINE__)
#elif defined(HAVE___FUNCTION__)
#define externalErrorExit(ignore) \
_externalErrorExit_func(NULL, __FUNCTION__, __LINE__)
#define externalErrorExitDesc(errDesc) \
_externalErrorExit_func(errDesc, __FUNCTION__, __LINE__)
#define mhdErrorExit(ignore) \
_mhdErrorExit_func(NULL, __FUNCTION__, __LINE__)
#define mhdErrorExitDesc(errDesc) \
_mhdErrorExit_func(errDesc, __FUNCTION__, __LINE__)
#define testErrorLog(ignore) \
_testErrorLog_func(NULL, __FUNCTION__, __LINE__)
#define testErrorLogDesc(errDesc) \
_testErrorLog_func(errDesc, __FUNCTION__, __LINE__)
#else
#define externalErrorExit(ignore) _externalErrorExit_func(NULL, NULL, __LINE__)
#define externalErrorExitDesc(errDesc) \
_externalErrorExit_func(errDesc, NULL, __LINE__)
#define mhdErrorExit(ignore) _mhdErrorExit_func(NULL, NULL, __LINE__)
#define mhdErrorExitDesc(errDesc) _mhdErrorExit_func(errDesc, NULL, __LINE__)
#define testErrorLog(ignore) _testErrorLog_func(NULL, NULL, __LINE__)
#define testErrorLogDesc(errDesc) _testErrorLog_func(errDesc, NULL, __LINE__)
#endif
static int verbose = 0;
enum tls_tool
@@ -198,11 +302,15 @@ wr_create_plain_sckt (void)
{
struct wr_socket *s = malloc (sizeof(struct wr_socket));
if (NULL == s)
{
testErrorLogDesc ("malloc() failed");
return NULL;
}
s->t = wr_plain;
s->fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (MHD_INVALID_SOCKET != s->fd)
return s;
return s; /* Success */
testErrorLogDesc ("socket() failed");
free (s);
return NULL;
}
@@ -218,7 +326,10 @@ wr_create_tls_sckt (void)
#ifdef HTTPS_SUPPORT
struct wr_socket *s = malloc (sizeof(struct wr_socket));
if (NULL == s)
{
testErrorLogDesc ("malloc() failed");
return NULL;
}
s->t = wr_tls;
s->tls_connected = 0;
s->fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -243,13 +354,23 @@ wr_create_tls_sckt (void)
#endif /* GnuTLS before 3.1.9 or Win x64 */
return s;
}
else
testErrorLogDesc ("gnutls_credentials_set() failed");
gnutls_certificate_free_credentials (s->tls_crd);
}
else
testErrorLogDesc ("gnutls_certificate_allocate_credentials() failed");
}
else
testErrorLogDesc ("gnutls_set_default_priority() failed");
gnutls_deinit (s->tls_s);
}
else
testErrorLogDesc ("gnutls_init() failed");
(void) MHD_socket_close_ (s->fd);
}
else
testErrorLogDesc ("socket() failed");
free (s);
#endif /* HTTPS_SUPPORT */
return NULL;
@@ -268,7 +389,10 @@ wr_create_from_plain_sckt (MHD_socket plain_sk)
struct wr_socket *s = malloc (sizeof(struct wr_socket));
if (NULL == s)
{
testErrorLogDesc ("malloc() failed");
return NULL;
}
s->t = wr_plain;
s->fd = plain_sk;
return s;
@@ -288,7 +412,10 @@ wr_connect (struct wr_socket *s,
int length)
{
if (0 != connect (s->fd, addr, length))
{
testErrorLogDesc ("connect() failed");
return -1;
}
if (wr_plain == s->t)
return 0;
#ifdef HTTPS_SUPPORT
@@ -303,6 +430,8 @@ wr_connect (struct wr_socket *s,
return 0;
}
#endif /* HTTPS_SUPPORT */
testErrorLogDesc ("HTTPS socket connect called, but code does not support" \
" HTTPS sockets");
return -1;
}
@@ -318,7 +447,10 @@ wr_handshake (struct wr_socket *s)
else if (GNUTLS_E_AGAIN == res)
MHD_socket_set_error_ (MHD_SCKT_EAGAIN_);
else
{
testErrorLogDesc ("gnutls_handshake() failed with hard error");
MHD_socket_set_error_ (MHD_SCKT_ECONNABORTED_); /* hard error */
}
return s->tls_connected;
}
@@ -355,9 +487,15 @@ wr_send (struct wr_socket *s,
if (GNUTLS_E_AGAIN == ret)
MHD_socket_set_error_ (MHD_SCKT_EAGAIN_);
else
{
testErrorLogDesc ("gnutls_record_send() failed with hard error");
MHD_socket_set_error_ (MHD_SCKT_ECONNABORTED_); /* hard error */
return -1;
}
}
#endif /* HTTPS_SUPPORT */
testErrorLogDesc ("HTTPS socket send called, but code does not support" \
" HTTPS sockets");
return -1;
}
@@ -391,7 +529,11 @@ wr_recv (struct wr_socket *s,
if (GNUTLS_E_AGAIN == ret)
MHD_socket_set_error_ (MHD_SCKT_EAGAIN_);
else
{
testErrorLogDesc ("gnutls_record_recv() failed with hard error");
MHD_socket_set_error_ (MHD_SCKT_ECONNABORTED_); /* hard error */
return -1;
}
}
#endif /* HTTPS_SUPPORT */
return -1;
@@ -440,6 +582,32 @@ static pthread_t pt_client;
static volatile bool done;
const char *
term_reason_str (enum MHD_RequestTerminationCode term_code)
{
switch ((int) term_code)
{
case MHD_REQUEST_TERMINATED_COMPLETED_OK:
return "COMPLETED_OK";
case MHD_REQUEST_TERMINATED_WITH_ERROR:
return "TERMINATED_WITH_ERROR";
case MHD_REQUEST_TERMINATED_TIMEOUT_REACHED:
return "TIMEOUT_REACHED";
case MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN:
return "DAEMON_SHUTDOWN";
case MHD_REQUEST_TERMINATED_READ_ERROR:
return "READ_ERROR";
case MHD_REQUEST_TERMINATED_CLIENT_ABORT:
return "CLIENT_ABORT";
case -1:
return "(not called)";
default:
return "(unknown code)";
}
return "(problem)"; /* unreachable */
}
/**
* Callback used by MHD to notify the application about completed
* requests. Frees memory.
@@ -456,19 +624,23 @@ notify_completed_cb (void *cls,
void **con_cls,
enum MHD_RequestTerminationCode toe)
{
pthread_t *ppth = *con_cls;
(void) cls;
(void) connection; /* Unused. Silent compiler warning. */
if (verbose)
printf ("notify_completed_cb() has been called with '%s' code.\n",
term_reason_str (toe));
if ( (toe != MHD_REQUEST_TERMINATED_COMPLETED_OK) &&
(toe != MHD_REQUEST_TERMINATED_CLIENT_ABORT) &&
(toe != MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN) )
abort ();
mhdErrorExitDesc ("notify_completed_cb() called with wrong code");
if (NULL == con_cls)
mhdErrorExitDesc ("'con_cls' parameter is NULL");
if (NULL == *con_cls)
mhdErrorExitDesc ("'*con_cls' pointer is NULL");
if (! pthread_equal (**((pthread_t **) con_cls),
pthread_self ()))
abort ();
if (NULL != ppth)
free (*con_cls);
mhdErrorExitDesc ("notify_completed_cb() is called in wrong thread");
free (*con_cls);
*con_cls = NULL;
}
@@ -490,12 +662,16 @@ log_cb (void *cls,
(void) cls;
(void) connection; /* Unused. Silent compiler warning. */
if (0 != strcmp (uri,
"/"))
abort ();
if (NULL == uri)
mhdErrorExitDesc ("The 'uri' parameter is NULL");
if (0 != strcmp (uri, "/"))
{
fprintf (stderr, "Wrong 'uri' value: '%s'. ", uri);
mhdErrorExit ();
}
ppth = malloc (sizeof (pthread_t));
if (NULL == ppth)
abort ();
externalErrorExitDesc ("malloc() failed");
*ppth = pthread_self ();
return (void *) ppth;
}
@@ -534,15 +710,15 @@ notify_connection_cb (void *cls,
{
case MHD_CONNECTION_NOTIFY_STARTED:
if (MHD_NO != started)
abort ();
mhdErrorExitDesc ("The connection has been already started");
started = MHD_YES;
*socket_context = &started;
break;
case MHD_CONNECTION_NOTIFY_CLOSED:
if (MHD_YES != started)
abort ();
mhdErrorExitDesc ("The connection has not been started before");
if (&started != *socket_context)
abort ();
mhdErrorExitDesc ("Wrong '*socket_context' value");
*socket_context = NULL;
started = MHD_NO;
break;
@@ -563,15 +739,15 @@ make_blocking (MHD_socket fd)
flags = fcntl (fd, F_GETFL);
if (-1 == flags)
abort ();
externalErrorExitDesc ("fcntl() failed");
if ((flags & ~O_NONBLOCK) != flags)
if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK))
abort ();
externalErrorExitDesc ("fcntl() failed");
#elif defined(MHD_WINSOCK_SOCKETS)
unsigned long flags = 0;
if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
abort ();
externalErrorExitDesc ("ioctlsocket() failed");
#endif /* MHD_WINSOCK_SOCKETS */
}
@@ -598,7 +774,7 @@ send_all (struct wr_socket *sock,
ret = 0;
continue;
}
abort ();
externalErrorExitDesc ("send() failed");
}
}
}
@@ -628,10 +804,10 @@ recv_hdr (struct wr_socket *sock)
{
if (MHD_SCKT_ERR_IS_EAGAIN_ (MHD_socket_get_error_ ()))
continue;
abort ();
externalErrorExitDesc ("recv() failed");
}
if (0 == ret)
continue;
continue; /* TODO: replace with error exit! */
if (c == next)
{
i++;
@@ -675,11 +851,15 @@ recv_all (struct wr_socket *sock,
ret = 0;
continue;
}
abort ();
externalErrorExitDesc ("recv() failed");
}
}
if (0 != strncmp (text, buf, len))
abort ();
{
fprintf (stderr, "Wrong received text. Expected: '%s' ."
"Got: '%.*s'. ", text, (int) len, buf);
mhdErrorExit ();
}
}
@@ -794,12 +974,12 @@ upgrade_cb (void *cls,
usock = wr_create_from_plain_sckt (sock);
if (0 != extra_in_size)
abort ();
mhdErrorExitDesc ("'extra_in_size' is not zero");
if (0 != pthread_create (&pt,
NULL,
&run_usock,
urh))
abort ();
externalErrorExitDesc ("pthread_create() failed");
}
@@ -853,7 +1033,6 @@ ahc_upgrade (void *cls,
void **con_cls)
{
struct MHD_Response *resp;
enum MHD_Result ret;
(void) cls;
(void) url;
(void) method; /* Unused. Silent compiler warning. */
@@ -861,20 +1040,26 @@ ahc_upgrade (void *cls,
(void) upload_data;
(void) upload_data_size; /* Unused. Silent compiler warning. */
if (NULL == con_cls)
mhdErrorExitDesc ("'con_cls' is NULL");
if (NULL == *con_cls)
abort ();
mhdErrorExitDesc ("'*con_cls' value is NULL");
if (! pthread_equal (**((pthread_t **) con_cls), pthread_self ()))
abort ();
mhdErrorExitDesc ("ahc_upgrade() is called in wrong thread");
resp = MHD_create_response_for_upgrade (&upgrade_cb,
NULL);
MHD_add_response_header (resp,
MHD_HTTP_HEADER_UPGRADE,
"Hello World Protocol");
ret = MHD_queue_response (connection,
MHD_HTTP_SWITCHING_PROTOCOLS,
resp);
if (NULL == resp)
mhdErrorExitDesc ("MHD_create_response_for_upgrade() failed");
if (MHD_YES != MHD_add_response_header (resp,
MHD_HTTP_HEADER_UPGRADE,
"Hello World Protocol"))
mhdErrorExitDesc ("MHD_add_response_header() failed");
if (MHD_YES != MHD_queue_response (connection,
MHD_HTTP_SWITCHING_PROTOCOLS,
resp))
mhdErrorExitDesc ("MHD_queue_response() failed");
MHD_destroy_response (resp);
return ret;
return MHD_YES;
}
@@ -907,7 +1092,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
&ws,
&es,
&max_fd))
abort ();
mhdErrorExitDesc ("MHD_get_fdset() failed");
(void) MHD_get_timeout (daemon,
&to);
if (1000 < to)
@@ -919,7 +1104,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
&ws,
&es,
&tv))
abort ();
mhdErrorExitDesc ("MHD_get_fdset() failed"); /* TODO: handle errors */
MHD_run_from_select (daemon,
&rs,
&ws,
@@ -939,7 +1124,7 @@ static void
run_mhd_poll_loop (struct MHD_Daemon *daemon)
{
(void) daemon; /* Unused. Silent compiler warning. */
abort (); /* currently not implementable with existing MHD API */
externalErrorExitDesc ("Not implementable with MHD API");
}
@@ -964,6 +1149,8 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
di = MHD_get_daemon_info (daemon,
MHD_DAEMON_INFO_EPOLL_FD);
if (NULL == di)
mhdErrorExitDesc ("MHD_get_daemon_info() failed");
ep = di->listen_fd;
while (! done)
{
@@ -985,7 +1172,7 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
if ( (-1 == ret) &&
(EAGAIN != errno) &&
(EINTR != errno) )
abort ();
mhdErrorExitDesc ("MHD_get_fdset() failed"); /* TODO: handle errors */
MHD_run (daemon);
}
}
@@ -1074,28 +1261,28 @@ test_upgrade (int flags,
MHD_OPTION_END);
#endif /* HTTPS_SUPPORT */
if (NULL == d)
return 2;
mhdErrorExitDesc ("MHD_start_daemon() failed");
real_flags = MHD_get_daemon_info (d,
MHD_DAEMON_INFO_FLAGS);
if (NULL == real_flags)
abort ();
mhdErrorExitDesc ("MHD_get_daemon_info() failed");
dinfo = MHD_get_daemon_info (d,
MHD_DAEMON_INFO_BIND_PORT);
if ( (NULL == dinfo) ||
(0 == dinfo->port) )
abort ();
mhdErrorExitDesc ("MHD_get_daemon_info() failed");
if (! test_tls || (TLS_LIB_GNUTLS == use_tls_tool))
{
sock = test_tls ? wr_create_tls_sckt () : wr_create_plain_sckt ();
if (NULL == sock)
abort ();
externalErrorExitDesc ("Create socket failed");
sa.sin_family = AF_INET;
sa.sin_port = htons (dinfo->port);
sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
if (0 != wr_connect (sock,
(struct sockaddr *) &sa,
sizeof (sa)))
abort ();
externalErrorExitDesc ("Connect socket failed");
}
else
{
@@ -1109,16 +1296,13 @@ test_upgrade (int flags,
sizeof (port));
if (-1 == (pid = gnutlscli_connect (&tls_fork_sock,
port)))
{
MHD_stop_daemon (d);
return 4;
}
externalErrorExitDesc ("gnutlscli_connect() failed");
sock = wr_create_from_plain_sckt (tls_fork_sock);
if (NULL == sock)
abort ();
externalErrorExitDesc ("wr_create_from_plain_sckt() failed");
#else /* !HTTPS_SUPPORT || !HAVE_FORK || !HAVE_WAITPID */
abort ();
externalErrorExitDesc ("Unsupported 'use_tls_tool' value");
#endif /* !HTTPS_SUPPORT || !HAVE_FORK || !HAVE_WAITPID */
}
@@ -1126,7 +1310,7 @@ test_upgrade (int flags,
NULL,
&run_usock_client,
sock))
abort ();
externalErrorExitDesc ("pthread_create() failed");
if (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD) )
{
enum MHD_FLAG used_flags;
@@ -1137,13 +1321,18 @@ test_upgrade (int flags,
sizeof (used_flags));
run_mhd_loop (d, used_flags);
}
pthread_join (pt_client,
NULL);
pthread_join (pt,
NULL);
if (0 != pthread_join (pt_client,
NULL))
externalErrorExitDesc ("pthread_join() failed");
if (0 != pthread_join (pt,
NULL))
externalErrorExitDesc ("pthread_join() failed");
#if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
if (test_tls && (TLS_LIB_GNUTLS != use_tls_tool))
waitpid (pid, NULL, 0);
{
if ((pid_t) -1 == waitpid (pid, NULL, 0))
externalErrorExitDesc ("waitpid() failed");
}
#endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
MHD_stop_daemon (d);
return 0;
@@ -1196,12 +1385,12 @@ main (int argc,
printf ("GnuTLS library will be used for testing.\n");
break;
default:
abort ();
externalErrorExitDesc ("Wrong 'use_tls_tool' value");
}
}
if ( (TLS_LIB_GNUTLS == use_tls_tool) &&
(GNUTLS_E_SUCCESS != gnutls_global_init ()) )
abort ();
externalErrorExitDesc ("gnutls_global_init() failed");
#else /* ! HTTPS_SUPPORT */
fprintf (stderr, "HTTPS support was disabled by configure.\n");
@@ -1285,6 +1474,8 @@ main (int argc,
/* Test different event loops, with and without thread pool */
res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD,
0);
fflush (stderr);
fflush (stdout);
error_count += res;
if (res)
fprintf (stderr,
@@ -1294,6 +1485,8 @@ main (int argc,
printf ("PASSED: Upgrade with internal select.\n");
res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD,
2);
fflush (stderr);
fflush (stdout);
error_count += res;
if (res)
fprintf (stderr,
@@ -1303,6 +1496,8 @@ main (int argc,
printf ("PASSED: Upgrade with internal select with thread pool.\n");
res = test_upgrade (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD,
0);
fflush (stderr);
fflush (stdout);
error_count += res;
if (res)
fprintf (stderr,
@@ -1312,6 +1507,8 @@ main (int argc,
printf ("PASSED: Upgrade with internal 'auto'.\n");
res = test_upgrade (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD,
2);
fflush (stderr);
fflush (stdout);
error_count += res;
if (res)
fprintf (stderr,
@@ -1322,6 +1519,8 @@ main (int argc,
#ifdef HAVE_POLL
res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD,
0);
fflush (stderr);
fflush (stdout);
error_count += res;
if (res)
fprintf (stderr,
@@ -1331,6 +1530,8 @@ main (int argc,
printf ("PASSED: Upgrade with internal poll.\n");
res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD,
2);
fflush (stderr);
fflush (stdout);
if (res)
fprintf (stderr,
"FAILED: Upgrade with internal poll with thread pool, return code %d.\n",
@@ -1341,6 +1542,8 @@ main (int argc,
#ifdef EPOLL_SUPPORT
res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD,
0);
fflush (stderr);
fflush (stdout);
if (res)
fprintf (stderr,
"FAILED: Upgrade with internal epoll, return code %d.\n",
@@ -1349,6 +1552,8 @@ main (int argc,
printf ("PASSED: Upgrade with internal epoll.\n");
res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD,
2);
fflush (stderr);
fflush (stdout);
if (res)
fprintf (stderr,
"FAILED: Upgrade with internal epoll, return code %d.\n",