From: Martin Molnar <molnam1@fel.cvut.cz>
Date: Mon, 25 May 2009 15:13:05 +0000 (+0200)
Subject: udp_socket_create returns socket descriptor
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/08ea1a57be5f25f15def4d03e90ce68f2712d49a

udp_socket_create returns socket descriptor

Signed-off-by: Martin <molnam1@fel.cvut.cz>
---

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 91e994506..8dd961e56 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -35,7 +35,6 @@
 #include <sys/time.h>
 
 #include <frsh.h>
-#include <fwp_endpoint.h>
 
 typedef struct {
     int udp_fd;
@@ -92,9 +91,7 @@ static int is_multicast_address(struct sockaddr_in *addr)
 static int 
 udp_socket_create(UDPContext *s, struct sockaddr_in *addr, int *addr_len)
 {
-	int ret,fd;
-	unsigned int node, port;
-	fwp_endpoint_attr_t attr;
+	int ret,udp_fd;
 
     addr->sin_family = AF_INET;
     addr->sin_addr.s_addr = htonl (INADDR_ANY);
@@ -102,14 +99,15 @@ udp_socket_create(UDPContext *s, struct sockaddr_in *addr, int *addr_len)
     *addr_len = sizeof(struct sockaddr_in);
 
 	/* set params for contract */
-	frsh_network_bytes_to_budget(FRSH_NETPF_FWP, 30000, &s->budget);
-	s->period = fosa_msec_to_rel_time(1000);
+	frsh_network_bytes_to_budget(FRSH_NETPF_FWP, 8600000, &s->budget);
+	s->period = fosa_msec_to_rel_time(100);
 	s->send_pinfo.body = NULL;		
 	
-	if (frsh_send_endpoint_create(FRSH_NETPF_FWP, 
+	udp_fd = frsh_send_endpoint_create(FRSH_NETPF_FWP, 
 					s->dest_addr.sin_addr.s_addr,
 		 			ntohs(s->dest_addr.sin_port), s->send_pinfo, 
-					&s->sepoint) < 0) {
+					&s->sepoint);
+	if (udp_fd < 0) {
 			
 			return -1;
 	}
@@ -142,7 +140,7 @@ udp_socket_create(UDPContext *s, struct sockaddr_in *addr, int *addr_len)
 	//fwp_endpoint_get_params(s->sepoint->protocol_info.body, &node,
 	//		&port, &attr, &fd);
 
-	return 0;
+	return udp_fd;
 }
 
 static int udp_port(struct sockaddr_in *addr, int len)
@@ -278,6 +276,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
      * bind failed */
     /*if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0)
         goto fail;*/
+#endif
 
     len = sizeof(my_addr);
     getsockname(udp_fd, (struct sockaddr *)&my_addr, &len);
@@ -300,9 +299,9 @@ static int udp_open(URLContext *h, const char *uri, int flags)
         /* make the socket non-blocking */
         ff_socket_nonblock(udp_fd, 1);
     }
-#endif
     s->udp_fd = udp_fd;
     return 0;
+ 
  fail:
     if (udp_fd >= 0)
         closesocket(udp_fd);