eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

removed unused fields

Browse Source
This commit is contained in:
Robin Müller 2021-03-12 18:20:54 +01:00
parent 2684b0c68e
commit 5eb6b277ba
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osal/windows/TmTcWinUdpBridge.cpp
View File

@ -11,9 +11,8 @@
const std::string TmTcWinUdpBridge::DEFAULT_UDP_SERVER_PORT = "7301"; const std::string TmTcWinUdpBridge::DEFAULT_UDP_SERVER_PORT = "7301";
const std::string TmTcWinUdpBridge::DEFAULT_UDP_CLIENT_PORT = "7302"; const std::string TmTcWinUdpBridge::DEFAULT_UDP_CLIENT_PORT = "7302";
TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId, TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination,
object_id_t tcDestination, object_id_t tmStoreId, object_id_t tcStoreId, object_id_t tmStoreId, object_id_t tcStoreId, std::string udpServerPort):
std::string udpServerPort, std::string udpClientPort):
TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) { TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
if(udpServerPort == "") { if(udpServerPort == "") {
this->udpServerPort = DEFAULT_UDP_SERVER_PORT; this->udpServerPort = DEFAULT_UDP_SERVER_PORT;
@ -21,12 +20,6 @@ TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId,
else { else {
this->udpServerPort = udpServerPort; this->udpServerPort = udpServerPort;
} }
if(udpClientPort == "") {
this->udpClientPort = DEFAULT_UDP_CLIENT_PORT;
}
else {
this->udpClientPort = udpClientPort;
}
mutex = MutexFactory::instance()->createMutex(); mutex = MutexFactory::instance()->createMutex();
communicationLinkUp = false; communicationLinkUp = false;

9
osal/windows/TmTcWinUdpBridge.h
View File

@ -13,8 +13,7 @@ public:
static const std::string DEFAULT_UDP_CLIENT_PORT; static const std::string DEFAULT_UDP_CLIENT_PORT;
TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination, TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination,
object_id_t tmStoreId, object_id_t tcStoreId, object_id_t tmStoreId, object_id_t tcStoreId, std::string udpServerPort = "");
std::string udpServerPort = "", std::string udpClientPort = "");
virtual~ TmTcWinUdpBridge(); virtual~ TmTcWinUdpBridge();
/** /**
@ -32,16 +31,10 @@ protected:
private: private:
SOCKET serverSocket = 0; SOCKET serverSocket = 0;
std::string udpServerPort; std::string udpServerPort;
std::string udpClientPort;
const int serverSocketOptions = 0;
struct sockaddr_in clientAddress; struct sockaddr_in clientAddress;
int clientAddressLen = 0; int clientAddressLen = 0;
struct sockaddr_in serverAddress;
int serverAddressLen = 0;
//! Access to the client address is mutex protected as it is set by another task. //! Access to the client address is mutex protected as it is set by another task.
MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING; MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
dur_millis_t mutexTimeoutMs = 20; dur_millis_t mutexTimeoutMs = 20;