r3283 - in trunk: libmcrypto/source libmcrypto/source/openssl libminisip/include/libminisip/media libminisip/include/libminisip/signaling/conference libminisip/source libminisip/source/ipprovider libminisip/source/subsystem_contacts libminisip/source/subsystem_media libminisip/source/subsystem_media/codecs libminisip/source/subsystem_media/rtp libminisip/source/subsystem_media/soundcard libminisip/source/subsystem_media/soundcard/resampler libminisip/source/subsystem_signaling/sdp libminisip/source/subsystem_signaling/sip libmnetutil/include/libmnetutil libmnetutil/source libmsip/include/libmsip libmsip/source libmsip/source/dialogs libmsip/source/headers libmsip/source/messages libmsip/source/transactions libmutil/include/libmutil libmutil/source
erik at minisip.org
erik at minisip.org
Tue May 22 13:50:06 CEST 2007
Author: erik
Date: 2007-05-22 13:50:06 +0200 (Tue, 22 May 2007)
New Revision: 3283
Modified:
trunk/libmcrypto/source/cert.cxx
trunk/libmcrypto/source/openssl/OakleyDH.cxx
trunk/libmcrypto/source/openssl/TlsException.cxx
trunk/libmcrypto/source/openssl/TlsServerSocket.cxx
trunk/libmcrypto/source/openssl/TlsSocket.cxx
trunk/libmcrypto/source/openssl/init.cxx
trunk/libminisip/include/libminisip/media/DtmfSender.h
trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h
trunk/libminisip/source/Minisip.cxx
trunk/libminisip/source/MinisipExceptions.cxx
trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
trunk/libminisip/source/ipprovider/StunIpProvider.cxx
trunk/libminisip/source/subsystem_contacts/ContactDb.cxx
trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx
trunk/libminisip/source/subsystem_media/AudioMedia.cxx
trunk/libminisip/source/subsystem_media/CallRecorder.cxx
trunk/libminisip/source/subsystem_media/DtmfSender.cxx
trunk/libminisip/source/subsystem_media/MediaHandler.cxx
trunk/libminisip/source/subsystem_media/MediaStream.cxx
trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx
trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx
trunk/libminisip/source/subsystem_media/rtp/RtpHeader.cxx
trunk/libminisip/source/subsystem_media/rtp/RtpPacket.cxx
trunk/libminisip/source/subsystem_media/rtp/SRtpPacket.cxx
trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSpatial.cxx
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
trunk/libminisip/source/subsystem_media/soundcard/resampler/SimpleResampler.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx
trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx
trunk/libmnetutil/include/libmnetutil/NetworkException.h
trunk/libmnetutil/source/IP4Address.cxx
trunk/libmnetutil/source/IP4ServerSocket.cxx
trunk/libmnetutil/source/IP6ServerSocket.cxx
trunk/libmnetutil/source/NetworkException.cxx
trunk/libmnetutil/source/ServerSocket.cxx
trunk/libmnetutil/source/TCPSocket.cxx
trunk/libmnetutil/source/UDPSocket.cxx
trunk/libmsip/include/libmsip/SipHeaderContact.h
trunk/libmsip/include/libmsip/SipRequest.h
trunk/libmsip/source/SipCommandDispatcher.cxx
trunk/libmsip/source/SipDialogConfig.cxx
trunk/libmsip/source/SipLayerTransport.cxx
trunk/libmsip/source/SipMessageContentMime.cxx
trunk/libmsip/source/SipSMCommand.cxx
trunk/libmsip/source/SipStackInternal.cxx
trunk/libmsip/source/SipUri.cxx
trunk/libmsip/source/dialogs/SipDialog.cxx
trunk/libmsip/source/headers/SipHeaderAcceptContact.cxx
trunk/libmsip/source/headers/SipHeaderAuthorization.cxx
trunk/libmsip/source/headers/SipHeaderCSeq.cxx
trunk/libmsip/source/headers/SipHeaderContact.cxx
trunk/libmsip/source/headers/SipHeaderContentLength.cxx
trunk/libmsip/source/headers/SipHeaderRSeq.cxx
trunk/libmsip/source/headers/SipHeaderString.cxx
trunk/libmsip/source/headers/SipHeaderTo.cxx
trunk/libmsip/source/headers/SipHeaderUnknown.cxx
trunk/libmsip/source/headers/SipHeaderVia.cxx
trunk/libmsip/source/headers/SipHeaderWarning.cxx
trunk/libmsip/source/messages/SipMessage.cxx
trunk/libmsip/source/messages/SipRequest.cxx
trunk/libmsip/source/messages/SipResponse.cxx
trunk/libmsip/source/transactions/SipTransaction.cxx
trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx
trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx
trunk/libmsip/source/transactions/SipTransactionInviteServerUA.cxx
trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx
trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx
trunk/libmutil/include/libmutil/StateMachine.h
trunk/libmutil/include/libmutil/TimeoutProvider.h
trunk/libmutil/include/libmutil/XMLParser.h
trunk/libmutil/include/libmutil/minilist.h
trunk/libmutil/source/CircularBuffer.cxx
trunk/libmutil/source/Exception.cxx
trunk/libmutil/source/Library.cxx
trunk/libmutil/source/MessageRouter.cxx
trunk/libmutil/source/TextUI.cxx
trunk/libmutil/source/ThreadPosix.cxx
trunk/libmutil/source/XMLParser.cxx
trunk/libmutil/source/stringutils.cxx
Log:
This commit does not change how minisip works. This is
fixes of warnings when using a compiler in a quite trict
mode.
* Remove shadowing of attributes and variables in many places
* Fix potential but in minilist optimization for O(1) forward
itteration.
* Added default switch cases
- for unknown SSL errors
* I removed unnecessary parameters from addDefaultHeaders.
The removed ones are attributes.
* I removed static buildUri function in SipRequest that
was not used.
* checkZrtpChecksum did not return a vaule. Now we
always return true. It's still not implemented.
Modified: trunk/libmcrypto/source/cert.cxx
===================================================================
--- trunk/libmcrypto/source/cert.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/cert.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -97,8 +97,8 @@
m_pk = priv_key;
}
-void certificate::set_pk( const std::string &file ){
- set_pk( priv_key::load( file ) );
+void certificate::set_pk( const std::string &file_ ){
+ set_pk( priv_key::load( file_ ) );
}
void certificate::set_encpk(char *derEncPk, int length,
Modified: trunk/libmcrypto/source/openssl/OakleyDH.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/OakleyDH.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/openssl/OakleyDH.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -44,7 +44,7 @@
}
}
-OakleyDH::OakleyDH( int groupValue ){
+OakleyDH::OakleyDH( int groupValue_ ){
// Store opensslDhPtr in priv
priv = DH_new();
if( opensslDhPtr == NULL )
@@ -53,7 +53,7 @@
"DH parameters." );
}
- if( !setGroup( groupValue ) ){
+ if( !setGroup( groupValue_ ) ){
throw Exception( "Could not set the openssl "
"DH group." );
}
@@ -63,8 +63,8 @@
DH_free( opensslDhPtr );
}
-bool OakleyDH::setGroup( int groupValue ){
- this->groupValue = groupValue;
+bool OakleyDH::setGroup( int groupValue_ ){
+ this->groupValue = groupValue_;
switch( groupValue ) {
case DH_GROUP_OAKLEY5:
BN_hex2bn( &opensslDhPtr->p, OAKLEY5_P );
Modified: trunk/libmcrypto/source/openssl/TlsException.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsException.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/openssl/TlsException.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -31,7 +31,7 @@
using namespace std;
-TLSConnectFailed::TLSConnectFailed( int errorNumber, SSL * ssl ):ConnectFailed(errorNumber),ssl(ssl){};
+TLSConnectFailed::TLSConnectFailed( int errorNumber_, SSL * ssl_ ):ConnectFailed(errorNumber_),ssl(ssl_){};
const char *TLSConnectFailed::what(){
@@ -56,6 +56,8 @@
msg = "SSL Error: I/O error" ; break;
case SSL_ERROR_SSL:
msg = "SSL Error: Error in the SSL protocol" ; break;
+ default:
+ msg = "SSL Error: Unknown SSL error";
}
return msg.c_str();
}
Modified: trunk/libmcrypto/source/openssl/TlsServerSocket.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsServerSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/openssl/TlsServerSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -53,8 +53,8 @@
#endif
-TLSServerSocket::TLSServerSocket( int32_t domain, int32_t listen_port )
- :ServerSocket( domain, listen_port )
+TLSServerSocket::TLSServerSocket( int32_t domain_, int32_t listen_port_ )
+ :ServerSocket( domain_, listen_port_ )
{
}
@@ -82,36 +82,36 @@
-OsslServerSocket::OsslServerSocket( int32_t listen_port, MRef<ossl_certificate *> cert, MRef<ossl_ca_db *> cert_db):TLSServerSocket(AF_INET, listen_port)
+OsslServerSocket::OsslServerSocket( int32_t listen_port_, MRef<ossl_certificate *> cert_, MRef<ossl_ca_db *> cert_db_):TLSServerSocket(AF_INET, listen_port)
{
- init(false, listen_port, cert, cert_db);
+ init(false, listen_port_, cert_, cert_db_);
}
-OsslServerSocket::OsslServerSocket( bool use_ipv6, int32_t listen_port,
- MRef<ossl_certificate *> cert,
- MRef<ossl_ca_db *> cert_db):TLSServerSocket(use_ipv6?AF_INET6:AF_INET, listen_port)
+OsslServerSocket::OsslServerSocket( bool use_ipv6_, int32_t listen_port_,
+ MRef<ossl_certificate *> cert_,
+ MRef<ossl_ca_db *> cert_db_):TLSServerSocket(use_ipv6_?AF_INET6:AF_INET, listen_port_)
{
- init(use_ipv6, listen_port, cert, cert_db);
+ init(use_ipv6_, listen_port_, cert_, cert_db_);
}
-void OsslServerSocket::init( bool use_ipv6, int32_t listen_port,
+void OsslServerSocket::init( bool use_ipv6_, int32_t listen_port_,
MRef<ossl_certificate *> cert,
- MRef<ossl_ca_db *> cert_db)
+ MRef<ossl_ca_db *> cert_db_)
{
+ this->cert_db = cert_db_;
int32_t backlog = 25;
SSL_METHOD * meth;
const unsigned char * sid_ctx = (const unsigned char *)"Minisip TLS";
- if( use_ipv6 )
- listen("::", listen_port, backlog);
+ if( use_ipv6_ )
+ listen("::", listen_port_, backlog);
else
- listen("0.0.0.0", listen_port, backlog);
+ listen("0.0.0.0", listen_port_, backlog);
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
meth = SSLv23_server_method();
this->ssl_ctx = SSL_CTX_new( meth );
- this->cert_db = cert_db;
if( ssl_ctx == NULL ){
#ifdef DEBUG_OUTPUT
Modified: trunk/libmcrypto/source/openssl/TlsSocket.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/openssl/TlsSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -85,7 +85,7 @@
// When created by a TLS Server
-OsslSocket::OsslSocket( MRef<StreamSocket *> tcp_socket, SSL_CTX * ssl_ctx ):
+OsslSocket::OsslSocket( MRef<StreamSocket *> tcp_socket, SSL_CTX * ssl_ctx_ ):
sock(tcp_socket){
type = SOCKET_TYPE_TLS;
peerPort = tcp_socket->getPeerPort();
@@ -94,7 +94,7 @@
int error;
// Copy the SSL parameters, since the server still needs them
// Initialize ssl in priv
- priv = SSL_new( ssl_ctx );
+ priv = SSL_new( ssl_ctx_ );
this->ssl_ctx = SSL_get_SSL_CTX( ssl );
SSL_set_fd( ssl, tcp_socket->getFd() );
@@ -109,30 +109,30 @@
}
-OsslSocket::OsslSocket( IPAddress &addr, int32_t port, void * &ssl_ctx,
+OsslSocket::OsslSocket( IPAddress &addr, int32_t port, void * &ssl_ctx_,
MRef<ossl_certificate *> cert,
- MRef<ossl_ca_db *> cert_db ){
+ MRef<ossl_ca_db *> cert_db_ ){
MRef<TCPSocket*> tcp_sock = new TCPSocket( addr, port );
- OsslSocket::OsslSocket_init( *tcp_sock, ssl_ctx, cert, cert_db);
+ OsslSocket::OsslSocket_init( *tcp_sock, ssl_ctx_, cert, cert_db_);
}
-OsslSocket::OsslSocket( string addr, int32_t port, void * &ssl_ctx,
+OsslSocket::OsslSocket( string addr, int32_t port, void * &ssl_ctx_,
MRef<ossl_certificate *> cert,
- MRef<ossl_ca_db *> cert_db ){
+ MRef<ossl_ca_db *> cert_db_ ){
MRef<TCPSocket*> tcp_sock = new TCPSocket( addr, port );
- OsslSocket::OsslSocket_init( *tcp_sock, ssl_ctx, cert, cert_db);
+ OsslSocket::OsslSocket_init( *tcp_sock, ssl_ctx_, cert, cert_db_);
}
/* Helper function ... simplify the maintenance of constructors ... */
-void OsslSocket::OsslSocket_init( MRef<StreamSocket*> ssock, void * &ssl_ctx,
+void OsslSocket::OsslSocket_init( MRef<StreamSocket*> ssock, void * &ssl_ctx_,
MRef<ossl_certificate *> cert,
- MRef<ossl_ca_db *> cert_db ){
+ MRef<ossl_ca_db *> cert_db_ ){
type = SOCKET_TYPE_TLS;
const unsigned char * sid_ctx = (const unsigned char *)"Minisip TLS";
SSLeay_add_ssl_algorithms();
SSL_METHOD *meth = SSLv23_client_method();
- this->ssl_ctx = (SSL_CTX *)ssl_ctx;
- this->cert_db = cert_db;
+ this->ssl_ctx = (SSL_CTX *)ssl_ctx_;
+ this->cert_db = cert_db_;
peerPort = ssock->getPeerPort();
MRef<ossl_certificate*> ssl_cert;
MRef<ossl_ca_db*> ssl_db;
Modified: trunk/libmcrypto/source/openssl/init.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/init.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmcrypto/source/openssl/init.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -69,7 +69,7 @@
void OpenSSLThreadGuard::openssl_locker(int mode, int i,
const char *file, int line)
{
- MRef<OpenSSLThreadGuard *> instance = OpenSSLThreadGuard::getInstance();
- instance->setLock(i, mode & CRYPTO_LOCK);
+ MRef<OpenSSLThreadGuard *> inst = OpenSSLThreadGuard::getInstance();
+ inst->setLock(i, mode & CRYPTO_LOCK);
}
Modified: trunk/libminisip/include/libminisip/media/DtmfSender.h
===================================================================
--- trunk/libminisip/include/libminisip/media/DtmfSender.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/include/libminisip/media/DtmfSender.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -33,20 +33,20 @@
class LIBMINISIP_API DtmfEvent{
public:
- DtmfEvent( uint8_t symbol,
- uint8_t volume,
- uint16_t duration,
- bool endOfEvent,
- bool startOfEvent,
- uint32_t * ts,
- bool lastBlock = false ):
- symbol(symbol),
- volume(volume),
- duration(duration),
- endOfEvent(endOfEvent),
- startOfEvent(startOfEvent),
- ts(ts),
- lastBlock(lastBlock){
+ DtmfEvent( uint8_t symbol_,
+ uint8_t volume_,
+ uint16_t duration_,
+ bool endOfEvent_,
+ bool startOfEvent_,
+ uint32_t * ts_,
+ bool lastBlock_ = false ):
+ symbol(symbol_),
+ volume(volume_),
+ duration(duration_),
+ endOfEvent(endOfEvent_),
+ startOfEvent(startOfEvent_),
+ ts(ts_),
+ lastBlock(lastBlock_){
};
private:
Modified: trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -59,11 +59,11 @@
}
void setSip(MRef<Sip*> ssp);
- void setGui(MRef<Gui *> guiptr){gui = guiptr;};
+ void setGui(MRef<Gui *> g){gui = g;};
virtual void setConferenceController(ConferenceControl *conf);
virtual void removeConferenceController(ConferenceControl *conf);
- void setMediaHandler(MRef<MediaHandler *> mediaHandler){
- this->mediaHandler = mediaHandler;}
+ void setMediaHandler(MRef<MediaHandler *> mh){
+ this->mediaHandler = mh;}
virtual void sipcb_handleCommand(const CommandString &command);
virtual void sipcb_handleConfCommand(const CommandString &command);
Modified: trunk/libminisip/source/Minisip.cxx
===================================================================
--- trunk/libminisip/source/Minisip.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/Minisip.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -167,7 +167,7 @@
* -p <plugin path>
* -c <configuration file>
*/
-Minisip::Minisip( MRef<Gui *> gui, int /*argc*/, char **argv ) : gui(gui){
+Minisip::Minisip( MRef<Gui *> g, int /*argc*/, char **argv ) : gui(g){
string pluginPath = argv ? argv[0] : "";
int i=0;
@@ -190,9 +190,11 @@
if (path)
confPath = path;
else
- throw
- MinisipBadArgument("bad argument for -c");
+ throw MinisipBadArgument("bad argument for -c");
break;
+ default:
+ throw MinisipBadArgument((string("bad argument: ") + a[1]).c_str());
+ break;
}
}
@@ -266,6 +268,7 @@
sip->getSipStack()->handleCommand(sipcmd);
sip->stop();
}
+ return 1;
}
int Minisip::join(){
@@ -288,11 +291,11 @@
confMessageRouter = NULL;
gui = NULL;
+ return 1;
}
int Minisip::exit(){
- int ret = 1;
mout << BOLD << "Minisip is Shutting down!!!" << PLAIN << end;
stop();
Modified: trunk/libminisip/source/MinisipExceptions.cxx
===================================================================
--- trunk/libminisip/source/MinisipExceptions.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/MinisipExceptions.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -27,7 +27,7 @@
using namespace std;
-MinisipException::MinisipException( const std::string& what ) : Exception(what){
+MinisipException::MinisipException( const std::string& msg ) : Exception(msg){
}
Modified: trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -65,7 +65,7 @@
//if a preferred network interface is specified in the config file ...
if( config->networkInterfaceName != "") {
- for (unsigned i=0; i<ifaces.size(); i++){
+ for (i=0; i<ifaces.size(); i++){
if ( config->networkInterfaceName == ifaces[i] ) {
localIp = NetworkFunctions::getInterfaceIPStr(ifaces[i]);
ipFound=true;
Modified: trunk/libminisip/source/ipprovider/StunIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/StunIpProvider.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/ipprovider/StunIpProvider.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -167,11 +167,11 @@
natType, externalIp, stunIp, stunPort );
}
-StunIpProvider::StunIpProvider( uint32_t natType, string externalIp, MRef<IPAddress *> stunIp, uint16_t stunPort ):
- stunIp(stunIp),
- stunPort(stunPort),
- externalIp(externalIp),
- natType(natType)
+StunIpProvider::StunIpProvider( uint32_t natType_, string externalIp_, MRef<IPAddress *> stunIp_, uint16_t stunPort_ ):
+ stunIp(stunIp_),
+ stunPort(stunPort_),
+ externalIp(externalIp_),
+ natType(natType_)
{
}
Modified: trunk/libminisip/source/subsystem_contacts/ContactDb.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/ContactDb.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_contacts/ContactDb.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -41,11 +41,11 @@
}
-ContactEntry::ContactEntry( string uri, string desc,
- MRef<PhoneBookPerson *> person ):
- uri(uri),
- desc(desc),
- person(person),
+ContactEntry::ContactEntry( string uri_, string desc_,
+ MRef<PhoneBookPerson *> p):
+ uri(uri_),
+ desc(desc_),
+ person(p),
onlineStatus(CONTACT_STATUS_UNKNOWN){
@@ -64,8 +64,8 @@
}
-void ContactEntry::setDb( MRef<ContactDb *> db ){
- ContactEntry::db = db;
+void ContactEntry::setDb( MRef<ContactDb *> d){
+ ContactEntry::db = d;
}
string ContactEntry::getName(){
@@ -86,12 +86,12 @@
return id;
}
-void ContactEntry::setDesc( string desc ){
- this->desc = desc;
+void ContactEntry::setDesc( string d ){
+ this->desc = d;
}
-void ContactEntry::setUri( string uri ){
- this->uri = uri;
+void ContactEntry::setUri( string u ){
+ this->uri = u;
}
Modified: trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -37,7 +37,7 @@
using namespace std;
-MXmlPhoneBookIo::MXmlPhoneBookIo( string fileName ):fileName(fileName){
+MXmlPhoneBookIo::MXmlPhoneBookIo( string fn ):fileName( fn ){
}
Modified: trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -48,12 +48,12 @@
return NULL;
}
-void PhoneBook::setIo( MRef<PhoneBookIo *> io ){
- this->io = io;
+void PhoneBook::setIo( MRef<PhoneBookIo *> io_ ){
+ this->io = io_;
}
-void PhoneBook::setName( string name ){
- this->name = name;
+void PhoneBook::setName( string n ){
+ this->name = n;
}
string PhoneBook::getName(){
@@ -83,7 +83,7 @@
return io->getPhoneBookId();
}
-PhoneBookPerson::PhoneBookPerson( std::string name ):name(name){
+PhoneBookPerson::PhoneBookPerson( std::string n ):name( n ){
}
PhoneBookPerson::~PhoneBookPerson(){
@@ -100,8 +100,8 @@
}*/
}
-void PhoneBookPerson::setName( string name ){
- this->name = name;
+void PhoneBookPerson::setName( string n){
+ this->name = n;
}
string PhoneBookPerson::getName(){
Modified: trunk/libminisip/source/subsystem_media/AudioMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -72,10 +72,10 @@
//AudioMedia::AudioMedia( MRef<SoundIO *> soundIo, MRef<Codec *> codec ):
// Media(codec),
// soundIo(soundIo){
-AudioMedia::AudioMedia( MRef<SoundIO *> soundIo,
- std::list<MRef<Codec *> > codecList ):
- Media(codecList),
- soundIo(soundIo){
+AudioMedia::AudioMedia( MRef<SoundIO *> soundIo_,
+ std::list<MRef<Codec *> > codecList_ ):
+ Media(codecList_),
+ soundIo(soundIo_){
// for audio media, we assume that we can both send and receive
receive = true;
@@ -263,7 +263,7 @@
}
-AudioMediaSource::AudioMediaSource( uint32_t ssrc, MRef<Media *> media ):
+AudioMediaSource::AudioMediaSource( uint32_t ssrc_, MRef<Media *> m):
BasicSoundSource( ssrc,
NULL, //plc
0/*position*/,
@@ -272,8 +272,8 @@
2 //number of channels (numChannels)
//buffer size defaults to 16000 * numChannels
),
- media(media),
- ssrc(ssrc)
+ media(m),
+ ssrc(ssrc_)
{
}
Modified: trunk/libminisip/source/subsystem_media/CallRecorder.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/CallRecorder.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/CallRecorder.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -39,13 +39,13 @@
CallRecorder::CallRecorder( MRef<AudioMedia *> aMedia,
- MRef<RtpReceiver *> rtpReceiver,
+ MRef<RtpReceiver *> rtpReceiver_,
MRef<IpProvider *> ipProvider ):
- MediaStreamReceiver( (Media *)*aMedia, rtpReceiver ),
+ MediaStreamReceiver( (Media *)*aMedia, rtpReceiver_ ),
+ enabledMic(false),
+ enabledNtwk(false),
fileDev( NULL ),
- audioMedia( aMedia),
- enabledMic(false),
- enabledNtwk(false)
+ audioMedia( aMedia)
{
static int count = 0;
count ++;
Modified: trunk/libminisip/source/subsystem_media/DtmfSender.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/DtmfSender.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/DtmfSender.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -33,8 +33,8 @@
# include"../include/minisip_wce_extra_includes.h"
#endif
-DtmfSender::DtmfSender( MRef<Session *> session ){
- this->session = session;
+DtmfSender::DtmfSender( MRef<Session *> session_ ){
+ this->session = session_;
}
void DtmfSender::timeout( DtmfEvent * event ){
Modified: trunk/libminisip/source/subsystem_media/MediaHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -54,15 +54,14 @@
using namespace std;
-MediaHandler::MediaHandler( MRef<SipSoftPhoneConfiguration *> config, MRef<IpProvider *> ipProvider, MRef<IpProvider *> ip6Provider ): ip6Provider(ip6Provider){
+MediaHandler::MediaHandler( MRef<SipSoftPhoneConfiguration *> conf, MRef<IpProvider *> ipp, MRef<IpProvider *> ip6p ): ip6Provider(ip6p){
- this->ipProvider = ipProvider;
- this->config = config;
+ this->ipProvider = ipp;
+ this->config = conf;
init();
}
MediaHandler::~MediaHandler(){
-// cerr << "~MediaHandler" << end;
}
void MediaHandler::init(){
@@ -77,11 +76,11 @@
MRef<MPlugin *> plugin = *i;
MRef<MediaPlugin *> mediaPlugin = dynamic_cast<MediaPlugin*>( *plugin );
if( mediaPlugin ){
- MRef<Media *> media = mediaPlugin->createMedia( config );
- MRef<AudioMedia *> audio = dynamic_cast<AudioMedia *>( *media );
+ MRef<Media *> m = mediaPlugin->createMedia( config );
+ MRef<AudioMedia *> audio = dynamic_cast<AudioMedia *>( *m );
- if( media ){
- registerMedia( media );
+ if( m ){
+ registerMedia( m );
}
if( !audioMedia && audio ){
@@ -95,16 +94,8 @@
ringtoneFile = config->ringtone;
}
-// MediaHandler::~MediaHandler() {
-// cerr << "~MediaHandler" << endl;
-// if( ! Session::registry ){
-// cerr << "deleting session::registry" << endl;
-// }
-// }
+MRef<Session *> MediaHandler::createSession( MRef<SipIdentity*> id, string callId ){
-
-MRef<Session *> MediaHandler::createSession( /*SipDialogSecurityConfig &securityConfig*/ MRef<SipIdentity*> id, string callId ){
-
list< MRef<Media *> >::iterator i;
MRef<Session *> session;
MRef<RtpReceiver *> rtpReceiver = NULL;
@@ -125,9 +116,9 @@
session->setCallId( callId );
for( i = media.begin(); i != media.end(); i++ ){
- MRef<Media *> media = *i;
+ MRef<Media *> m = *i;
- if( media->receive ){
+ if( m->receive ){
if( ipProvider )
rtpReceiver = new RtpReceiver( ipProvider );
@@ -135,7 +126,7 @@
rtp6Receiver = new RtpReceiver( ip6Provider );
MRef<MediaStreamReceiver *> rStream;
- rStream = new MediaStreamReceiver( media, rtpReceiver, rtp6Receiver );
+ rStream = new MediaStreamReceiver( m, rtpReceiver, rtp6Receiver );
session->addMediaStreamReceiver( rStream );
if( (*i) == this->audioMedia ) {
CallRecorder * cr;
@@ -155,7 +146,7 @@
#endif
}
- if( media->send ){
+ if( m->send ){
if( !rtpReceiver && !ipProvider.isNull() ){
rtpReceiver = new RtpReceiver( ipProvider );
}
@@ -173,7 +164,7 @@
sock6 = rtp6Receiver->getSocket();
MRef<MediaStreamSender *> sStream;
- sStream = new MediaStreamSender( media, sock, sock6 );
+ sStream = new MediaStreamSender( m, sock, sock6 );
session->addMediaStreamSender( sStream );
#ifdef ZRTP_SUPPORT
if(/*securityConfig.use_zrtp*/ id->use_zrtp) {
@@ -199,8 +190,8 @@
}
-void MediaHandler::registerMedia( MRef<Media*> media ){
- this->media.push_back( media );
+void MediaHandler::registerMedia( MRef<Media*> m){
+ this->media.push_back( m );
}
CommandString MediaHandler::handleCommandResp(string, const CommandString& c){
Modified: trunk/libminisip/source/subsystem_media/MediaStream.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaStream.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/MediaStream.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -47,7 +47,7 @@
using namespace std;
-MediaStream::MediaStream( MRef<Media *> media ):media(media),ka(NULL) {
+MediaStream::MediaStream( MRef<Media *> m):media(m),ka(NULL) {
disabled = false;
#ifdef ZRTP_SUPPORT
zrtpBridge = NULL;
@@ -231,9 +231,9 @@
return initCrypto( ssrc, seq_no );
}
-void MediaStream::setKeyAgreement( MRef<KeyAgreement *> ka ){
+void MediaStream::setKeyAgreement( MRef<KeyAgreement *> ka_ ){
kaLock.lock();
- this->ka = ka;
+ this->ka = ka_;
/* Reset the CryptoContext since we have a new KeyAgreement */
cryptoContexts.clear();
@@ -277,15 +277,16 @@
#endif
-MediaStreamReceiver::MediaStreamReceiver( MRef<Media *> media,
- MRef<RtpReceiver *> rtpReceiver, MRef<RtpReceiver *> rtp6Recv ):
- MediaStream( media ),
- rtpReceiver( rtpReceiver ),
+MediaStreamReceiver::MediaStreamReceiver( MRef<Media *> m,
+ MRef<RtpReceiver *> rtpRecv,
+ MRef<RtpReceiver *> rtp6Recv ):
+ MediaStream( m ),
+ rtpReceiver( rtpRecv ),
rtp6Receiver( rtp6Recv ){
id = rand();
externalPort = 0;
running = false;
- codecList = media->getAvailableCodecs();
+ codecList = m->getAvailableCodecs();
}
uint32_t MediaStreamReceiver::getId(){
@@ -440,8 +441,10 @@
}
-MediaStreamSender::MediaStreamSender( MRef<Media *> media, MRef<UDPSocket *> senderSocket, MRef<UDPSocket *> sender6Socket ):
- MediaStream( media ){
+MediaStreamSender::MediaStreamSender( MRef<Media *> m,
+ MRef<UDPSocket *> senderSocket,
+ MRef<UDPSocket *> sender6Socket ):
+ MediaStream( m ){
selectedCodec = NULL;
remotePort = 0;
seqNo = (uint16_t)rand();
@@ -597,13 +600,13 @@
}
-void MediaStreamSender::setRemoteAddress( MRef<IPAddress *> remoteAddress ){
+void MediaStreamSender::setRemoteAddress( MRef<IPAddress *> ra){
mdbg << "MediaStreamSender::setRemoteAddress: " <<
- remoteAddress->getString() << endl;
- this->remoteAddress = remoteAddress;
+ ra->getString() << endl;
+ this->remoteAddress = ra;
#ifdef ZRTP_SUPPORT
if (zrtpBridge) {
- zrtpBridge->setRemoteAddress(remoteAddress);
+ zrtpBridge->setRemoteAddress(ra);
}
#endif // ZRTP_SUPPORT
}
Modified: trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -58,7 +58,7 @@
return new G711Codec( lib, G711A );
}
-G711Codec::G711Codec( MRef<Library *> lib, G711Version version ): AudioCodec( lib ), version( version ){
+G711Codec::G711Codec( MRef<Library *> lib, G711Version v): AudioCodec( lib ), version( v ){
}
@@ -67,7 +67,7 @@
}
-G711CodecState::G711CodecState( G711Version version ): version( version ){
+G711CodecState::G711CodecState( G711Version v): version( v ){
}
uint32_t G711CodecState::encode(void *in_buf, int32_t in_buf_size, void *out_buf){
Modified: trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -32,19 +32,23 @@
#include<libminisip/media/rtp/CryptoContext.h>
#include<libmikey/MikeyPayloadSP.h>
-CryptoContext::CryptoContext( uint32_t ssrc ):
-ssrc(ssrc),
-using_mki(false),mki_length(0),mki(NULL),
-roc(0),guessed_roc(0),s_l(0),key_deriv_rate(0),
-replay_window(0),
-master_key(NULL), master_key_length(0),
-master_key_srtp_use_nb(0), master_key_srtcp_use_nb(0),
-master_salt(NULL), master_salt_length(0),
-n_e(0),k_e(NULL),n_a(0),k_a(NULL),n_s(0),k_s(NULL),
-ealg(MIKEY_SRTP_EALG_NULL), aalg(MIKEY_SRTP_AALG_NULL),
-ekeyl(0), akeyl(0), skeyl(0),
-encr(1), auth(1){}/*These should be set to 0, but for backward compatability they are set to 1 *///encryption(no_encr),authentication(no_auth)
+CryptoContext::CryptoContext( uint32_t ssrc_ ):
+ ssrc(ssrc_),
+ using_mki(false),mki_length(0),mki(NULL),
+ roc(0),guessed_roc(0),s_l(0),key_deriv_rate(0),
+ replay_window(0),
+ master_key(NULL), master_key_length(0),
+ master_key_srtp_use_nb(0), master_key_srtcp_use_nb(0),
+ master_salt(NULL), master_salt_length(0),
+ n_e(0),k_e(NULL),n_a(0),k_a(NULL),n_s(0),k_s(NULL),
+ ealg(MIKEY_SRTP_EALG_NULL), aalg(MIKEY_SRTP_AALG_NULL),
+ ekeyl(0), akeyl(0), skeyl(0),
+ encr(1), auth(1) /*These should be set to 0, but for backward compatability they are set to 1 */
+ //encryption(no_encr),authentication(no_auth)
+{
+}
+
CryptoContext::CryptoContext( uint32_t ssrc, int roc, uint16_t seq_no,
int64_t key_deriv_rate,
//enum encr_method encryption,
@@ -60,13 +64,13 @@
uint8_t skeyl,
uint8_t encr,
uint8_t auth,
- uint8_t tag_length):
+ uint8_t tag_length_):
-ssrc(ssrc),using_mki(false),mki_length(0),mki(NULL),
-roc(roc),guessed_roc(0),s_l(seq_no),key_deriv_rate(key_deriv_rate),
-replay_window(0),
-master_key_srtp_use_nb(0), master_key_srtcp_use_nb(0)
-//encryption(encryption),authentication(authentication)
+ ssrc(ssrc),using_mki(false),mki_length(0),mki(NULL),
+ roc(roc),guessed_roc(0),s_l(seq_no),key_deriv_rate(key_deriv_rate),
+ replay_window(0),
+ master_key_srtp_use_nb(0), master_key_srtcp_use_nb(0)
+ //encryption(encryption),authentication(authentication)
{
this->ealg = ealg;
this->aalg = aalg;
@@ -108,7 +112,7 @@
case MIKEY_SRTP_AALG_SHA1HMAC:
n_a = akeyl;
k_a = new unsigned char[ n_a ];
- this->tag_length = tag_length;
+ this->tag_length = tag_length_;
break;
}
}
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -55,7 +55,7 @@
};
*/
-RtcpReport::RtcpReport(unsigned packet_type):packet_type(packet_type){
+RtcpReport::RtcpReport(unsigned ptype):packet_type(ptype){
this->version=2;
this->padding=0;
this->length=0;
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -44,8 +44,8 @@
*/
-RtcpReportReceptionBlock::RtcpReportReceptionBlock(unsigned ssrc){
- this->ssrc = ssrc;
+RtcpReportReceptionBlock::RtcpReportReceptionBlock(unsigned ssrc_){
+ this->ssrc = ssrc_;
this->fraction_lost=0;
this->cumulative_n_lost = 0;
this->seq_high = 0;
Modified: trunk/libminisip/source/subsystem_media/rtp/RtpHeader.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtpHeader.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/RtpHeader.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -93,8 +93,8 @@
}
-void RtpHeader::setTimestamp(uint32_t timestamp){
- this->timestamp = timestamp;
+void RtpHeader::setTimestamp(uint32_t t){
+ this->timestamp = t;
}
uint32_t RtpHeader::getTimestamp(){
Modified: trunk/libminisip/source/subsystem_media/rtp/RtpPacket.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtpPacket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/RtpPacket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -52,10 +52,10 @@
zrtpChecksum = 0;
}
-RtpPacket::RtpPacket(unsigned char *content, int content_length,
+RtpPacket::RtpPacket(unsigned char *content_, int cl,
int seq_no, unsigned timestamp, unsigned ssrc):
- content_length(content_length){
-
+ content_length(cl)
+{
extensionLength = 0;
extensionHeader = NULL;
zrtpChecksum = 0;
@@ -67,13 +67,13 @@
if( content_length ){
this->content = new unsigned char[content_length];
- memcpy(this->content, content, content_length);
+ memcpy(this->content, content_, content_length);
}
else
this->content = NULL;
}
-RtpPacket::RtpPacket(RtpHeader hdr, unsigned char *content, int content_length): header(hdr) {
+RtpPacket::RtpPacket(RtpHeader hdr, unsigned char *content_, int cl): header(hdr) {
extensionLength = 0;
extensionHeader = NULL;
@@ -84,26 +84,26 @@
* set pointer to extension header, compute length and
* adjust content pointer and content_length
*/
- if (header.getExtension() && content_length >= 4) {
+ if (header.getExtension() && cl >= 4) {
extensionLength = 4;
- content_length -= 4; // minimum size of extension header
+ cl -= 4; // minimum size of extension header
- short tmp = *((short *)(content+2));
+ short tmp = *((short *)(content_+2));
tmp = ntoh16(tmp);
tmp *= 4; // ext. header length is in words (4 bytes)
extensionLength += tmp;
- content_length -= tmp;
+ cl -= tmp;
- if (content_length >= 0) {
+ if (cl >= 0) {
extensionHeader = new unsigned char[extensionLength];
- memcpy(this->extensionHeader, content, extensionLength);
+ memcpy(this->extensionHeader, content_, extensionLength);
}
}
- this->content_length = content_length;
+ this->content_length = cl;
if( content_length > 0 ){
this->content = new unsigned char[content_length];
- memcpy(this->content, content+extensionLength, content_length);
+ memcpy(this->content, content_ + extensionLength, content_length);
}
else
this->content = NULL;
@@ -230,6 +230,7 @@
content_length -= 2;
}
// TODO: implement the real recompute and check of checksum
+ return true;
}
#define CKSUM_CARRY(x) (x = (x >> 16) + (x & 0xffff), (~(x + (x >> 16)) & 0xffff))
Modified: trunk/libminisip/source/subsystem_media/rtp/SRtpPacket.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SRtpPacket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/rtp/SRtpPacket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -124,7 +124,7 @@
unsigned char * mac = new unsigned char[tag_length];
scontext->rtp_authenticate( this, (uint32_t)( guessed_index >> 16 ), mac );
- for( int i = 0; i < tag_length; i++ ){
+ for( unsigned i = 0; i < tag_length; i++ ){
if( tag[i] != mac[i] )
{
#ifdef DEBUG_OUTPUT
@@ -160,16 +160,16 @@
tag_length=0;
}
-SRtpPacket::SRtpPacket( unsigned char *content, int content_length,
+SRtpPacket::SRtpPacket( unsigned char *content_, int clen,
int seq_no, unsigned timestamp, unsigned ssrc):
- RtpPacket( content, content_length, seq_no, timestamp, ssrc ), tag(NULL), tag_length(0), mki(NULL), mki_length(0){
+ RtpPacket( content_, clen, seq_no, timestamp, ssrc ), tag(NULL), tag_length(0), mki(NULL), mki_length(0){
}
SRtpPacket::SRtpPacket(RtpHeader hdr, unsigned char *content, int content_length,
- unsigned char * tag, int tag_length,
- unsigned char * mki, int mki_length):
- RtpPacket(hdr, content, content_length ), encrypted(true), tag_length(tag_length), mki_length(mki_length){
+ unsigned char * tag, int tag_length_,
+ unsigned char * mki, int mki_length_):
+ RtpPacket(hdr, content, content_length ), encrypted(true), tag_length(tag_length_), mki_length(mki_length_){
if(tag_length){
this->tag = new unsigned char[tag_length];
Modified: trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSpatial.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSpatial.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSpatial.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -108,6 +108,7 @@
case 5: newPosition = 3; break;
case 2: newPosition = 5; break;
case 4: newPosition = 4; break;
+
}
} else {
if( SPATIAL_POS % 2 ) { //if odd number of positions
Modified: trunk/libminisip/source/subsystem_media/soundcard/FileSoundDevice.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/FileSoundDevice.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/FileSoundDevice.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -281,6 +281,8 @@
case FILESOUND_TYPE_MP3:
cerr << "FileSoundDevice::readFromDevice - filetype not implemented" << endl;
break;
+ default:
+ cerr << "FileSoundDevice::readFromDevice - filetype unknown" << endl;
}
return retValue;
}
@@ -368,6 +370,8 @@
case FILESOUND_TYPE_MP3:
cerr << "FileSoundDevice::write - filetype not implemented" << endl;
break;
+ default:
+ cerr << "FileSoundDevice::write - filetype unknown" << endl;
}
return retValue;
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDriver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDriver.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDriver.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -26,14 +26,14 @@
#include<libminisip/media/soundcard/SoundDriver.h>
-SoundDeviceName::SoundDeviceName(std::string name,
- std::string description,
- int maxInputChannels,
- int maxOutputChannels) :
- name( name ),
- description( description ),
- maxInputChannels( maxInputChannels ),
- maxOutputChannels( maxOutputChannels )
+SoundDeviceName::SoundDeviceName(std::string name_,
+ std::string descr,
+ int maxInputChannels_,
+ int maxOutputChannels_) :
+ name( name_ ),
+ description( descr ),
+ maxInputChannels( maxInputChannels_ ),
+ maxOutputChannels( maxOutputChannels_ )
{
}
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -96,12 +96,12 @@
MRef<SoundDevice *> inputDevice,
MRef<SoundDevice *> outputDevice,
string mixerType,
- int nChannels,
- int32_t samplingRate,
- int format):
- nChannels(nChannels),
- samplingRate(samplingRate),
- format(format),
+ int nChannels_,
+ int32_t samplingRate_,
+ int format_):
+ nChannels(nChannels_),
+ samplingRate(samplingRate_),
+ format(format_),
recording(false)
{
soundDevIn = inputDevice;
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -58,8 +58,8 @@
return position;
}
-void SoundSource::setPos(int32_t position){
- this->position=position;
+void SoundSource::setPos(int32_t p){
+ this->position=p;
}
BasicSoundSource::BasicSoundSource(int32_t id,
Modified: trunk/libminisip/source/subsystem_media/soundcard/resampler/SimpleResampler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/resampler/SimpleResampler.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_media/soundcard/resampler/SimpleResampler.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -30,14 +30,14 @@
SimpleResampler::SimpleResampler( uint32_t inputFreq, uint32_t outputFreq,
- uint32_t duration, uint32_t nChannels ){
+ uint32_t duration, uint32_t nChannels_ ){
sampleRatio = 10000*inputFreq/outputFreq;
inputFrames = inputFreq * duration / 1000;
outputFrames = outputFreq * duration / 1000;
- this->nChannels = nChannels;
+ this->nChannels = nChannels_;
previousFrame = new short[ nChannels ];
memset( previousFrame, '\0', nChannels * sizeof( short ) );
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -66,10 +66,10 @@
}
-SdpHeaderC::SdpHeaderC(string net_type, string addr_type, string addr):SdpHeader(SDP_HEADER_TYPE_C, 4){
+SdpHeaderC::SdpHeaderC(string net_type, string addr_type, string addr_):SdpHeader(SDP_HEADER_TYPE_C, 4){
this->netType=net_type;
this->addrType = addr_type;
- this->addr=addr;
+ this->addr=addr_;
}
SdpHeaderC::~SdpHeaderC(){
@@ -96,8 +96,8 @@
return addr;
}
-void SdpHeaderC::setAddr(string addr){
- this->addr=addr;
+void SdpHeaderC::setAddr(string a){
+ this->addr=a;
}
string SdpHeaderC::getString(){
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -102,16 +102,16 @@
}
}
-SdpHeaderM::SdpHeaderM(string media,
- int32_t port,
+SdpHeaderM::SdpHeaderM(string media_,
+ int32_t port_,
int32_t n_ports,
- string transport)
+ string transp)
: SdpHeader(SDP_HEADER_TYPE_M, 8)
{
- this->media=media;
- this->port=port;
+ this->media=media_;
+ this->port=port_;
this->nPorts=n_ports;
- this->transport=transport;
+ this->transport=transp;
}
SdpHeaderM::SdpHeaderM(const SdpHeaderM &src): SdpHeader( SDP_HEADER_TYPE_M, 8 ){
@@ -153,8 +153,8 @@
return port;
}
-void SdpHeaderM::setPort(int32_t port){
- this->port=port;
+void SdpHeaderM::setPort(int32_t p){
+ this->port=p;
}
int32_t SdpHeaderM::getNrPorts(){
Modified: trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -67,10 +67,10 @@
DefaultDialogHandler::DefaultDialogHandler(MRef<SipStack*> stack,
MRef<SipSoftPhoneConfiguration*> pconf,
- MRef<MediaHandler *>mediaHandler):
+ MRef<MediaHandler *>mh):
sipStack(stack),
phoneconf(pconf),
- mediaHandler(mediaHandler)
+ mediaHandler(mh)
{
outsideDialogSeqNo=1;
@@ -115,7 +115,6 @@
bool isConfJoin=false;
bool isP2T=false;
bool isConfConnect=false;
- MRef<SipHeaderValueAcceptContact*> acp;
int i=0;
MRef<SipHeaderValue*> hdr=inv->getHeaderValueNo(SIP_HEADER_TYPE_ACCEPTCONTACT, i);
do{
Modified: trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -59,11 +59,10 @@
using namespace std;
-Sip::Sip(MRef<SipSoftPhoneConfiguration*> pconfig,
- MRef<MediaHandler*>mediaHandler){
+Sip::Sip(MRef<SipSoftPhoneConfiguration*> pconfig, MRef<MediaHandler*>mh){
this->phoneconfig = pconfig;
- this->mediaHandler = mediaHandler;
+ this->mediaHandler = mh;
MRef<SipStackConfig *> stackConfig /*= new SipStackConfig()*/;
// // Deep copy
@@ -357,6 +356,6 @@
sipstack->run();
}
-void Sip::setMediaHandler( MRef<MediaHandler *> mediaHandler ){
- this->mediaHandler = mediaHandler;
+void Sip::setMediaHandler( MRef<MediaHandler *> mh ){
+ this->mediaHandler = mh;
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -505,12 +505,12 @@
getSipStack()->getCallback()->handleCommand("sip_conf", cmdstr2 );
getMediaSession()->start();
- MRef<LogEntry *> logEntry = new LogEntryIncomingCompletedCall();
+ MRef<LogEntry *> log= new LogEntryIncomingCompletedCall();
- logEntry->start = time( NULL );
- logEntry->peerSipUri = getLastInvite()->getFrom().getString();
+ log->start = time( NULL );
+ log->peerSipUri = getLastInvite()->getFrom().getString();
- setLogEntry( logEntry );
+ setLogEntry( log );
return true;
}else{
@@ -904,12 +904,12 @@
}
-SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> mediaSession, minilist<ConfMember> *conflist,string confid, string cid) :
+SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, minilist<ConfMember> *conflist,string confid, string cid) :
SipDialog(stack,ident,cid),
confCallback(confCb),
lastInvite(NULL),
phoneconf(pconf),
- mediaSession(mediaSession)
+ mediaSession(s)
{
confId=confid;
numConnected= conflist->size();
@@ -950,12 +950,12 @@
setUpStateMachine();
}
-SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> mediaSession, string confid, string cid) :
+SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string confid, string cid) :
SipDialog(stack,ident, cid),
confCallback(confCb),
lastInvite(NULL),
phoneconf(pconf),
- mediaSession(mediaSession)
+ mediaSession(s)
{
confId=confid;
//cerr<<"SDCVididididididididididdididi "+confId<<endl;
@@ -973,12 +973,6 @@
SipDialogConfVoip::~SipDialogConfVoip(){
}
-/*
-void SipDialogVoip::handleSdp(MRef<SdpPacket*> sdp){
-
-}
-*/
-
void SipDialogConfVoip::sendInvite(const string &branch){
// mdbg << "ERROR: SipDialogVoip::sendInvite() UNIMPLEMENTED"<< end;
@@ -1330,8 +1324,8 @@
return logEntry;
}
-void SipDialogConfVoip::setLogEntry( MRef<LogEntry *> logEntry ){
- this->logEntry = logEntry;
+void SipDialogConfVoip::setLogEntry( MRef<LogEntry *> l){
+ this->logEntry = l;
}
MRef<Session *> SipDialogConfVoip::getMediaSession(){
@@ -1339,19 +1333,19 @@
}
-bool SipDialogConfVoip::sortMIME(MRef<SipMessageContent *> Offer, string peerUri, int type){
+bool SipDialogConfVoip::sortMIME(MRef<SipMessageContent *> Offer, string peerUri, int type_){
if (Offer){
if ( Offer->getContentType().substr(0,9) == "multipart"){
MRef<SipMessageContent *> part;
part = ((SipMessageContentMime*)*Offer)->popFirstPart();
while( *part != NULL){
- sortMIME(part, peerUri, type);
+ sortMIME(part, peerUri, type_);
part = ((SipMessageContentMime*)*Offer)->popFirstPart();
}
}
if( (Offer->getContentType()).substr(0,15) == "application/sdp"){
- switch (type){
+ switch (type_){
case 10:
#ifdef ENABLE_TS
ts.save("setSdpOffer");
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -136,15 +136,15 @@
MRef<SipHeaderValueSubscriptionState *> statehdr = (SipHeaderValueSubscriptionState*)*resp->getHeaderValueNo(SIP_HEADER_TYPE_SUBSCRIPTIONSTATE,0);
- int timeout;
+ int to;
if (statehdr && statehdr->hasParameter("expires")){
- timeout = atoi(statehdr->getParameter("expires").c_str());
+ to = atoi(statehdr->getParameter("expires").c_str());
}else{
mdbg << "WARNING: SipDialogPresenceClient did not contain any expires header - using 300 seconds"<<end;
- timeout = 300;
+ to = 300;
}
- requestTimeout(timeout * 1000, "timerDoSubscribe");
+ requestTimeout(to * 1000, "timerDoSubscribe");
#ifdef DEBUG_OUTPUT
merr << "Subscribed for presence for user "<< toUri->getSipUri().getString()<< end;
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -243,10 +243,10 @@
}
-void SipDialogPresenceServer::sendNoticeToAll(string onlineStatus){
+void SipDialogPresenceServer::sendNoticeToAll(string onlineStatus_){
usersLock.lock();
for (int i=0; i<subscribing_users.size(); i++){
- sendNotice(onlineStatus, subscribing_users[i]);
+ sendNotice(onlineStatus_, subscribing_users[i]);
}
usersLock.unlock();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -582,11 +582,11 @@
SipDialogVoip::SipDialogVoip( MRef<SipStack*> stack,
MRef<SipIdentity*> ident,
MRef<SipSoftPhoneConfiguration*> pconf,
- MRef<Session *> mediaSession,
+ MRef<Session *> s,
string cid ) :
SipDialog(stack,ident, cid),
phoneconf(pconf),
- mediaSession(mediaSession),
+ mediaSession(s),
notifyEarlyTermination(false),
lastInvite(NULL)
{
@@ -735,8 +735,8 @@
return logEntry;
}
-void SipDialogVoip::setLogEntry( MRef<LogEntry *> logEntry ){
- this->logEntry = logEntry;
+void SipDialogVoip::setLogEntry( MRef<LogEntry *> l){
+ this->logEntry = l;
}
MRef<Session *> SipDialogVoip::getMediaSession(){
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -513,8 +513,8 @@
}
-SipDialogVoipClient::SipDialogVoipClient(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> mediaSession, string cid) :
- SipDialogVoip(stack, ident, pconf, mediaSession, cid)
+SipDialogVoipClient::SipDialogVoipClient(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string cid) :
+ SipDialogVoip(stack, ident, pconf, s, cid)
{
setUpStateMachine();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -278,12 +278,12 @@
getMediaSession()->start();
- MRef<LogEntry *> logEntry = new LogEntryIncomingCompletedCall();
+ MRef<LogEntry *> log= new LogEntryIncomingCompletedCall();
- logEntry->start = time( NULL );
- logEntry->peerSipUri = getLastInvite()->getFrom().getString();
+ log->start = time( NULL );
+ log->peerSipUri = getLastInvite()->getFrom().getString();
- setLogEntry( logEntry );
+ setLogEntry( log );
return true;
}else{
@@ -429,7 +429,7 @@
if( rack->getMethod() != provisional->getCSeqMethod() ||
rack->getCSeqNum() != provisional->getCSeq() ||
- rack->getResponseNum() != dialogState.rseqNo ){
+ (unsigned)rack->getResponseNum() != dialogState.rseqNo ){
// TODO reject 481
cerr << "Non matching RAck" << endl;
return false;
@@ -602,8 +602,8 @@
}
-SipDialogVoipServer::SipDialogVoipServer(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> mediaSession, string cid) :
- SipDialogVoip(stack, ident, pconf, mediaSession, cid),
+SipDialogVoipServer::SipDialogVoipServer(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string cid) :
+ SipDialogVoip(stack, ident, pconf, s, cid),
use100Rel( false ), resendTimer1xx( 0 )
{
setUpStateMachine();
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -142,21 +142,24 @@
string kaTypeString;
switch( (*iIdent)->ka_type ){
- case KEY_MGMT_METHOD_MIKEY_DH:
- kaTypeString = "dh";
- break;
- case KEY_MGMT_METHOD_MIKEY_PSK:
- kaTypeString = "psk";
- break;
- case KEY_MGMT_METHOD_MIKEY_PK:
- kaTypeString = "pk";
- break;
- case KEY_MGMT_METHOD_MIKEY_DHHMAC:
- kaTypeString = "dhhmac";
- break;
- case KEY_MGMT_METHOD_MIKEY_RSA_R:
- kaTypeString = "rsa-r";
- break;
+ case KEY_MGMT_METHOD_MIKEY_DH:
+ kaTypeString = "dh";
+ break;
+ case KEY_MGMT_METHOD_MIKEY_PSK:
+ kaTypeString = "psk";
+ break;
+ case KEY_MGMT_METHOD_MIKEY_PK:
+ kaTypeString = "pk";
+ break;
+ case KEY_MGMT_METHOD_MIKEY_DHHMAC:
+ kaTypeString = "dhhmac";
+ break;
+ case KEY_MGMT_METHOD_MIKEY_RSA_R:
+ kaTypeString = "rsa-r";
+ break;
+ default:
+ kaTypeString = "";
+ break;
}
backend->save(accountPath + "ka_type", kaTypeString);
@@ -213,16 +216,18 @@
while( !caDbItem.isNull() ){
switch( caDbItem->type ){
- case CERT_DB_ITEM_TYPE_FILE:
- backend->save(accountPath + "ca_file["+itoa(iFile)+"]",
- caDbItem->item);
- iFile ++;
- break;
- case CERT_DB_ITEM_TYPE_DIR:
- backend->save(accountPath + "ca_dir["+itoa(iDir)+"]",
- caDbItem->item);
- iDir ++;
- break;
+ case CERT_DB_ITEM_TYPE_FILE:
+ backend->save(accountPath + "ca_file["+itoa(iFile)+"]",
+ caDbItem->item);
+ iFile ++;
+ break;
+ case CERT_DB_ITEM_TYPE_DIR:
+ backend->save(accountPath + "ca_dir["+itoa(iDir)+"]",
+ caDbItem->item);
+ iDir ++;
+ break;
+ default:
+ merr<< "Warning: unknown certificate object type"<<end;
}
caDbItem = cert_db->get_next();
Modified: trunk/libmnetutil/include/libmnetutil/NetworkException.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/NetworkException.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/include/libmnetutil/NetworkException.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -44,7 +44,7 @@
class LIBMNETUTIL_API HostNotFound : public NetworkException{
public:
- HostNotFound( std::string host ):NetworkException(-1),host(host){};
+ HostNotFound( std::string host_ ):NetworkException(-1),host(host_){};
virtual ~HostNotFound()throw() {}
virtual const char*what();
private:
Modified: trunk/libmnetutil/source/IP4Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP4Address.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/IP4Address.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -166,7 +166,7 @@
unsigned char *ip;
unsigned long int ip_data;
- if (inet_aton(ipaddr.c_str(),(struct in_addr *)&ip_data)){
+ if (inet_aton(ipaddr.c_str(),(struct in_addr *)((void*)&ip_data) )){
ip = (unsigned char *)&ip_data;
}else{
Modified: trunk/libmnetutil/source/IP4ServerSocket.cxx
===================================================================
--- trunk/libmnetutil/source/IP4ServerSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/IP4ServerSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -63,7 +63,7 @@
return (struct sockaddr *)sin;
}
-MRef<TCPSocket *> IP4ServerSocket::createSocket(int32_t fd, struct sockaddr_in *saddr){
- return new TCPSocket(fd, (struct sockaddr*)saddr, sizeof(struct sockaddr_in));
+MRef<TCPSocket *> IP4ServerSocket::createSocket(int32_t fd_, struct sockaddr_in *saddr){
+ return new TCPSocket(fd_, (struct sockaddr*)saddr, sizeof(struct sockaddr_in));
}
Modified: trunk/libmnetutil/source/IP6ServerSocket.cxx
===================================================================
--- trunk/libmnetutil/source/IP6ServerSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/IP6ServerSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -63,7 +63,7 @@
return (struct sockaddr *)sin;
}
-MRef<TCPSocket *> IP6ServerSocket::createSocket(int32_t fd, struct sockaddr_in6 *saddr){
- return new TCPSocket(fd,(struct sockaddr*)saddr, sizeof(struct sockaddr_in6));
+MRef<TCPSocket *> IP6ServerSocket::createSocket(int32_t fd_, struct sockaddr_in6 *saddr){
+ return new TCPSocket(fd_,(struct sockaddr*)saddr, sizeof(struct sockaddr_in6));
}
Modified: trunk/libmnetutil/source/NetworkException.cxx
===================================================================
--- trunk/libmnetutil/source/NetworkException.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/NetworkException.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -32,25 +32,25 @@
using namespace std;
-ConnectFailed::ConnectFailed( int errorNumber ):NetworkException(errorNumber){};
+ConnectFailed::ConnectFailed( int errorNr ):NetworkException(errorNr){};
-UnknownAddressFamily::UnknownAddressFamily( int errorNumber ) : NetworkException(errorNumber) { }
+UnknownAddressFamily::UnknownAddressFamily( int errorNr ) : NetworkException(errorNr) { }
-SendFailed::SendFailed( int errorNumber ):NetworkException(errorNumber){};
+SendFailed::SendFailed( int errorNr ):NetworkException(errorNr){};
-ResolvError::ResolvError( int errorNumber ):NetworkException(errorNumber){};
+ResolvError::ResolvError( int errorNr ):NetworkException(errorNr){};
-SocketFailed::SocketFailed( int errorNumber ):NetworkException(errorNumber){};
+SocketFailed::SocketFailed( int errorNr ):NetworkException(errorNr){};
-ListenFailed::ListenFailed( int errorNumber ):NetworkException(errorNumber){};
+ListenFailed::ListenFailed( int errorNr ):NetworkException(errorNr){};
-BindFailed::BindFailed( int errorNumber ):NetworkException(errorNumber){};
+BindFailed::BindFailed( int errorNr ):NetworkException(errorNr){};
-GetSockNameFailed::GetSockNameFailed( int errorNumber ):NetworkException(errorNumber){};
+GetSockNameFailed::GetSockNameFailed( int errorNr ):NetworkException(errorNr){};
-SetSockOptFailed::SetSockOptFailed( int errorNumber ):NetworkException(errorNumber){};
+SetSockOptFailed::SetSockOptFailed( int errorNr ):NetworkException(errorNr){};
-NetworkException::NetworkException( int errorNumber ):errorNumber(errorNumber){
+NetworkException::NetworkException( int errorNr ):errorNumber(errorNr){
#ifdef WIN32
msg = string( strerror( errorNumber ));
#else
Modified: trunk/libmnetutil/source/ServerSocket.cxx
===================================================================
--- trunk/libmnetutil/source/ServerSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/ServerSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -51,10 +51,8 @@
typedef int socklen_t;
#endif
-ServerSocket::ServerSocket(int32_t domain, int32_t listenport){
+ServerSocket::ServerSocket(int32_t domain_, int32_t listenport):domain(domain_),listen_port(listenport){
type = SOCKET_TYPE_TCP;
- this->domain=domain;
- this->listen_port=listenport;
fd = (int32_t)::socket(domain, SOCK_STREAM, IPPROTO_TCP);
if (fd<0){
throw SocketFailed( errno );
Modified: trunk/libmnetutil/source/TCPSocket.cxx
===================================================================
--- trunk/libmnetutil/source/TCPSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/TCPSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -86,9 +86,9 @@
ipaddress.connect(*this, port);
}
-TCPSocket::TCPSocket(int32_t fd, struct sockaddr * addr, int32_t addr_len){
+TCPSocket::TCPSocket(int32_t fd_, struct sockaddr * addr, int32_t addr_len){
type = SOCKET_TYPE_TCP;
- this->fd=fd;
+ this->fd=fd_;
peerAddress = IPAddress::create( addr, addr_len );
peerPort = peerAddress->getPort();
}
Modified: trunk/libmnetutil/source/UDPSocket.cxx
===================================================================
--- trunk/libmnetutil/source/UDPSocket.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmnetutil/source/UDPSocket.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -61,9 +61,9 @@
using namespace std;
-bool UDPSocket::initUdpSocket( bool use_ipv6, int32_t port ) {
+bool UDPSocket::initUdpSocket( bool use_ipv6_, int32_t port ) {
type = SOCKET_TYPE_UDP;
- this->use_ipv6 = use_ipv6;
+ this->use_ipv6 = use_ipv6_;
#ifdef _MSC_VER
massert(sizeof(SOCKET)==4);
@@ -114,8 +114,8 @@
return true;
}
-UDPSocket::UDPSocket( int32_t port, bool use_ipv6 ) {
- initUdpSocket( use_ipv6, port );
+UDPSocket::UDPSocket( int32_t port, bool use_ipv6_ ) {
+ initUdpSocket( use_ipv6_, port );
}
/*
Modified: trunk/libmsip/include/libmsip/SipHeaderContact.h
===================================================================
--- trunk/libmsip/include/libmsip/SipHeaderContact.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/include/libmsip/SipHeaderContact.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -74,7 +74,7 @@
* SIP REGISTER message
* @param featuretag
*/
- void setFeatureTag(std::string featuretag){this->featuretag=featuretag;}
+ void setFeatureTag(std::string ft){this->featuretag=ft;}
/**
* Used to get/set the expires for this contact in the registrar.
Modified: trunk/libmsip/include/libmsip/SipRequest.h
===================================================================
--- trunk/libmsip/include/libmsip/SipRequest.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/include/libmsip/SipRequest.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -184,8 +184,6 @@
*
*/
void addDefaultHeaders(const SipUri& fromUri,
- const SipUri& toUri,
- const std::string& method,
int seqNo,
const std::string& callId="");
Modified: trunk/libmsip/source/SipCommandDispatcher.cxx
===================================================================
--- trunk/libmsip/source/SipCommandDispatcher.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipCommandDispatcher.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -160,8 +160,8 @@
}
}
-void SipCommandDispatcher::setCallback(MRef<CommandReceiver*> callback){
- this->callback = callback;
+void SipCommandDispatcher::setCallback(MRef<CommandReceiver*> cb){
+ this->callback = cb;
}
Modified: trunk/libmsip/source/SipDialogConfig.cxx
===================================================================
--- trunk/libmsip/source/SipDialogConfig.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipDialogConfig.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -38,12 +38,12 @@
int SipIdentity::globalIndex = 1; //give an initial value
-SipCredential::SipCredential( const std::string &username,
- const std::string &password,
- const std::string &realm ):
- realm( realm ),
- username( username ),
- password( password )
+SipCredential::SipCredential( const std::string &u,
+ const std::string &p,
+ const std::string &r):
+ realm( r ),
+ username( u ),
+ password( p )
{
}
Modified: trunk/libmsip/source/SipLayerTransport.cxx
===================================================================
--- trunk/libmsip/source/SipLayerTransport.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipLayerTransport.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -232,6 +232,10 @@
return msg;
//return SipMessage::createMessage( messageString );
}
+ default:
+ /*never reached*/
+ massert(0);
+ break;
}
return NULL;
}
@@ -284,9 +288,9 @@
StreamThreadData::StreamThreadData( MRef<StreamSocket *> theSocket,
- MRef<SipLayerTransport *> transport)
+ MRef<SipLayerTransport *> t)
:ssocket( theSocket ){
- this->transport = transport;
+ this->transport = t;
}
@@ -332,8 +336,8 @@
}
SipLayerTransport::SipLayerTransport(MRef<certificate_chain *> cchain,
- MRef<ca_db *> cert_db):
- cert_chain(cchain), cert_db(cert_db), tls_ctx(NULL)
+ MRef<ca_db *> cert_db_):
+ cert_chain(cchain), cert_db(cert_db_), tls_ctx(NULL)
{
manager = new SocketServer();
manager->start();
@@ -840,7 +844,6 @@
{
MRef<Socket *> socket;
MRef<IPAddress *> tempAddr;
- MRef<IPAddress *> destAddr;
MRef<SipSocketServer *> server;
#ifdef DEBUG_OUTPUT
cerr << "SipLayerTransport: sendMessage addr=" << ip_addr << ", port=" << port << endl;
Modified: trunk/libmsip/source/SipMessageContentMime.cxx
===================================================================
--- trunk/libmsip/source/SipMessageContentMime.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipMessageContentMime.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -36,29 +36,29 @@
return new SipMessageContentMime(buf, ContentType);
}
-SipMessageContentMime::SipMessageContentMime(std::string ContentType){
- this->ContentType = ContentType;
+SipMessageContentMime::SipMessageContentMime(std::string t){
+ this->ContentType = t;
this->boundry = "boun=_dry";
this->Message = "";
this->uniqueboundry = "_Minisip";
}
-SipMessageContentMime::SipMessageContentMime(std::string ContentType, std::string Message, std::string boundry) {
- this->Message = Message;
- this->ContentType = ContentType;
- this->boundry = boundry;
+SipMessageContentMime::SipMessageContentMime(std::string t, std::string m, std::string b) {
+ this->Message = m;
+ this->ContentType = t;
+ this->boundry = b;
this->uniqueboundry = "_Minisip";
}
-SipMessageContentMime::SipMessageContentMime(std::string content, std::string ContentType) {
+SipMessageContentMime::SipMessageContentMime(std::string content, std::string t) {
size_t index2;
std::string cont;
this->uniqueboundry = "_Minisip";
- if(ContentType.substr(0,9) == "multipart"){
- this->ContentType = ContentType.substr(0 , ContentType.find("; ",0) );
- index2 = ContentType.find("; boundary=",0);
+ if(t.substr(0,9) == "multipart"){
+ this->ContentType = t.substr(0 , ContentType.find("; ",0) );
+ index2 = t.find("; boundary=",0);
massert(index2 != string::npos);
- this->boundry = ContentType.substr(index2 + 11 , ContentType.find(";",index2 + 11));
+ this->boundry = t.substr(index2 + 11 , t.find(";",index2 + 11));
// Find first bodypart
index2 = content.find("--"+this->boundry, 0);
massert(index2 != string::npos);
@@ -100,7 +100,7 @@
}
}
else{
- this->ContentType = ContentType;
+ this->ContentType = t;
this->Message = content;
this->boundry = "";
}
@@ -135,8 +135,8 @@
return ContentType;
}
-void SipMessageContentMime::setBoundry(std::string boundry){
- this->boundry = boundry;
+void SipMessageContentMime::setBoundry(std::string b){
+ this->boundry = b;
}
std::string SipMessageContentMime::getBoundry(){
Modified: trunk/libmsip/source/SipSMCommand.cxx
===================================================================
--- trunk/libmsip/source/SipSMCommand.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipSMCommand.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -89,25 +89,25 @@
}
SipSMCommand::SipSMCommand(MRef<SipMessage*> p,
- int source,
- int destination):
+ int s,
+ int d):
type(COMMAND_PACKET),
cmdstr("",""),
cmdpkt(p),
- source(source),
- destination(destination)
+ source(s),
+ destination(d)
{
}
-SipSMCommand::SipSMCommand(const CommandString &s,
- int source,
- int destination):
+SipSMCommand::SipSMCommand(const CommandString &cs,
+ int s,
+ int d):
type(COMMAND_STRING),
- cmdstr(s),
+ cmdstr(cs),
cmdpkt(NULL),
- source(source),
- destination(destination)
+ source(s),
+ destination(d)
{
}
Modified: trunk/libmsip/source/SipStackInternal.cxx
===================================================================
--- trunk/libmsip/source/SipStackInternal.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipStackInternal.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -176,8 +176,8 @@
}
-void SipStackInternal::setCallback(MRef<CommandReceiver*> callback){
- this->callback = callback;
+void SipStackInternal::setCallback(MRef<CommandReceiver*> cb){
+ this->callback = cb;
dispatcher->setCallback(callback);
}
@@ -185,8 +185,8 @@
return callback;
}
-void SipStackInternal::setConfCallback(MRef<CommandReceiver*> callback){
- this->confCallback = callback;
+void SipStackInternal::setConfCallback(MRef<CommandReceiver*> cb){
+ this->confCallback = cb;
}
MRef<CommandReceiver*> SipStackInternal::getConfCallback(){
Modified: trunk/libmsip/source/SipUri.cxx
===================================================================
--- trunk/libmsip/source/SipUri.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/SipUri.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -135,24 +135,24 @@
}
-void SipUri::setParams(string userName, string ip, string type, int32_t port){
+void SipUri::setParams(string userName_, string ip_, string type, int32_t port_){
clear();
#ifdef DEBUG_OUTPUT
// cerr << "SipUri::setParams " << endl;
#endif
- parseUserInfo( userName );
+ parseUserInfo( userName_ );
if( getUserName() == "" && getIp() != "" ) {
setUser( getIp() );
setIp( "" );
setPort( 0 );
}
- if( getIp() == "" && ip != "" ) {
- setIp( ip );
+ if( getIp() == "" && ip_ != "" ) {
+ setIp( ip_ );
}
- if( port != 0 ) setPort( port );
+ if( port_ != 0 ) setPort( port );
if( type != "" ) setUserType( type );
validUri = true;
}
@@ -344,22 +344,16 @@
return userName;
}
-void SipUri::setIp(string ip){
- this->ip=ip;
-#ifdef DEBUG_OUTPUT
-// cerr << "SipUri: ip = " << this->ip << endl;
-#endif
+void SipUri::setIp(string i){
+ this->ip=i;
}
const string & SipUri::getIp() const {
return ip;
}
-void SipUri::setPort(int32_t port){
- this->port=port;
-#ifdef DEBUG_OUTPUT
-// cerr << "SipUri: port = " << itoa( this->port ) << endl;
-#endif
+void SipUri::setPort(int32_t p){
+ this->port=p;
}
int32_t SipUri::getPort() const {
@@ -368,9 +362,6 @@
void SipUri::setUserType(string type){
setParameter( "user", type );
-#ifdef DEBUG_OUTPUT
-// cerr << "SipUri: user type = " << type << endl;
-#endif
}
const string & SipUri::getUserType() const {
@@ -379,9 +370,6 @@
void SipUri::setTransport(string transp){
setParameter( "transport", transp );
-#ifdef DEBUG_OUTPUT
-// cerr << "SipUri: transport = " << transp << endl;
-#endif
}
const string & SipUri::getTransport() const {
Modified: trunk/libmsip/source/dialogs/SipDialog.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialog.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/dialogs/SipDialog.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -243,6 +243,9 @@
case SIP_HEADER_TYPE_PROXYAUTHORIZATION:
ack->addHeader(header);
break;
+ default:
+ /*don't copy other headers*/
+ break;
}
}
Modified: trunk/libmsip/source/headers/SipHeaderAcceptContact.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderAcceptContact.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderAcceptContact.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -126,12 +126,12 @@
* @param set_explicit set the explicit flag
*/
-SipHeaderValueAcceptContact::SipHeaderValueAcceptContact(string featuretag,
- bool set_require, bool set_explicit)
+SipHeaderValueAcceptContact::SipHeaderValueAcceptContact(string ft,
+ bool sr, bool se)
:SipHeaderValue(SIP_HEADER_TYPE_ACCEPTCONTACT,sipHeaderValueValueTypeStr){
- this->featuretag = featuretag;
- this->set_require = set_require;
- this->set_explicit = set_explicit;
+ this->featuretag = ft;
+ this->set_require = sr;
+ this->set_explicit = se;
}
/**
Modified: trunk/libmsip/source/headers/SipHeaderAuthorization.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderAuthorization.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderAuthorization.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -51,8 +51,8 @@
const string sipHeaderValueAuthorizationTypeString="Authorization";
-SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type, const string &typeStr)
- : SipHeaderValue(type, typeStr)
+SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type_, const string &typeStr)
+ : SipHeaderValue(type_, typeStr)
{
}
@@ -63,8 +63,8 @@
init( build_from );
}
-SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type, const string &build_from, const string &typeStr)
- : SipHeaderValue(type,typeStr)
+SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type_, const string &build_from, const string &typeStr)
+ : SipHeaderValue(type_,typeStr)
{
init( build_from );
}
@@ -86,9 +86,9 @@
const string &opaque,
const SipUri &uri,
const string &response,
- const string &auth_method)
+ const string &auth_meth)
: SipHeaderValue(SIP_HEADER_TYPE_AUTHORIZATION, sipHeaderValueAuthorizationTypeString),
- auth_method(auth_method)
+ auth_method(auth_meth)
{
setParameter("algorithm", "MD5");
setParameter("username", quote(username));
@@ -100,18 +100,18 @@
setParameter("opaque", quote(opaque));
}
-SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type,
+SipHeaderValueAuthorization::SipHeaderValueAuthorization(int type_,
const string &username,
const string &realm,
const string &nonce,
const string &opaque,
const SipUri &uri,
const string &response,
- const string &auth_method,
+ const string &auth_meth,
const string &typeStr
)
- : SipHeaderValue(type,typeStr),
- auth_method(auth_method)
+ : SipHeaderValue(type_,typeStr),
+ auth_method(auth_meth)
{
setParameter("algorithm", "MD5");
setParameter("username", quote(username));
Modified: trunk/libmsip/source/headers/SipHeaderCSeq.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderCSeq.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderCSeq.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -84,8 +84,8 @@
return method;
}
-void SipHeaderValueCSeq::setMethod(const string &method){
- this->method=method;
+void SipHeaderValueCSeq::setMethod(const string &m){
+ this->method=m;
}
void SipHeaderValueCSeq::setCSeq(int32_t n){
Modified: trunk/libmsip/source/headers/SipHeaderContact.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderContact.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderContact.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -139,8 +139,8 @@
return uri;
}
-void SipHeaderValueContact::setUri(const SipUri &uri){
- this->uri=uri;
+void SipHeaderValueContact::setUri(const SipUri &u){
+ this->uri=u;
}
//CESC
Modified: trunk/libmsip/source/headers/SipHeaderContentLength.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderContentLength.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderContentLength.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -83,14 +83,14 @@
}
string SipHeaderValueContentLength::getString() const{
- return /*"Content-Length: "+*/itoa(content_length);
+ return itoa(content_length);
}
int32_t SipHeaderValueContentLength::getContentLength() const{
return content_length;
}
-void SipHeaderValueContentLength::setContentLength(int32_t content_length){
- this->content_length=content_length;
+void SipHeaderValueContentLength::setContentLength(int32_t l){
+ this->content_length=l;
}
Modified: trunk/libmsip/source/headers/SipHeaderRSeq.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderRSeq.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderRSeq.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -48,7 +48,7 @@
: SipHeaderValue(SIP_HEADER_TYPE_RSEQ,sipHeaderValueRSeqTypeStr)
{
unsigned i=0;
- int len=build_from.size();
+ unsigned len=build_from.size();
while (isWS(build_from[i]))
i++;
string num="";
Modified: trunk/libmsip/source/headers/SipHeaderString.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderString.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderString.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -39,8 +39,8 @@
using namespace std;
-SipHeaderValueString::SipHeaderValueString(int type, const string& typeStr, const string &build_from)
- : SipHeaderValue(type, typeStr)
+SipHeaderValueString::SipHeaderValueString(int type_, const string& typeStr, const string &build_from)
+ : SipHeaderValue(type_, typeStr)
{
str=build_from;
}
Modified: trunk/libmsip/source/headers/SipHeaderTo.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderTo.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderTo.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -70,7 +70,7 @@
return uri;
}
-void SipHeaderValueTo::setUri(const SipUri &uri){
- this->uri=uri;
+void SipHeaderValueTo::setUri(const SipUri &u){
+ this->uri=u;
}
Modified: trunk/libmsip/source/headers/SipHeaderUnknown.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderUnknown.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderUnknown.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -41,8 +41,8 @@
const string sipHeaderUnknownTypeString ="";
-SipHeaderValueUnknown::SipHeaderValueUnknown(const string &headerName, const string &build_from)
- :SipHeaderValueString(SIP_HEADER_TYPE_UNKNOWN,headerName, build_from)
+SipHeaderValueUnknown::SipHeaderValueUnknown(const string &headerName_, const string &build_from)
+ :SipHeaderValueString(SIP_HEADER_TYPE_UNKNOWN,headerName_, build_from)
{
}
Modified: trunk/libmsip/source/headers/SipHeaderVia.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderVia.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderVia.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -158,12 +158,12 @@
ip="UNKNOWN_IP";
}
-SipHeaderValueVia::SipHeaderValueVia(const string &proto, const string &ip, int32_t port/*, const string &branch*/)
+SipHeaderValueVia::SipHeaderValueVia(const string &proto, const string &ip_, int32_t port_)
: SipHeaderValue(SIP_HEADER_TYPE_VIA,sipHeaderValueViaTypeStr)
{
setProtocol(proto);
- setIp(ip);
- setPort(port);
+ setIp(ip_);
+ setPort(port_);
}
SipHeaderValueVia::~SipHeaderValueVia(){
@@ -188,16 +188,16 @@
return protocol;
}
-void SipHeaderValueVia::setProtocol(const string &protocol){
- this->protocol=protocol;
+void SipHeaderValueVia::setProtocol(const string &p){
+ this->protocol=p;
}
string SipHeaderValueVia::getIp() const{
return ip;
}
-void SipHeaderValueVia::setIp(const string &ip){
- this->ip=ip;
+void SipHeaderValueVia::setIp(const string &i){
+ this->ip=i;
}
int32_t SipHeaderValueVia::getPort() const{
Modified: trunk/libmsip/source/headers/SipHeaderWarning.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderWarning.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/headers/SipHeaderWarning.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -69,12 +69,12 @@
}
-SipHeaderValueWarning::SipHeaderValueWarning(string domainName, uint16_t errorCode, string warning)
+SipHeaderValueWarning::SipHeaderValueWarning(string dn, uint16_t ec, string warn)
: SipHeaderValue(SIP_HEADER_TYPE_WARNING,sipHeaderValueWarningTypeStr)
{
- this->errorCode=errorCode;
- this->domainName=domainName;
- this->warning=warning;
+ this->errorCode=ec;
+ this->domainName=dn;
+ this->warning=warn;
}
SipHeaderValueWarning::~SipHeaderValueWarning(){
@@ -89,22 +89,23 @@
return warning;
}
-void SipHeaderValueWarning::setWarning(const string &warning){
- this->warning=warning;
+void SipHeaderValueWarning::setWarning(const string &w){
+ this->warning=w;
}
string SipHeaderValueWarning::getDomainName() const{
return domainName;
}
-void SipHeaderValueWarning::setDomainName(const string &domainName){
- this->domainName=domainName;
+void SipHeaderValueWarning::setDomainName(const string &d){
+ this->domainName=d;
}
uint16_t SipHeaderValueWarning::getErrorCode() const{
return errorCode;
}
-void SipHeaderValueWarning::setErrorCode(const uint16_t& errorCode){
- this->errorCode=errorCode;
+void SipHeaderValueWarning::setErrorCode(const uint16_t& e){
+ this->errorCode=e;
}
+
Modified: trunk/libmsip/source/messages/SipMessage.cxx
===================================================================
--- trunk/libmsip/source/messages/SipMessage.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/messages/SipMessage.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -244,19 +244,18 @@
int contentStart = parseHeaders(buildFrom, i);
int clen = getContentLength();
if (clen>0){
- string content=buildFrom.substr(contentStart, clen);
- if ((int)content.length() != clen){
- cerr << "WARNING: Length of content was shorter than expected (" << clen <<"!="<<(int)content.length()<<")"<<endl;
+ string contentbuf=buildFrom.substr(contentStart, clen);
+ if ((int)contentbuf.length() != clen){
+ cerr << "WARNING: Length of content was shorter than expected (" << clen <<"!="<<(int)contentbuf.length()<<")"<<endl;
}
MRef<SipHeader*> h = getHeaderOfType(SIP_HEADER_TYPE_CONTENTTYPE);
if (h){
- MRef<SipMessageContent*> smcref;
string contentType = ((SipHeaderValueString*)*(h->getHeaderValue(0) ))->getString();
// string b = (SipHeaderValueContentType*)*(h->getHeaderValue(0) )->getParameter("boundary");
//cerr <<"boundary="<< b <<endl;
SipMessageContentFactoryFuncPtr contentFactory = contentFactories.getFactory( contentType );
if (contentFactory){
- MRef<SipMessageContent*> smcref = contentFactory(content, contentType );
+ MRef<SipMessageContent*> smcref = contentFactory(contentbuf, contentType );
setContent(smcref);
}else{ //TODO: Better error handling
merr << "WARNING: No SipMessageContentFactory found for content type "<<contentType <<end;
@@ -295,8 +294,8 @@
return NULL;
}
-void SipMessage::setContent(MRef<SipMessageContent*> content){
- this->content=content;
+void SipMessage::setContent(MRef<SipMessageContent*> c){
+ this->content=c;
if( content ){
string contentType = content->getContentType();
if( contentType != "" ){
@@ -539,9 +538,9 @@
}
-void SipMessage::setSocket(MRef<Socket*> sock)
+void SipMessage::setSocket(MRef<Socket*> s)
{
- this->sock = sock;
+ this->sock = s;
}
MRef<Socket*> SipMessage::getSocket()
Modified: trunk/libmsip/source/messages/SipRequest.cxx
===================================================================
--- trunk/libmsip/source/messages/SipRequest.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/messages/SipRequest.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -84,6 +84,8 @@
case SIP_HEADER_TYPE_PROXYAUTHORIZATION:
req->addHeader(header);
break;
+ default:
+ break;
}
}
@@ -128,6 +130,8 @@
case SIP_HEADER_TYPE_PROXYAUTHORIZATION:
add=true;
break;
+ default:
+ break;
}
if (add){
req->addHeader(header);
@@ -147,7 +151,7 @@
const string& msg)
{
MRef<SipRequest*> req = new SipRequest("MESSAGE", toUri);
- req->addDefaultHeaders(fromUri,toUri,"MESSAGE",seqNo,callId);
+ req->addDefaultHeaders(fromUri,seqNo,callId);
req->addHeader(new SipHeader(new SipHeaderValueUserAgent(HEADER_USER_AGENT_DEFAULT)));
req->setContent(new SipMessageContentIM(msg));
return req;
@@ -177,7 +181,7 @@
{
MRef<SipRequest*> req = new SipRequest("INVITE", toUri);
- req->addDefaultHeaders( fromUri, toUri, "INVITE", seq_no, call_id );
+ req->addDefaultHeaders( fromUri, seq_no, call_id );
addHeaders(req, contact, stack);
return req;
@@ -191,7 +195,7 @@
)
{
MRef<SipRequest*> req = new SipRequest("NOTIFY", toUri);
- req->addDefaultHeaders(fromUri, toUri,"NOTIFY",seqNo,callId);
+ req->addDefaultHeaders(fromUri, seqNo,callId);
req->addHeader(new SipHeader(new SipHeaderValueUserAgent(HEADER_USER_AGENT_DEFAULT)));
req->addHeader(new SipHeader(new SipHeaderValueEvent("presence")));
return req;
@@ -206,7 +210,7 @@
{
MRef<SipRequest*> req = new SipRequest("REGISTER", registrar);
- req->addDefaultHeaders(fromUri,fromUri,"REGISTER",seq_no,call_id);
+ req->addDefaultHeaders(fromUri,seq_no,call_id);
req->addHeader(new SipHeader(*contactHdr));
req->addHeader(new SipHeader(new SipHeaderValueUserAgent(HEADER_USER_AGENT_DEFAULT)));
@@ -225,7 +229,7 @@
{
MRef<SipRequest*> req = new SipRequest("SUBSCRIBE", toUri );
- req->addDefaultHeaders(fromUri, toUri,"SUBSCRIBE",seq_no, call_id);
+ req->addDefaultHeaders(fromUri, seq_no, call_id);
req->addHeader(new SipHeader(new SipHeaderValueContact(contact)));
req->addHeader(new SipHeader(new SipHeaderValueEvent("presence")));
req->addHeader(new SipHeader(new SipHeaderValueAccept("application/xpidf+xml")));
@@ -234,23 +238,21 @@
}
void SipRequest::addDefaultHeaders(const SipUri& fromUri,
- const SipUri& toUri,
- const string& method,
int seqNo,
const string& callId)
{
addHeader(new SipHeader(new SipHeaderValueFrom(fromUri)));
- addHeader(new SipHeader(new SipHeaderValueTo(toUri)));
+ addHeader(new SipHeader(new SipHeaderValueTo(uri)));
addHeader(new SipHeader(new SipHeaderValueCallID(callId)));
addHeader(new SipHeader(new SipHeaderValueCSeq(method, seqNo)));
addHeader(new SipHeader(new SipHeaderValueMaxForwards(70)));
}
-SipRequest::SipRequest(const string &method,
- const SipUri &uri) :
- method(method),
- uri(uri)
+SipRequest::SipRequest(const string &method_,
+ const SipUri &uri_) :
+ method(method_),
+ uri(uri_)
{
}
@@ -332,53 +334,18 @@
}
-void SipRequest::setMethod(const string &method){
- this->method = method;
+void SipRequest::setMethod(const string &m){
+ this->method = m;
}
string SipRequest::getMethod() const{
return method;
}
-static string buildUri(const string &name)
-{
- string ret ="";
-
- //FIXME sanitize the request uri ... if we used a SipURI object, this would not be needed
- string username; //hide the class::username ... carefull
- size_t pos;
- username = name;
-
- pos = username.find('<');
- if( pos != string::npos ) {
- username.erase( 0, pos + 1 ); //erase the part in front of the '<'
- pos = username.find('>');
- username.erase( pos );
- }
-
- if (username.length()>4 && username.substr(0,4)=="sip:")
- ret = username;
- else if (username.length()>5 && username.substr(0,5)=="sips:")
- ret = username;
- else
- ret = "sip:"+username;
-
-#if 0
- if (username.find("@")==string::npos)
- ret = ret+"@"+ip;
-#endif
-
- return ret;
+void SipRequest::setUri(const SipUri &u){
+ this->uri = u;
}
-// void SipRequest::setUri(const string &uri){
-// setUri(SipUri(buildUri(uri)));
-// }
-
-void SipRequest::setUri(const SipUri &uri){
- this->uri = uri;
-}
-
const SipUri &SipRequest::getUri() const{
return uri;
}
@@ -394,21 +361,21 @@
void SipRequest::addRoute(const string &addr, int32_t port,
const string &transport)
{
- string uri = "<sip:" + addr;
+ string u = "<sip:" + addr;
if( port ){
char buf[20];
sprintf(buf, "%d", port);
- uri = uri + ":" + buf;
+ u = u + ":" + buf;
}
if( transport != "" ){
- uri = uri + ";transport=" + transport;
+ u = u + ";transport=" + transport;
}
- uri = uri + ";lr>";
+ u = u + ";lr>";
- addRoute( uri );
+ addRoute( u );
}
void SipRequest::addRoutes(const list<SipUri> &routes){
Modified: trunk/libmsip/source/messages/SipResponse.cxx
===================================================================
--- trunk/libmsip/source/messages/SipResponse.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/messages/SipResponse.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -51,17 +51,17 @@
const string SipResponse::type="RESPONSE";
-SipResponse::SipResponse(string branch,
+SipResponse::SipResponse(string branch_,
int32_t status,
- string status_desc,
+ string status_desc_,
MRef<SipRequest*> req)
{
- setBranch(branch);
+ this->status_code=status;
+ this->status_desc=status_desc_;
+
+ setBranch(branch_);
setContent(NULL);
- this->status_code=status;
- this->status_desc=status_desc;
-
MRef<SipHeaderValue*> mf = new SipHeaderValueMaxForwards(70);
addHeader(new SipHeader(*mf));
@@ -76,8 +76,11 @@
case SIP_HEADER_TYPE_CALLID:
case SIP_HEADER_TYPE_CSEQ:
case SIP_HEADER_TYPE_RECORDROUTE: //if it exhists in the request, it is copied to response
- addHeader(header); //FIXME: Other headers should be copies as well (?)
+ addHeader(header);
break;
+ default:
+ /*don't copy any other header*/
+ break;
}
}
}
Modified: trunk/libmsip/source/transactions/SipTransaction.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransaction.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransaction.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -52,13 +52,13 @@
SipTransaction::SipTransaction(MRef<SipStackInternal*> stackInternal,
int cseq,
- const string &cSeqMethod,
+ const string &cseqm,
const string &b,
const string &callid):
StateMachine<SipSMCommand, string>(stackInternal->getTimeoutProvider() ),
sipStackInternal(stackInternal),
cSeqNo(cseq),
- cSeqMethod(cSeqMethod),
+ cSeqMethod(cseqm),
branch(b)
{
dispatcher = stackInternal->getDispatcher();
@@ -254,10 +254,10 @@
SipTransactionClient::SipTransactionClient(MRef<SipStackInternal*> stackInternal,
int seq_no,
- const string &cSeqMethod,
- const string &branch,
+ const string &cseqm,
+ const string &branch_,
const string &callid):
- SipTransaction(stackInternal, seq_no,cSeqMethod,branch,callid)
+ SipTransaction(stackInternal, seq_no, cseqm, branch_, callid)
{
}
@@ -268,10 +268,10 @@
SipTransactionServer::SipTransactionServer(MRef<SipStackInternal*> stackInternal,
int seq_no,
- const string &cSeqMethod,
- const string &branch,
+ const string &cseqm,
+ const string &branch_,
const string &callid):
- SipTransaction(stackInternal,seq_no,cSeqMethod,branch,callid)
+ SipTransaction(stackInternal,seq_no,cseqm,branch_,callid)
{
}
Modified: trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -524,11 +524,10 @@
SipTransactionInviteClient::SipTransactionInviteClient(MRef<SipStackInternal*> stack,
- //MRef<SipDialog*> call,
int seq_no,
- const string &cSeqMethod,
+ const string &cseqm,
const string &callid):
- SipTransactionClient(stack, /*call,*/ seq_no, cSeqMethod, "", callid),
+ SipTransactionClient(stack, seq_no, cseqm, "", callid),
lastInvite(NULL)
{
timerA=sipStackInternal->getTimers()->getA();
Modified: trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -516,12 +516,11 @@
SipTransactionInviteServer::SipTransactionInviteServer(MRef<SipStackInternal*> stack,
- //MRef<SipDialog*> d,
int seq_no,
- const string &cSeqMethod,
- const string &branch,
+ const string &cseqm,
+ const string &branch_,
const string &callid) :
- SipTransactionServer(stack, /*d,*/ seq_no, cSeqMethod, branch,callid),
+ SipTransactionServer(stack, seq_no, cseqm, branch_, callid),
lastResponse(NULL),
timerG(500)
{
Modified: trunk/libmsip/source/transactions/SipTransactionInviteServerUA.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionInviteServerUA.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransactionInviteServerUA.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -144,10 +144,10 @@
SipTransactionInviteServerUA::SipTransactionInviteServerUA(MRef<SipStackInternal*> stack,
int seq_no,
- const string &cSeqMethod,
- const string &branch,
+ const string &cseqm,
+ const string &branch_,
const string &callid) :
- SipTransactionInviteServer(stack, seq_no, cSeqMethod, branch, callid)
+ SipTransactionInviteServer(stack, seq_no, cseqm, branch_, callid)
{
changeStateMachine();
}
Modified: trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -433,11 +433,10 @@
SipTransactionNonInviteClient::SipTransactionNonInviteClient(
MRef<SipStackInternal *> stack,
- //MRef<SipDialog*> d,
int seq_no,
- const string &cSeqMethod,
+ const string &cseqm,
const string &callid) :
- SipTransactionClient(stack, /*d,*/ seq_no, cSeqMethod, "", callid),
+ SipTransactionClient(stack, seq_no, cseqm, "", callid),
lastRequest(NULL)
{
Modified: trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -360,12 +360,11 @@
}
SipTransactionNonInviteServer::SipTransactionNonInviteServer(MRef<SipStackInternal*> stack,
- // MRef<SipDialog*> call,
int seq_no,
- const string &cSeqMethod,
- const string &branch,
+ const string &cseqm,
+ const string &branch_,
const string &callid) :
- SipTransactionServer(stack, /*call,*/ seq_no, cSeqMethod, branch, callid),
+ SipTransactionServer(stack, seq_no, cseqm, branch_, callid),
lastResponse(NULL)
{
setUpStateMachine();
Modified: trunk/libmutil/include/libmutil/StateMachine.h
===================================================================
--- trunk/libmutil/include/libmutil/StateMachine.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/include/libmutil/StateMachine.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -255,10 +255,10 @@
template<class CommandType, class TimeoutType>
class State : public MObject{
public:
- State(MRef<StateMachine<CommandType,TimeoutType> *> stateMachine,
- const std::string &name):
- stateMachine(stateMachine),
- name(name)
+ State(MRef<StateMachine<CommandType,TimeoutType> *> stateMachine_,
+ const std::string &name_):
+ stateMachine(stateMachine_),
+ name(name_)
{}
~State(){
@@ -276,16 +276,16 @@
transitions.push_back(transition);
}
- MRef<StateTransition<CommandType, TimeoutType> *> getTransition(const std::string &name){
+ MRef<StateTransition<CommandType, TimeoutType> *> getTransition(const std::string &name_){
for (typename std::list<MRef<StateTransition<CommandType,TimeoutType> *> >::iterator i=transitions.begin(); i!=transitions.end(); i++)
- if ((*i)->getName()==name)
+ if ((*i)->getName()==name_)
return *i;
return NULL;
}
- bool removeTransition(const std::string &name){
+ bool removeTransition(const std::string &name_){
for (typename std::list<MRef<StateTransition<CommandType,TimeoutType> *> >::iterator i=transitions.begin(); i!=transitions.end(); i++){
- if ((*i)->getName()==name){
+ if ((*i)->getName()==name_){
transitions.erase(i);
return true;
}
@@ -318,16 +318,16 @@
class StateTransition : public MObject{
public:
- StateTransition(MRef<StateMachine<CommandType, TimeoutType> *> stateMachine,
- const std::string &name,
+ StateTransition(MRef<StateMachine<CommandType, TimeoutType> *> stateMachine_,
+ const std::string &name_,
bool (StateMachine<CommandType, TimeoutType>::*a)(const CommandType& ),
- MRef<State<CommandType,TimeoutType> *> from_state,
- MRef<State<CommandType,TimeoutType> *> to_state):
- stateMachine(stateMachine),
- name(name),
+ MRef<State<CommandType,TimeoutType> *> from_state_,
+ MRef<State<CommandType,TimeoutType> *> to_state_):
+ stateMachine(stateMachine_),
+ name(name_),
action(a),
- from_state(from_state),
- to_state(to_state)
+ from_state(from_state_),
+ to_state(to_state_)
{
from_state->register_transition(this);
}
Modified: trunk/libmutil/include/libmutil/TimeoutProvider.h
===================================================================
--- trunk/libmutil/include/libmutil/TimeoutProvider.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/include/libmutil/TimeoutProvider.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -69,11 +69,10 @@
class TPRequest{
public:
- TPRequest( TOSubscriber tsi, int timeout_ms, const TOCommand &command):subscriber(tsi){
+ TPRequest( TOSubscriber tsi, int timeout_ms, const TOCommand &cmd):subscriber(tsi),command(cmd){
when_ms = mtime();
when_ms += timeout_ms;
- this->command=command;
}
/**
Modified: trunk/libmutil/include/libmutil/XMLParser.h
===================================================================
--- trunk/libmutil/include/libmutil/XMLParser.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/include/libmutil/XMLParser.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -63,19 +63,19 @@
class LIBMUTIL_API XMLException : public Exception{
public:
- XMLException(std::string msg):
- Exception(msg.c_str()) {};
+ XMLException(std::string m):
+ Exception(m.c_str()) {};
private:
};
class LIBMUTIL_API XMLElementNotFound: public XMLException{
public:
- XMLElementNotFound(std::string msg):XMLException(msg){};
+ XMLElementNotFound(std::string m):XMLException(m){};
};
class LIBMUTIL_API XMLFileNotFound: public XMLException{
public:
- XMLFileNotFound(std::string msg):XMLException(msg){};
+ XMLFileNotFound(std::string m):XMLException(m){};
};
Modified: trunk/libmutil/include/libmutil/minilist.h
===================================================================
--- trunk/libmutil/include/libmutil/minilist.h 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/include/libmutil/minilist.h 2007-05-22 11:50:06 UTC (rev 3283)
@@ -40,7 +40,7 @@
template<class T>
class MiniListNode{
public:
- MiniListNode( T v, MiniListNode *next=NULL):value(v), next(next){}
+ MiniListNode( T v, MiniListNode *nxt=NULL):value(v), next(nxt){}
MiniListNode * getNext(){ return next;}
void setNext( MiniListNode *n ){ next = n; }
T getValue(){return value;}
@@ -67,7 +67,7 @@
*/
minilist():head(NULL),end(NULL),nelem(0)
#ifdef MINILIST_FORWARD_ITERATOR_OPTIMIZE
- ,last_index(-2)
+ ,last_index(-2),last_node(NULL)
#endif
{}
@@ -79,7 +79,7 @@
*/
minilist(const minilist &l2)
#ifdef MINILIST_FORWARD_ITERATOR_OPTIMIZE
- :last_index(-2)
+ :last_index(-2),last_node(NULL)
#endif
{
head=end=NULL;
Modified: trunk/libmutil/source/CircularBuffer.cxx
===================================================================
--- trunk/libmutil/source/CircularBuffer.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/CircularBuffer.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -27,15 +27,15 @@
#include <string.h> //for memcpy
-CircularBuffer::CircularBuffer(int size):
- maxSize(size),
+CircularBuffer::CircularBuffer(int size_):
+ maxSize(size_),
size(0),
readIdx(0),
writeIdx(0),
byteCounter(0) {
buf = NULL;
- buf = new short[size];
+ buf = new short[size_];
}
CircularBuffer::CircularBuffer(const CircularBuffer &b):
Modified: trunk/libmutil/source/Exception.cxx
===================================================================
--- trunk/libmutil/source/Exception.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/Exception.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -48,8 +48,8 @@
* See:
* http://www.gnu.org/software/libc/manual/html_node/Backtraces.html
*/
-Exception::Exception(char const* what):exception(){
- msg = string(what);
+Exception::Exception(char const* m):exception(){
+ msg = string(m);
#ifdef HAVE_EXECINFO_H
stack = new void*[MAX_STACK_TRACE_DEPTH];
if (stack){
@@ -66,8 +66,8 @@
/**
* Same as Exception(char*) except that it takes a string instead.
*/
-Exception::Exception(const std::string &what):exception(){
- msg = what;
+Exception::Exception(const std::string &m):exception(){
+ msg = m;
#ifdef HAVE_EXECINFO_H
stack = new void*[MAX_STACK_TRACE_DEPTH];
if (stack){
Modified: trunk/libmutil/source/Library.cxx
===================================================================
--- trunk/libmutil/source/Library.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/Library.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -38,7 +38,7 @@
int Library::refCount;
-Library::Library(const string &path):path(path){
+Library::Library(const string &path_):path(path_){
if( refCount == 0 )
lt_dlinit();
Modified: trunk/libmutil/source/MessageRouter.cxx
===================================================================
--- trunk/libmutil/source/MessageRouter.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/MessageRouter.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -18,7 +18,7 @@
*/
-SubsystemNotFoundException::SubsystemNotFoundException(const char *what):Exception(what){
+SubsystemNotFoundException::SubsystemNotFoundException(const char *m):Exception(m){
}
Modified: trunk/libmutil/source/TextUI.cxx
===================================================================
--- trunk/libmutil/source/TextUI.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/TextUI.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -352,7 +352,7 @@
}
if (cbSuggest.size()==0){
- for (int i=0; i<completionCallbacks.size(); i++){
+ for (i=0; i<completionCallbacks.size(); i++){
if (hint=="" ||
(completionCallbacks[i].match.size()>=hint.size() &&
completionCallbacks[i].match.substr(0,hint.size())==hint )){
Modified: trunk/libmutil/source/ThreadPosix.cxx
===================================================================
--- trunk/libmutil/source/ThreadPosix.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/ThreadPosix.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -313,7 +313,7 @@
ret = pthread_create(
//(pthread_t*)handle.hptr,
- (pthread_t*)&handle.handle,
+ (pthread_t*)((void*)&handle.handle),
NULL, // either NULL or &attr,
LinuxThreadStarter,
self);
@@ -348,7 +348,7 @@
#ifdef DEBUG_OUTPUT
mdbg << "Running createThread"<< end;
#endif // DEBUG_OUTPUT
- pthread_create( /* (pthread_t*)h.hptr*/ (pthread_t*)&h.handle, NULL, LinuxStaticThreadStarter, (void*)f);
+ pthread_create( /* (pthread_t*)h.hptr*/ (pthread_t*)((void*)&h.handle), NULL, LinuxStaticThreadStarter, (void*)f);
return h;
}
@@ -361,7 +361,7 @@
#ifdef DEBUG_OUTPUT
mdbg << "Running createThread" << end;
#endif // DEBUG_OUTPUT
- pthread_create(/* (pthread_t*)h.hptr*/ (pthread_t*)&h.handle, NULL, LinuxStaticThreadStarterArg, argptr);
+ pthread_create(/* (pthread_t*)h.hptr*/ (pthread_t*)((void*)&h.handle), NULL, LinuxStaticThreadStarterArg, argptr);
return h;
}
Modified: trunk/libmutil/source/XMLParser.cxx
===================================================================
--- trunk/libmutil/source/XMLParser.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/XMLParser.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -172,7 +172,7 @@
if (indent>=0)
ret = ret+">\n";
if (cur->getValue().length()>0){
- for (int32_t j=0; j<indent+1; j++)
+ for (j=0; j<indent+1; j++)
ret = ret+"\t";
ret = ret +cur->getValue()+"";
ret = ret+'\n';
@@ -199,7 +199,7 @@
}
-XMLFileParser::XMLFileParser(string filename, XMLParserCallback *cb):XMLParser(cb), filename(filename){
+XMLFileParser::XMLFileParser(string filename_, XMLParserCallback *cb):XMLParser(cb), filename(filename_){
string s = "";
if (filename != ""){
@@ -407,7 +407,7 @@
xmlprint("", root);
}
-XMLNode::XMLNode(int32_t type, string name, string value):name(name), value(value),type(type){
+XMLNode::XMLNode(int32_t type_, string name_, string value_):name(name_), value(value_),type(type_){
}
@@ -427,7 +427,7 @@
subnodes.push_back(n);
}
-XMLElement::XMLElement(string name):XMLNode(XML_NODE_TYPE_ELEMENT, name){
+XMLElement::XMLElement(string name_):XMLNode(XML_NODE_TYPE_ELEMENT, name_){
}
@@ -447,7 +447,7 @@
}
*/
-XMLAttribute::XMLAttribute(string name, string value):XMLNode(XML_NODE_TYPE_ATTRIBUTE,name,value){
+XMLAttribute::XMLAttribute(string name_, string value_):XMLNode(XML_NODE_TYPE_ATTRIBUTE,name_,value_){
}
Modified: trunk/libmutil/source/stringutils.cxx
===================================================================
--- trunk/libmutil/source/stringutils.cxx 2007-05-22 11:27:22 UTC (rev 3282)
+++ trunk/libmutil/source/stringutils.cxx 2007-05-22 11:50:06 UTC (rev 3283)
@@ -227,10 +227,10 @@
return -1;
}
- iterator i;
+ iterator i,j;
iterator last = s1.end();
- for (iterator i = s1.begin(), j = s2.begin(); i != last; ++i, ++j){
+ for (i = s1.begin(), j = s2.begin(); i != last; ++i, ++j){
const charT c1 = *i;
const charT c2 = *j;
if ( !(c1 == c2) &&
More information about the Minisip-devel
mailing list