Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Bdd/Targets/Common/BddTargetTlsSender_MbedTls_FreeRtosTcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "BddTargetMtlsConfig.h"
#include "BddTargetSwitchConfig.h"
#include "BddTargetTlsConfig.h"
#include "SolidSyslogFreeRtosAddress.h"
#include "SolidSyslogFreeRtosTcpStream.h"
#include "SolidSyslogMbedTlsStream.h"
#include "SolidSyslogNullSender.h"
Expand Down Expand Up @@ -55,6 +56,7 @@ struct SolidSyslogResolver;

static struct SolidSyslogStream* underlyingStream;
static struct SolidSyslogStream* tlsStream;
static struct SolidSyslogAddress* address;
static struct SolidSyslogSender* sender;

/* Entropy + CTR_DRBG live for the lifetime of the BDD target; one-shot init
Expand Down Expand Up @@ -376,10 +378,13 @@ struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver*
tlsStreamConfig.ClientKey = &clientKey;
tlsStream = SolidSyslogMbedTlsStream_Create(&tlsStreamConfig);

address = SolidSyslogFreeRtosAddress_Create();

static struct SolidSyslogStreamSenderConfig senderConfig;
senderConfig = (struct SolidSyslogStreamSenderConfig) {0};
senderConfig.Resolver = resolver;
senderConfig.Stream = tlsStream;
senderConfig.Address = address;
senderConfig.Endpoint = DispatchEndpoint;
senderConfig.EndpointVersion = DispatchEndpointVersion;
sender = SolidSyslogStreamSender_Create(&senderConfig);
Expand All @@ -398,6 +403,7 @@ void BddTargetTlsSender_Destroy(void)
return;
}
SolidSyslogStreamSender_Destroy(sender);
SolidSyslogFreeRtosAddress_Destroy(address);
SolidSyslogMbedTlsStream_Destroy(tlsStream);
SolidSyslogFreeRtosTcpStream_Destroy(underlyingStream);

Expand Down
6 changes: 6 additions & 0 deletions Bdd/Targets/Common/BddTargetTlsSender_OpenSsl_PosixTcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "BddTargetMtlsConfig.h"
#include "BddTargetTlsConfig.h"
#include "BddTargetTlsSender.h"
#include "SolidSyslogPosixAddress.h"
#include "SolidSyslogPosixSleep.h"
#include "SolidSyslogPosixTcpStream.h"
#include "SolidSyslogStreamSender.h"
Expand All @@ -13,6 +14,7 @@ struct SolidSyslogResolver;
static struct SolidSyslogStream* underlyingStream;

static struct SolidSyslogStream* tlsStream;
static struct SolidSyslogAddress* address;
static struct SolidSyslogSender* sender;

struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver* resolver, bool mtls)
Expand All @@ -37,10 +39,13 @@ struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver*
}
tlsStream = SolidSyslogTlsStream_Create(&tlsStreamConfig);

address = SolidSyslogPosixAddress_Create();

static struct SolidSyslogStreamSenderConfig senderConfig;
senderConfig = (struct SolidSyslogStreamSenderConfig) {0};
senderConfig.Resolver = resolver;
senderConfig.Stream = tlsStream;
senderConfig.Address = address;
senderConfig.Endpoint = mtls ? BddTargetMtlsConfig_GetEndpoint : BddTargetTlsConfig_GetEndpoint;
senderConfig.EndpointVersion =
mtls ? BddTargetMtlsConfig_GetEndpointVersion : BddTargetTlsConfig_GetEndpointVersion;
Expand All @@ -52,6 +57,7 @@ struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver*
void BddTargetTlsSender_Destroy(void)
{
SolidSyslogStreamSender_Destroy(sender);
SolidSyslogPosixAddress_Destroy(address);
SolidSyslogTlsStream_Destroy(tlsStream);
SolidSyslogPosixTcpStream_Destroy(underlyingStream);
}
6 changes: 6 additions & 0 deletions Bdd/Targets/Common/BddTargetTlsSender_OpenSsl_WinsockTcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
#include "SolidSyslogStreamSender.h"
#include "SolidSyslogTlsStream.h"
#include "SolidSyslogWindowsSleep.h"
#include "SolidSyslogWinsockAddress.h"
#include "SolidSyslogWinsockTcpStream.h"

struct SolidSyslogResolver;

static struct SolidSyslogStream* underlyingStream;

static struct SolidSyslogStream* tlsStream;
static struct SolidSyslogAddress* address;
static struct SolidSyslogSender* sender;

struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver* resolver, bool mtls)
Expand All @@ -37,10 +39,13 @@ struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver*
}
tlsStream = SolidSyslogTlsStream_Create(&tlsStreamConfig);

address = SolidSyslogWinsockAddress_Create();

static struct SolidSyslogStreamSenderConfig senderConfig;
senderConfig = (struct SolidSyslogStreamSenderConfig) {0};
senderConfig.Resolver = resolver;
senderConfig.Stream = tlsStream;
senderConfig.Address = address;
senderConfig.Endpoint = mtls ? BddTargetMtlsConfig_GetEndpoint : BddTargetTlsConfig_GetEndpoint;
senderConfig.EndpointVersion =
mtls ? BddTargetMtlsConfig_GetEndpointVersion : BddTargetTlsConfig_GetEndpointVersion;
Expand All @@ -52,6 +57,7 @@ struct SolidSyslogSender* BddTargetTlsSender_Create(struct SolidSyslogResolver*
void BddTargetTlsSender_Destroy(void)
{
SolidSyslogStreamSender_Destroy(sender);
SolidSyslogWinsockAddress_Destroy(address);
SolidSyslogTlsStream_Destroy(tlsStream);
SolidSyslogWinsockTcpStream_Destroy(underlyingStream);
}
7 changes: 4 additions & 3 deletions Bdd/Targets/FreeRtos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ add_executable(SolidSyslogBddTarget
${CMAKE_CURRENT_SOURCE_DIR}/Common/Syscalls.c
${CMAKE_SOURCE_DIR}/Platform/FatFs/Source/SolidSyslogFatFsFile.c
${CMAKE_SOURCE_DIR}/Platform/FatFs/Source/SolidSyslogFatFsFileStatic.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogAddress.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosAddress.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosAddressStatic.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosDatagram.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosDatagramStatic.c
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source/SolidSyslogFreeRtosMutex.c
Expand Down Expand Up @@ -298,10 +299,10 @@ target_include_directories(SolidSyslogBddTarget PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} # FreeRTOSConfig.h, FreeRTOSIPConfig.h
${CMAKE_CURRENT_SOURCE_DIR}/Common # CmsdkUart.h
${CMAKE_SOURCE_DIR}/Core/Interface # SolidSyslog*.h
${CMAKE_SOURCE_DIR}/Core/Source # SolidSyslogAddress.h (consumed by adapters)
${CMAKE_SOURCE_DIR}/Core/Source # internal headers consumed by adapters
${CMAKE_SOURCE_DIR}/Platform/FatFs/Interface # SolidSyslogFatFsFile.h
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Interface # SolidSyslogFreeRtos*.h
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source # SolidSyslogAddressInternal.h
${CMAKE_SOURCE_DIR}/Platform/FreeRtos/Source # SolidSyslogFreeRtosAddressPrivate.h
${CMAKE_SOURCE_DIR}/Platform/MbedTls/Interface # SolidSyslogMbedTlsStream.h
${CMAKE_SOURCE_DIR}/Platform/MbedTls/Source # SolidSyslogMbedTlsStreamPrivate.h
${CMAKE_SOURCE_DIR}/Bdd/Targets/Common # BddTargetInteractive.h
Expand Down
9 changes: 9 additions & 0 deletions Bdd/Targets/FreeRtos/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "SolidSyslogFatFsFile.h"
#include "SolidSyslogFileBlockDevice.h"
#include "SolidSyslogFormatter.h"
#include "SolidSyslogFreeRtosAddress.h"
#include "SolidSyslogFreeRtosDatagram.h"
#include "SolidSyslogFreeRtosMutex.h"
#include "SolidSyslogFreeRtosStaticResolver.h"
Expand Down Expand Up @@ -238,7 +239,9 @@ static struct SolidSyslogStructuredData* originSd = NULL;
* TeardownAll then SemihostingExit). */
static struct SolidSyslogResolver* resolver = NULL;
static struct SolidSyslogDatagram* datagram = NULL;
static struct SolidSyslogAddress* udpAddress = NULL;
static struct SolidSyslogStream* tcpStream = NULL;
static struct SolidSyslogAddress* tcpAddress = NULL;
static struct SolidSyslogSender* tcpSender = NULL;
static struct SolidSyslogSender* tlsSender = NULL;
static struct SolidSyslogSender* udpSender = NULL;
Expand Down Expand Up @@ -700,8 +703,10 @@ static void TeardownAll(void)
BddTargetTlsSender_Destroy();
tlsSender = NULL;
SolidSyslogStreamSender_Destroy(tcpSender);
SolidSyslogFreeRtosAddress_Destroy(tcpAddress);
SolidSyslogFreeRtosTcpStream_Destroy(tcpStream);
SolidSyslogUdpSender_Destroy(udpSender);
SolidSyslogFreeRtosAddress_Destroy(udpAddress);
SolidSyslogFreeRtosDatagram_Destroy(datagram);
SolidSyslogFreeRtosStaticResolver_Destroy(resolver);
}
Expand Down Expand Up @@ -805,10 +810,12 @@ static void InteractiveTask(void* argument)

resolver = SolidSyslogFreeRtosStaticResolver_Create(TEST_DESTINATION_IPV4);
datagram = SolidSyslogFreeRtosDatagram_Create();
udpAddress = SolidSyslogFreeRtosAddress_Create();

struct SolidSyslogUdpSenderConfig udpConfig = {
.Resolver = resolver,
.Datagram = datagram,
.Address = udpAddress,
.Endpoint = GetEndpoint,
.EndpointVersion = GetEndpointVersion,
};
Expand All @@ -819,9 +826,11 @@ static void InteractiveTask(void* argument)
* same host:port for both transports — the syslog-ng config in
* Bdd/syslog-ng/syslog-ng.conf has a TCP listener on 5514 alongside UDP. */
tcpStream = SolidSyslogFreeRtosTcpStream_Create();
tcpAddress = SolidSyslogFreeRtosAddress_Create();
struct SolidSyslogStreamSenderConfig tcpConfig = {
.Resolver = resolver,
.Stream = tcpStream,
.Address = tcpAddress,
.Endpoint = GetEndpoint,
.EndpointVersion = GetEndpointVersion,
};
Expand Down
9 changes: 9 additions & 0 deletions Bdd/Targets/Linux/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "SolidSyslogPosixSleep.h"
#include "SolidSyslogPosixSysUpTime.h"
#include "SolidSyslogGetAddrInfoResolver.h"
#include "SolidSyslogPosixAddress.h"
#include "SolidSyslogPosixDatagram.h"
#include "SolidSyslogPosixTcpStream.h"
#include "SolidSyslogSwitchingSender.h"
Expand All @@ -52,10 +53,12 @@ static const char* const THRESHOLD_MARKER_PATH = "/tmp/solidsyslog_threshold_mar
static struct SolidSyslogFile* storeFile;
static struct SolidSyslogBlockDevice* storeBlockDevice;
static struct SolidSyslogStream* plainTcpStream;
static struct SolidSyslogAddress* plainTcpAddress;
static struct SolidSyslogSender* plainTcpSender;
static struct SolidSyslogSender* udpSender;
static struct SolidSyslogSender* switchingSender;
static struct SolidSyslogDatagram* udpDatagram;
static struct SolidSyslogAddress* udpAddress;
static struct SolidSyslogResolver* sharedResolver;

static void GetTimeQuality(struct SolidSyslogTimeQuality* timeQuality)
Expand Down Expand Up @@ -83,17 +86,21 @@ static struct SolidSyslogSender* CreateSender(const struct BddTargetOptions* opt
struct SolidSyslogResolver* resolver = sharedResolver;

udpDatagram = SolidSyslogPosixDatagram_Create();
udpAddress = SolidSyslogPosixAddress_Create();
static struct SolidSyslogUdpSenderConfig udpConfig = {0};
udpConfig.Resolver = resolver;
udpConfig.Datagram = udpDatagram;
udpConfig.Address = udpAddress;
udpConfig.Endpoint = BddTargetUdpConfig_GetEndpoint;
udpConfig.EndpointVersion = BddTargetUdpConfig_GetEndpointVersion;
udpSender = SolidSyslogUdpSender_Create(&udpConfig);

plainTcpStream = SolidSyslogPosixTcpStream_Create();
plainTcpAddress = SolidSyslogPosixAddress_Create();
static struct SolidSyslogStreamSenderConfig tcpConfig = {0};
tcpConfig.Resolver = resolver;
tcpConfig.Stream = plainTcpStream;
tcpConfig.Address = plainTcpAddress;
tcpConfig.Endpoint = BddTargetTcpConfig_GetEndpoint;
tcpConfig.EndpointVersion = BddTargetTcpConfig_GetEndpointVersion;
plainTcpSender = SolidSyslogStreamSender_Create(&tcpConfig);
Expand Down Expand Up @@ -189,8 +196,10 @@ static void DestroySender(void)
SolidSyslogSwitchingSender_Destroy(switchingSender);
BddTargetTlsSender_Destroy();
SolidSyslogStreamSender_Destroy(plainTcpSender);
SolidSyslogPosixAddress_Destroy(plainTcpAddress);
SolidSyslogPosixTcpStream_Destroy(plainTcpStream);
SolidSyslogUdpSender_Destroy(udpSender);
SolidSyslogPosixAddress_Destroy(udpAddress);
SolidSyslogPosixDatagram_Destroy(udpDatagram);
SolidSyslogGetAddrInfoResolver_Destroy(sharedResolver);
}
Expand Down
9 changes: 9 additions & 0 deletions Bdd/Targets/Windows/BddTargetWindows.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "SolidSyslogWindowsProcessId.h"
#include "SolidSyslogWindowsSleep.h"
#include "SolidSyslogWindowsSysUpTime.h"
#include "SolidSyslogWinsockAddress.h"
#include "SolidSyslogWinsockDatagram.h"
#include "SolidSyslogWinsockResolver.h"
#include "SolidSyslogWinsockTcpStream.h"
Expand Down Expand Up @@ -72,8 +73,10 @@ static struct SolidSyslog* solidSyslog;
teardown can reach them after the SwitchingSender wraps them all. */
static struct SolidSyslogResolver* resolver;
static struct SolidSyslogStream* plainTcpStream;
static struct SolidSyslogAddress* plainTcpAddress;
static struct SolidSyslogSender* plainTcpSender;
static struct SolidSyslogDatagram* udpDatagram;
static struct SolidSyslogAddress* udpAddress;
static struct SolidSyslogSender* udpSender;
static struct SolidSyslogSender* switchingSender;

Expand Down Expand Up @@ -181,17 +184,21 @@ static struct SolidSyslogSender* CreateSender(const struct BddTargetWindowsOptio
resolver = SolidSyslogWinsockResolver_Create();

udpDatagram = SolidSyslogWinsockDatagram_Create();
udpAddress = SolidSyslogWinsockAddress_Create();
static struct SolidSyslogUdpSenderConfig udpConfig = {0};
udpConfig.Resolver = resolver;
udpConfig.Datagram = udpDatagram;
udpConfig.Address = udpAddress;
udpConfig.Endpoint = GetEndpoint;
udpConfig.EndpointVersion = GetEndpointVersion;
udpSender = SolidSyslogUdpSender_Create(&udpConfig);

plainTcpStream = SolidSyslogWinsockTcpStream_Create();
plainTcpAddress = SolidSyslogWinsockAddress_Create();
static struct SolidSyslogStreamSenderConfig tcpConfig = {0};
tcpConfig.Resolver = resolver;
tcpConfig.Stream = plainTcpStream;
tcpConfig.Address = plainTcpAddress;
tcpConfig.Endpoint = GetEndpoint;
tcpConfig.EndpointVersion = GetEndpointVersion;
plainTcpSender = SolidSyslogStreamSender_Create(&tcpConfig);
Expand All @@ -218,8 +225,10 @@ static void DestroySender(void)
SolidSyslogSwitchingSender_Destroy(switchingSender);
BddTargetTlsSender_Destroy();
SolidSyslogStreamSender_Destroy(plainTcpSender);
SolidSyslogWinsockAddress_Destroy(plainTcpAddress);
SolidSyslogWinsockTcpStream_Destroy(plainTcpStream);
SolidSyslogUdpSender_Destroy(udpSender);
SolidSyslogWinsockAddress_Destroy(udpAddress);
SolidSyslogWinsockDatagram_Destroy(udpDatagram);
SolidSyslogWinsockResolver_Destroy(resolver);
}
Expand Down
Loading
Loading