diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index bfb5a72c22d12b08c04e4ec292704504bb047ca5..7ce6a35b3da05db627e51c907ec7126edff5d229 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -607,7 +607,7 @@ namespace sfl {
}
else {
// _debug("RTP: Received an RTP event with payload: %d", adu->getType());
- ost::RTPPacket::RFC2833Payload *dtmf = (ost::RTPPacket::RFC2833Payload *)adu->getData();
+ // ost::RTPPacket::RFC2833Payload *dtmf = (ost::RTPPacket::RFC2833Payload *)adu->getData();
// _debug("RTP: Data received %d", dtmf->event);
}
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
index 0595cf43660e7fcb9e51fdd6b74d64aecb0578b9..8577c85b40ded945fdbf5b0f8debee389a407821 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -39,9 +39,14 @@ namespace sfl
AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) :
ost::SymmetricRTPSession (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort()),
- _localCryptoSuite(0),
- _remoteCryptoSuite(0),
- AudioRtpSession<AudioSrtpSession> (manager, sipcall)
+ AudioRtpSession<AudioSrtpSession> (manager, sipcall),
+ _localCryptoSuite(0),
+ _remoteCryptoSuite(0),
+ _localMasterKeyLength(0),
+ _localMasterSaltLength(0),
+ _remoteMasterKeyLength(0),
+ _remoteMasterSaltLength(0)
+
{
// Initialize local Crypto context
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
index d3b8c3dbfd07d0aa55f9a32883ca1d516eb673f3..7dd888116b57e25b7c35b9fd34be3705afae279f 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
@@ -69,57 +69,57 @@ namespace sfl {
AudioSrtpSession(ManagerImpl * manager, SIPCall * sipcall);
- std::vector<std::string> getLocalCryptoInfo(void);
+ std::vector<std::string> getLocalCryptoInfo(void);
- void setRemoteCryptoInfo(sfl::SdesNegotiator& nego);
+ void setRemoteCryptoInfo(sfl::SdesNegotiator& nego);
private:
void initializeLocalMasterKey(void);
- void initializeLocalMasterSalt(void);
+ void initializeLocalMasterSalt(void);
- void initializeRemoteCryptoContext(void);
+ void initializeRemoteCryptoContext(void);
- void initializeLocalCryptoContext(void);
+ void initializeLocalCryptoContext(void);
- std::string getBase64ConcatenatedKeys();
+ std::string getBase64ConcatenatedKeys();
- void unBase64ConcatenatedKeys(std::string base64keys);
+ void unBase64ConcatenatedKeys(std::string base64keys);
- char* encodeBase64(unsigned char *input, int length);
+ char* encodeBase64(unsigned char *input, int length);
- char* decodeBase64(unsigned char *input, int length, int *length_out);
+ char* decodeBase64(unsigned char *input, int length, int *length_out);
- /** Default local crypto suite is AES_CM_128_HMAC_SHA1_80*/
- int _localCryptoSuite;
+ /** Default local crypto suite is AES_CM_128_HMAC_SHA1_80*/
+ int _localCryptoSuite;
- /** Remote crypto suite is initialized at AES_CM_128_HMAC_SHA1_80*/
- int _remoteCryptoSuite;
+ /** Remote crypto suite is initialized at AES_CM_128_HMAC_SHA1_80*/
+ int _remoteCryptoSuite;
uint8 _localMasterKey[16];
- /** local master key length in byte */
- int _localMasterKeyLength;
+ /** local master key length in byte */
+ int _localMasterKeyLength;
- uint8 _localMasterSalt[14];
+ uint8 _localMasterSalt[14];
- /** local master salt length in byte */
- int _localMasterSaltLength;
+ /** local master salt length in byte */
+ int _localMasterSaltLength;
- uint8 _remoteMasterKey[16];
+ uint8 _remoteMasterKey[16];
- /** remote master key length in byte */
- int _remoteMasterKeyLength;
+ /** remote master key length in byte */
+ int _remoteMasterKeyLength;
- uint8 _remoteMasterSalt[14];
+ uint8 _remoteMasterSalt[14];
- /** remote master salt length in byte */
- int _remoteMasterSaltLength;
+ /** remote master salt length in byte */
+ int _remoteMasterSaltLength;
- ost::CryptoContext* _remoteCryptoCtx;
+ ost::CryptoContext* _remoteCryptoCtx;
- ost::CryptoContext* _localCryptoCtx;
+ ost::CryptoContext* _localCryptoCtx;
};
}
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
index 3f754c8df169c1bbb9fe49e3b79bab666e71c4fc..09cb2d3528073bf2ad3018bd887a05ed667be84d 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -469,7 +469,7 @@ void PulseLayer::writeToSpeaker (void)
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
int copied = tone->getNext (out, writeableSize / sizeof (SFLDataFormat), 100);
- int returnValue = pa_stream_write (playback->pulseStream(), out, copied * sizeof (SFLDataFormat), NULL, 0, PA_SEEK_RELATIVE);
+ pa_stream_write (playback->pulseStream(), out, copied * sizeof (SFLDataFormat), NULL, 0, PA_SEEK_RELATIVE);
pa_xfree (out);
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index a9a36eb8995bb69bdef2238cd19cf6b919aa20bf..991ab0722fd3dce4dbc31e10beedbf05e2d34a7f 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -821,7 +821,7 @@ std::map<std::string, int32_t> ConfigurationManager::getShortcuts() {
std::map<std::string, int> shortcutsMap;
int shortcut;
- for (int i = 0; i < shortcutsKeys.size(); i++) {
+ for (int i = 0; i < (int)shortcutsKeys.size(); i++) {
std::string key = shortcutsKeys.at(i);
shortcut = Manager::instance().getConfigInt("Shortcuts", key);
shortcutsMap.insert(std::pair<std::string, int>(key, shortcut));
@@ -836,7 +836,7 @@ void ConfigurationManager::setShortcuts(
std::map<std::string, int> map_cpy = shortcutsMap;
std::map<std::string, int>::iterator it;
- for (int i = 0; i < shortcutsKeys.size(); i++) {
+ for (int i = 0; i < (int)shortcutsKeys.size(); i++) {
std::string key = shortcutsKeys.at(i);
it = map_cpy.find(key);
if (it != shortcutsMap.end()) {
diff --git a/tools/pysflphone/pysflphone_testdbus.py b/tools/pysflphone/pysflphone_testdbus.py
index 991435e1ad484cb436c6c42d7bdc40ecae20a5eb..d05da47a9999167af290ac3f4a65c00158da612c 100644
--- a/tools/pysflphone/pysflphone_testdbus.py
+++ b/tools/pysflphone/pysflphone_testdbus.py
@@ -97,7 +97,7 @@ class SflPhoneTests():
def test_ip2ip_send_hangup(self):
"""Make a call to a server (sipp) on port 5062"""
i = 0
- while(i < 200):
+ while(i < 500):
callid = self.sflphone.Call("sip:test@" + REMOTEADDR_lo)
time.sleep(0.5)
@@ -313,7 +313,7 @@ sflphone.setFirstRegisteredAccount();
# Test 1: - Send an IP2IP call
# - Hangup
-testsuite.test_ip2ip_send_hangup()
+# testsuite.test_ip2ip_send_hangup()
# Test 2: - Send an IP2IP call
# - Peer Hangup
@@ -321,7 +321,7 @@ testsuite.test_ip2ip_send_hangup()
# Test 3: - Receive an IP2IP call
# - Hangup
-# testsuite.test_ip2ip_recv_hangup()
+testsuite.test_ip2ip_recv_hangup()
# Test 4: - Receive an IP2IP call
# - Peer Hangup
diff --git a/tools/pysflphone/sflphonectrlsimple.py b/tools/pysflphone/sflphonectrlsimple.py
index fdf6772e3ff010258eee72dd7f2ac3200ef60fbd..8de24706aafc65065d397722d9b54dfd570c6075 100755
--- a/tools/pysflphone/sflphonectrlsimple.py
+++ b/tools/pysflphone/sflphonectrlsimple.py
@@ -2,6 +2,8 @@
#
# Copyright (C) 2009 by the Free Software Foundation, Inc.
#
+# Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
@@ -201,7 +203,8 @@ class SflPhoneCtrlSimple(Thread):
except KeyError, e:
print "This call didn't exist!: " + callid + ". Adding it to the list."
callDetails = self.getCallDetails(callid)
- self.activeCalls[callid] = {'Account': callDetails['ACCOUNTID'], 'To': callDetails['PEER_NUMBER'], 'State': state }
+ self.activeCalls[callid] = {'Account': callDetails['ACCOUNTID'],
+ 'To': callDetails['PEER_NUMBER'], 'State': state }
elif state in [ "BUSY", "FAILURE" ]:
try:
del self.activeCalls[callid]
@@ -537,7 +540,9 @@ class SflPhoneCtrlSimple(Thread):
def Refuse(self, callid):
"""Refuse an incoming call identified by a CallID"""
+
print "Refuse call " + callid
+
# if not self.account:
# self.setFirstRegisteredAccount()
@@ -608,6 +613,7 @@ class SflPhoneCtrlSimple(Thread):
return callid
def run(self):
+ """Processing method for this thread"""
gobject.threads_init()
# self.loop.run()
context = self.loop.get_context()