X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=baf6247d6ad1f644c16bf9e16fa59cc0e76b9650;hb=a72efcd9b1c000c47bbe363f51c9123528e41d84;hp=58ffb2514294f3656f5567687a9e4b63fdad70f1;hpb=e5078110436f4461a1f70c364bab84e8b82b155d;p=umurmur.git

diff --git a/src/client.c b/src/client.c
index 58ffb25..baf6247 100644
--- a/src/client.c
+++ b/src/client.c
@@ -51,7 +51,6 @@ void Client_free(client_t *client);
 
 declare_list(clients);
 static int clientcount; /* = 0 */
-static int session = 1;
 static int maxBandwidth;
 
 int iCodecAlpha, iCodecBeta;
@@ -92,18 +91,14 @@ void Client_janitor()
 	list_iterate(itr, &clients) {
 		client_t *c;
 		c = list_get_entry(itr, client_t, node);
-		Log_debug("Client %s BW available %d", c->playerName, c->availableBandwidth);
+		Log_debug("Client %s BW available %d", c->username, c->availableBandwidth);
 		c->availableBandwidth += maxBandwidth;
 		if (c->availableBandwidth > bwTop)
 			c->availableBandwidth = bwTop;
 		
 		if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) {
 			/* No activity from client - assume it is lost and close. */
-			Log_info("Timeout, closing session %d - %s@%s:%d",
-					 c->sessionId,
-					 c->playerName,
-					 inet_ntoa(c->remote_tcp.sin_addr),
-					 ntohs(c->remote_tcp.sin_port));
+			Log_info_client(c, "Timeout, closing.");
 			Client_free(c);
 		}
 	}
@@ -166,6 +161,23 @@ void recheckCodecVersions()
 	
 }
 
+static int findFreeSessionId()
+{
+	int id;
+	client_t *itr = NULL;
+
+	for (id = 1; id < INT_MAX; id++) {
+		itr = NULL;
+		while ((itr = Client_iterate(&itr)) != NULL) {
+			if (itr->sessionId == id)
+				break;
+		}
+		if (itr == NULL) /* Found free id */
+			return id;
+	}
+	return -1;
+}
+
 int Client_add(int fd, struct sockaddr_in *remote)
 {
 	client_t *newclient;
@@ -180,13 +192,16 @@ int Client_add(int fd, struct sockaddr_in *remote)
 	memcpy(&newclient->remote_tcp, remote, sizeof(struct sockaddr_in));
 	newclient->ssl = SSL_newconnection(newclient->tcpfd, &newclient->SSLready);
 	if (newclient->ssl == NULL) {
-		Log_warn("SSL negotiation failed");
+		Log_warn("SSL negotiation failed with %s:%d", inet_ntoa(remote->sin_addr),
+				 ntohs(remote->sin_port));
 		free(newclient);
 		return -1;
 	}
 	newclient->availableBandwidth = maxBandwidth;
 	Timer_init(&newclient->lastActivity);
-	newclient->sessionId = session++; /* XXX - more elaborate? */
+	newclient->sessionId = findFreeSessionId();
+	if (newclient->sessionId < 0)
+		Log_fatal("Could not find a free session ID");
 	
 	init_list_entry(&newclient->txMsgQueue);
 	init_list_entry(&newclient->chan_node);
@@ -213,13 +228,14 @@ void Client_free(client_t *client)
 	struct dlist *itr, *save;
 	message_t *sendmsg;
 
-	Log_info("Disconnect session %d - %s@%s:%d",
-			 client->sessionId,
-			 client->playerName,
-			 inet_ntoa(client->remote_tcp.sin_addr),
-			 ntohs(client->remote_tcp.sin_port));
-
 	if (client->authenticated) {
+		int leave_id;
+		leave_id = Chan_userLeave(client);
+		if (leave_id > 0) { /* Remove temp channel */
+			sendmsg = Msg_create(ChannelRemove);
+			sendmsg->payload.channelRemove->channel_id = leave_id;
+			Client_send_message_except(client, sendmsg);
+		}
 		sendmsg = Msg_create(UserRemove);
 		sendmsg->payload.userRemove->session = client->sessionId;
 		Client_send_message_except(client, sendmsg);
@@ -231,7 +247,6 @@ void Client_free(client_t *client)
 	Voicetarget_free_all(client);
 	
 	list_del(&client->node);
-	list_del(&client->chan_node);
 	if (client->ssl)
 		SSL_free(client->ssl);
 	close(client->tcpfd);
@@ -240,8 +255,8 @@ void Client_free(client_t *client)
 		free(client->release);
 	if (client->os)
 		free(client->os);			
-	if (client->playerName)
-		free(client->playerName);
+	if (client->username)
+		free(client->username);
 	if (client->context)
 		free(client->context);
 	free(client);
@@ -324,7 +339,7 @@ int Client_read(client_t *client)
 					client->msgsize = ntohl(msgLen);
 				}
 				if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) {
-					Log_warn("Too big message received (%d). Discarding.", client->msgsize);
+					Log_info_client(client, "Too big message received (%d bytes). Discarding.", client->msgsize);
 					client->rxcount = client->msgsize = 0;
 					client->drainleft = client->msgsize;
 				}
@@ -345,7 +360,7 @@ int Client_read(client_t *client)
 				return 0;
 			}
 			else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_ZERO_RETURN) {
-				Log_warn("Error: Zero return - closing");
+				Log_info_client(client, "Connection closed by peer");
 				if (!client->shutdown_wait)
 					Client_close(client);
 			}
@@ -354,14 +369,10 @@ int Client_read(client_t *client)
 					/* Hmm. This is where we end up when the client closes its connection.
 					 * Kind of strange...
 					 */
-					Log_info("Connection closed by peer. Session %d - %s@%s:%d",
-							 client->sessionId,
-							 client->playerName,
-							 inet_ntoa(client->remote_tcp.sin_addr),
-							 ntohs(client->remote_tcp.sin_port));
+					Log_info_client(client, "Connection closed by peer");
 				}
 				else {
-					Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc));
+					Log_info_client(client, "SSL error: %d - Closing connection", SSL_get_error(client->ssl, rc));
 				}
 				Client_free(client);
 				return -1;
@@ -490,7 +501,7 @@ int Client_send_message_except(client_t *client, message_t *msg)
 		if (itr != client) {
 			if (count++ > 0)
 				Msg_inc_ref(msg); /* One extra reference for each new copy */
-			Log_debug("Msg %d to %s refcount %d",  msg->messageType, itr->playerName, msg->refcount);
+			Log_debug("Msg %d to %s refcount %d",  msg->messageType, itr->username, msg->refcount);
 			Client_send_message(itr, msg);
 		}
 	}
@@ -515,12 +526,7 @@ static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t *
 			Timer_restart(&client->cryptState.tLastRequest);
 			
 			sendmsg = Msg_create(CryptSetup);
-			Log_info("Requesting voice channel crypt resync. Session %d - %s@%s:%d",
-					 client->sessionId,
-					 client->playerName,
-					 inet_ntoa(client->remote_tcp.sin_addr),
-					 ntohs(client->remote_tcp.sin_port));
-		
+			Log_info_client(client, "Requesting voice channel crypt resync");		
 			Client_send_message(client, sendmsg);
 		}
 	}
@@ -585,11 +591,7 @@ int Client_read_udp()
 			if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) {
 				if (checkDecrypt(itr, encrypted, buffer, len)) {
 					itr->key = key;
-					Log_info("New UDP connection from session %d - %s@%s:%d",
-							 itr->sessionId,
-							 itr->playerName,
-							 inet_ntoa(from.sin_addr),
-							 ntohs(from.sin_port));
+					Log_info_client(itr, "New UDP connection port %d", ntohs(from.sin_port));
 					memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
 					break;
 				}
@@ -624,7 +626,9 @@ out:
 static inline void Client_send_voice(client_t *src, client_t *dst, uint8_t *data, int len, int poslen)
 {
 	if (IS_AUTH(dst) && dst != src && !dst->deaf) {
-		if (poslen > 0 && strcmp(src->context, dst->context) == 0)
+		if (poslen > 0 && /* Has positional data */
+			src->context != NULL && dst->context != NULL && /* ...both source and destination has context */
+			strcmp(src->context, dst->context) == 0) /* ...and the contexts match */
 			Client_send_udp(dst, data, len);
 		else
 			Client_send_udp(dst, data, len - poslen);