cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwSocket.h/cpp : Change testMain() to take a cfg..

Browse Source
This commit is contained in:
kevin 2024-11-30 12:16:47 -05:00
parent 953734ff54
commit 3363de82ed
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cwSocket.cpp
View File

@ -2,7 +2,10 @@
#include "cwLog.h" #include "cwLog.h"
#include "cwCommonImpl.h" #include "cwCommonImpl.h"
#include "cwMem.h" #include "cwMem.h"
#include "cwTest.h"
#include "cwObject.h"
#include "cwThread.h" #include "cwThread.h"
#include "cwText.h"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -1255,7 +1258,11 @@ cw::rc_t cw::socksrv::stop( handle_t h )
return thread::pause( p->thH ); return thread::pause( p->thH );
} }
cw::rc_t cw::socksrv::test( const char* localNicDevice, sock::portNumber_t localPort, const char* remoteAddrIp, sock::portNumber_t remotePort, unsigned flags ) cw::rc_t cw::socksrv::test( const char* localNicDevice,
sock::portNumber_t localPort,
const char* remoteAddrIp,
sock::portNumber_t remotePort,
unsigned flags )
{ {
handle_t h; handle_t h;
rc_t rc = kOkRC; rc_t rc = kOkRC;
@ -1344,17 +1351,43 @@ cw::rc_t cw::socksrv::test( const char* localNicDevice, sock::portNumber_t loca
return rcSelect(rc,rc1,rc2); return rcSelect(rc,rc1,rc2);
} }
cw::rc_t cw::socksrv::testMain( bool tcpFl, const char* localNicDevice, sock::portNumber_t localPort, const char* remoteAddrIp, sock::portNumber_t remotePort ) cw::rc_t cw::socksrv::testMain( const object_t* cfg )
{ {
unsigned flags = 0; rc_t rc = kOkRC;
const char* protocol_str = nullptr;
sock::portNumber_t localPort = 5688;
const char* remoteAddrIp = nullptr;
sock::portNumber_t remotePort = 5687;
const char* localNicDevice = nullptr;
unsigned flags = 0;
if( tcpFl ) if((rc = cfg->getv("protocol",protocol_str,
"localPort",localPort )) != kOkRC )
{
rc = cwLogError(rc,"Required arg. parse failed.");
goto errLabel;
}
if((rc = cfg->getv_opt("remoteAddr",remoteAddrIp,
"remotePort",remotePort,
"nicDev",localNicDevice )) != kOkRC )
{
rc = cwLogError(rc,"Optional arg. parse failed.");
goto errLabel;
}
if( textIsEqual(protocol_str,"tcp") )
{ {
flags |= sock::kTcpFl | sock::kStreamFl | sock::kReuseAddrFl | sock::kReusePortFl; flags |= sock::kTcpFl | sock::kStreamFl | sock::kReuseAddrFl | sock::kReusePortFl;
if( remoteAddrIp == nullptr ) if( remoteAddrIp == nullptr )
flags |= sock::kListenFl; flags |= sock::kListenFl;
} }
rc = test(localNicDevice,localPort,remoteAddrIp,remotePort,flags);
errLabel:
return test(localNicDevice,localPort,remoteAddrIp,remotePort,flags); return rc;
} }

2
cwSocket.h
View File

@ -107,7 +107,7 @@ namespace cw
rc_t stop( handle_t h ); rc_t stop( handle_t h );
rc_t test( const char* localNicDevice, sock::portNumber_t localPort, const char* remoteAddrIp, sock::portNumber_t remotePort, unsigned flags=0 ); rc_t test( const char* localNicDevice, sock::portNumber_t localPort, const char* remoteAddrIp, sock::portNumber_t remotePort, unsigned flags=0 );
rc_t testMain( bool tcpFl, const char* localNicDevice, sock::portNumber_t localPort, const char* remoteAddrIp=nullptr, sock::portNumber_t remotePort=sock::kInvalidPortNumber ); rc_t testMain( const object_t* cfg );
} }
} }