From 73516e9f143f3a6852a2d2e68c788d0fd5cd7076 Mon Sep 17 00:00:00 2001 From: LX3JL Date: Tue, 26 Jan 2021 11:05:13 +0100 Subject: [PATCH] undo PR #176 #176 is breaking ambed connectivity when ambed on same machine than xlxd. So this revert to previous version --- src/ccodecstream.cpp | 2 +- src/ctranscoder.cpp | 2 +- src/cudpsocket.cpp | 7 +------ src/cudpsocket.h | 1 - 4 files changed, 3 insertions(+), 9 deletions(-) mode change 100644 => 100755 src/ccodecstream.cpp mode change 100644 => 100755 src/ctranscoder.cpp mode change 100644 => 100755 src/cudpsocket.cpp mode change 100644 => 100755 src/cudpsocket.h diff --git a/src/ccodecstream.cpp b/src/ccodecstream.cpp old mode 100644 new mode 100755 index 10d9a2b..7d8e0c8 --- a/src/ccodecstream.cpp +++ b/src/ccodecstream.cpp @@ -99,7 +99,7 @@ bool CCodecStream::Init(uint16 uiPort) m_uiPort = uiPort; // create our socket - ok = m_Socket.Open(CIp("0.0.0.0"), uiPort); + ok = m_Socket.Open(uiPort); if ( ok ) { // start thread; diff --git a/src/ctranscoder.cpp b/src/ctranscoder.cpp old mode 100644 new mode 100755 index 36faa8a..6b810c9 --- a/src/ctranscoder.cpp +++ b/src/ctranscoder.cpp @@ -97,7 +97,7 @@ bool CTranscoder::Init(void) m_Ip = g_Reflector.GetTranscoderIp(); // create our socket - ok = m_Socket.Open(CIp("0.0.0.0"), TRANSCODER_PORT); + ok = m_Socket.Open(TRANSCODER_PORT); if ( ok ) { // start thread; diff --git a/src/cudpsocket.cpp b/src/cudpsocket.cpp old mode 100644 new mode 100755 index b528ffa..5caa074 --- a/src/cudpsocket.cpp +++ b/src/cudpsocket.cpp @@ -51,11 +51,6 @@ CUdpSocket::~CUdpSocket() // open & close bool CUdpSocket::Open(uint16 uiPort) -{ - return Open(g_Reflector.GetListenIp(), uiPort); -} - -bool CUdpSocket::Open(const CIp & listenIp, uint16 uiPort) { bool open = false; @@ -67,7 +62,7 @@ bool CUdpSocket::Open(const CIp & listenIp, uint16 uiPort) ::memset(&m_SocketAddr, 0, sizeof(struct sockaddr_in)); m_SocketAddr.sin_family = AF_INET; m_SocketAddr.sin_port = htons(uiPort); - m_SocketAddr.sin_addr.s_addr = inet_addr(listenIp); + m_SocketAddr.sin_addr.s_addr = inet_addr(g_Reflector.GetListenIp()); if ( bind(m_Socket, (struct sockaddr *)&m_SocketAddr, sizeof(struct sockaddr_in)) == 0 ) { diff --git a/src/cudpsocket.h b/src/cudpsocket.h old mode 100644 new mode 100755 index bb28fc1..e91ed80 --- a/src/cudpsocket.h +++ b/src/cudpsocket.h @@ -56,7 +56,6 @@ public: // open & close bool Open(uint16); - bool Open(const CIp &, uint16); void Close(void); int GetSocket(void) { return m_Socket; }