hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated and changed namespace for socket library, added IPv6 support, attempt to fix RTMP

Browse source
This commit is contained in:
Thulinma 2011-06-20 13:33:17 +02:00
commit 694a0075ee
16 changed files with 48 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Connector_HTTP/Makefile
View file

@ -1,4 +1,4 @@
SRC = main.cpp ../util/ddv_socket.cpp ../util/http_parser.cpp ../util/flv_tag.cpp ../util/amf.cpp
SRC = main.cpp ../util/socket.cpp ../util/http_parser.cpp ../util/flv_tag.cpp ../util/amf.cpp
OBJ = $(SRC:.cpp=.o)
OUT = DDV_Conn_HTTP
INCLUDES =

8
Connector_HTTP/main.cpp
View file

@ -12,7 +12,7 @@
#include <sys/epoll.h>
#include <getopt.h>
#include <ctime>
#include "../util/ddv_socket.h"
#include "../util/socket.h"
#include "../util/http_parser.h"
#include "../util/flv_tag.h"
#include "../util/MP4/interface.cpp"
@ -114,12 +114,12 @@ namespace Connector_HTTP{
}//BuildManifest
/// Main function for Connector_HTTP
int Connector_HTTP(DDV::Socket conn){
int Connector_HTTP(Socket::Connection conn){
int handler = HANDLER_PROGRESSIVE;///< The handler used for processing this request.
bool ready4data = false;///< Set to true when streaming is to begin.
bool inited = false;
bool progressive_has_sent_header = false;
DDV::Socket ss(-1);
Socket::Connection ss(-1);
std::string streamname;
std::string FlashBuf;
std::string FlashMeta;
@ -212,7 +212,7 @@ namespace Connector_HTTP{
if (ready4data){
if (!inited){
//we are ready, connect the socket!
ss = DDV::Socket(streamname);
ss = Socket::Connection(streamname);
if (!ss.connected()){
#if DEBUG >= 1
fprintf(stderr, "Could not connect to server!\n");