forked from Telodendria/Telodendria
Fix compile error in Tls, work on getting certs and keys into HttpServer.
This commit is contained in:
parent
bdaea9872e
commit
8782aa046d
2 changed files with 5 additions and 2 deletions
|
@ -53,6 +53,8 @@ struct HttpServer
|
||||||
unsigned int maxConnections;
|
unsigned int maxConnections;
|
||||||
pthread_t socketThread;
|
pthread_t socketThread;
|
||||||
int flags;
|
int flags;
|
||||||
|
char *tlsCrt;
|
||||||
|
char *tlsKey;
|
||||||
|
|
||||||
volatile unsigned int stop:1;
|
volatile unsigned int stop:1;
|
||||||
volatile unsigned int isRunning:1;
|
volatile unsigned int isRunning:1;
|
||||||
|
@ -646,8 +648,7 @@ HttpServerEventThread(void *args)
|
||||||
#ifdef TLS_IMPL
|
#ifdef TLS_IMPL
|
||||||
if (server->flags & HTTP_FLAG_TLS)
|
if (server->flags & HTTP_FLAG_TLS)
|
||||||
{
|
{
|
||||||
/* TODO: Get server cert and key in here */
|
fp = TlsServerStream(connFd, server->tlsCrt, server->tlsKey);
|
||||||
fp = TlsServerStream(connFd, NULL, NULL);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
#ifndef TELODENDRIA_TLS_H
|
||||||
|
#define TELODENDRIA_TLS_H
|
||||||
|
|
||||||
#include <Stream.h>
|
#include <Stream.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue