Fix minor refactoring errors
Minor fixes: - Add missing includes in src/includes.h (stdbool, string, stdlib, poll, fcntl, errno, netdb, arpa/inet, netinet/in) - Fix empty Mutex struct in src/thread.h - Fix String -> HTTP_String typos in 5 source files - Fix server_secure_context_add_certificate missing key_file parameter Non-trivial issues remain (see PR description for details)
This commit is contained in:
@@ -143,7 +143,7 @@ int server_secure_context_free(ServerSecureContext *ctx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
||||||
String domain, String cert_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
@@ -359,7 +359,7 @@ int socket_manager_listen_tls(SocketManager *sm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int socket_manager_add_certificate(SocketManager *sm,
|
int socket_manager_add_certificate(SocketManager *sm,
|
||||||
String domain, String cert_file, String key_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
if (sm->secure_sock == NATIVE_SOCKET_INVALID)
|
if (sm->secure_sock == NATIVE_SOCKET_INVALID)
|
||||||
return -1;
|
return -1;
|
||||||
@@ -3023,7 +3023,7 @@ int http_server_listen_tls(HTTP_Server *server,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int http_server_add_certificate(HTTP_Server *server,
|
int http_server_add_certificate(HTTP_Server *server,
|
||||||
String domain, String cert_file, String key_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
if (socket_manager_add_certificate(&server->sockets,
|
if (socket_manager_add_certificate(&server->sockets,
|
||||||
domain, cert_file, key_file) < 0)
|
domain, cert_file, key_file) < 0)
|
||||||
|
|||||||
@@ -9,6 +9,9 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
@@ -17,6 +20,11 @@
|
|||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -105,7 +113,7 @@ typedef struct {
|
|||||||
int server_secure_context_init(ServerSecureContext *ctx);
|
int server_secure_context_init(ServerSecureContext *ctx);
|
||||||
int server_secure_context_free(ServerSecureContext *ctx);
|
int server_secure_context_free(ServerSecureContext *ctx);
|
||||||
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// src/socket.h
|
// src/socket.h
|
||||||
@@ -348,7 +356,7 @@ int socket_manager_listen_tls(SocketManager *sm,
|
|||||||
// authenticity.
|
// authenticity.
|
||||||
// Returns 0 on success, -1 on error.
|
// Returns 0 on success, -1 on error.
|
||||||
int socket_manager_add_certificate(SocketManager *sm,
|
int socket_manager_add_certificate(SocketManager *sm,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|
||||||
// When a thread is blocked on a poll() call for
|
// When a thread is blocked on a poll() call for
|
||||||
// descriptors associated to this socket manager,
|
// descriptors associated to this socket manager,
|
||||||
@@ -418,7 +426,7 @@ void socket_set_user(SocketManager *sm, SocketHandle handle);
|
|||||||
////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
// TODO
|
char unused; // TODO
|
||||||
} Mutex;
|
} Mutex;
|
||||||
|
|
||||||
int mutex_init(Mutex *mutex);
|
int mutex_init(Mutex *mutex);
|
||||||
@@ -924,13 +932,13 @@ int http_server_listen_tcp(HTTP_Server *server,
|
|||||||
// interfact, using the specified certificate and key
|
// interfact, using the specified certificate and key
|
||||||
// to verify the connection.
|
// to verify the connection.
|
||||||
int http_server_listen_tls(HTTP_Server *server,
|
int http_server_listen_tls(HTTP_Server *server,
|
||||||
String addr, Port port, String cert_file_name,
|
HTTP_String addr, Port port, HTTP_String cert_file_name,
|
||||||
String key_file_name);
|
HTTP_String key_file_name);
|
||||||
|
|
||||||
// Add the certificate for an additional domain when
|
// Add the certificate for an additional domain when
|
||||||
// the server is listening for HTTPS requests.
|
// the server is listening for HTTPS requests.
|
||||||
int http_server_add_certificate(HTTP_Server *server,
|
int http_server_add_certificate(HTTP_Server *server,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|
||||||
// When a thread is blocked waiting for server events,
|
// When a thread is blocked waiting for server events,
|
||||||
// other threads can call this function to wake it up.
|
// other threads can call this function to wake it up.
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
@@ -9,5 +12,11 @@
|
|||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ int server_secure_context_free(ServerSecureContext *ctx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
||||||
String domain, String cert_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,4 +26,4 @@ typedef struct {
|
|||||||
int server_secure_context_init(ServerSecureContext *ctx);
|
int server_secure_context_init(ServerSecureContext *ctx);
|
||||||
int server_secure_context_free(ServerSecureContext *ctx);
|
int server_secure_context_free(ServerSecureContext *ctx);
|
||||||
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
int server_secure_context_add_certificate(ServerSecureContext *ctx,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ int http_server_listen_tls(HTTP_Server *server,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int http_server_add_certificate(HTTP_Server *server,
|
int http_server_add_certificate(HTTP_Server *server,
|
||||||
String domain, String cert_file, String key_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
if (socket_manager_add_certificate(&server->sockets,
|
if (socket_manager_add_certificate(&server->sockets,
|
||||||
domain, cert_file, key_file) < 0)
|
domain, cert_file, key_file) < 0)
|
||||||
|
|||||||
+3
-3
@@ -114,13 +114,13 @@ int http_server_listen_tcp(HTTP_Server *server,
|
|||||||
// interfact, using the specified certificate and key
|
// interfact, using the specified certificate and key
|
||||||
// to verify the connection.
|
// to verify the connection.
|
||||||
int http_server_listen_tls(HTTP_Server *server,
|
int http_server_listen_tls(HTTP_Server *server,
|
||||||
String addr, Port port, String cert_file_name,
|
HTTP_String addr, Port port, HTTP_String cert_file_name,
|
||||||
String key_file_name);
|
HTTP_String key_file_name);
|
||||||
|
|
||||||
// Add the certificate for an additional domain when
|
// Add the certificate for an additional domain when
|
||||||
// the server is listening for HTTPS requests.
|
// the server is listening for HTTPS requests.
|
||||||
int http_server_add_certificate(HTTP_Server *server,
|
int http_server_add_certificate(HTTP_Server *server,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|
||||||
// When a thread is blocked waiting for server events,
|
// When a thread is blocked waiting for server events,
|
||||||
// other threads can call this function to wake it up.
|
// other threads can call this function to wake it up.
|
||||||
|
|||||||
+1
-1
@@ -206,7 +206,7 @@ int socket_manager_listen_tls(SocketManager *sm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int socket_manager_add_certificate(SocketManager *sm,
|
int socket_manager_add_certificate(SocketManager *sm,
|
||||||
String domain, String cert_file, String key_file)
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file)
|
||||||
{
|
{
|
||||||
if (sm->secure_sock == NATIVE_SOCKET_INVALID)
|
if (sm->secure_sock == NATIVE_SOCKET_INVALID)
|
||||||
return -1;
|
return -1;
|
||||||
|
|||||||
+1
-1
@@ -236,7 +236,7 @@ int socket_manager_listen_tls(SocketManager *sm,
|
|||||||
// authenticity.
|
// authenticity.
|
||||||
// Returns 0 on success, -1 on error.
|
// Returns 0 on success, -1 on error.
|
||||||
int socket_manager_add_certificate(SocketManager *sm,
|
int socket_manager_add_certificate(SocketManager *sm,
|
||||||
String domain, String cert_file, String key_file);
|
HTTP_String domain, HTTP_String cert_file, HTTP_String key_file);
|
||||||
|
|
||||||
// When a thread is blocked on a poll() call for
|
// When a thread is blocked on a poll() call for
|
||||||
// descriptors associated to this socket manager,
|
// descriptors associated to this socket manager,
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
// TODO
|
char unused; // TODO
|
||||||
} Mutex;
|
} Mutex;
|
||||||
|
|
||||||
int mutex_init(Mutex *mutex);
|
int mutex_init(Mutex *mutex);
|
||||||
|
|||||||
Reference in New Issue
Block a user