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

Loop support

Browse source
This commit is contained in:
Erik Zandvliet 2010-06-21 16:10:25 +02:00
parent d94140c660
commit 2db97a1b7b
1 changed files with 42 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
Server/main.cpp
View file

@ -59,47 +59,52 @@ int main( int argc, char * argv[] ) {
//invalidate the current buffer //invalidate the current buffer
ringbuf[current_buffer]->size = 0; ringbuf[current_buffer]->size = 0;
ringbuf[current_buffer]->number = -1; ringbuf[current_buffer]->number = -1;
//read FLV frame header - 11 bytes if (std::cin.peek() == 'F') {
ret = fread(ringbuf[current_buffer]->data,1,11,stdin); //new FLV file, read the file head again.
//TODO: Check ret? ret = fread(&header,1,13,stdin);
//if video frame? (id 9) check for incoming connections } else {
if (ringbuf[current_buffer]->data[0] == 9) { //read FLV frame header - 11 bytes
incoming = listener.accept(&BError); ret = fread(ringbuf[current_buffer]->data,1,11,stdin);
if (incoming){ //TODO: Check ret?
open_connection = get_empty(connectionList,connections); //if video frame? (id 9) check for incoming connections
if (open_connection != -1) { if (ringbuf[current_buffer]->data[0] == 9) {
connectionList[open_connection]->connect(incoming); incoming = listener.accept(&BError);
//send the FLV header if (incoming){
std::cout << "Client " << open_connection << " connected." << std::endl; open_connection = get_empty(connectionList,connections);
connectionList[open_connection]->MyBuffer = lastproper; if (open_connection != -1) {
connectionList[open_connection]->MyBuffer_num = ringbuf[lastproper]->number; connectionList[open_connection]->connect(incoming);
//TODO: Do this more nicely? //send the FLV header
if (connectionList[open_connection]->Conn->send(&header[0],13,NULL) != 13){ std::cout << "Client " << open_connection << " connected." << std::endl;
connectionList[open_connection]->disconnect(); connectionList[open_connection]->MyBuffer = lastproper;
std::cout << "Client " << open_connection << " failed to receive the header!" << std::endl; connectionList[open_connection]->MyBuffer_num = ringbuf[lastproper]->number;
//TODO: Do this more nicely?
if (connectionList[open_connection]->Conn->send(&header[0],13,NULL) != 13){
connectionList[open_connection]->disconnect();
std::cout << "Client " << open_connection << " failed to receive the header!" << std::endl;
}
std::cout << "Client " << open_connection << " received header!" << std::endl;
}else{
std::cout << "New client not connected: no more connections!" << std::endl;
} }
std::cout << "Client " << open_connection << " received header!" << std::endl;
}else{
std::cout << "New client not connected: no more connections!" << std::endl;
} }
} }
//calculate body length of frame
frame_bodylength = 4;
frame_bodylength += ringbuf[current_buffer]->data[3];
frame_bodylength += (ringbuf[current_buffer]->data[2] << 8);
frame_bodylength += (ringbuf[current_buffer]->data[1] << 16);
//read the rest of the frame
ret = fread(&ringbuf[current_buffer]->data[11],1,frame_bodylength,stdin);
//TODO: Check ret?
ringbuf[current_buffer]->size = frame_bodylength + 11;
ringbuf[current_buffer]->number = loopcount;
//send all connections what they need, if and when they need it
for (int i = 0; i < connections; i++) {connectionList[i]->Send(ringbuf, buffers);}
//keep track of buffers
lastproper = current_buffer;
current_buffer++;
current_buffer %= buffers;
} }
//calculate body length of frame
frame_bodylength = 4;
frame_bodylength += ringbuf[current_buffer]->data[3];
frame_bodylength += (ringbuf[current_buffer]->data[2] << 8);
frame_bodylength += (ringbuf[current_buffer]->data[1] << 16);
//read the rest of the frame
ret = fread(&ringbuf[current_buffer]->data[11],1,frame_bodylength,stdin);
//TODO: Check ret?
ringbuf[current_buffer]->size = frame_bodylength + 11;
ringbuf[current_buffer]->number = loopcount;
//send all connections what they need, if and when they need it
for (int i = 0; i < connections; i++) {connectionList[i]->Send(ringbuf, buffers);}
//keep track of buffers
lastproper = current_buffer;
current_buffer++;
current_buffer %= buffers;
} }
// disconnect listener // disconnect listener