← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/mumble/ServerHandler.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig, Patrick Matthäi, Thorvald Natvig
  • Date: 2011-02-19 22:58:58 UTC
  • mfrom: (9.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110219225858-0xlftrf4z1z4jt9e
Tags: 1.2.3-1
[ Patrick Matthäi ]
* Do not build with non existant libpulse-dev on hurd-i386.

[ Thorvald Natvig ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/ServerHandler.cpp
87
87
        bStrong = false;
88
88
 
89
89
        // For some strange reason, on Win32, we have to call supportsSsl before the cipher list is ready.
90
 
        qWarning("OpenSSL Support: %d", QSslSocket::supportsSsl());
 
90
        qWarning("OpenSSL Support: %d (%s)", QSslSocket::supportsSsl(), SSLeay_version(SSLEAY_VERSION));
91
91
 
92
92
        MumbleSSL::addSystemCA();
93
93
 
198
198
        pds >> uiSession;
199
199
        ClientUser *p = ClientUser::get(uiSession);
200
200
        AudioOutputPtr ao = g.ao;
201
 
        if (ao && p && ! p->bLocalMute && !(((msgFlags & 0x3f) == 2) && g.s.bWhisperFriends && p->qsFriendName.isEmpty())) {
 
201
        if (ao && p && ! p->bLocalMute && !(((msgFlags & 0x1f) == 2) && g.s.bWhisperFriends && p->qsFriendName.isEmpty())) {
202
202
                unsigned int iSeq;
203
203
                pds >> iSeq;
204
204
                QByteArray qba;
349
349
        mpp.set_lost(cs.uiLost);
350
350
        mpp.set_resync(cs.uiResync);
351
351
 
352
 
        mpp.set_udp_ping_avg(static_cast<float>(boost::accumulators::mean(accUDP)));
353
 
        mpp.set_udp_ping_var(static_cast<float>(boost::accumulators::variance(accUDP)));
 
352
 
 
353
        if (boost::accumulators::count(accUDP)) {
 
354
                mpp.set_udp_ping_avg(static_cast<float>(boost::accumulators::mean(accUDP)));
 
355
                mpp.set_udp_ping_var(static_cast<float>(boost::accumulators::variance(accUDP)));
 
356
        }
354
357
        mpp.set_udp_packets(static_cast<int>(boost::accumulators::count(accUDP)));
355
 
        mpp.set_tcp_ping_avg(static_cast<float>(boost::accumulators::mean(accTCP)));
356
 
        mpp.set_tcp_ping_var(static_cast<float>(boost::accumulators::variance(accTCP)));
 
358
 
 
359
        if (boost::accumulators::count(accTCP)) {
 
360
                mpp.set_tcp_ping_avg(static_cast<float>(boost::accumulators::mean(accTCP)));
 
361
                mpp.set_tcp_ping_var(static_cast<float>(boost::accumulators::variance(accTCP)));
 
362
        }
357
363
        mpp.set_tcp_packets(static_cast<int>(boost::accumulators::count(accTCP)));
 
364
 
358
365
        sendMessage(mpp);
359
366
}
360
367
 
422
429
}
423
430
 
424
431
void ServerHandler::serverConnectionClosed(QAbstractSocket::SocketError err, const QString &reason) {
 
432
        Connection *c = cConnection.get();
 
433
        if (! c)
 
434
                return;
 
435
        if (c->bDisconnectedEmitted)
 
436
                return;
 
437
        c->bDisconnectedEmitted = true;
 
438
 
425
439
        AudioOutputPtr ao = g.ao;
426
440
        if (ao)
427
441
                ao->wipe();
464
478
        MumbleProto::Version mpv;
465
479
        mpv.set_release(u8(QLatin1String(MUMBLE_RELEASE)));
466
480
 
467
 
        QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)\\.(\\d+)"));
468
 
        if (rx.exactMatch(QLatin1String(MUMTEXT(MUMBLE_VERSION_STRING)))) {
469
 
                int major = rx.cap(1).toInt();
470
 
                int minor = rx.cap(2).toInt();
471
 
                int patch = rx.cap(3).toInt();
472
 
                mpv.set_version((major << 16) | (minor << 8) | patch);
 
481
        unsigned int version = MumbleVersion::getRaw();
 
482
        if (version) {
 
483
                mpv.set_version(version);
473
484
        }
 
485
 
474
486
        mpv.set_os(u8(OSInfo::getOS()));
475
487
        mpv.set_os_version(u8(OSInfo::getOSVersion()));
476
488
        sendMessage(mpv);
671
683
                mptm.add_tree_id(channel);
672
684
        } else {
673
685
                mptm.add_channel_id(channel);
 
686
 
 
687
                if (message_ == QString::fromAscii(g.ccHappyEaster + 10)) g.bHappyEaster = true;
674
688
        }
675
689
        mptm.set_message(u8(message_));
676
690
        sendMessage(mptm);
715
729
        mpus.set_self_deaf(deaf);
716
730
        sendMessage(mpus);
717
731
}
 
732
 
 
733
void ServerHandler::announceRecordingState(bool recording) {
 
734
        MumbleProto::UserState mpus;
 
735
        mpus.set_recording(recording);
 
736
        sendMessage(mpus);
 
737
}
 
738