[Opalvoip-svn] SF.net SVN: opalvoip:[30855] opal/trunk/src/opal/console_mgr.cxx
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2013-11-06 06:08:06
|
Revision: 30855 http://sourceforge.net/p/opalvoip/code/30855 Author: rjongbloed Date: 2013-11-06 06:08:03 +0000 (Wed, 06 Nov 2013) Log Message: ----------- Tidied output when protocol disabled, don't mention various options, even if verbose. Modified Paths: -------------- opal/trunk/src/opal/console_mgr.cxx Modified: opal/trunk/src/opal/console_mgr.cxx =================================================================== --- opal/trunk/src/opal/console_mgr.cxx 2013-11-06 06:07:23 UTC (rev 30854) +++ opal/trunk/src/opal/console_mgr.cxx 2013-11-06 06:08:03 UTC (rev 30855) @@ -102,13 +102,11 @@ } - bool Initialise(PArgList & args, bool verbose) + bool Initialise(PArgList & args, ostream & output, bool verbose) { - OpalConsoleManager::LockedStream lockedOutput(m_console); - ostream & output = lockedOutput; - if (args.HasOption(m_endpoint.GetPrefixName()+"-crypto")) m_endpoint.SetMediaCryptoSuites(args.GetOptionString(m_endpoint.GetPrefixName()+"-crypto").Lines()); + if (verbose) output << m_endpoint.GetPrefixName().ToUpper() << " crypto suites: " << setfill(',') << m_endpoint.GetMediaCryptoSuites() << setfill(' ') << '\n'; @@ -121,11 +119,25 @@ if (args.HasOption(m_endpoint.GetPrefixName()+"-tx-bandwidth")) m_endpoint.SetInitialBandwidth(OpalBandwidth::Rx, args.GetOptionString(m_endpoint.GetPrefixName()+"-tx-bandwidth")); + if (args.HasOption(m_endpoint.GetPrefixName()+"-ui") && !SetUIMode(args.GetOptionString(m_endpoint.GetPrefixName()+"-ui"))) { output << "Unknown user indication mode for " << m_endpoint.GetPrefixName() << endl; return false; } + if (verbose) + output << m_endpoint.GetPrefixName() << "user input mode: " << m_endpoint.GetSendUserInputMode() << '\n'; + + + PCaselessString interfaces = args.GetOptionString("sip"); + if (!m_endpoint.StartListeners(interfaces.Lines())) { + output << "Could not start listeners for " << m_endpoint.GetPrefixName() << endl; + return false; + } + + if (verbose) + output << m_endpoint.GetPrefixName() << " listening on: " << setfill(',') << m_endpoint.GetListeners() << setfill(' ') << '\n'; + return true; } @@ -312,33 +324,19 @@ virtual bool Initialise(PArgList & args, bool verbose, const PString & defaultRoute) { - if (!OpalRTPConsoleEndPoint::Initialise(args, verbose)) - return false; - OpalConsoleManager::LockedStream lockedOutput(m_console); ostream & output = lockedOutput; // Set up SIP - PCaselessString interfaces; - if (args.HasOption("no-sip") || (interfaces = args.GetOptionString("sip")) == "x") { + if (args.HasOption("no-sip")) { if (verbose) output << "SIP protocol disabled.\n"; return true; } - if (!StartListeners(interfaces.Lines())) { - output << "Could not start SIP listeners." << endl; + if (!OpalRTPConsoleEndPoint::Initialise(args, output, verbose)) return false; - } - if (verbose) - output << "SIP listening on: " << setfill(',') << GetListeners() << setfill(' ') << '\n'; - - - if (verbose) - output << "SIP options: " - << GetSendUserInputMode() << '\n'; - if (args.HasOption("proxy")) { SetProxy(args.GetOptionString("proxy"), args.GetOptionString("user"), args.GetOptionString("password")); if (verbose) @@ -441,37 +439,26 @@ virtual bool Initialise(PArgList & args, bool verbose, const PString & defaultRoute) { - if (!OpalRTPConsoleEndPoint::Initialise(args, verbose)) - return false; - OpalConsoleManager::LockedStream lockedOutput(m_console); ostream & output = lockedOutput; // Set up H.323 - PCaselessString interfaces; - if (args.HasOption("no-h323") || (interfaces = args.GetOptionString("h323")) == "x") { + if (args.HasOption("no-h323")) { if (verbose) output << "H.323 protocol disabled.\n"; return true; } - if (!StartListeners(interfaces.Lines())) { - output << "Could not start H.323 listeners." << endl; + if (!OpalRTPConsoleEndPoint::Initialise(args, output, verbose)) return false; - } - if (verbose) - output << "H.323 listening on: " << setfill(',') << GetListeners() << setfill(' ') << '\n'; - - DisableFastStart(args.HasOption("no-fast")); DisableH245Tunneling(args.HasOption("no-tunnel")); if (verbose) output << "H.323 options: " << (IsFastStartDisabled() ? "Slow" : "Fast") << " connect, " - << (IsH245TunnelingDisabled() ? "Separate" : "Tunnelled") << " H.245, " - << GetSendUserInputMode() << '\n'; + << (IsH245TunnelingDisabled() ? "Separate" : "Tunnelled") << " H.245\n"; if (args.HasOption("gk-host") || args.HasOption("gk-id")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |