fixes #67 - OnAir Crash on hangup

Studio-Link · Apr 2, 2019 · 8ebfe28 · 8ebfe28
1 parent 8cbff79
commit 8ebfe28
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/src/modules/webapp/option.c b/src/modules/webapp/option.c
@@ -54,6 +54,7 @@ void webapp_options_set(char *key, char *value)
 	if (!str_cmp(key, "onair")) {
 		static struct call *call = NULL;
 		if (!str_cmp(value, "false")) {
+			call = webapp_get_call("sip:stream@studio-link.de");
 			ua_hangup(uag_current(), call, 0, NULL);
 		}
 		else {
@@ -71,8 +72,7 @@ void webapp_options_set(char *key, char *value)
 			system(command);
 
 			ua_connect(uag_current(), &call, NULL,
-					"stream", VIDMODE_ON);
-
+					"stream@studio-link.de", VIDMODE_OFF);
 		}
 	}
 #endif

diff --git a/src/modules/webapp/utils.c b/src/modules/webapp/utils.c
@@ -105,3 +105,21 @@ int webapp_load_file(struct mbuf *mb, char *filename)
 
 	return err;
 }
+
+
+struct call* webapp_get_call(char *sid)
+{
+	struct list *calls = ua_calls(uag_current());
+	struct call *call = NULL;
+	struct le *le;
+	char id[64] = {0};
+
+	for (le = list_head(calls); le; le = le->next) {
+		call = le->data;
+		re_snprintf(id, sizeof(id), "%x", call);
+		if (!str_cmp(id, sid))
+			return call;
+	}
+
+	return NULL;
+}
diff --git a/src/modules/webapp/webapp.h b/src/modules/webapp/webapp.h
@@ -134,6 +134,7 @@ void webapp_odict_add(struct odict *og, const struct odict_entry *e);
 int webapp_write_file(char *string, char *filename);
 int webapp_write_file_json(struct odict *json, char *filename);
 int webapp_load_file(struct mbuf *mb, char *filename);
+struct call* webapp_get_call(char *sid);
 
 /*
  * slrtaudio module

diff --git a/src/modules/webapp/ws_calls.c b/src/modules/webapp/ws_calls.c
@@ -4,22 +4,6 @@
 
 #define SIP_CLOSED "{ \"callback\": \"CLOSED\"}"
 
-static struct call* get_call(char *sid)
-{
-	struct list *calls = ua_calls(uag_current());
-	struct call *call = NULL;
-	struct le *le;
-	char id[64] = {0};
-
-	for (le = list_head(calls); le; le = le->next) {
-		call = le->data;
-		re_snprintf(id, sizeof(id), "%x", call);
-		if (!str_cmp(id, sid))
-			return call;
-	}
-
-	return NULL;
-}
 
 static bool active_calls(void)
 {
@@ -59,7 +43,7 @@ void webapp_ws_calls(const struct websock_hdr *hdr,
 	if (!key)
 		goto out;
 
-	call = get_call(key->u.str);
+	call = webapp_get_call(key->u.str);
 
 	if (!str_cmp(e->u.str, "accept")) {
 		ua_answer(uag_current(), call);