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

diff --git a/src/messagehandler.c b/src/messagehandler.c
index a847287..c5233f9 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -554,8 +554,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);
@@ -662,17 +661,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);
 		}
@@ -870,17 +869,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;