ekiga r6351 - in trunk: . src/endpoints
- From: dsandras svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6351 - in trunk: . src/endpoints
- Date: Tue, 3 Jun 2008 18:15:18 +0000 (UTC)
Author: dsandras
Date: Tue Jun 3 18:15:18 2008
New Revision: 6351
URL: http://svn.gnome.org/viewvc/ekiga?rev=6351&view=rev
Log:
Better namespace naming.
Modified:
trunk/ChangeLog
trunk/src/endpoints/accountshandler.cpp
trunk/src/endpoints/h323.cpp
trunk/src/endpoints/h323.h
trunk/src/endpoints/opal-gmconf-bridge.cpp
trunk/src/endpoints/opal-main.cpp
trunk/src/endpoints/sip.cpp
trunk/src/endpoints/sip.h
Modified: trunk/src/endpoints/accountshandler.cpp
==============================================================================
--- trunk/src/endpoints/accountshandler.cpp (original)
+++ trunk/src/endpoints/accountshandler.cpp Tue Jun 3 18:15:18 2008
@@ -155,7 +155,7 @@
void GMAccountsEndpoint::SIPRegister (GmAccount *a)
{
std::string aor;
- OpalSip::CallProtocolManager *sip_manager = dynamic_cast<OpalSip::CallProtocolManager *> (ep.get_protocol_manager ("sip"));
+ Opal::Sip::CallProtocolManager *sip_manager = dynamic_cast<Opal::Sip::CallProtocolManager *> (ep.get_protocol_manager ("sip"));
// TODO Move this to the engine and drop the dynamic cast
aor = a->username;
@@ -170,7 +170,7 @@
void GMAccountsEndpoint::H323Register (GmAccount *a)
{
std::string aor;
- OpalH323::CallProtocolManager *h323_manager = dynamic_cast<OpalH323::CallProtocolManager *> (ep.get_protocol_manager ("h323"));
+ Opal::H323::CallProtocolManager *h323_manager = dynamic_cast<Opal::H323::CallProtocolManager *> (ep.get_protocol_manager ("h323"));
// TODO Move this to the engine and drop the dynamic cast
aor = a->username;
Modified: trunk/src/endpoints/h323.cpp
==============================================================================
--- trunk/src/endpoints/h323.cpp (original)
+++ trunk/src/endpoints/h323.cpp Tue Jun 3 18:15:18 2008
@@ -51,17 +51,17 @@
dialer (const std::string & uri, GMManager & ep)
: PThread (1000, AutoDeleteThread),
- dial_uri (uri),
- endpoint (ep)
+ dial_uri (uri),
+ endpoint (ep)
{
this->Resume ();
};
-
+
void Main ()
- {
- PString token;
- endpoint.SetUpCall ("pc:*", dial_uri, token);
- };
+ {
+ PString token;
+ endpoint.SetUpCall ("pc:*", dial_uri, token);
+ };
private:
const std::string dial_uri;
@@ -69,12 +69,15 @@
};
+using namespace Opal::H323;
+
+
/* The class */
-OpalH323::CallProtocolManager::CallProtocolManager (GMManager & ep, Ekiga::ServiceCore & _core, unsigned _listen_port)
- : H323EndPoint (ep),
- endpoint (ep),
- core (_core),
- runtime (*(dynamic_cast<Ekiga::Runtime *> (core.get ("runtime"))))
+CallProtocolManager::CallProtocolManager (GMManager & ep, Ekiga::ServiceCore & _core, unsigned _listen_port)
+ : H323EndPoint (ep),
+ endpoint (ep),
+ core (_core),
+ runtime (*(dynamic_cast<Ekiga::Runtime *> (core.get ("runtime"))))
{
protocol_name = "h323";
uri_prefix = "h323:";
@@ -82,7 +85,7 @@
/* Initial requested bandwidth */
SetInitialBandwidth (40000);
-
+
/* Start listener */
set_listen_port (listen_port);
@@ -92,8 +95,8 @@
}
-bool OpalH323::CallProtocolManager::populate_menu (Ekiga::Contact &contact,
- Ekiga::MenuBuilder &builder)
+bool CallProtocolManager::populate_menu (Ekiga::Contact &contact,
+ Ekiga::MenuBuilder &builder)
{
std::string name = contact.get_name ();
std::map<std::string, std::string> uris = contact.get_uris ();
@@ -102,8 +105,8 @@
}
-bool OpalH323::CallProtocolManager::populate_menu (const std::string uri,
- Ekiga::MenuBuilder & builder)
+bool CallProtocolManager::populate_menu (const std::string uri,
+ Ekiga::MenuBuilder & builder)
{
std::map<std::string, std::string> uris;
uris [""] = uri;
@@ -112,9 +115,9 @@
}
-bool OpalH323::CallProtocolManager::menu_builder_add_actions (const std::string & /*fullname*/,
- std::map<std::string,std::string> & uris,
- Ekiga::MenuBuilder & builder)
+bool CallProtocolManager::menu_builder_add_actions (const std::string & /*fullname*/,
+ std::map<std::string,std::string> & uris,
+ Ekiga::MenuBuilder & builder)
{
bool populated = false;
@@ -128,7 +131,7 @@
if (!iter->first.empty ())
action = action + " [" + iter->first + "]";
- builder.add_action ("call", action, sigc::bind (sigc::mem_fun (this, &OpalH323::CallProtocolManager::on_dial), iter->second));
+ builder.add_action ("call", action, sigc::bind (sigc::mem_fun (this, &CallProtocolManager::on_dial), iter->second));
populated = true;
}
@@ -137,7 +140,7 @@
}
-bool OpalH323::CallProtocolManager::dial (const std::string & uri)
+bool CallProtocolManager::dial (const std::string & uri)
{
PString token;
std::stringstream ustr;
@@ -153,13 +156,13 @@
}
-const std::string & OpalH323::CallProtocolManager::get_protocol_name () const
+const std::string & CallProtocolManager::get_protocol_name () const
{
return protocol_name;
}
-void OpalH323::CallProtocolManager::set_dtmf_mode (unsigned mode)
+void CallProtocolManager::set_dtmf_mode (unsigned mode)
{
switch (mode)
{
@@ -181,7 +184,7 @@
}
-unsigned OpalH323::CallProtocolManager::get_dtmf_mode () const
+unsigned CallProtocolManager::get_dtmf_mode () const
{
if (GetSendUserInputMode () == OpalConnection::SendUserInputAsString)
return 0;
@@ -199,7 +202,7 @@
}
-bool OpalH323::CallProtocolManager::set_listen_port (unsigned port)
+bool CallProtocolManager::set_listen_port (unsigned port)
{
interface.protocol = "tcp";
interface.interface = "*";
@@ -221,30 +224,30 @@
}
-const Ekiga::CallProtocolManager::Interface & OpalH323::CallProtocolManager::get_listen_interface () const
+const Ekiga::CallProtocolManager::Interface & CallProtocolManager::get_listen_interface () const
{
return interface;
}
-void OpalH323::CallProtocolManager::set_forward_uri (const std::string & uri)
+void CallProtocolManager::set_forward_uri (const std::string & uri)
{
forward_uri = uri;
}
-const std::string & OpalH323::CallProtocolManager::get_forward_uri () const
+const std::string & CallProtocolManager::get_forward_uri () const
{
return forward_uri;
}
-void OpalH323::CallProtocolManager::Register (const PString & aor,
- const PString & authUserName,
- const PString & password,
- const PString & gatekeeperID,
- unsigned int expires,
- bool unregister)
+void CallProtocolManager::Register (const PString & aor,
+ const PString & authUserName,
+ const PString & password,
+ const PString & gatekeeperID,
+ unsigned int expires,
+ bool unregister)
{
PString info;
PString host;
@@ -339,9 +342,9 @@
}
-bool OpalH323::CallProtocolManager::UseGatekeeper (const PString & address,
- const PString & domain,
- const PString & iface)
+bool CallProtocolManager::UseGatekeeper (const PString & address,
+ const PString & domain,
+ const PString & iface)
{
bool result =
H323EndPoint::UseGatekeeper (address, domain, iface);
@@ -354,7 +357,7 @@
}
-bool OpalH323::CallProtocolManager::RemoveGatekeeper (const PString & address)
+bool CallProtocolManager::RemoveGatekeeper (const PString & address)
{
if (IsRegisteredWithGatekeeper (address))
return H323EndPoint::RemoveGatekeeper (0);
@@ -363,7 +366,7 @@
}
-bool OpalH323::CallProtocolManager::IsRegisteredWithGatekeeper (const PString & address)
+bool CallProtocolManager::IsRegisteredWithGatekeeper (const PString & address)
{
PWaitAndSignal m(gk_name_mutex);
@@ -371,11 +374,11 @@
}
-bool OpalH323::CallProtocolManager::OnIncomingConnection (OpalConnection & connection,
- G_GNUC_UNUSED unsigned options,
- G_GNUC_UNUSED OpalConnection::StringOptions *stroptions)
+bool CallProtocolManager::OnIncomingConnection (OpalConnection & connection,
+ G_GNUC_UNUSED unsigned options,
+ G_GNUC_UNUSED OpalConnection::StringOptions *stroptions)
{
- PTRACE (3, "OpalH323::CallProtocolManager\tIncoming connection");
+ PTRACE (3, "CallProtocolManager\tIncoming connection");
if (!forward_uri.empty () && endpoint.get_unconditional_forward ())
connection.ForwardCall (forward_uri);
@@ -405,7 +408,7 @@
}
-void OpalH323::CallProtocolManager::on_dial (std::string uri)
+void CallProtocolManager::on_dial (std::string uri)
{
endpoint.dial (uri);
}
Modified: trunk/src/endpoints/h323.h
==============================================================================
--- trunk/src/endpoints/h323.h (original)
+++ trunk/src/endpoints/h323.h Tue Jun 3 18:15:18 2008
@@ -46,87 +46,90 @@
#include "manager.h"
-namespace OpalH323 {
+namespace Opal {
- class CallProtocolManager : public H323EndPoint,
- public Ekiga::CallProtocolManager,
- public Ekiga::PresentityDecorator,
- public Ekiga::ContactDecorator
- {
- PCLASSINFO(CallProtocolManager, H323EndPoint);
+ namespace H323 {
-public:
- CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
+ class CallProtocolManager : public H323EndPoint,
+ public Ekiga::CallProtocolManager,
+ public Ekiga::PresentityDecorator,
+ public Ekiga::ContactDecorator
+ {
+ PCLASSINFO(CallProtocolManager, H323EndPoint);
+ public:
+ CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
- /* ContactDecorator and PresentityDecorator */
- bool populate_menu (Ekiga::Contact &contact,
- Ekiga::MenuBuilder &builder);
- bool populate_menu (const std::string uri,
- Ekiga::MenuBuilder & builder);
+ /* ContactDecorator and PresentityDecorator */
+ bool populate_menu (Ekiga::Contact &contact,
+ Ekiga::MenuBuilder &builder);
- bool menu_builder_add_actions (const std::string & fullname,
- std::map<std::string, std::string> & uris,
- Ekiga::MenuBuilder & builder);
+ bool populate_menu (const std::string uri,
+ Ekiga::MenuBuilder & builder);
+ bool menu_builder_add_actions (const std::string & fullname,
+ std::map<std::string, std::string> & uris,
+ Ekiga::MenuBuilder & builder);
- /* CallProtocolManager */
- bool dial (const std::string & uri);
- const std::string & get_protocol_name () const;
+ /* CallProtocolManager */
+ bool dial (const std::string & uri);
- void set_dtmf_mode (unsigned mode);
- unsigned get_dtmf_mode () const;
+ const std::string & get_protocol_name () const;
- bool set_listen_port (unsigned port);
- const Ekiga::CallProtocolManager::Interface & get_listen_interface () const;
+ void set_dtmf_mode (unsigned mode);
+ unsigned get_dtmf_mode () const;
+ bool set_listen_port (unsigned port);
+ const Ekiga::CallProtocolManager::Interface & get_listen_interface () const;
- /* H.323 CallProtocolManager */
- void set_forward_uri (const std::string & uri);
- const std::string & get_forward_uri () const;
+ /* H.323 CallProtocolManager */
+ void set_forward_uri (const std::string & uri);
+ const std::string & get_forward_uri () const;
- /* OPAL methods */
- void Register (const PString & aor,
- const PString & authUserName,
- const PString & password,
- const PString & gatekeeperID,
- unsigned int expires,
- bool unregister);
-private:
- bool UseGatekeeper (const PString & address = PString::Empty (),
- const PString & domain = PString::Empty (),
- const PString & iface = PString::Empty ());
+ /* OPAL methods */
+ void Register (const PString & aor,
+ const PString & authUserName,
+ const PString & password,
+ const PString & gatekeeperID,
+ unsigned int expires,
+ bool unregister);
- bool RemoveGatekeeper (const PString & address);
+ private:
+ bool UseGatekeeper (const PString & address = PString::Empty (),
+ const PString & domain = PString::Empty (),
+ const PString & iface = PString::Empty ());
- bool IsRegisteredWithGatekeeper (const PString & address);
+ bool RemoveGatekeeper (const PString & address);
- bool OnIncomingConnection (OpalConnection &connection,
- unsigned options,
- OpalConnection::StringOptions *str_options);
+ bool IsRegisteredWithGatekeeper (const PString & address);
+ bool OnIncomingConnection (OpalConnection &connection,
+ unsigned options,
+ OpalConnection::StringOptions *str_options);
-private:
- void on_dial (std::string uri);
- GMManager & endpoint;
- Ekiga::ServiceCore & core;
- Ekiga::Runtime & runtime;
+ private:
+ void on_dial (std::string uri);
- PMutex gk_name_mutex;
- PString gk_name;
+ GMManager & endpoint;
+ Ekiga::ServiceCore & core;
+ Ekiga::Runtime & runtime;
- Ekiga::CallProtocolManager::Interface interface;
+ PMutex gk_name_mutex;
+ PString gk_name;
- std::string protocol_name;
- std::string uri_prefix;
- std::string forward_uri;
+ Ekiga::CallProtocolManager::Interface interface;
- unsigned listen_port;
+ std::string protocol_name;
+ std::string uri_prefix;
+ std::string forward_uri;
+
+ unsigned listen_port;
+ };
};
};
#endif
Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp (original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp Tue Jun 3 18:15:18 2008
@@ -226,7 +226,7 @@
//
else if (key.find (SIP_KEY) != string::npos) {
- OpalSip::CallProtocolManager *sip_manager = dynamic_cast<OpalSip::CallProtocolManager *> (manager.get_protocol_manager ("sip"));
+ Opal::Sip::CallProtocolManager *sip_manager = dynamic_cast<Opal::Sip::CallProtocolManager *> (manager.get_protocol_manager ("sip"));
if (sip_manager) {
if (key == SIP_KEY "outbound_proxy_host") {
@@ -257,7 +257,7 @@
//
else if (key.find (SIP_KEY) != string::npos) {
- OpalH323::CallProtocolManager *h323_manager = dynamic_cast<OpalH323::CallProtocolManager *> (manager.get_protocol_manager ("h323"));
+ Opal::H323::CallProtocolManager *h323_manager = dynamic_cast<Opal::H323::CallProtocolManager *> (manager.get_protocol_manager ("h323"));
if (h323_manager) {
if (key == H323_KEY "enable_h245_tunneling") {
Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp (original)
+++ trunk/src/endpoints/opal-main.cpp Tue Jun 3 18:15:18 2008
@@ -54,6 +54,7 @@
return (uri.find ("sip:") == 0);
}
+using namespace Opal;
bool
opal_init (Ekiga::ServiceCore &core,
@@ -75,8 +76,8 @@
chat_core = dynamic_cast<Ekiga::ChatCore *> (core.get ("chat-core"));
GMManager *call_manager = new GMManager (core);
- OpalSip::CallProtocolManager *sip_manager = new OpalSip::CallProtocolManager (*call_manager, core, sip_port);
- OpalH323::CallProtocolManager *h323_manager = new OpalH323::CallProtocolManager (*call_manager, core, h323_port);
+ Sip::CallProtocolManager *sip_manager = new Sip::CallProtocolManager (*call_manager, core, sip_port);
+ H323::CallProtocolManager *h323_manager = new H323::CallProtocolManager (*call_manager, core, h323_port);
call_manager->add_protocol_manager (*sip_manager);
call_manager->add_protocol_manager (*h323_manager);
Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp (original)
+++ trunk/src/endpoints/sip.cpp Tue Jun 3 18:15:18 2008
@@ -73,17 +73,19 @@
GMManager & endpoint;
};
+using namespace Opal::Sip;
+
/* The class */
-OpalSip::CallProtocolManager::CallProtocolManager (GMManager & ep,
+CallProtocolManager::CallProtocolManager (GMManager & ep,
Ekiga::ServiceCore & _core,
unsigned _listen_port)
- : SIPEndPoint (ep),
- Ekiga::PresencePublisher (_core),
- endpoint (ep),
- core (_core),
- presence_core (*(dynamic_cast<Ekiga::PresenceCore *> (core.get ("presence-core")))),
- runtime (*(dynamic_cast<Ekiga::Runtime *> (core.get ("runtime"))))
+ : SIPEndPoint (ep),
+ Ekiga::PresencePublisher (_core),
+ endpoint (ep),
+ core (_core),
+ presence_core (*(dynamic_cast<Ekiga::PresenceCore *> (core.get ("presence-core")))),
+ runtime (*(dynamic_cast<Ekiga::Runtime *> (core.get ("runtime"))))
{
protocol_name = "sip";
uri_prefix = "sip:";
@@ -116,7 +118,7 @@
}
-bool OpalSip::CallProtocolManager::populate_menu (Ekiga::Contact &contact,
+bool CallProtocolManager::populate_menu (Ekiga::Contact &contact,
Ekiga::MenuBuilder &builder)
{
std::string name = contact.get_name ();
@@ -126,7 +128,7 @@
}
-bool OpalSip::CallProtocolManager::populate_menu (const std::string uri,
+bool CallProtocolManager::populate_menu (const std::string uri,
Ekiga::MenuBuilder & builder)
{
std::map<std::string, std::string> uris;
@@ -136,7 +138,7 @@
}
-bool OpalSip::CallProtocolManager::menu_builder_add_actions (const std::string & fullname,
+bool CallProtocolManager::menu_builder_add_actions (const std::string & fullname,
std::map<std::string,std::string> & uris,
Ekiga::MenuBuilder & builder)
{
@@ -152,7 +154,7 @@
if (!iter->first.empty ())
action = action + " [" + iter->first + "]";
- builder.add_action ("call", action, sigc::bind (sigc::mem_fun (this, &OpalSip::CallProtocolManager::on_dial), iter->second));
+ builder.add_action ("call", action, sigc::bind (sigc::mem_fun (this, &CallProtocolManager::on_dial), iter->second));
populated = true;
}
@@ -167,7 +169,7 @@
if (!iter->first.empty ())
action = action + " [" + iter->first + "]";
- builder.add_action ("message", action, sigc::bind (sigc::mem_fun (this, &OpalSip::CallProtocolManager::on_message), fullname, iter->second));
+ builder.add_action ("message", action, sigc::bind (sigc::mem_fun (this, &CallProtocolManager::on_message), fullname, iter->second));
populated = true;
}
@@ -176,7 +178,7 @@
}
-void OpalSip::CallProtocolManager::fetch (const std::string _uri)
+void CallProtocolManager::fetch (const std::string _uri)
{
std::string::size_type loc = _uri.find ("@", 0);
std::string domain;
@@ -196,7 +198,7 @@
}
-void OpalSip::CallProtocolManager::unfetch (const std::string uri)
+void CallProtocolManager::unfetch (const std::string uri)
{
if (IsSubscribed (SIPSubscribe::Presence, uri.c_str ())) {
@@ -208,7 +210,7 @@
}
-void OpalSip::CallProtocolManager::publish (const Ekiga::PersonalDetails & details)
+void CallProtocolManager::publish (const Ekiga::PersonalDetails & details)
{
std::string hostname = (const char *) PIPSocket::GetHostName ();
std::string short_status = ((Ekiga::PersonalDetails &) (details)).get_short_status ();
@@ -256,7 +258,7 @@
}
-bool OpalSip::CallProtocolManager::send_message (const std::string & _uri,
+bool CallProtocolManager::send_message (const std::string & _uri,
const std::string & _message)
{
if (!_uri.empty () && (_uri.find ("sip:") == 0 || _uri.find (':') == string::npos) && !_message.empty ()) {
@@ -272,7 +274,7 @@
}
-bool OpalSip::CallProtocolManager::dial (const std::string & uri)
+bool CallProtocolManager::dial (const std::string & uri)
{
PString token;
std::stringstream ustr;
@@ -293,13 +295,13 @@
}
-const std::string & OpalSip::CallProtocolManager::get_protocol_name () const
+const std::string & CallProtocolManager::get_protocol_name () const
{
return protocol_name;
}
-void OpalSip::CallProtocolManager::set_dtmf_mode (unsigned mode)
+void CallProtocolManager::set_dtmf_mode (unsigned mode)
{
switch (mode) {
@@ -318,7 +320,7 @@
}
-unsigned OpalSip::CallProtocolManager::get_dtmf_mode () const
+unsigned CallProtocolManager::get_dtmf_mode () const
{
// SIP Info
if (GetSendUserInputMode () == OpalConnection::SendUserInputAsTone)
@@ -332,7 +334,7 @@
}
-bool OpalSip::CallProtocolManager::set_listen_port (unsigned port)
+bool CallProtocolManager::set_listen_port (unsigned port)
{
unsigned udp_min, udp_max;
@@ -370,51 +372,51 @@
}
-const Ekiga::CallProtocolManager::Interface & OpalSip::CallProtocolManager::get_listen_interface () const
+const Ekiga::CallProtocolManager::Interface & CallProtocolManager::get_listen_interface () const
{
return interface;
}
-void OpalSip::CallProtocolManager::set_forward_uri (const std::string & uri)
+void CallProtocolManager::set_forward_uri (const std::string & uri)
{
forward_uri = uri;
}
-const std::string & OpalSip::CallProtocolManager::get_forward_uri () const
+const std::string & CallProtocolManager::get_forward_uri () const
{
return forward_uri;
}
-void OpalSip::CallProtocolManager::set_outbound_proxy (const std::string & uri)
+void CallProtocolManager::set_outbound_proxy (const std::string & uri)
{
outbound_proxy = uri;
SetProxy (SIPURL (outbound_proxy));
}
-const std::string & OpalSip::CallProtocolManager::get_outbound_proxy () const
+const std::string & CallProtocolManager::get_outbound_proxy () const
{
return outbound_proxy;
}
-void OpalSip::CallProtocolManager::set_nat_binding_delay (unsigned delay)
+void CallProtocolManager::set_nat_binding_delay (unsigned delay)
{
SetNATBindingTimeout (PTimeInterval (0, delay));
}
-unsigned OpalSip::CallProtocolManager::get_nat_binding_delay ()
+unsigned CallProtocolManager::get_nat_binding_delay ()
{
return GetNATBindingTimeout ().GetSeconds ();
}
-void OpalSip::CallProtocolManager::Register (const PString & _aor,
+void CallProtocolManager::Register (const PString & _aor,
const PString & authUserName,
const PString & password,
unsigned int expires,
@@ -451,7 +453,7 @@
}
-void OpalSip::CallProtocolManager::OnRegistered (const PString & _aor,
+void CallProtocolManager::OnRegistered (const PString & _aor,
bool was_registering)
{
std::string aor = (const char *) _aor;
@@ -522,7 +524,7 @@
}
-void OpalSip::CallProtocolManager::OnRegistrationFailed (const PString & _aor,
+void CallProtocolManager::OnRegistrationFailed (const PString & _aor,
SIP_PDU::StatusCodes r,
bool wasRegistering)
{
@@ -748,11 +750,11 @@
}
-bool OpalSip::CallProtocolManager::OnIncomingConnection (OpalConnection &connection,
+bool CallProtocolManager::OnIncomingConnection (OpalConnection &connection,
unsigned options,
OpalConnection::StringOptions * stroptions)
{
- PTRACE (3, "OpalSip::CallProtocolManager\tIncoming connection");
+ PTRACE (3, "CallProtocolManager\tIncoming connection");
if (!forward_uri.empty () && endpoint.get_unconditional_forward ())
connection.ForwardCall (forward_uri);
@@ -782,7 +784,7 @@
}
-void OpalSip::CallProtocolManager::OnReceivedMESSAGE (G_GNUC_UNUSED OpalTransport & transport,
+void CallProtocolManager::OnReceivedMESSAGE (G_GNUC_UNUSED OpalTransport & transport,
SIP_PDU & pdu)
{
PString *last = NULL;
@@ -814,7 +816,7 @@
}
-void OpalSip::CallProtocolManager::OnMessageFailed (const SIPURL & messageUrl,
+void CallProtocolManager::OnMessageFailed (const SIPURL & messageUrl,
SIP_PDU::StatusCodes /*reason*/)
{
SIPURL to = messageUrl;
@@ -825,7 +827,7 @@
}
-SIPURL OpalSip::CallProtocolManager::GetRegisteredPartyName (const SIPURL & host)
+SIPURL CallProtocolManager::GetRegisteredPartyName (const SIPURL & host)
{
GmAccount *account = NULL;
@@ -880,7 +882,7 @@
void
-OpalSip::CallProtocolManager::OnPresenceInfoReceived (const PString & user,
+CallProtocolManager::OnPresenceInfoReceived (const PString & user,
const PString & basic,
const PString & note)
{
@@ -924,13 +926,13 @@
}
-void OpalSip::CallProtocolManager::on_dial (std::string uri)
+void CallProtocolManager::on_dial (std::string uri)
{
endpoint.dial (uri);
}
-void OpalSip::CallProtocolManager::on_message (const std::string & name,
+void CallProtocolManager::on_message (const std::string & name,
const std::string & uri)
{
runtime.run_in_main (sigc::bind (new_chat.make_slot (), name, uri));
Modified: trunk/src/endpoints/sip.h
==============================================================================
--- trunk/src/endpoints/sip.h (original)
+++ trunk/src/endpoints/sip.h Tue Jun 3 18:15:18 2008
@@ -55,131 +55,134 @@
class Ekiga::PersonalDetails;
-namespace OpalSip {
+namespace Opal {
- class CallProtocolManager : public SIPEndPoint,
- public Ekiga::ChatManager,
- public Ekiga::CallProtocolManager,
- public Ekiga::PresenceFetcher,
- public Ekiga::PresencePublisher,
- public Ekiga::PresentityDecorator,
- public Ekiga::ContactDecorator
- {
- PCLASSINFO(CallProtocolManager, SIPEndPoint);
+ namespace Sip {
-public:
+ class CallProtocolManager : public SIPEndPoint,
+ public Ekiga::ChatManager,
+ public Ekiga::CallProtocolManager,
+ public Ekiga::PresenceFetcher,
+ public Ekiga::PresencePublisher,
+ public Ekiga::PresentityDecorator,
+ public Ekiga::ContactDecorator
+ {
+ PCLASSINFO(CallProtocolManager, SIPEndPoint);
- CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
+ public:
+ CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
- /* ContactDecorator and PresentityDecorator */
- bool populate_menu (Ekiga::Contact &contact,
- Ekiga::MenuBuilder &builder);
- bool populate_menu (const std::string uri,
- Ekiga::MenuBuilder & builder);
+ /* ContactDecorator and PresentityDecorator */
+ bool populate_menu (Ekiga::Contact &contact,
+ Ekiga::MenuBuilder &builder);
- bool menu_builder_add_actions (const std::string & fullname,
- std::map<std::string, std::string> & uris,
- Ekiga::MenuBuilder & builder);
+ bool populate_menu (const std::string uri,
+ Ekiga::MenuBuilder & builder);
+ bool menu_builder_add_actions (const std::string & fullname,
+ std::map<std::string, std::string> & uris,
+ Ekiga::MenuBuilder & builder);
- /* PresenceFetcher */
- void fetch (const std::string uri);
- void unfetch (const std::string uri);
+ /* PresenceFetcher */
+ void fetch (const std::string uri);
+ void unfetch (const std::string uri);
- /* PresencePublisher */
- void publish (const Ekiga::PersonalDetails & details);
+ /* PresencePublisher */
+ void publish (const Ekiga::PersonalDetails & details);
- /* ChatManager */
- bool send_message (const std::string & uri,
- const std::string & message);
+ /* ChatManager */
+ bool send_message (const std::string & uri,
+ const std::string & message);
- /* CallProtocolManager */
- bool dial (const std::string & uri);
- const std::string & get_protocol_name () const;
+ /* CallProtocolManager */
+ bool dial (const std::string & uri);
- void set_dtmf_mode (unsigned mode);
- unsigned get_dtmf_mode () const;
+ const std::string & get_protocol_name () const;
- bool set_listen_port (unsigned port);
- const Ekiga::CallProtocolManager::Interface & get_listen_interface () const;
+ void set_dtmf_mode (unsigned mode);
+ unsigned get_dtmf_mode () const;
+ bool set_listen_port (unsigned port);
+ const Ekiga::CallProtocolManager::Interface & get_listen_interface () const;
- /* SIP CallProtocolManager */
- void set_nat_binding_delay (unsigned delay);
- unsigned get_nat_binding_delay ();
- void set_outbound_proxy (const std::string & uri);
- const std::string & get_outbound_proxy () const;
+ /* SIP CallProtocolManager */
+ void set_nat_binding_delay (unsigned delay);
+ unsigned get_nat_binding_delay ();
- void set_forward_uri (const std::string & uri);
- const std::string & get_forward_uri () const;
+ void set_outbound_proxy (const std::string & uri);
+ const std::string & get_outbound_proxy () const;
+ void set_forward_uri (const std::string & uri);
+ const std::string & get_forward_uri () const;
- /* OPAL Methods */
- void Register (const PString & aor,
- const PString & authUserName,
- const PString & password,
- unsigned int expires,
- bool unregister);
- void OnRegistered (const PString & aor,
- bool wasRegistering);
+ /* OPAL Methods */
+ void Register (const PString & aor,
+ const PString & authUserName,
+ const PString & password,
+ unsigned int expires,
+ bool unregister);
- void OnRegistrationFailed (const PString & aor,
- SIP_PDU::StatusCodes reason,
- bool wasRegistering);
+ void OnRegistered (const PString & aor,
+ bool wasRegistering);
- bool OnIncomingConnection (OpalConnection &connection,
- unsigned options,
- OpalConnection::StringOptions * stroptions);
+ void OnRegistrationFailed (const PString & aor,
+ SIP_PDU::StatusCodes reason,
+ bool wasRegistering);
- virtual void OnPresenceInfoReceived (const PString & user,
- const PString & basic,
- const PString & note);
+ bool OnIncomingConnection (OpalConnection &connection,
+ unsigned options,
+ OpalConnection::StringOptions * stroptions);
- virtual void OnReceivedMESSAGE (OpalTransport & transport,
- SIP_PDU & pdu);
+ virtual void OnPresenceInfoReceived (const PString & user,
+ const PString & basic,
+ const PString & note);
- void OnMessageFailed (const SIPURL & messageUrl,
- SIP_PDU::StatusCodes reason);
+ virtual void OnReceivedMESSAGE (OpalTransport & transport,
+ SIP_PDU & pdu);
- SIPURL GetRegisteredPartyName (const SIPURL & host);
+ void OnMessageFailed (const SIPURL & messageUrl,
+ SIP_PDU::StatusCodes reason);
+ SIPURL GetRegisteredPartyName (const SIPURL & host);
- /* Callbacks */
-private:
- void on_dial (std::string uri);
- void on_message (const std::string & name,
- const std::string & uri);
+ /* Callbacks */
+ private:
+ void on_dial (std::string uri);
+ void on_message (const std::string & name,
+ const std::string & uri);
- PMutex msgDataMutex;
- msgDict msgData;
- GMManager & endpoint;
+ PMutex msgDataMutex;
+ msgDict msgData;
- std::list<std::string> subscribed_uris; // List of subscribed uris
- std::list<std::string> domains; // List of registered domains
- std::list<std::string> aors; // List of registered aor
- Ekiga::ServiceCore & core;
- Ekiga::PresenceCore & presence_core;
- Ekiga::Runtime & runtime;
+ GMManager & endpoint;
- Ekiga::CallProtocolManager::Interface interface;
+ std::list<std::string> subscribed_uris; // List of subscribed uris
+ std::list<std::string> domains; // List of registered domains
+ std::list<std::string> aors; // List of registered aor
+ Ekiga::ServiceCore & core;
+ Ekiga::PresenceCore & presence_core;
+ Ekiga::Runtime & runtime;
- std::string protocol_name;
- std::string uri_prefix;
- std::string forward_uri;
- std::string outbound_proxy;
+ Ekiga::CallProtocolManager::Interface interface;
- unsigned listen_port;
+ std::string protocol_name;
+ std::string uri_prefix;
+ std::string forward_uri;
+ std::string outbound_proxy;
+
+ unsigned listen_port;
+ };
};
};
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
