Merge pull request gpac#2910 from gpac/buildbot-mabr_misc

Buildbot mabr misc
makesoftwaresafe · Jul 8, 2024 · a012d22 · a012d22
2 parents 99a7952 + b7f1604
commit a012d22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/include/gpac/route.h b/include/gpac/route.h
@@ -63,7 +63,7 @@ typedef struct __gf_routedmx GF_ROUTEDmx;
 /*!The types of events used to communicate withe the demuxer user.*/
 typedef enum
 {
-	/*! A new service detected, service ID is in evt_param, no file info*/
+	/*! A new service is detected, service ID is in evt_param, no file info*/
 	GF_ROUTE_EVT_SERVICE_FOUND = 0,
 	/*! Service scan completed, no evt_param, no file info*/
 	GF_ROUTE_EVT_SERVICE_SCAN,
@@ -76,7 +76,7 @@ typedef enum
 	/*! Segment reception, identified through a file template, service ID is in evt_param*/
 	GF_ROUTE_EVT_DYN_SEG,
     /*! fragment reception (part of a segment), identified through a file template, service ID is in evt_param
-     \note The data is always beginning at the start of the object
+     \note The data always begins at the start of the object
     */
     GF_ROUTE_EVT_DYN_SEG_FRAG,
     /*! Object deletion (only for dynamic TOIs), used to notify the cache that an object is no longer available. File info only contains the filename being removed*/

diff --git a/src/filters/out_route.c b/src/filters/out_route.c
@@ -2564,13 +2564,10 @@ static void routeout_update_mabr_manifest(GF_ROUTEOutCtx *ctx)
 	u32 i, count;
 	if (ctx->dvb_mabr_config) return;
 
-	const char *src_ip;
-	char szIP[GF_MAX_IP_NAME_LEN];
-	src_ip = ctx->ifce;
-	if (!src_ip) {
-		if (gf_sk_get_local_ip(ctx->sock_dvb_mabr, szIP) != GF_OK)
-			strcpy(szIP, "127.0.0.1");
-		src_ip = szIP;
+	char szHost[GF_MAX_IP_NAME_LEN];
+	if (gf_sk_get_host_name(szHost) != GF_OK) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("Cannot get host name, using 127.0.0.1\n"));
+		strcpy(szHost, "127.0.0.1");
 	}
 
 	count = gf_list_count(ctx->services);
@@ -2595,7 +2592,7 @@ static void routeout_update_mabr_manifest(GF_ROUTEOutCtx *ctx)
 		gf_dynstrcat(&payload_text, "\" protocolVersion=\"1\"/>\n", NULL);
 		gf_dynstrcat(&payload_text, "<EndpointAddress>\n<NetworkSourceAddress>", NULL);
 
-		gf_dynstrcat(&payload_text, src_ip, NULL);
+		gf_dynstrcat(&payload_text, szHost, NULL);
 		gf_dynstrcat(&payload_text, "</NetworkSourceAddress>\n<NetworkDestinationGroupAddress>", NULL);
 		//- for FLUTE we use the main port to deliver FDT, manifests and init - we could split by service as done for ROUTE
 		//- for ROUTE we must send the STSID, on the session port
@@ -2702,7 +2699,7 @@ static void routeout_update_mabr_manifest(GF_ROUTEOutCtx *ctx)
 			}
 			gf_dynstrcat(&payload_text, "<EndpointAddress>\n<NetworkSourceAddress>", NULL);
 
-			gf_dynstrcat(&payload_text, src_ip, NULL);
+			gf_dynstrcat(&payload_text, szHost, NULL);
 			gf_dynstrcat(&payload_text, "</NetworkSourceAddress>\n<NetworkDestinationGroupAddress>", NULL);
 			gf_dynstrcat(&payload_text, rpid->rlct->ip, NULL);
 			gf_dynstrcat(&payload_text, "</NetworkDestinationGroupAddress>\n<TransportDestinationPort>", NULL);
@@ -2986,7 +2983,7 @@ static const GF_FilterArgs ROUTEOutArgs[] =
 		"- no: do not send checksum\n"
 		"- meta: only send checksum for configuration files, manifests and init segments\n"
 		"- all: send checksum for everything", GF_PROP_UINT, "meta", "no|meta|all", 0},
-	{ OFFS(recv_obj_timeout), "timeout period in ms before resorting to unicast repair", GF_PROP_UINT, "50", NULL, 0},
+	{ OFFS(recv_obj_timeout), "set timeout period in ms before client resorts to unicast repair", GF_PROP_UINT, "50", NULL, 0},
 	{ OFFS(errsim), "simulate errors using a 2-state Markov chain. Value are percentages", GF_PROP_VEC2, "0.0x100.0", NULL, 0},
 	{0}
 };