devs/stabber
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Removed threads

Browse Source
This commit is contained in:
James Booth
2015-05-11 23:44:43 +01:00
parent a3fcd69fa2
commit d392c77b03
6 changed files with 103 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -1,2 +1,2 @@
bin_PROGRAMS = server
server_SOURCES = src/server/server.c src/server/clients.h src/server/clients.c
server_SOURCES = src/server/server.c src/server/xmppclient.h src/server/xmppclient.c

52
src/server/clients.c
View File

@@ -1,52 +0,0 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <glib.h>
#include "server/clients.h"
GSList *clients;
pthread_mutex_t clients_lock;
pthread_mutexattr_t lock_attr;
void
clients_init(void)
{
// initialise recursive mutex
pthread_mutexattr_init(&lock_attr);
pthread_mutexattr_settype(&lock_attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&clients_lock, &lock_attr);
}
ChatClient*
clients_new(struct sockaddr_in client_addr, int socket)
{
ChatClient *client = malloc(sizeof(ChatClient));
client->ip = strdup(inet_ntoa(client_addr.sin_addr));
client->port = ntohs(client_addr.sin_port);
client->sock = socket;
client->nickname = NULL;
return client;
}
void
clients_add(ChatClient *client)
{
pthread_mutex_lock(&clients_lock);
clients = g_slist_append(clients, client);
pthread_mutex_unlock(&clients_lock);
}
void
clients_print_total(void)
{
pthread_mutex_lock(&clients_lock);
printf("Connected clients: %d\n", g_slist_length(clients));
pthread_mutex_unlock(&clients_lock);
}

23
src/server/clients.h
View File

@@ -1,23 +0,0 @@
#ifndef __H_CLIENTS
#define __H_CLIENTS
#include <netinet/in.h>
typedef struct thread_client_t {
char *ip;
int port;
int sock;
char *nickname;
} ChatClient;
void clients_init(void);
ChatClient* clients_new(struct sockaddr_in client_addr, int socket);
void clients_add(ChatClient *client);
void clients_print_total(void);
void clients_register(ChatClient *client, char *nickname);
void clients_broadcast_message(char *from, char *message);
void clients_end_session(ChatClient *client);
#endif

86
src/server/server.c
View File

@@ -5,17 +5,17 @@
#include <stdlib.h>
#include <unistd.h>
#include "server/clients.h"
#include "server/xmppclient.h"
#define STREAM_REQ "<?xml version=\"1.0\"?><stream:stream to=\"localhost\" xml:lang=\"en\" version=\"1.0\" xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\">"
#define STREAM_RESP "<?xml version=\"1.0\"?><stream:stream from=\"localhost\" id=\"stream1\" xml:lang=\"en\" version=\"1.0\" xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\">"
#define FEATURES "<stream:features></stream:features>"
#define AUTH_REQ "<iq id=\"_xmpp_auth1\" type=\"set\"><query xmlns=\"jabber:iq:auth\"><username>stabber</username><password>password</password><resource>profanity</resource></query></iq>"
#define AUTH_RESP "<iq id=\"_xmpp_auth1\" type=\"result\"/>"
#define END_STREAM "</stream:stream>"
void* connection_handler(void *data)
void connection_handler(XMPPClient *client)
{
ChatClient *client = (ChatClient *)data;
int read_size;
// client loop
@@ -38,12 +38,14 @@ void* connection_handler(void *data)
// error
if (read_size == -1) {
perror("Error receiving on connection");
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
// client closed
} else if (read_size == 0) {
printf("%s:%d - Client disconnected.\n", client->ip, client->port);
printf("\n%s:%d - Client disconnected.\n", client->ip, client->port);
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
@@ -80,7 +82,7 @@ void* connection_handler(void *data)
memset(buf, 0, sizeof(buf));
// listen to client stream
// wait for auth request
stream = g_string_new("");
errno = 0;
gboolean received = FALSE;
@@ -95,12 +97,14 @@ void* connection_handler(void *data)
// error
if (read_size == -1) {
perror("Error receiving on connection");
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
// client closed
} else if (read_size == 0) {
printf("%s:%d - Client disconnected.\n", client->ip, client->port);
printf("\n%s:%d - Client disconnected.\n", client->ip, client->port);
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
@@ -122,11 +126,43 @@ void* connection_handler(void *data)
fflush(stdout);
memset(buf, 0, sizeof(buf));
// wait until stream closed
stream = g_string_new("");
errno = 0;
gboolean received = FALSE;
while ((!received) && ((read_size = recv(client->sock, buf, 1, 0)) > 0)) {
printf("%c", buf[0]);
fflush(stdout);
g_string_append_len(stream, buf, read_size);
if (g_str_has_suffix(stream->str, END_STREAM)) {
received = TRUE;
}
memset(buf, 0, sizeof(buf));
}
// error
if (read_size == -1) {
perror("Error receiving on connection");
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
// client closed
} else if (read_size == 0) {
printf("\n%s:%d - Client disconnected.\n", client->ip, client->port);
xmppclient_end_session(client);
g_string_free(stream, TRUE);
break;
} else {
printf("\nEnd stream receieved");
xmppclient_end_session(client);
break;
}
}
}
}
return 0;
}
int main(int argc , char *argv[])
@@ -167,8 +203,6 @@ int main(int argc , char *argv[])
printf("Starting on port: %d...\n", port);
clients_init();
// create socket
errno = 0;
listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); // ipv4, tcp, ip
@@ -198,29 +232,17 @@ int main(int argc , char *argv[])
}
puts("Waiting for incoming connections...");
// connection accept loop
while (1) {
c = sizeof(struct sockaddr_in);
errno = 0;
client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c);
if (client_socket == -1) {
perror("Accept failed");
}
// create thread for each new client
ChatClient *client = clients_new(client_addr, client_socket);
clients_add(client);
pthread_t client_thread;
ret = pthread_create(&client_thread, NULL, connection_handler, (void *)client);
if (ret == 0) {
printf("%s:%d - Connection handler assigned.\n", client->ip, client->port);
} else {
puts("Could not create thread.");
}
clients_print_total();
// connection accept
c = sizeof(struct sockaddr_in);
errno = 0;
client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c);
if (client_socket == -1) {
perror("Accept failed");
return 0;
}
XMPPClient *client = xmppclient_new(client_addr, client_socket);
connection_handler(client);
return 0;
}

32
src/server/xmppclient.c Normal file
View File

@@ -0,0 +1,32 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <glib.h>
#include "server/xmppclient.h"
XMPPClient*
xmppclient_new(struct sockaddr_in client_addr, int socket)
{
XMPPClient *client = malloc(sizeof(XMPPClient));
client->ip = strdup(inet_ntoa(client_addr.sin_addr));
client->port = ntohs(client_addr.sin_port);
client->sock = socket;
client->nickname = NULL;
return client;
}
void
xmppclient_end_session(XMPPClient *client)
{
close(client->sock);
free(client->ip);
free(client->nickname);
free(client);
}

16
src/server/xmppclient.h Normal file
View File

@@ -0,0 +1,16 @@
#ifndef __H_XMPPCLIENT
#define __H_XMPPCLIENT
#include <netinet/in.h>
typedef struct xmpp_client_t {
char *ip;
int port;
int sock;
char *nickname;
} XMPPClient;
XMPPClient* xmppclient_new(struct sockaddr_in client_addr, int socket);
void xmppclient_end_session(XMPPClient *client);
#endif