diff --git a/doc/images/screenshots/accounts.png b/doc/images/screenshots/accounts.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1d033892ad357faf1e79c20141ffb9b6bd1d80 Binary files /dev/null and b/doc/images/screenshots/accounts.png differ diff --git a/doc/images/screenshots/audio-parameters.png b/doc/images/screenshots/audio-parameters.png new file mode 100644 index 0000000000000000000000000000000000000000..7be7badab519fd06a3c5ef00f9c2916f12511f4b Binary files /dev/null and b/doc/images/screenshots/audio-parameters.png differ diff --git a/doc/images/screenshots/desktop-notif-voice mail.png b/doc/images/screenshots/desktop-notif-voice mail.png new file mode 100644 index 0000000000000000000000000000000000000000..4d2899877f696477da49f7cee1935e52d43189bf Binary files /dev/null and b/doc/images/screenshots/desktop-notif-voice mail.png differ diff --git a/doc/images/screenshots/gtk gui.png b/doc/images/screenshots/gtk gui.png new file mode 100644 index 0000000000000000000000000000000000000000..958beb4ee40b156630d41ecb7c5ce77f35cb4256 Binary files /dev/null and b/doc/images/screenshots/gtk gui.png differ diff --git a/doc/images/screenshots/several-calls.png b/doc/images/screenshots/several-calls.png new file mode 100644 index 0000000000000000000000000000000000000000..65dc12dbcbba742c04f3d974bca9fe660a004756 Binary files /dev/null and b/doc/images/screenshots/several-calls.png differ diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index 00cc13ce505af9f4091a37681001c369c9887474..53edb26da43784a081ce286da2f7e88543e06809 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -789,7 +789,7 @@ ManagerImpl::startVoiceMessageNotification(const AccountID& accountId, const std ManagerImpl::stopVoiceMessageNotification(const AccountID& accountId) { // TODO : do not notify when no messages - if (_dbus) _dbus->getCallManager()->voiceMailNotify(accountId, 0 ); + //if (_dbus) _dbus->getCallManager()->voiceMailNotify(accountId, 0 ); } //THREAD=VoIP diff --git a/src/sipaccount.cpp b/src/sipaccount.cpp index cdd79558d17d0166a0df52b0fa493847c62524c0..1adcd5dbdd0f53460eae11cd2f644c755f43c953 100644 --- a/src/sipaccount.cpp +++ b/src/sipaccount.cpp @@ -42,7 +42,6 @@ SIPAccount::registerVoIPLink() _link->setFullName(Manager::instance().getConfigString(_accountID,SIP_FULL_NAME)); _link->setHostName(Manager::instance().getConfigString(_accountID,SIP_HOST_PART)); int useStun = Manager::instance().getConfigInt(_accountID,SIP_USE_STUN); - //_link->setAccountID( getAccountID() ); SIPVoIPLink* thislink = dynamic_cast<SIPVoIPLink*> (_link); thislink->setStunServer(Manager::instance().getConfigString(_accountID,SIP_STUN_SERVER)); diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp index 01ece811a435203c82a24978b900d446e097788c..46104ceb6cc0f41fb490d029baa51f34286f70ad 100644 --- a/src/sipvoiplink.cpp +++ b/src/sipvoiplink.cpp @@ -57,7 +57,7 @@ SIPVoIPLink::SIPVoIPLink(const AccountID& accountID) : VoIPLink(accountID), _localExternAddress("") { _evThread = new EventThread(this); - _initDone = false; + _nMsgVoicemail = 0; _eXosipRegID = EXOSIP_ERROR_STD; @@ -78,7 +78,6 @@ SIPVoIPLink::~SIPVoIPLink() bool SIPVoIPLink::init() { - _debug("INIT DONE : %d\n" , _initDone); if (!_initDone) { if (0 != eXosip_init()) { _debug("! SIP Failure: Could not initialize eXosip\n"); @@ -88,7 +87,7 @@ SIPVoIPLink::init() // Pour éviter qu'on refasse l'init sans avoir considéré l'erreur, // s'il y en a une ? _initDone = true; - + // check networking capabilities if ( !checkNetwork() ) { _debug("! SIP FAILURE: Unable to determine network capabilities\n"); @@ -155,9 +154,7 @@ SIPVoIPLink::init() void SIPVoIPLink::terminate() { - _debug("Terminate before\n"); terminateSIPCall(); - _debug("Terminate after\n"); if (_initDone) { // TODO The next line makes the daemon crash on // account delete if at least one account is registered. @@ -213,6 +210,12 @@ SIPVoIPLink::loadSIPLocalIP() return returnValue; } +void +SIPVoIPLink::parseRequestUri( osip_uri_t* req ) +{ + _debug("%d\n",req->url_header); +} + void SIPVoIPLink::getEvent() { @@ -226,6 +229,10 @@ SIPVoIPLink::getEvent() return; } + parseRequestUri( event->request->req_uri); + + //if(event->request->line != 0) + _debug("%s\n\n" , event->request->req_uri); switch (event->type) { /* REGISTER related events */ case EXOSIP_REGISTRATION_NEW: /** 00 < announce new registration. */ diff --git a/src/sipvoiplink.h b/src/sipvoiplink.h index 0a40e059799f0a811343a0a753832fd4735a8696..72e9e657bfddec53aad56f6bf9ceee877b4ce280 100644 --- a/src/sipvoiplink.h +++ b/src/sipvoiplink.h @@ -89,6 +89,7 @@ public: private: + void parseRequestUri( osip_uri_t* ); /** Terminate every call not hangup | brutal | Protected by mutex */ void terminateSIPCall(); diff --git a/src/voiplink.cpp b/src/voiplink.cpp index 2af83fc6341a71add244ceea8bda63ae8e31dbc2..26f35ebc560feaf824555c76537aba42ef3763de 100644 --- a/src/voiplink.cpp +++ b/src/voiplink.cpp @@ -25,7 +25,7 @@ #include "voiplink.h" #include "manager.h" -VoIPLink::VoIPLink(const AccountID& accountID) : _accountID(accountID), _localIPAddress("127.0.0.1"), _localPort(0), _registrationError(""), _initDone(false) +VoIPLink::VoIPLink(const AccountID& accountID) : _accountID(accountID), _localIPAddress("127.0.0.1"), _localPort(0), _registrationError(""), _initDone(false) { }