Merge branch 'master' of git://github.com/Diaoul/umurmur into Diaoul/master

[umurmur.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 35ab266c331697e20ed0189e46d0a85fa03ed323..e190a0b9f67fa30f94ebed2fc8a6951dd8f9a765 100644 (file)
--- 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);
        
@@ -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 */
        }