Fix RTMP URL path parsing (#245)

Author: alfredh

include/re_fmt.h

@@ -42,6 +42,7 @@ int      pl_strcasecmp(const struct pl *pl, const char *str);
 int      pl_cmp(const struct pl *pl1, const struct pl *pl2);
 int      pl_casecmp(const struct pl *pl1, const struct pl *pl2);
 const char *pl_strchr(const struct pl *pl, char c);
+const char *pl_strrchr(const struct pl *pl, char c);
 
 /** Advance pl position/length by +/- N bytes */
 static inline void pl_advance(struct pl *pl, ssize_t n)

src/fmt/pl.c

@@ -503,3 +503,28 @@ const char *pl_strchr(const struct pl *pl, char c)
 
 	return NULL;
 }
+
+
+/**
+ * Locate the last occurrence of character in pointer-length string
+ *
+ * @param pl  Pointer-length string
+ * @param c   Character to locate
+ *
+ * @return Pointer to last char if found, otherwise NULL
+ */
+const char *pl_strrchr(const struct pl *pl, char c)
+{
+	const char *p, *end;
+
+	if (!pl_isset(pl))
+		return NULL;
+
+	end = pl->p + pl->l - 1;
+	for (p = end; p >= pl->p; p--) {
+		if (*p == c)
+			return p;
+	}
+
+	return NULL;
+}

src/rtmp/conn.c

@@ -437,7 +437,7 @@ static int send_connect(struct rtmp_conn *conn)
 				1,
 			RTMP_AMF_TYPE_OBJECT, 8,
 		          RTMP_AMF_TYPE_STRING, "app", conn->app,
-		          RTMP_AMF_TYPE_STRING, "flashVer", "LNX 9,0,124,2",
+		          RTMP_AMF_TYPE_STRING, "flashVer", "FMLE/3.0",
 		          RTMP_AMF_TYPE_STRING, "tcUrl", conn->uri,
 		          RTMP_AMF_TYPE_BOOLEAN, "fpad", false,
 		          RTMP_AMF_TYPE_NUMBER, "capabilities", 15.0,
@@ -803,18 +803,30 @@ int rtmp_connect(struct rtmp_conn **connp, struct dnsc *dnsc, const char *uri,
 	struct pl pl_hostport;
 	struct pl pl_host;
 	struct pl pl_port;
+	struct pl pl_path;
 	struct pl pl_app;
 	struct pl pl_stream;
+	const char *tok;
 	uint16_t defport;
 	int err;
 
 	if (!connp || !uri)
 		return EINVAL;
 
-	if (re_regex(uri, strlen(uri), "[a-z]+://[^/]+/[^/]+/[^]+",
-		     &pl_scheme, &pl_hostport, &pl_app, &pl_stream))
+	if (re_regex(uri, strlen(uri), "[a-z]+://[^/]+/[^]+",
+		     &pl_scheme, &pl_hostport, &pl_path))
 		return EINVAL;
 
+	tok = pl_strrchr(&pl_path, '/');
+	if (!tok)
+		return EINVAL;
+
+	pl_app.p = pl_path.p;
+	pl_app.l = tok - pl_path.p;
+
+	pl_stream.p = tok + 1;
+	pl_stream.l = pl_path.p + pl_path.l - pl_stream.p;
+
 	if (!pl_strcasecmp(&pl_scheme, "rtmp")) {
 		tls     = NULL;
 		defport = RTMP_PORT;