Revert "Add ability to specify IP to use for listening to ambed"

This reverts commit 8239493fa8.
pull/191/head
Geoffrey Merck 5 years ago
parent 3aa17ae7fd
commit f5f6f444d7

@ -97,10 +97,9 @@ bool CCodecStream::Init(uint16 uiPort)
// create server's IP // create server's IP
m_Ip = g_Reflector.GetTranscoderIp(); m_Ip = g_Reflector.GetTranscoderIp();
m_uiPort = uiPort; m_uiPort = uiPort;
CIp interfaceIp = g_Reflector.GetTranscoderInterfaceIp();
// create our socket // create our socket
ok = m_Socket.Open(interfaceIp, uiPort); ok = m_Socket.Open(CIp("0.0.0.0"), uiPort);
if ( ok ) if ( ok )
{ {
// start thread; // start thread;

@ -59,10 +59,8 @@ public:
const CCallsign &GetCallsign(void) const { return m_Callsign; } const CCallsign &GetCallsign(void) const { return m_Callsign; }
void SetListenIp(const CIp &ip) { m_Ip = ip; } void SetListenIp(const CIp &ip) { m_Ip = ip; }
void SetTranscoderIp(const CIp &ip) { m_AmbedIp = ip; } void SetTranscoderIp(const CIp &ip) { m_AmbedIp = ip; }
void SetTranscoderInterfaceIp(const CIp &ip) { m_AmbedInterfaceIp = ip; }
const CIp &GetListenIp(void) const { return m_Ip; } const CIp &GetListenIp(void) const { return m_Ip; }
const CIp &GetTranscoderIp(void) const { return m_AmbedIp; } const CIp &GetTranscoderIp(void) const { return m_AmbedIp; }
const CIp &GetTranscoderInterfaceIp(void) const { return m_AmbedInterfaceIp; }
// operation // operation
bool Start(void); bool Start(void);
@ -123,7 +121,6 @@ protected:
CCallsign m_Callsign; CCallsign m_Callsign;
CIp m_Ip; CIp m_Ip;
CIp m_AmbedIp; CIp m_AmbedIp;
CIp m_AmbedInterfaceIp;//Ip used ot talk to ambed IP
// objects // objects
CUsers m_Users; // sorted list of lastheard stations CUsers m_Users; // sorted list of lastheard stations

@ -95,11 +95,9 @@ bool CTranscoder::Init(void)
// create server's IP // create server's IP
m_Ip = g_Reflector.GetTranscoderIp(); m_Ip = g_Reflector.GetTranscoderIp();
CIp interfaceIp = g_Reflector.GetTranscoderInterfaceIp();
// create our socket // create our socket
ok = m_Socket.Open(interfaceIp, TRANSCODER_PORT); ok = m_Socket.Open(CIp("0.0.0.0"), TRANSCODER_PORT);
if ( ok ) if ( ok )
{ {
// start thread; // start thread;
@ -107,7 +105,7 @@ bool CTranscoder::Init(void)
} }
else else
{ {
std::cout << "Transcoder Error opening socket on port UDP" << TRANSCODER_PORT << " on ip " << g_Reflector.GetListenIp() << std::endl; std::cout << "Error opening socket on port UDP" << TRANSCODER_PORT << " on ip " << g_Reflector.GetListenIp() << std::endl;
} }
// done // done

@ -87,11 +87,10 @@ int main(int argc, const char * argv[])
#endif #endif
// check arguments // check arguments
if ( argc < 4 || argc > 5) if ( argc != 4 )
{ {
std::cout << "Usage: xlxd callsign xlxdip ambedip [interface_to_reach_ambed] " << std::endl; std::cout << "Usage: xlxd callsign xlxdip ambedip" << std::endl;
std::cout << "example (ambed running locally): xlxd XLX999 192.168.178.212 127.0.0.1" << std::endl; std::cout << "example: xlxd XLX999 192.168.178.212 127.0.0.1" << std::endl;
std::cout << "example (ambed running on another host): xlxd XLX999 192.168.178.212 10.9.0.100 10.9.0.1" << std::endl;
return 1; return 1;
} }
@ -102,7 +101,6 @@ int main(int argc, const char * argv[])
g_Reflector.SetCallsign(argv[1]); g_Reflector.SetCallsign(argv[1]);
g_Reflector.SetListenIp(CIp(argv[2])); g_Reflector.SetListenIp(CIp(argv[2]));
g_Reflector.SetTranscoderIp(CIp(CIp(argv[3]))); g_Reflector.SetTranscoderIp(CIp(CIp(argv[3])));
g_Reflector.SetTranscoderInterfaceIp(CIp(argv[argc == 5 ? 4 : 2]));
// and let it run // and let it run
if ( !g_Reflector.Start() ) if ( !g_Reflector.Start() )

Loading…
Cancel
Save

Powered by TurnKey Linux.