X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=2ad53ba983273dbee7256d925a9b210829cb7826;hb=00d6addea82c3c75ac784f9c7877ef61a382492b;hp=35ab266c331697e20ed0189e46d0a85fa03ed323;hpb=082533e47427c10c255a12a962b8d8ea7ef0bdc0;p=umurmur.git

diff --git a/src/client.c b/src/client.c
index 35ab266..2ad53ba 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -200,7 +200,7 @@ void recheckCodecVersions()
 	// it as alpha and announce it. If another codec now got the
 	// majority set it as the opposite of the currently valid bPreferAlpha
 	// and announce it.
-	if (version == (uint32_t)0x8000000a)
+	if (version == (uint32_t)0x8000000b)
 		bPreferAlpha = true;
 	else
 		bPreferAlpha = ! bPreferAlpha;
@@ -211,8 +211,8 @@ void recheckCodecVersions()
 		iCodecBeta = version;
 	
 	sendmsg = Msg_create(CodecVersion);
-	sendmsg->payload.codecVersion->alpha = version;
-	sendmsg->payload.codecVersion->beta = version;
+	sendmsg->payload.codecVersion->alpha = iCodecAlpha;
+	sendmsg->payload.codecVersion->beta = iCodecBeta;
 	sendmsg->payload.codecVersion->prefer_alpha = bPreferAlpha;
 	Client_send_message_except(NULL, sendmsg);
 	
@@ -354,10 +354,10 @@ int Client_read_fd(int fd)
 			break;
 		}
 	}
-	if (client == NULL)
-		Log_fatal("No client found for fd %d", fd);
-	
-	return Client_read(client);
+	if (client != NULL)
+		return Client_read(client);
+	else
+		return -1;
 }
 
 int Client_read(client_t *client)
@@ -457,10 +457,10 @@ int Client_write_fd(int fd)
 			break;
 		}
 	}
-	if (client == NULL)
-		Log_fatal("No client found for fd %d", fd);
-	Client_write(client);
-	return 0;
+	if (client != NULL)
+		return Client_write(client);
+	else
+		return -1;
 }
 
 int Client_write(client_t *client)
@@ -690,7 +690,6 @@ int Client_read_udp()
 					memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
 					break;
 				}
-				else Log_warn("Bad cryptstate from peer");
 			}
 		} /* while */
 	}