X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=3a7217d93924f8a40d1ac3b5376b74d98c1587d8;hb=fd7391c60349ab3c0b4d3c8b626c5a32098807e0;hp=ceaacf6eb04e9fc84ed12fcd7a29afc093ecb2ac;hpb=820c23b9acd55999cc2e5777d5beeec8efd8970d;p=umurmur.git

diff --git a/src/client.c b/src/client.c
index ceaacf6..3a7217d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -39,9 +39,8 @@
 #include "messagehandler.h"
 #include "conf.h"
 #include "channel.h"
-
-/* Version 0.2.0 XXX fixme */
-const uint32_t versionBlob = 1<<16 | 2<<8 | 0;
+#include "version.h"
+#include "voicetarget.h"
 
 static int Client_read(client_t *client);
 static int Client_write(client_t *client);
@@ -107,7 +106,7 @@ void Client_janitor()
 void recheckCodecVersions()
 {
 	int codec_map[MAX_CODECS][2];
-	client_t *itr;
+	client_t *itr = NULL;
 	int i, codecindex, max = 0, version, current_version;
 	message_t *sendmsg;
 	
@@ -115,15 +114,16 @@ void recheckCodecVersions()
 	while (Client_iterate(&itr) != NULL) {
 		for (i = 0; i < itr->codec_count; i++) {
 			for (codecindex = 0; codecindex < MAX_CODECS; codecindex++) {
-				if (codec_map[codecindex][0] == 0)
+				if (codec_map[codecindex][0] == 0) {
 					codec_map[codecindex][0] = itr->codecs[i];
+					codec_map[codecindex][1] = 1;
+					break;
+				}
 				if (itr->codecs[i] == codec_map[codecindex][0])
 					codec_map[codecindex][1]++;
 			}
 		}
 	}
-	if (codec_map[codecindex][0] == 0)
-		return;
 	for (codecindex = 0; codecindex < MAX_CODECS; codecindex++) {
 		if (codec_map[codecindex][0] == 0)
 			break;
@@ -185,6 +185,7 @@ int Client_add(int fd, struct sockaddr_in *remote)
 	init_list_entry(&newclient->txMsgQueue);
 	init_list_entry(&newclient->chan_node);
 	init_list_entry(&newclient->node);
+	init_list_entry(&newclient->voicetargets);
 	
 	list_add_tail(&newclient->node, &clients);
 	clientcount++;
@@ -192,9 +193,10 @@ int Client_add(int fd, struct sockaddr_in *remote)
 	/* Send version message to client */
 	sendmsg = Msg_create(Version);
 	sendmsg->payload.version->has_version = true;
-	sendmsg->payload.version->version = (1 << 16) | (2 << 8) | 0; /* XXX fix */
-	sendmsg->payload.version->release = strdup("1.2.0");
-	sendmsg->payload.version->os = strdup("Linux/OpenWRT");
+	sendmsg->payload.version->version = PROTOCOL_VERSION;
+	sendmsg->payload.version->release = strdup(UMURMUR_VERSION);
+	/* XXX - set OS to something relevant? */
+	/* sendmsg->payload.version->os = strdup("Linux/OpenWRT"); */
 		
 	Client_send_message(newclient, sendmsg);
 
@@ -219,7 +221,8 @@ void Client_free(client_t *client)
 		list_del(&list_get_entry(itr, message_t, node)->node);
 		Msg_free(list_get_entry(itr, message_t, node));
 	}
-		
+	Voicetarget_free_all(client);
+	
 	list_del(&client->node);
 	list_del(&client->chan_node);
 	if (client->ssl)
@@ -256,7 +259,7 @@ int Client_read_fd(int fd)
 	client_t *client = NULL;
 	
 	list_iterate(itr, &clients) {
-		if(fd == list_get_entry(itr, client_t, node)->tcpfd) {
+		if (fd == list_get_entry(itr, client_t, node)->tcpfd) {
 			client = list_get_entry(itr, client_t, node);
 			break;
 		}
@@ -538,11 +541,11 @@ int Client_read_udp()
 	/* Ping packet */
 	if (len == 12 && *encrypted == 0) {
 		uint32_t *ping = (uint32_t *)encrypted;
-		ping[0] = htons(versionBlob);
+		ping[0] = htonl((uint32_t)PROTOCOL_VERSION);
 		// 1 and 2 will be the timestamp, which we return unmodified.
-		ping[3] = htons((uint32_t)clientcount);
-		ping[4] = htons((uint32_t)getIntConf(MAX_CLIENTS));
-		ping[5] = htons((uint32_t)getIntConf(MAX_BANDWIDTH));
+		ping[3] = htonl((uint32_t)clientcount);
+		ping[4] = htonl((uint32_t)getIntConf(MAX_CLIENTS));
+		ping[5] = htonl((uint32_t)getIntConf(MAX_BANDWIDTH));
 		
 		sendto(udpsock, encrypted, 6 * sizeof(uint32_t), 0, (struct sockaddr *)&from, fromlen);
 		return 0;
@@ -584,6 +587,7 @@ int Client_read_udp()
 		Client_voiceMsg(itr, buffer, len);
 		break;
 	case UDPPing:
+		Log_debug("UDP Ping reply len %d", len);
 		Client_send_udp(itr, buffer, len);
 		break;
 	default:
@@ -604,7 +608,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
 	unsigned int target = data[0] & 0x1f;
 	unsigned int poslen, counter;
 	int offset, packetsize;
-
+	voicetarget_t *vt;
+	
 	channel_t *ch = (channel_t *)client->channel;
 	struct dlist *itr;
 	
@@ -627,7 +632,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
 	Pds_add_numval(pds, client->sessionId);
 	Pds_append_data_nosize(pds, data + 1, len - 1);
 	
-	if (target & 0x1f) { /* Loopback */
+	if (target == 0x1f) { /* Loopback */
 		buffer[0] = (uint8_t) type;
 		Client_send_udp(client, buffer, pds->offset + 1);
 	}
@@ -644,8 +649,51 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
 				Client_send_udp(c, buffer, pds->offset + 1);
 			}
 		}
+		/* Channel links */
+		if (!list_empty(&ch->channel_links)) {
+			struct dlist *ch_itr;
+			list_iterate(ch_itr, &ch->channel_links) {
+				channel_t *ch_link;
+				ch_link = list_get_entry(ch_itr, channel_t, link_node);
+				list_iterate(itr, &ch_link->clients) {
+					client_t *c;
+					c = list_get_entry(itr, client_t, chan_node);
+					if (c != client && !c->deaf) {
+						Log_debug("Linked voice from %s -> %s", ch->name, ch_link->name);
+						Client_send_udp(c, buffer, pds->offset + 1);
+					}
+				}
+			}
+		}
+	} else if ((vt = Voicetarget_get_id(client, target)) != NULL) {	/* Targeted whisper */
+		int i;
+		channel_t *ch;
+		/* Channels */
+		for (i = 0; i < TARGET_MAX_CHANNELS && vt->channels[i] != -1; i++) {
+			Log_debug("Whisper channel %d", vt->channels[i]);
+			ch = Chan_fromId(vt->channels[i]);
+			if (ch == NULL)
+				continue;
+			list_iterate(itr, &ch->clients) {
+				client_t *c;
+				c = list_get_entry(itr, client_t, chan_node);
+				if (c != client && !c->deaf && IS_AUTH(c)) {
+					Client_send_udp(c, buffer, pds->offset + 1);
+				}
+			}
+		}			
+		/* Sessions */
+		for (i = 0; i < TARGET_MAX_SESSIONS && vt->sessions[i] != -1; i++) {
+			client_t *c;
+			Log_debug("Whisper session %d", vt->sessions[i]);
+			while (Client_iterate(&c) != NULL) {
+				if (c->sessionId == vt->sessions[i] && c != client && !c->deaf && IS_AUTH(c)) {
+					Client_send_udp(c, buffer, pds->offset + 1);
+					break;
+				}
+			}
+		}
 	}
-	/* XXX - Add targeted whisper here */
 out:
 	Pds_free(pds);
 	Pds_free(pdi);