diff options
Diffstat (limited to 'anyrtpproxy')
| -rw-r--r-- | anyrtpproxy/Makefile | 21 | ||||
| -rw-r--r-- | anyrtpproxy/anyrtpproxy.cpp | 12 |
2 files changed, 11 insertions, 22 deletions
diff --git a/anyrtpproxy/Makefile b/anyrtpproxy/Makefile index 9bb23d4..f4486b1 100644 --- a/anyrtpproxy/Makefile +++ b/anyrtpproxy/Makefile @@ -6,11 +6,12 @@ LD = g++ LDFLAGS = -g -Wall -O2 -lpthread OBJS = anyrtpproxy.o \ - signalController.o \ - PracticalSocket.o \ - log.o \ - buffer.o \ + ../signalController.o \ + ../PracticalSocket.o \ + ../log.o \ + ../buffer.o \ ../rtpSessionTable.o \ + ../rtpSession.o \ options.o EXECUTABLE = anyrtpproxy @@ -20,18 +21,6 @@ all: $(EXECUTABLE) anyrtpproxy: $(OBJS) $(LD) $(OBJS) -o $@ $(LDFLAGS) -signalController.o: ../signalController.cpp ../signalController.h - $(C++) $(CCFLAGS) $< -c - -PracticalSocket.o: ../PracticalSocket.cpp ../PracticalSocket.h - $(C++) $(CCFLAGS) $< -c - -log.o: ../log.cpp ../log.h - $(C++) $(CCFLAGS) $< -c - -buffer.o: ../buffer.cpp ../buffer.h - $(C++) $(CCFLAGS) $< -c - options.o: options.cpp options.h $(C++) $(CCFLAGS) $< -c diff --git a/anyrtpproxy/anyrtpproxy.cpp b/anyrtpproxy/anyrtpproxy.cpp index 9079994..3b0c488 100644 --- a/anyrtpproxy/anyrtpproxy.cpp +++ b/anyrtpproxy/anyrtpproxy.cpp @@ -35,8 +35,8 @@ public: private: Mutex mutex; - std::map<ControlHost, std::pair<UDPSocket*, pthread_t>> control_hosts_; -} + std::map<ControlHost, std::pair<UDPSocket*, pthread_t> > control_hosts_; +}; void* sender(void* dont_use_me) { @@ -50,10 +50,10 @@ void* sender(void* dont_use_me) u_int16_t remote_port; while(1) { buf.setLength(MAX_PACKET_SIZE); - u_int32_t len = control_sock_.recvFrom(buf.getBuf(), buf.getLength(), remote_host, remote_port); + u_int32_t len = control_sock.recvFrom(buf.getBuf(), buf.getLength(), remote_host, remote_port); buf.setLength(len); - param->control_.setHost(remote_host, remote_port); +//TODO????//TODO????//TODO????//TODO????//TODO????//TODO????//TODO???? control.setHost(remote_host, remote_port); // SenderThreadParam receiverParam = {control_host, control_sock, sock, gOpt.getRemoteHosts().front()}; // pthread_t receiverThread; @@ -62,8 +62,8 @@ void* sender(void* dont_use_me) HostList::const_iterator it = remote_host_list.begin(); - for(;it != remote_host_list.end(); it++) - param->sock_.sendTo(buf.getBuf(), buf.getLength(), it->addr_, it->port_); +// for(;it != remote_host_list.end(); it++) +// param->sock_.sendTo(buf.getBuf(), buf.getLength(), it->addr_, it->port_); } } catch(std::exception &e) |