Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/contacts/Contact.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ QDataStream &operator>>(QDataStream &in, Contact &contact)
BlockInfo blockInfo;
QList<Contact::PhoneNumber> phoneNumbers;

in >> id >> dn >> sourceUid >> name >> prio >> displayName >> company >> mail >> lastModified
>> sipStatusSubscriptable >> phoneNumbers >> blockInfo;
in >> id >> dn >> sourceUid >> name >> prio >> displayName >> configId >> company >> mail
>> lastModified >> sipStatusSubscriptable >> phoneNumbers >> blockInfo;
contact = Contact(id, dn, sourceUid, { prio, displayName, configId }, name, company, mail,
lastModified, phoneNumbers, blockInfo);

Expand Down
37 changes: 31 additions & 6 deletions src/contacts/carddav/CardDAVAddressBookFeeder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,29 @@ void CardDAVAddressBookFeeder::loadCachedData(const size_t hash)

QDataStream in(&cacheFile);

quint16 magic;
quint8 version;
qsizetype numberOfContacts;
quint16 magic = 0;
quint8 version = 0;

in >> magic;
in >> version;
in >> m_ignoredIds;
in >> numberOfContacts;

if (magic != CARDDAV_MAGIC || version != CARDDAV_VERSION) {
if (in.status() != QDataStream::Ok || magic != CARDDAV_MAGIC || version != CARDDAV_VERSION) {
qCInfo(lcCardDAVAddressBookFeeder) << "CardDAV cache file at" << filePath
<< "is invalid and will therefore be removed.";
cacheFile.close();
cacheFile.remove();
return;
}

qsizetype numberOfContacts = 0;
in >> m_ignoredIds;
in >> numberOfContacts;

if (in.status() != QDataStream::Ok || numberOfContacts < 0 || numberOfContacts > 1000000) {
qCWarning(lcCardDAVAddressBookFeeder) << "CardDAV cache file at" << filePath
<< "is corrupted and will therefore be removed.";
m_ignoredIds.clear();
cacheFile.close();
cacheFile.remove();
return;
}
Expand All @@ -240,6 +251,20 @@ void CardDAVAddressBookFeeder::loadCachedData(const size_t hash)
Contact *contact = new Contact(this);
in >> key;
in >> *contact;

if (in.status() != QDataStream::Ok) {
delete contact;
qCWarning(lcCardDAVAddressBookFeeder)
<< "CardDAV cache file at" << filePath
<< "is truncated or corrupted - aborting cache load.";
qDeleteAll(m_cachedContacts);
m_cachedContacts.clear();
m_ignoredIds.clear();
cacheFile.close();
cacheFile.remove();
return;
}

m_cachedContacts.insert(key, contact);
}

Expand Down
20 changes: 14 additions & 6 deletions src/media/AudioPort.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ bool AudioPort::initialize()
createPort(m_device.id().toStdString(), m_pj_fmt);

if (m_device.mode() == QAudioDevice::Mode::Input) {
adjustTxLevel(NORMAL_AUDIO_LEVEL);
try {
adjustTxLevel(NORMAL_AUDIO_LEVEL);
} catch (pj::Error &err) {
qCCritical(lcAudioPort) << "failed to adjust tx level: " << err.info();
}
}

return true;
Expand All @@ -45,7 +49,11 @@ void AudioPort::setMuted(bool value)
{
if (m_isMuted != value) {
if (m_device.mode() == QAudioDevice::Mode::Input) {
adjustTxLevel(value ? 0.0f : NORMAL_AUDIO_LEVEL);
try {
adjustTxLevel(value ? 0.0f : NORMAL_AUDIO_LEVEL);
} catch (pj::Error &err) {
qCCritical(lcAudioPort) << "failed to adjust tx level: " << err.info();
}
}

m_isMuted = value;
Expand Down Expand Up @@ -166,8 +174,8 @@ void AudioPort::startSinkIO()

qCInfo(lcAudioPort).noquote().nospace()
<< "Initialize sink of device_descr=\"" << m_device.description() << "\", device_id=\""
<< m_device.id() << "\", with settings:"
<< "\nsampleRate=" << m_audioFormat.sampleRate()
<< m_device.id()
<< "\", with settings:" << "\nsampleRate=" << m_audioFormat.sampleRate()
<< "\nchannelCount=" << m_audioFormat.channelCount()
<< "\nbytesPerSample=" << m_audioFormat.bytesPerSample()
<< "\nsampleFormat=" << m_audioFormat.sampleFormat();
Expand Down Expand Up @@ -208,8 +216,8 @@ void AudioPort::startSourceIO()

qCInfo(lcAudioPort).noquote().nospace()
<< "Initialize source of device_descr=\"" << m_device.description()
<< "\", device_id=\"" << m_device.id() << "\", with settings:"
<< "\nsampleRate=" << m_audioFormat.sampleRate()
<< "\", device_id=\"" << m_device.id()
<< "\", with settings:" << "\nsampleRate=" << m_audioFormat.sampleRate()
<< "\nchannelCount=" << m_audioFormat.channelCount()
<< "\nbytesPerSample=" << m_audioFormat.bytesPerSample()
<< "\nsampleFormat=" << m_audioFormat.sampleFormat();
Expand Down
33 changes: 28 additions & 5 deletions src/sip/SIPCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "NotificationManager.h"
#include "AvatarManager.h"
#include "GlobalCallState.h"
#include "ErrorBus.h"

#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
Expand Down Expand Up @@ -159,8 +160,8 @@ void SIPCall::onCallState(pj::OnCallStateParam &prm)
qCInfo(lcSIPCall).nospace() << "Call State: " << ci.stateText << " (" << remoteUri << ")"
<< " last status code: "
<< EnumTranslation::instance().sipStatusCode(statusCode) << " ("
<< statusCode << ") "
<< " last reason " << ci.lastReason << " contactId " << m_contactId;
<< statusCode << ") " << " last reason " << ci.lastReason
<< " contactId " << m_contactId;

if (statusCode == PJSIP_SC_RINGING) {
ringToneFactory.ringingTone()->start();
Expand Down Expand Up @@ -359,13 +360,35 @@ void SIPCall::onCallMediaState(pj::OnCallMediaStateParam &prm)

qCInfo(lcSIPCall) << "Found media, index" << i << "of" << ci.media.size();
aud_med = getAudioMedia(i);
mic_media.startTransmit(aud_med);
aud_med.startTransmit(speaker_media);

try {
mic_media.startTransmit(aud_med);
} catch (pj::Error &err) {
qCCritical(lcSIPCall)
<< "failed to start mic media transmission: " << err.info();
ErrorBus::instance().addFatalError(
tr("Failed to initialize microphone audio"));
}

try {
aud_med.startTransmit(speaker_media);
} catch (pj::Error &err) {
qCCritical(lcSIPCall)
<< "failed to start aud media transmission: " << err.info();
ErrorBus::instance().addFatalError(tr("Failed to initialize call audio"));
}

if (!m_sniffer) {
m_sniffer = new Sniffer(this);
m_sniffer->initialize();
aud_med.startTransmit(dynamic_cast<pj::AudioMediaPort &>(*m_sniffer));

try {
aud_med.startTransmit(dynamic_cast<pj::AudioMediaPort &>(*m_sniffer));
} catch (pj::Error &err) {
qCCritical(lcSIPCall)
<< "failed to start audio level transmission: " << err.info();
}

connect(m_sniffer, &Sniffer::audioLevelChanged, this, [this]() {
Q_EMIT SIPCallManager::instance().audioLevelChanged(
this, m_sniffer->audioLevel());
Expand Down
Loading