X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=882409ae75e8d25503bec0c98c3a179d2af268e4;hb=HEAD;hp=a8472871ae86f38ad5c391266eedb2053c11e974;hpb=a1a0ba19a94a1bfe3c40629aa9c5f3a4b23db3ee;p=umurmur.git

diff --git a/src/messagehandler.c b/src/messagehandler.c
index a847287..882409a 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -306,7 +306,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		sendmsg->payload.userState->session = client->sessionId;
 		sendmsg->payload.userState->name = strdup(client->username);
 		sendmsg->payload.userState->has_channel_id = true;
-		sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id;
+		sendmsg->payload.userState->channel_id = client->channel->id;
 
 		if (defaultChan->silent) {
 			sendmsg->payload.userState->has_suppress = true;
@@ -324,11 +324,11 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			sendmsg->payload.userState->session = client_itr->sessionId;
 			sendmsg->payload.userState->name = strdup(client_itr->username);
 			sendmsg->payload.userState->has_channel_id = true;
-			sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id;
-			sendmsg->payload.userState->has_suppress = ((channel_t *)client_itr->channel)->silent;
-			sendmsg->payload.userState->suppress = ((channel_t *)client_itr->channel)->silent;
+			sendmsg->payload.userState->channel_id = client_itr->channel->id;
+			sendmsg->payload.userState->has_suppress = client_itr->channel->silent;
+			sendmsg->payload.userState->suppress = client_itr->channel->silent;
 
-			client_itr->isSuppressed = ((channel_t *)client_itr->channel)->silent;
+			client_itr->isSuppressed = client_itr->channel->silent;
 
 			if (client_itr->self_deaf) {
 				sendmsg->payload.userState->has_self_deaf = true;
@@ -438,10 +438,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			break;
 		}
 		if (msg->payload.userState->has_session && msg->payload.userState->session != client->sessionId) {
-			while (Client_iterate(&target) != NULL) {
-				if (target->sessionId == msg->payload.userState->session)
-					break;
-			}
+			target = Client_find_by_session(msg->payload.userState->session);
+
 			if (target == NULL) {
 				Log_warn("Client with sessionID %d not found", msg->payload.userState->session);
 				break;
@@ -554,8 +552,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			}
 		}
 		if (msg->payload.userState->has_plugin_context) {
-			if (client->context)
-				free(client->context);
+			free(client->context);
 			client->context = Memory_safeMalloc(1, msg->payload.userState->plugin_context.len);
 			memcpy(client->context, msg->payload.userState->plugin_context.data,
 				   msg->payload.userState->plugin_context.len);
@@ -610,21 +607,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			int i;
 			client_t *itr;
 			for (i = 0; i < msg->payload.textMessage->n_session; i++) {
-				itr = NULL;
-				while (Client_iterate(&itr) != NULL) {
-					if (!IS_AUTH(itr))
-						continue;
-					if (itr->sessionId == msg->payload.textMessage->session[i]) {
-						if (!itr->deaf && !itr->self_deaf) {
-							Msg_inc_ref(msg);
-							Client_send_message(itr, msg);
-							Log_debug("Text message to session ID %d", itr->sessionId);
-						}
-						break;
-					}
-				}
+				itr = Client_find_by_session(msg->payload.textMessage->session[i]);
+
 				if (itr == NULL)
 					Log_warn("TextMessage: Session ID %d not found", msg->payload.textMessage->session[i]);
+				else if (IS_AUTH(itr) && !itr->deaf && !itr->self_deaf) {
+					Msg_inc_ref(msg);
+					Client_send_message(itr, msg);
+					Log_debug("Text message to session ID %d", itr->sessionId);
+				}
 			} /* for */
 		}
 		break;
@@ -662,17 +653,17 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			Log_debug("Client version 0x%x", client->version);
 		}
 		if (msg->payload.version->release) {
-			if (client->release) free(client->release);
+			free(client->release);
 			client->release = strdup(msg->payload.version->release);
 			Log_debug("Client release %s", client->release);
 		}
 		if (msg->payload.version->os) {
-			if (client->os) free(client->os);
+			free(client->os);
 			client->os = strdup(msg->payload.version->os);
 			Log_debug("Client OS %s", client->os);
 		}
 		if (msg->payload.version->os_version) {
-			if (client->os_version) free(client->os_version);
+			free(client->os_version);
 			client->os_version = strdup(msg->payload.version->os_version);
 			Log_debug("Client OS version %s", client->os_version);
 		}
@@ -799,15 +790,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
 
 		if (!msg->payload.userStats->has_session)
 			sendPermissionDenied(client, "Not supported by uMurmur");
-		while (Client_iterate(&target) != NULL) {
-			if (!IS_AUTH(target))
-				continue;
-			if (target->sessionId == msg->payload.userStats->session)
-				break;
-		}
+
+		target = Client_find_by_session(msg->payload.userStats->session);
+
 		if (!target) /* Not found */
 			break;
 
+		if (!IS_AUTH(target)) /* Not authenticated. */
+			break;
+
 		/*
 		 * Differences from Murmur:
 		 * o Ignoring certificates intentionally
@@ -870,17 +861,21 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			sendmsg->payload.userStats->opus = target->bOpus;
 
 			/* Address */
-			sendmsg->payload.userStats->has_address = true;
-			sendmsg->payload.userStats->address.data
-				= Memory_safeMalloc(16, sizeof(uint8_t));
-			memset(sendmsg->payload.userStats->address.data, 0, 16);
-			/* ipv4 representation as ipv6 address. Supposedly correct. */
-			memset(&sendmsg->payload.userStats->address.data[10], 0xff, 2); /* IPv4 */
-      if(target->remote_tcp.ss_family == AF_INET)
-        memcpy(&sendmsg->payload.userStats->address.data[12], &((struct sockaddr_in*)&target->remote_tcp)->sin_addr, 4);
-      else
-        memcpy(&sendmsg->payload.userStats->address.data[0], &((struct sockaddr_in6*)&target->remote_tcp)->sin6_addr, 16);
-			sendmsg->payload.userStats->address.len = 16;
+			if (getBoolConf(SHOW_ADDRESSES)) {
+				sendmsg->payload.userStats->has_address = true;
+				sendmsg->payload.userStats->address.data
+					= Memory_safeMalloc(16, sizeof(uint8_t));
+				memset(sendmsg->payload.userStats->address.data, 0, 16);
+				/* ipv4 representation as ipv6 address. Supposedly correct. */
+				memset(&sendmsg->payload.userStats->address.data[10], 0xff, 2); /* IPv4 */
+				if(target->remote_tcp.ss_family == AF_INET)
+					memcpy(&sendmsg->payload.userStats->address.data[12], &((struct sockaddr_in*)&target->remote_tcp)->sin_addr, 4);
+				else
+					memcpy(&sendmsg->payload.userStats->address.data[0], &((struct sockaddr_in6*)&target->remote_tcp)->sin6_addr, 16);
+				sendmsg->payload.userStats->address.len = 16;
+			} else {
+				sendmsg->payload.userStats->has_address = false;
+			}
 		}
 		/* BW */
 		sendmsg->payload.userStats->has_bandwidth = true;
@@ -902,10 +897,9 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			sendPermissionDenied(client, "Permission denied");
 			break;
 		}
-		while (Client_iterate(&target) != NULL) {
-			if (target->sessionId == msg->payload.userRemove->session)
-				break;
-		}
+
+		target = Client_find_by_session(msg->payload.userRemove->session);
+
 		if (target == NULL) {
 			Log_warn("Client with sessionId %d not found", msg->payload.userRemove->session);
 			break;