diff --git a/src/account.h b/src/account.h index 2d7886309f155ad6796a12674380fb3ff3ffbe32..b89baf42c66bf883a4fd3c88a30d23e48eaebc3e 100644 --- a/src/account.h +++ b/src/account.h @@ -75,7 +75,19 @@ class Account{ * Virtual destructor */ virtual ~Account(); - + + // copy constructor + Account(const Account& rh):_accountID(rh._accountID), _link(rh._link), _enabled(rh._enabled){ + _debug("Account copy constructor hasn't been implemented yet. Quit! "); + exit(0); + } + + // assignment operator + Account& operator=(const Account& rh){ + _debug("Account assignment operator hasn't been implemented yet. Quit! "); + exit(0); + } + /** * Load the settings for this account. */ diff --git a/src/audio/audioloop.h b/src/audio/audioloop.h index 2b601d800f6e7d4706800abd11433cac6b33ceb0..98114e9002820c75a4ff0cc3029b301f05657cca 100644 --- a/src/audio/audioloop.h +++ b/src/audio/audioloop.h @@ -43,7 +43,10 @@ public: virtual ~AudioLoop(); // Copy Constructor - AudioLoop(const AudioLoop& rh):_buffer(0),_size(0), _pos(0), _sampleRate(0) { *this = rh; } + AudioLoop(const AudioLoop& rh):_buffer(rh._buffer),_size(rh._size), _pos(rh._pos), _sampleRate(rh._sampleRate) { + _debug("AudioLoop copy constructor hasn't been implemented yet. Quit!"); + exit(0); + } // Assignment Operator AudioLoop& operator=( const AudioLoop& rh){ diff --git a/src/useragent.cpp b/src/useragent.cpp index 23a4bc334a5b5ceb1e2d50d8346771dce322c658..4f4370208a050389bae334711172fb382fd5fadb 100644 --- a/src/useragent.cpp +++ b/src/useragent.cpp @@ -31,9 +31,10 @@ UserAgent *UserAgent::_current; -UserAgent::UserAgent() { - _useStun = false; - _localIPAddress = "127.0.0.1"; +UserAgent::UserAgent():_endpt(NULL) ,_sock(NULL), _cp(), _pool(NULL), _mutex(NULL), _mod(), _options_handler(), _useStun(false), _stunHost(), + _stunServer(""), _localExternAddress(""), _localIPAddress("127.0.0.1"), _localExternPort(0), _localPort(0), _thread(NULL) { + //_useStun = false; + //_localIPAddress = "127.0.0.1"; UserAgent::_current = this; } @@ -87,8 +88,7 @@ pj_status_t UserAgent::sipCreate() { pj_status_t UserAgent::sipInit() { pj_status_t status; - const pj_str_t STR_OPTIONS = {(char*)"OPTIONS", 7}; - + /* Init SIP UA: */ //FIXME! DNS initialize here! */ @@ -278,8 +278,6 @@ pj_status_t UserAgent::sipInit() { } void UserAgent::sipDestory() { - int i, size; - /* Signal threads to quit: */ Manager::instance().setSipThreadStatus(true); @@ -459,7 +457,7 @@ bool UserAgent::removeAccount(pjsip_regc *regc) } pj_str_t UserAgent::buildContact(char *userName) { - pj_str_t contact; + //pj_str_t contact; char tmp[256]; //FIXME: IPV6 issue!! @@ -501,7 +499,7 @@ pj_status_t UserAgent::stunServerResolve() { int UserAgent::createUDPServer() { pj_status_t status; - pj_str_t ipAddr; + //pj_str_t ipAddr; pj_sockaddr_in bound_addr; pjsip_host_port a_name; char tmpIP[32]; @@ -650,7 +648,7 @@ pj_bool_t UserAgent::mod_on_rx_request(pjsip_rx_data *rdata) { unsigned options = 0; pjsip_dialog* dialog; pjsip_tx_data *tdata; - pjmedia_sdp_session *r_sdp; + //pjmedia_sdp_session *r_sdp; AccountID account_id; // voicemail part @@ -672,7 +670,7 @@ pj_bool_t UserAgent::mod_on_rx_request(pjsip_rx_data *rdata) { // Get the account id of callee from username and server account_id = Manager::instance().getAccountIdFromNameAndServer(userName, server); if(account_id == AccountNULL) { - _debug("UserAgent: Username %s doesn't match any account!\n"); + _debug("UserAgent: Username %s doesn't match any account!\n",userName); return PJ_FALSE; } _debug("UserAgent: The receiver is : %s@%s\n", userName.data(), server.data()); @@ -1106,6 +1104,7 @@ bool UserAgent::onhold(SIPCall *call) { status = pjsip_inv_send_msg( call->getInvSession(), tdata); _debug("UserAgent: After pjsip_inv_reinite begins!\n"); + return (status == PJ_SUCCESS); } bool UserAgent::offhold(SIPCall *call) { @@ -1125,6 +1124,7 @@ bool UserAgent::offhold(SIPCall *call) { status = pjsip_inv_send_msg( call->getInvSession(), tdata); _debug("UserAgent: After pjsip_inv_reinite begins!\n"); + return (status == PJ_SUCCESS); } bool UserAgent::hangup(SIPCall* call) { @@ -1162,9 +1162,9 @@ bool UserAgent::transfer(SIPCall *call, const std::string& to) { pjsip_evsub *sub; pjsip_tx_data *tdata; - pjsip_dialog *dlg; - pjsip_generic_string_hdr *gs_hdr; - const pj_str_t str_ref_by = { (char*)"Referred-By", 11 }; + //pjsip_dialog *dlg; + //pjsip_generic_string_hdr *gs_hdr; + //const pj_str_t str_ref_by = { (char*)"Referred-By", 11 }; struct pjsip_evsub_user xfer_cb; pj_status_t status; pj_str_t dest;