Attachment #396226 for bug #536526

View | Details | Raw Unified | Return to bug 536526
Collapse All | Expand All




	}

exit:
#if FF_API_CLOSE_INPUT_FILE
	if (ctx) av_close_input_file(ctx);
#else
	if (ctx) avformat_close_input(&ctx);


		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
		if (!ffd->seekable) {
#if FF_API_CLOSE_INPUT_FILE
			av_close_input_file(ffd->ctx);
#else
			avformat_close_input(&ffd->ctx);


err_exit:
	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
#if FF_API_CLOSE_INPUT_FILE
	if (ffd->ctx) av_close_input_file(ffd->ctx);
#else
	if (ffd->ctx) avformat_close_input(&ffd->ctx);


	ffd->is_running = 0;

#if FF_API_CLOSE_INPUT_FILE
	if (ffd->ctx) av_close_input_file(ffd->ctx);
#else
	if (ffd->ctx) avformat_close_input(&ffd->ctx);




	GF_Err e;
	u16 proxy_port = 0;
	const char *proxy, *ip;

	if (!sess->sock) {
		sess->num_retry = 40;
		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);

		}

		sess->status = GF_NETIO_CONNECTED;
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);

			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
			       ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
		}
		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
	}

	if (rewrite_size && sess->chunked) {




		res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
	}
	if (res<0) {
		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] Couldn't set socket %s buffer size to %d: %d\n", SendBuffer ? "send" : "receive", NewSize, res));
	} else {
		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
	}
	return GF_OK;
}


	gf_sk_free(sock);

	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Solving %s address\n", PeerName));
	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
	if (!res) return GF_IP_CONNECTION_FAILURE;
	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Host %s found\n", PeerName));

	/*turn on MobileIP*/
	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {

			}
		}

        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
		if (ret == SOCKET_ERROR) {
			closesocket(sock->socket);
			sock->socket = NULL_SOCKET;
			continue;
		}
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));

		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
		sock->dest_addr_len = (u32) aip->ai_addrlen;

	/*get the server IP*/
	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
		Host = gethostbyname(PeerName);
		if (Host == NULL) {
			switch (LASTSOCKERROR) {

				return GF_IP_NETWORK_FAILURE;
			}
		}
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
	}

	if (sock->flags & GF_SOCK_IS_TCP) {
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
		if (ret == SOCKET_ERROR) {
			u32 res = LASTSOCKERROR;
			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket - last sock error %d\n", res));
			switch (res) {
			case EAGAIN:
				return GF_IP_SOCK_WOULD_BLOCK;

				return GF_IP_CONNECTION_FAILURE;
			}
		}
        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
	}
#endif
	return GF_OK;

Return to bug 536526

Lines 301-307 static Bool FFD_CanHandleURL(GF_InputService plug, const char url) Link Here

(-)a/modules/ffmpeg_in/ffmpeg_demux.c (-4 / +4 lines)
301	}	301	}
302		302
303	exit:	303	exit:
304	#ifndef FF_API_CLOSE_INPUT_FILE	304	#if FF_API_CLOSE_INPUT_FILE
305	if (ctx) av_close_input_file(ctx);	305	if (ctx) av_close_input_file(ctx);
306	#else	306	#else
307	if (ctx) avformat_close_input(&ctx);	307	if (ctx) avformat_close_input(&ctx);
Lines 680-686 static GF_Err FFD_ConnectService(GF_InputService plug, GF_ClientService serv, Link Here
680		680
681	ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;	681	ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
682	if (!ffd->seekable) {	682	if (!ffd->seekable) {
683	#ifndef FF_API_CLOSE_INPUT_FILE	683	#if FF_API_CLOSE_INPUT_FILE
684	av_close_input_file(ffd->ctx);	684	av_close_input_file(ffd->ctx);
685	#else	685	#else
686	avformat_close_input(&ffd->ctx);	686	avformat_close_input(&ffd->ctx);
Lines 699-705 static GF_Err FFD_ConnectService(GF_InputService plug, GF_ClientService serv, Link Here
699		699
700	err_exit:	700	err_exit:
701	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));	701	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
702	#ifndef FF_API_CLOSE_INPUT_FILE	702	#if FF_API_CLOSE_INPUT_FILE
703	if (ffd->ctx) av_close_input_file(ffd->ctx);	703	if (ffd->ctx) av_close_input_file(ffd->ctx);
704	#else	704	#else
705	if (ffd->ctx) avformat_close_input(&ffd->ctx);	705	if (ffd->ctx) avformat_close_input(&ffd->ctx);
Lines 757-763 static GF_Err FFD_CloseService(GF_InputService *plug) Link Here
757		757
758	ffd->is_running = 0;	758	ffd->is_running = 0;
759		759
760	#ifndef FF_API_CLOSE_INPUT_FILE	760	#if FF_API_CLOSE_INPUT_FILE
761	if (ffd->ctx) av_close_input_file(ffd->ctx);	761	if (ffd->ctx) av_close_input_file(ffd->ctx);
762	#else	762	#else
763	if (ffd->ctx) avformat_close_input(&ffd->ctx);	763	if (ffd->ctx) avformat_close_input(&ffd->ctx);

Lines 1236-1242 static void gf_dm_connect(GF_DownloadSession *sess) Link Here

(-)a/src/utils/downloader.c (-2 / +3 lines)
1236	GF_Err e;	1236	GF_Err e;
1237	u16 proxy_port = 0;	1237	u16 proxy_port = 0;
1238	const char proxy, ip;	1238	const char proxy, ip;
1239	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("gf_dm_connect"":%d\n", __LINE__));	1239
1240	if (!sess->sock) {	1240	if (!sess->sock) {
1241	sess->num_retry = 40;	1241	sess->num_retry = 40;
1242	sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);	1242	sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
Lines 1312-1317 static void gf_dm_connect(GF_DownloadSession *sess) Link Here
1312	}	1312	}
1313		1313
1314	sess->status = GF_NETIO_CONNECTED;	1314	sess->status = GF_NETIO_CONNECTED;
		1315	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
1315	gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);	1316	gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
1316	gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);	1317	gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
1317	gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);	1318	gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
Lines 1945-1951 static GFINLINE void gf_dm_data_received(GF_DownloadSession sess, u8 payload, Link Here
1945	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,	1946	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
1946	("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));	1947	("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
1947	}	1948	}
1948	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));	1949	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
1949	}	1950	}
1950		1951
1951	if (rewrite_size && sess->chunked) {	1952	if (rewrite_size && sess->chunked) {

Lines 379-387 GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool SendBuffer, u32 NewSize) Link Here

(-)a/src/utils/os_net.c (-3 / +11 lines)
379	res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );	379	res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
380	}	380	}
381	if (res<0) {	381	if (res<0) {
382	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't set socket %s buffer size: %d\n", SendBuffer ? "send" : "receive", res));	382	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] Couldn't set socket %s buffer size to %d: %d\n", SendBuffer ? "send" : "receive", NewSize, res));
383	} else {	383	} else {
384	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));	384	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
385	}	385	}
386	return GF_OK;	386	return GF_OK;
387	}	387	}
Lines 483-490 GF_Err gf_sk_connect(GF_Socket sock, const char PeerName, u16 PortNumber, cons Link Here
483		483
484	gf_sk_free(sock);	484	gf_sk_free(sock);
485		485
		486	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Solving %s address\n", PeerName));
486	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);	487	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
487	if (!res) return GF_IP_CONNECTION_FAILURE;	488	if (!res) return GF_IP_CONNECTION_FAILURE;
		489	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Host %s found\n", PeerName));
488		490
489	/turn on MobileIP/	491	/turn on MobileIP/
490	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {	492	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
Lines 525-536 GF_Err gf_sk_connect(GF_Socket sock, const char PeerName, u16 PortNumber, cons Link Here
525	}	527	}
526	}	528	}
527		529
		530	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
528	ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);	531	ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
529	if (ret == SOCKET_ERROR) {	532	if (ret == SOCKET_ERROR) {
530	closesocket(sock->socket);	533	closesocket(sock->socket);
531	sock->socket = NULL_SOCKET;	534	sock->socket = NULL_SOCKET;
532	continue;	535	continue;
533	}	536	}
		537	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
534		538
535	memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);	539	memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
536	sock->dest_addr_len = (u32) aip->ai_addrlen;	540	sock->dest_addr_len = (u32) aip->ai_addrlen;
Lines 562-567 GF_Err gf_sk_connect(GF_Socket sock, const char PeerName, u16 PortNumber, cons Link Here
562	/get the server IP/	566	/get the server IP/
563	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);	567	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
564	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {	568	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
		569	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
565	Host = gethostbyname(PeerName);	570	Host = gethostbyname(PeerName);
566	if (Host == NULL) {	571	if (Host == NULL) {
567	switch (LASTSOCKERROR) {	572	switch (LASTSOCKERROR) {
Lines 574-587 GF_Err gf_sk_connect(GF_Socket sock, const char PeerName, u16 PortNumber, cons Link Here
574	return GF_IP_NETWORK_FAILURE;	579	return GF_IP_NETWORK_FAILURE;
575	}	580	}
576	}	581	}
		582	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
577	memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));	583	memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
578	}	584	}
579		585
580	if (sock->flags & GF_SOCK_IS_TCP) {	586	if (sock->flags & GF_SOCK_IS_TCP) {
		587	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
581	ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));	588	ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
582	if (ret == SOCKET_ERROR) {	589	if (ret == SOCKET_ERROR) {
583	u32 res = LASTSOCKERROR;	590	u32 res = LASTSOCKERROR;
584	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't connect socket - last sock error %d\n", res));	591	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket - last sock error %d\n", res));
585	switch (res) {	592	switch (res) {
586	case EAGAIN:	593	case EAGAIN:
587	return GF_IP_SOCK_WOULD_BLOCK;	594	return GF_IP_SOCK_WOULD_BLOCK;
Lines 606-611 GF_Err gf_sk_connect(GF_Socket sock, const char PeerName, u16 PortNumber, cons Link Here
606	return GF_IP_CONNECTION_FAILURE;	613	return GF_IP_CONNECTION_FAILURE;
607	}	614	}
608	}	615	}
		616	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
609	}	617	}
610	#endif	618	#endif
611	return GF_OK;	619	return GF_OK;