jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #26295: sip: don't crash if transport could not be created

Browse Source
This commit is contained in:
Tristan Matthews
2013-06-21 17:16:57 -04:00
parent 8db484c845
commit c15fef2fef
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/src/sip/sipvoiplink.cpp
View File

@ -678,14 +678,16 @@ void SIPVoIPLink::sendRegister(Account *a)
std::string contact = account->getContactHeader();
pj_str_t pjContact = pj_str((char*) contact.c_str());
if (account->isStunEnabled()) {
DEBUG("Setting VIA sent-by to %s:%u", account->transport_->local_name.host.ptr, account->transport_->local_name.port);
if (pjsip_regc_set_via_sent_by(regc, &account->transport_->local_name, account->transport_) != PJ_SUCCESS)
throw VoipLinkException("Unable to set the \"sent-by\" field");
} else if (not received.empty() and received != account->getPublishedAddress()) {
DEBUG("Setting VIA sent-by to %s:%d", received.c_str(), account->getRPort());
if (pjsip_regc_set_via_sent_by(regc, account->getViaAddr(), account->transport_) != PJ_SUCCESS)
throw VoipLinkException("Unable to set the \"sent-by\" field");
if (account->transport_) {
if (account->isStunEnabled()) {
DEBUG("Setting VIA sent-by to %s:%u", account->transport_->local_name.host.ptr, account->transport_->local_name.port);
if (pjsip_regc_set_via_sent_by(regc, &account->transport_->local_name, account->transport_) != PJ_SUCCESS)
throw VoipLinkException("Unable to set the \"sent-by\" field");
} else if (not received.empty() and received != account->getPublishedAddress()) {
DEBUG("Setting VIA sent-by to %s:%d", received.c_str(), account->getRPort());
if (pjsip_regc_set_via_sent_by(regc, account->getViaAddr(), account->transport_) != PJ_SUCCESS)
throw VoipLinkException("Unable to set the \"sent-by\" field");
}
}
if (pjsip_regc_init(regc, &pjSrv, &pjFrom, &pjFrom, 1, &pjContact, account->getRegistrationExpire()) != PJ_SUCCESS)