[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "nat-support" updated.

[Commits to the Asterisk SCF project code repositories]

branch "nat-support" has been updated
       via  4f9cd7bbd27a0dfd06a17fd366d99984c8d32d26 (commit)
      from  9c3dc6a9d0a70dfb93ef2544d0709e225f961df8 (commit)

Summary of changes:
 slice/AsteriskSCF/System/NAT/NATTraversalIf.ice |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 4f9cd7bbd27a0dfd06a17fd366d99984c8d32d26
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 12 09:30:06 2011 -0230

    Add some exceptions to the negotiation stage.

diff --git a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
index 48a23c6..46a206b 100644
--- a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
+++ b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
@@ -296,6 +296,16 @@ exception NegotiationNotSupported
 {
 };
 
+exception NegotiationInterrupted
+{
+    string reason;
+};
+
+exception NegotiationError
+{
+   string errorMessage;
+};
+
 exception NoValidCandidates
 {
 };
@@ -356,10 +366,17 @@ interface InteractiveConnectionAgent
      *
      * @throws NoValidCandidates if all connection check fail.
      *
+     * @throws NegotiationInterrupted if the negotiation is interrupted for some reason.
+     *
+     * @throws NegotiationError if the negotation fails (includes error message). 
+     *
      **/
-    Candidate negotiate(string hostname, int port, CandidateSeq proposedCandidates) throws UnsupportedCandidate, NegotiationNotSupported,
-              NoValidCandidates;
-
+    ["amd"] Candidate negotiate(string hostname, int port, CandidateSeq proposedCandidates) throws 
+        UnsupportedCandidate, 
+        NegotiationNotSupported, 
+        NegotiationInterrupted, 
+        NegotiationError,
+        NoValidCandidates; 
     /**
      * 
      * Return a list of Candidates for the current agent.

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


-- 
asterisk-scf/integration/slice.git