Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread client packets, non-blocking receive to remove agents

Browse source
This commit is contained in:
Stephen Birarda 2013-01-11 13:15:51 -07:00
parent 1754417af1
commit 6cbe461520
1 changed files with 84 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
socket.cpp
View file

@ -8,6 +8,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#include <pthread.h>
const int UDP_PORT = 55443; const int UDP_PORT = 55443;
const int MAX_PACKET_SIZE = 1024; const int MAX_PACKET_SIZE = 1024;
@ -18,13 +19,13 @@ const int SAMPLES_PER_PACKET = 512;
const int MAX_AGENTS = 1000; const int MAX_AGENTS = 1000;
const int LOGOFF_CHECK_INTERVAL = 1000; const int LOGOFF_CHECK_INTERVAL = 1000;
char packet_data[MAX_PACKET_SIZE];
sockaddr_in address, dest_address; sockaddr_in address, dest_address;
socklen_t destLength = sizeof(dest_address); socklen_t destLength = sizeof(dest_address);
struct AgentList { struct AgentList {
uint32_t ip; sockaddr_in agent_addr;
in_addr sin_addr;
unsigned short port;
bool active; bool active;
timeval time; timeval time;
} agents[MAX_AGENTS]; } agents[MAX_AGENTS];
@ -68,21 +69,23 @@ int network_init()
return handle; return handle;
} }
int addAgent(uint32_t ip, unsigned short port) { int addAgent(sockaddr_in dest_address) {
// Search for agent in list and add if needed // Search for agent in list and add if needed
int i = 0;
int is_new = 0; int is_new = 0;
int i = 0;
while ((ip != agents[i].ip) && (i < num_agents)) {
i++; for (i = 0; i < num_agents; i++) {
if (dest_address.sin_addr.s_addr == agents[i].agent_addr.sin_addr.s_addr) {
break;
}
} }
if ((i == num_agents) || (agents[i].active == false)) is_new = 1; if ((i == num_agents) || (agents[i].active == false)) {
is_new = 1;
agents[i].ip = ip; }
agents[i].port = port;
agents[i].agent_addr = dest_address;
agents[i].active = true; agents[i].active = true;
agents[i].sin_addr.s_addr = ip;
gettimeofday(&agents[i].time, NULL); gettimeofday(&agents[i].time, NULL);
if (i == num_agents) { if (i == num_agents) {
@ -97,14 +100,14 @@ void update_agent_list(timeval now) {
// std::cout << "Checking agent list" << "\n"; // std::cout << "Checking agent list" << "\n";
for (i = 0; i < num_agents; i++) { for (i = 0; i < num_agents; i++) {
if ((diffclock(agents[i].time, now) > LOGOFF_CHECK_INTERVAL) && if ((diffclock(agents[i].time, now) > LOGOFF_CHECK_INTERVAL) &&
agents[i].active) { agents[i].active) {
std::cout << "Expired Agent #" << i << "\n"; std::cout << "Expired Agent #" << i << "\n";
agents[i].active = false; agents[i].active = false;
} }
} }
} }
void send_buffer_thread() void *send_buffer_thread(void *args)
{ {
// create our send socket // create our send socket
int handle = create_socket(); int handle = create_socket();
@ -116,20 +119,55 @@ void send_buffer_thread()
std::cout << "Buffer send socket created.\n"; std::cout << "Buffer send socket created.\n";
} }
int sent_bytes;
while (1) { while (1) {
// sleep for the length of a packet of audio // sleep for the length of a packet of audio
sleep((SAMPLES_PER_PACKET/SAMPLE_RATE) * pow(10, 6)); usleep((SAMPLES_PER_PACKET/SAMPLE_RATE) * pow(10, 6));
// send out whatever we have in the buffer as mixed audio // send out whatever we have in the buffer as mixed audio
// to our recent clients // to our recent clients
for (int i = 0; i < num_agents; i++) {
if (agents[i].active) {
sockaddr_in dest_address = agents[i].agent_addr;
sent_bytes = sendto(handle, packet_data, MAX_PACKET_SIZE,
0, (sockaddr *) &dest_address, sizeof(dest_address));
if (sent_bytes < MAX_PACKET_SIZE) {
std::cout << "Error sending mix packet!\n";
}
}
}
} }
} }
struct process_arg_struct {
char packet_data[MAX_PACKET_SIZE];
sockaddr_in dest_address;
};
void *process_client_packet(void *args)
{
struct process_arg_struct *process_args = (struct process_arg_struct *) args;
sockaddr_in dest_address = process_args->dest_address;
strcpy(packet_data, process_args->packet_data);
if (addAgent(dest_address)) {
std::cout << "Added agent: " <<
inet_ntoa(dest_address.sin_addr) << " on " <<
dest_address.sin_port << "\n";
}
pthread_exit(0);
}
int main(int argc, const char * argv[]) int main(int argc, const char * argv[])
{ {
timeval now, last_agent_update;
int received_bytes = 0; int received_bytes = 0;
timeval time, last_time;
int handle = network_init(); int handle = network_init();
@ -140,32 +178,45 @@ int main(int argc, const char * argv[])
std::cout << "Network Started. Waiting for packets.\n"; std::cout << "Network Started. Waiting for packets.\n";
} }
gettimeofday(&last_time, NULL); // Set socket as non-blocking
int nonBlocking = 1;
if ( fcntl( handle, F_SETFL, O_NONBLOCK, nonBlocking ) == -1 )
{
printf( "failed to set non-blocking socket\n" );
return false;
}
gettimeofday(&last_agent_update, NULL);
char packet_data[MAX_PACKET_SIZE]; char packet_data[MAX_PACKET_SIZE];
pthread_t buffer_send_thread;
pthread_create(&buffer_send_thread, NULL, send_buffer_thread, NULL);
while (1) { while (1) {
received_bytes = recvfrom(handle, (char*)packet_data, MAX_PACKET_SIZE, received_bytes = recvfrom(handle, (char*)packet_data, MAX_PACKET_SIZE,
0, (sockaddr*)&dest_address, &destLength); 0, (sockaddr*)&dest_address, &destLength);
if (received_bytes > 0) { if (received_bytes > 0) {
// std::cout << "Packet from: " << inet_ntoa(dest_address.sin_addr) struct process_arg_struct args;
// << " " << packet_data << "\n"; strcpy(args.packet_data, packet_data);
args.dest_address = dest_address;
if (addAgent(dest_address.sin_addr.s_addr, dest_address.sin_port)) {
std::cout << "Added agent: " << pthread_t client_process_thread;
inet_ntoa(dest_address.sin_addr) << " on " << pthread_create(&client_process_thread, NULL, process_client_packet, (void *)&args);
dest_address.sin_port << "\n"; pthread_join(client_process_thread, NULL);
}
} }
gettimeofday(&time, NULL); gettimeofday(&now, NULL);
if (diffclock(last_time, time) > LOGOFF_CHECK_INTERVAL) { if (diffclock(last_agent_update, now) > LOGOFF_CHECK_INTERVAL) {
gettimeofday(&last_time, NULL); gettimeofday(&last_agent_update, NULL);
update_agent_list(last_time); update_agent_list(last_agent_update);
} }
} }
pthread_join(buffer_send_thread, NULL);
return 0; return 0;
} }