[farsight2/master] Don't force base ip/port, its optional

[Olivier Crête]

---
 tests/check/transmitter/nice.c                 |   12 ++++++++++--
 transmitters/nice/fs-nice-stream-transmitter.c |   23 -----------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
index 5593e65..9c45ed7 100644
--- a/tests/check/transmitter/nice.c
+++ b/tests/check/transmitter/nice.c
@@ -73,8 +73,16 @@ _new_local_candidate (FsStreamTransmitter *st, FsCandidate *candidate,
   ts_fail_if (candidate->foundation == NULL,
       "Candidate doenst have a foundation");
   ts_fail_if (candidate->component_id == 0, "Component id is 0");
-  ts_fail_if (candidate->base_ip == NULL, "Candidate doesnt have a base ip");
-  ts_fail_if (candidate->base_port == 0, "Candidate doesnt have a base port");
+  if (candidate->type == FS_CANDIDATE_TYPE_HOST)
+  {
+    ts_fail_if (candidate->base_ip != NULL, "Host candidate has a base ip");
+    ts_fail_if (candidate->base_port != 0, "Host candidate has a base port");
+  }
+  else
+  {
+    ts_fail_if (candidate->base_ip == NULL, "Candidate doesnt have a base ip");
+    ts_fail_if (candidate->base_port == 0, "Candidate doesnt have a base port");
+  }
   ts_fail_if (candidate->username == NULL, "Candidate doenst have a username");
   ts_fail_if (candidate->password == NULL, "Candidate doenst have a password");
 
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index cb3c66d..2d46969 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -697,29 +697,6 @@ fs_nice_stream_transmitter_set_remote_candidates (
       return FALSE;
     }
 
-
-    if (self->priv->compatibility_mode == NICE_COMPATIBILITY_DRAFT19)
-    {
-      if (candidate->type == FS_CANDIDATE_TYPE_HOST &&
-          (candidate->base_ip || candidate->base_port))
-      {
-        g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
-            "Must not include the base addr/port in host candidates");
-        return FALSE;
-      }
-
-      if ((candidate->type == FS_CANDIDATE_TYPE_SRFLX ||
-              candidate->type == FS_CANDIDATE_TYPE_PRFLX ||
-              candidate->type == FS_CANDIDATE_TYPE_RELAY ) &&
-          (!candidate->base_ip || !candidate->base_port))
-      {
-        g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
-            "Must include the base addr/port in server/peer reflexive and"
-            " relay candidates");
-        return FALSE;
-      }
-    }
-
     if (!candidate->username)
     {
       g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
-- 
1.5.6.5