X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=5b76b7e3c6d1a3bd1a1f4f3df101e012a2f44203;hb=d9280fa11ed4cb6cc0f36394c5d57350464973b3;hp=3d884629dc66235e3311a6462e2c60e1814af79c;hpb=21ed5998124647e79de379c35b75acaf7323677a;p=umurmur.git

diff --git a/src/client.c b/src/client.c
index 3d88462..5b76b7e 100644
--- a/src/client.c
+++ b/src/client.c
@@ -54,6 +54,7 @@ extern char system_string[], version_string[];
 static int Client_read(client_t *client);
 static int Client_write(client_t *client);
 static int Client_send_udp(client_t *client, uint8_t *data, int len);
+static client_t *Client_find_by_fd(int fd);
 void Client_free(client_t *client);
 
 declare_list(clients);
@@ -426,17 +427,27 @@ void Client_disconnect_all()
 	}
 }
 
-int Client_read_fd(int fd)
+client_t *Client_find_by_fd(int fd)
 {
 	struct dlist *itr;
-	client_t *client = NULL;
 
 	list_iterate(itr, &clients) {
-		if (fd == list_get_entry(itr, client_t, node)->tcpfd) {
-			client = list_get_entry(itr, client_t, node);
-			break;
+		client_t *client = list_get_entry(itr, client_t, node);
+
+		if (client->tcpfd == fd) {
+			return client;
 		}
 	}
+
+	return NULL;
+}
+
+int Client_read_fd(int fd)
+{
+	client_t *client;
+
+	client = Client_find_by_fd(fd);
+
 	if (client != NULL)
 		return Client_read(client);
 	else
@@ -538,15 +549,10 @@ int Client_read(client_t *client)
 
 int Client_write_fd(int fd)
 {
-	struct dlist *itr;
-	client_t *client = NULL;
+	client_t *client;
+
+	client = Client_find_by_fd(fd);
 
-	list_iterate(itr, &clients) {
-		if(fd == list_get_entry(itr, client_t, node)->tcpfd) {
-			client = list_get_entry(itr, client_t, node);
-			break;
-		}
-	}
 	if (client != NULL)
 		return Client_write(client);
 	else
@@ -664,14 +670,18 @@ void Client_textmessage(client_t *client, char *text)
 	uint32_t *tree_id;
 	message_t *sendmsg = NULL;
 
-	message = Memory_safeMalloc(1, strlen(text) + 1);
+	message = strdup(text);
+
+	if (message == NULL)
+		Log_fatal("Out of memory");
+
 	tree_id = Memory_safeMalloc(1, sizeof(uint32_t));
 	*tree_id = 0;
 	sendmsg = Msg_create(TextMessage);
 	sendmsg->payload.textMessage->message = message;
 	sendmsg->payload.textMessage->n_tree_id = 1;
 	sendmsg->payload.textMessage->tree_id = tree_id;
-	strcpy(message, text);
+
 	Client_send_message(client, sendmsg);
 }
 
@@ -877,7 +887,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
 	int offset, packetsize;
 	voicetarget_t *vt;
 
-	channel_t *ch = (channel_t *)client->channel;
+	channel_t *ch = client->channel;
 	struct dlist *itr;
 
 	if (!client->authenticated || client->mute || client->self_mute || ch->silent)