[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  acb89ff28ec27b52e11c8b3376178f3f0ca601df (commit)
      from  f18ca9c161f989c7a2f8423c0b4b17b7ea594bac (commit)

Summary of changes:
 src/NAT/Candidates.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit acb89ff28ec27b52e11c8b3376178f3f0ca601df
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Aug 2 15:43:01 2011 -0230

    Fix linking issue and some candidate formatting errors.

diff --git a/src/NAT/Candidates.cpp b/src/NAT/Candidates.cpp
index 06600e7..4c8174e 100644
--- a/src/NAT/Candidates.cpp
+++ b/src/NAT/Candidates.cpp
@@ -24,7 +24,7 @@ using namespace AsteriskSCF::System::NAT::V1;
 using namespace AsteriskSCF::NAT;
 using namespace std;
 
-std::string toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate)
+std::string AsteriskSCF::NAT::toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate)
 {
     stringstream os;
     if (!candidate)
@@ -112,15 +112,17 @@ std::string toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate)
     switch (candidate->transport)
     {
     case UDP:
-        os << "UDP";
+        os << "UDP ";
         break;
     case TCP:
-        os << "TCP";
+        os << "TCP ";
         break;
     default:
         assert("Invalid transport value" == 0);
     }
 
+    os << candidate->priority << ' ';
+
     //
     // If the candidate is a host candidate then we are almost done.
     //
@@ -132,7 +134,7 @@ std::string toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate)
     //
     // Otherwise, we've got a bit more to do.
     //
-    os << candidate->mappedAddress << ' ' << candidate->mappedPort << "typ ";
+    os << candidate->mappedAddress << ' ' << candidate->mappedPort << " typ ";
     switch (candidate->type)
     {
     case Host:

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice-util-cpp.git