Merge branch 'ice_gather'

1 files changed, 240 insertions, 5 deletions

diff --git a/modules/ice/ice.c b/modules/ice/ice.c
index 519f46b..36d5c20 100644
--- a/modules/ice/ice.c
+++ b/modules/ice/ice.c
@@ -29,6 +29,11 @@
  */
 
 
+enum {
+	ICE_LAYER = 0
+};
+
+
 struct mnat_sess {
 	struct list medial;
 	struct sa srv;
@@ -49,7 +54,10 @@ struct mnat_sess {
 
 struct mnat_media {
 	struct comp {
+		struct mnat_media *m;         /* pointer to parent */
+		struct stun_ctrans *ct_gath;
 		struct sa laddr;
+		unsigned id;
 		void *sock;
 	} compv[2];
 	struct le le;
@@ -57,6 +65,7 @@ struct mnat_media {
 	struct sdp_media *sdpm;
 	struct icem *icem;
 	bool complete;
+	int nstun;                   /**< Number of pending STUN candidates  */
 };
 
 
@@ -78,6 +87,228 @@ static void gather_handler(int err, uint16_t scode, const char *reason,
 			   void *arg);
 
 
+static void call_gather_handler(int err, struct mnat_media *m, uint16_t scode,
+				const char *reason)
+{
+
+	/* No more pending requests? */
+	if (m->nstun != 0)
+		return;
+
+	debug("ice: all components gathered.\n");
+
+	if (err)
+		goto out;
+
+	/* Eliminate redundant local candidates */
+	icem_cand_redund_elim(m->icem);
+
+	err = icem_comps_set_default_cand(m->icem);
+	if (err) {
+		warning("ice: set default cands failed (%m)\n", err);
+		goto out;
+	}
+
+ out:
+	gather_handler(err, scode, reason, m);
+}
+
+
+static void stun_resp_handler(int err, uint16_t scode, const char *reason,
+			      const struct stun_msg *msg, void *arg)
+{
+	struct comp *comp = arg;
+	struct mnat_media *m = comp->m;
+	struct stun_attr *attr;
+	struct ice_cand *lcand;
+
+	--m->nstun;
+
+	if (err || scode > 0) {
+		warning("STUN Request failed: %m\n", err);
+		goto out;
+	}
+
+	debug("ice: srflx gathering for comp %u complete.\n", comp->id);
+
+	/* base candidate */
+	lcand = icem_cand_find(icem_lcandl(m->icem), comp->id, NULL);
+	if (!lcand)
+		goto out;
+
+	attr = stun_msg_attr(msg, STUN_ATTR_XOR_MAPPED_ADDR);
+	if (!attr)
+		attr = stun_msg_attr(msg, STUN_ATTR_MAPPED_ADDR);
+	if (!attr) {
+		warning("ice: no Mapped Address in Response\n");
+		err = EPROTO;
+		goto out;
+	}
+
+	err = icem_lcand_add(m->icem, icem_lcand_base(lcand),
+			     ICE_CAND_TYPE_SRFLX,
+			     &attr->v.sa);
+
+ out:
+	call_gather_handler(err, m, scode, reason);
+}
+
+
+/** Gather Server Reflexive address */
+static int send_binding_request(struct mnat_media *m, struct comp *comp)
+{
+	int err;
+
+	if (comp->ct_gath)
+		return EALREADY;
+
+	debug("ice: gathering srflx for comp %u ..\n", comp->id);
+
+	err = stun_request(&comp->ct_gath, icem_stun(m->icem), IPPROTO_UDP,
+			   comp->sock, &m->sess->srv, 0,
+			   STUN_METHOD_BINDING,
+			   NULL, false, 0,
+			   stun_resp_handler, comp, 1,
+			   STUN_ATTR_SOFTWARE, stun_software);
+	if (err)
+		return err;
+
+	++m->nstun;
+
+	return 0;
+}
+
+
+static void turnc_handler(int err, uint16_t scode, const char *reason,
+			  const struct sa *relay, const struct sa *mapped,
+			  const struct stun_msg *msg, void *arg)
+{
+	struct comp *comp = arg;
+	struct mnat_media *m = comp->m;
+	struct ice_cand *lcand;
+	(void)msg;
+
+	--m->nstun;
+
+	/* TURN failed, so we destroy the client */
+	if (err || scode) {
+		icem_set_turn_client(m->icem, comp->id, NULL);
+	}
+
+	if (err) {
+		warning("{%u} TURN Client error: %m\n",
+			      comp->id, err);
+		goto out;
+	}
+
+	if (scode) {
+		warning("{%u} TURN Client error: %u %s\n",
+			      comp->id, scode, reason);
+		err = send_binding_request(m, comp);
+		if (err)
+			goto out;
+		return;
+	}
+
+	debug("ice: relay gathered for comp %u (%u %s)\n",
+	      comp->id, scode, reason);
+
+	lcand = icem_cand_find(icem_lcandl(m->icem), comp->id, NULL);
+	if (!lcand)
+		goto out;
+
+	if (!sa_cmp(relay, icem_lcand_addr(icem_lcand_base(lcand)), SA_ALL)) {
+		err = icem_lcand_add(m->icem, icem_lcand_base(lcand),
+				     ICE_CAND_TYPE_RELAY, relay);
+	}
+
+	if (mapped) {
+		err |= icem_lcand_add(m->icem, icem_lcand_base(lcand),
+				      ICE_CAND_TYPE_SRFLX, mapped);
+	}
+	else {
+		err |= send_binding_request(m, comp);
+	}
+
+ out:
+	call_gather_handler(err, m, scode, reason);
+}
+
+
+static int cand_gather_relayed(struct mnat_media *m, struct comp *comp,
+			       const char *username, const char *password)
+{
+	struct turnc *turnc = NULL;
+	const int layer = ICE_LAYER - 10; /* below ICE stack */
+	int err;
+
+	err = turnc_alloc(&turnc, stun_conf(icem_stun(m->icem)),
+			  IPPROTO_UDP, comp->sock, layer, &m->sess->srv,
+			  username, password,
+			  60, turnc_handler, comp);
+	if (err)
+		return err;
+
+	err = icem_set_turn_client(m->icem, comp->id, turnc);
+	if (err)
+		goto out;
+
+	++m->nstun;
+
+ out:
+	mem_deref(turnc);
+
+	return err;
+}
+
+
+static int start_gathering(struct mnat_media *m,
+			   const char *username, const char *password)
+{
+	unsigned i;
+	int err = 0;
+
+	if (ice.mode != ICE_MODE_FULL)
+		return EINVAL;
+
+	/* for each component */
+	for (i=0; i<2; i++) {
+		struct comp *comp = &m->compv[i];
+
+		if (!comp->sock)
+			continue;
+
+		if (username && password) {
+			err |= cand_gather_relayed(m, comp,
+						   username, password);
+		}
+		else
+			err |= send_binding_request(m, comp);
+	}
+
+	return err;
+}
+
+
+static int icem_gather_srflx(struct mnat_media *m)
+{
+	if (!m)
+		return EINVAL;
+
+	return start_gathering(m, NULL, NULL);
+}
+
+
+static int icem_gather_relay(struct mnat_media *m,
+		      const char *username, const char *password)
+{
+	if (!m || !username || !password)
+		return EINVAL;
+
+	return start_gathering(m, username, password);
+}
+
+
 static bool is_cellular(const struct sa *laddr)
 {
 #if TARGET_OS_IPHONE
@@ -136,8 +367,10 @@ static void media_destructor(void *arg)
 	list_unlink(&m->le);
 	mem_deref(m->sdpm);
 	mem_deref(m->icem);
-	for (i=0; i<2; i++)
+	for (i=0; i<2; i++) {
+		mem_deref(m->compv[i].ct_gath);
 		mem_deref(m->compv[i].sock);
+	}
 }
 
 
@@ -220,11 +453,11 @@ static int media_start(struct mnat_sess *sess, struct mnat_media *m)
 	default:
 	case ICE_MODE_FULL:
 		if (ice.turn) {
-			err = icem_gather_relay(m->icem, &sess->srv,
+			err = icem_gather_relay(m,
 						sess->user, sess->pass);
 		}
 		else {
-			err = icem_gather_srflx(m->icem, &sess->srv);
+			err = icem_gather_srflx(m);
 		}
 		break;
 
@@ -564,9 +797,9 @@ static int media_alloc(struct mnat_media **mp, struct mnat_sess *sess,
 	m->compv[1].sock = mem_ref(sock2);
 
 	err = icem_alloc(&m->icem, ice.mode, sess->offerer,
-			 proto, 0,
+			 proto, ICE_LAYER,
 			 sess->tiebrk, sess->lufrag, sess->lpwd,
-			 gather_handler, conncheck_handler, m);
+			 conncheck_handler, m);
 	if (err)
 		goto out;
 
@@ -576,6 +809,8 @@ static int media_alloc(struct mnat_media **mp, struct mnat_sess *sess,
 	icem_set_name(m->icem, sdp_media_name(sdpm));
 
 	for (i=0; i<2; i++) {
+		m->compv[i].m = m;
+		m->compv[i].id = i+1;
 		if (m->compv[i].sock)
 			err |= icem_comp_add(m->icem, i+1, m->compv[i].sock);
 	}