move handle_ice_candidate

baresip · Aug 6, 2022 · 92435ed · 92435ed
1 parent db023b7
commit 92435ed
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/src/demo.c b/src/demo.c
@@ -236,34 +236,6 @@ static int handle_post_sdp(struct session *sess, const struct http_msg *msg)
 }
 
 
-static int handle_ice_candidate(struct session *sess, const struct odict *od)
-{
-	const char *cand, *mid;
-	struct pl pl_cand;
-	char *cand2 = NULL;
-	int err;
-
-	cand = odict_string(od, "candidate");
-	mid  = odict_string(od, "sdpMid");
-	if (!cand || !mid) {
-		warning("demo: candidate: missing 'candidate' or 'mid'\n");
-		return EPROTO;
-	}
-
-	err = re_regex(cand, str_len(cand), "candidate:[^]+", &pl_cand);
-	if (err)
-		return err;
-
-	pl_strdup(&cand2, &pl_cand);
-
-	peerconnection_add_ice_candidate(sess->pc, cand2, mid);
-
-	mem_deref(cand2);
-
-	return 0;
-}
-
-
 static void handle_get(struct http_conn *conn, const struct pl *path)
 {
 	const char *ext, *mime;
@@ -391,7 +363,7 @@ static void http_req_handler(struct http_conn *conn,
 				goto out;
 			}
 
-			handle_ice_candidate(sess, od);
+			session_handle_ice_candidate(sess, od);
 
 			/* sync reply */
 			http_reply(conn, 204, "No Content",

diff --git a/src/demo.h b/src/demo.h
@@ -19,6 +19,8 @@ struct session {
 
 struct session *session_lookup(const struct list *sessl,
 			       const struct http_msg *msg);
+int  session_handle_ice_candidate(struct session *sess,
+				  const struct odict *od);
 void session_close(struct session *sess, int err);
 
 

diff --git a/src/sess.c b/src/sess.c
@@ -30,6 +30,34 @@ struct session *session_lookup(const struct list *sessl,
 }
 
 
+int session_handle_ice_candidate(struct session *sess, const struct odict *od)
+{
+	const char *cand, *mid;
+	struct pl pl_cand;
+	char *cand2 = NULL;
+	int err;
+
+	cand = odict_string(od, "candidate");
+	mid  = odict_string(od, "sdpMid");
+	if (!cand || !mid) {
+		warning("demo: candidate: missing 'candidate' or 'mid'\n");
+		return EPROTO;
+	}
+
+	err = re_regex(cand, str_len(cand), "candidate:[^]+", &pl_cand);
+	if (err)
+		return err;
+
+	pl_strdup(&cand2, &pl_cand);
+
+	peerconnection_add_ice_candidate(sess->pc, cand2, mid);
+
+	mem_deref(cand2);
+
+	return 0;
+}
+
+
 void session_close(struct session *sess, int err)
 {
 	if (err)