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

make docs now works (needs doxygen installed), added documentation to a LOT of stuff, refactored most utility functions, complete rewrites of DDV sockets and the FLV parsers, updated HTTP_Box_Parser and Connector_HTTP to be able to cope with these new changes - Connector_RTMP, Buffer and Connector_RAW are currently broken. Need to be fixed ASAP.

Browse source
This commit is contained in:
Thulinma 2011-04-06 03:53:30 +02:00
parent 1ea85a27df
commit cc78697ba2
19 changed files with 1470 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

39
util/server_setup.cpp
View file

@ -1,23 +1,21 @@
int mainHandler(int CONN_fd);//define this function in your own code!
#include <signal.h>
#include "ddv_socket.cpp" //DDVTech Socket wrapper
#include "flv_sock.cpp" //FLV parsing with DDVTech Socket wrapper
int server_socket = 0;
#include "ddv_socket.h" //DDVTech Socket wrapper
#include "flv_tag.h" //FLV parsing with DDVTech Socket wrapper
DDV::ServerSocket server_socket(-1);
void termination_handler (int signum){
if (server_socket == 0) return;
if (!server_socket.connected()) return;
switch (signum){
case SIGINT: break;
case SIGHUP: break;
case SIGTERM: break;
default: return; break;
}
close(server_socket);
server_socket = 0;
server_socket.close();
}
int main(int argc, char ** argv){
int CONN_fd = 0;
DDV::Socket CONN_fd(-1);
//setup signal handler
struct sigaction new_action;
@ -31,12 +29,14 @@ int main(int argc, char ** argv){
int listen_port = DEFAULT_PORT;
bool daemon_mode = true;
std::string interface = "0.0.0.0";
int opt = 0;
static const char *optString = "np:h?";
static const char *optString = "np:i:h?";
static const struct option longOpts[] = {
{"help",0,0,'h'},
{"port",1,0,'p'},
{"interface",1,0,'i'},
{"no-daemon",0,0,'n'}
};
while ((opt = getopt_long(argc, argv, optString, longOpts, 0)) != -1){
@ -44,6 +44,9 @@ int main(int argc, char ** argv){
case 'p':
listen_port = atoi(optarg);
break;
case 'i':
interface = optarg;
break;
case 'n':
daemon_mode = false;
break;
@ -55,11 +58,11 @@ int main(int argc, char ** argv){
}
}
server_socket = DDV_Listen(listen_port);
server_socket = DDV::ServerSocket(listen_port, interface);
#if DEBUG >= 3
fprintf(stderr, "Made a listening socket on port %i...\n", listen_port);
fprintf(stderr, "Made a listening socket on %s:%i...\n", interface.c_str(), listen_port);
#endif
if (server_socket > 0){
if (server_socket.connected()){
if (daemon_mode){
daemon(1, 0);
#if DEBUG >= 3
@ -73,22 +76,22 @@ int main(int argc, char ** argv){
return 1;
}
int status;
while (server_socket > 0){
while (server_socket.connected()){
waitpid((pid_t)-1, &status, WNOHANG);
CONN_fd = DDV_Accept(server_socket);
if (CONN_fd > 0){
CONN_fd = server_socket.accept();
if (CONN_fd.connected()){
pid_t myid = fork();
if (myid == 0){
break;
}else{
#if DEBUG >= 3
fprintf(stderr, "Spawned new process %i for handling socket %i\n", (int)myid, CONN_fd);
fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, CONN_fd.getSocket());
#endif
}
}
}
if (server_socket <= 0){
if (!server_socket.connected()){
return 0;
}
return mainHandler(CONN_fd);
return MAINHANDLER(CONN_fd);
}