diff -Naur main.old/libmpdemux/asf_mmst_streaming.c main/libmpdemux/asf_mmst_streaming.c --- main.old/libmpdemux/asf_mmst_streaming.c Wed Oct 30 13:10:36 2002 +++ main/libmpdemux/asf_mmst_streaming.c Sat May 24 15:53:38 2003 @@ -90,7 +90,7 @@ memcpy (&cmd.buf[48], data, length); - if (write (s, cmd.buf, length+48) != (length+48)) { + if (send (s, cmd.buf, length+48, 0) != (length+48)) { printf ("write error\n"); } } @@ -118,7 +118,7 @@ while (command == 0x1b) { int len; - len = read (s, data, BUF_SIZE) ; + len = recv (s, data, BUF_SIZE, 0) ; if (!len) { printf ("\nalert! eof\n"); return; @@ -138,7 +138,7 @@ while (total < count) { - len = read (s, &buf[total], count-total); + len = recv (s, &buf[total], count-total, 0); if (len<0) { perror ("read error:"); @@ -460,7 +460,7 @@ // send_command(s, commandno ....) send_command (s, 1, 0, 0x0004000b, strlen(str) * 2+8, data); - len = read (s, data, BUF_SIZE) ; + len = recv (s, data, BUF_SIZE, 0) ; /*This sends details of the local machine IP address to a Funnel system at the server. * Also, the TCP or UDP transport selection is sent. @@ -475,7 +475,7 @@ memset (data, 0, 8); send_command (s, 2, 0, 0, 28*2+8, data); - len = read (s, data, BUF_SIZE) ; + len = recv (s, data, BUF_SIZE, 0) ; /* This command sends file path (at server) and file name request to the server. * 0x5 */ diff -Naur main.old/libmpdemux/asf_streaming.c main/libmpdemux/asf_streaming.c --- main.old/libmpdemux/asf_streaming.c Sun Mar 30 17:10:36 2003 +++ main/libmpdemux/asf_streaming.c Sat May 24 15:43:03 2003 @@ -656,7 +656,7 @@ http_hdr = asf_http_request( stream->streaming_ctrl ); mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request [%s]\n", http_hdr->buffer ); for(i=0; i < (int)http_hdr->buffer_size ; ) { - int r = write( fd, http_hdr->buffer+i, http_hdr->buffer_size-i ); + int r = send( fd, http_hdr->buffer+i, http_hdr->buffer_size-i, 0 ); if(r <0) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Socket write error : %s\n",strerror(errno)); return -1; @@ -666,7 +666,7 @@ http_free( http_hdr ); http_hdr = http_new_header(); do { - i = read( fd, buffer, BUFFER_SIZE ); + i = recv( fd, buffer, BUFFER_SIZE, 0 ); //printf("read: %d\n", i ); if( i<=0 ) { perror("read"); diff -Naur main.old/libmpdemux/netstream.h main/libmpdemux/netstream.h --- main.old/libmpdemux/netstream.h Sun Apr 6 18:15:43 2003 +++ main/libmpdemux/netstream.h Sat May 24 16:10:50 2003 @@ -45,7 +45,7 @@ static int net_read(int fd, char* buf, int len) { int r = 0; while(len) { - r = read(fd,buf,len); + r = recv(fd,buf,len,0); if(r <= 0) { if(errno == EINTR) continue; if(r < 0) @@ -95,7 +95,7 @@ static int net_write(int fd, char* buf, int len) { int w; while(len) { - w = write(fd,buf,len); + w = send(fd,buf,len,0); if(w <= 0) { if(errno == EINTR) continue; if(w < 0) diff -Naur main.old/libmpdemux/network.c main/libmpdemux/network.c --- main.old/libmpdemux/network.c Fri May 23 19:41:37 2003 +++ main/libmpdemux/network.c Sat May 24 15:43:58 2003 @@ -428,7 +428,7 @@ } mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer ); - ret = write( fd, http_hdr->buffer, http_hdr->buffer_size ); + ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, 0 ); if( ret!=(int)http_hdr->buffer_size ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while sending HTTP request: didn't sent all the request\n"); return -1; @@ -451,7 +451,7 @@ } do { - i = read( fd, response, BUFFER_SIZE ); + i = recv( fd, response, BUFFER_SIZE, 0 ); if( i<0 ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Read failed\n"); http_free( http_hdr ); @@ -794,7 +794,7 @@ if( len 0) total += n; @@ -238,7 +238,7 @@ return -1; } - ret=read (fd, ((uint8_t*)buf)+total, count-total); + ret=recv (fd, ((uint8_t*)buf)+total, count-total, 0); if (ret<=0) { printf ("input_pnm: read error.\n"); diff -Naur main.old/libmpdemux/realrtsp/rmff.c main/libmpdemux/realrtsp/rmff.c --- main.old/libmpdemux/realrtsp/rmff.c Thu Apr 17 20:38:57 2003 +++ main/libmpdemux/realrtsp/rmff.c Sat May 24 15:46:04 2003 @@ -502,7 +502,7 @@ do { buf = xbuffer_ensure_size(buf, index+8); - read(fd, buf+index, 8); + recv(fd, buf+index, 8, 0); chunk_type=BE_32(buf+index); index+=4; chunk_size=BE_32(buf+index); index+=4; @@ -514,7 +514,7 @@ case RMF_TAG: case PROP_TAG: buf = xbuffer_ensure_size(buf, index+chunk_size-8); - read(fd, buf+index, (chunk_size-8)); + recv(fd, buf+index, (chunk_size-8), 0); index+=(chunk_size-8); break; default: diff -Naur main.old/libmpdemux/realrtsp/rtsp.c main/libmpdemux/realrtsp/rtsp.c --- main.old/libmpdemux/realrtsp/rtsp.c Sat Apr 19 14:54:03 2003 +++ main/libmpdemux/realrtsp/rtsp.c Sat May 24 15:46:44 2003 @@ -158,7 +158,7 @@ while (total < len){ int n; - n = write (s, &buf[total], len - total); + n = send (s, &buf[total], len - total, 0); if (n > 0) total += n; @@ -181,7 +181,7 @@ while (total < count) { - ret=read (fd, ((uint8_t*)buf)+total, count-total); + ret=recv (fd, ((uint8_t*)buf)+total, count-total, 0); if (ret<0) { if(errno == EAGAIN) { diff -Naur main.old/libvo/vo_bl.c main/libvo/vo_bl.c --- main.old/libvo/vo_bl.c Tue Nov 12 19:37:36 2002 +++ main/libvo/vo_bl.c Sat May 24 15:59:47 2003 @@ -175,7 +175,7 @@ } static void udp_send(bl_host_t *h) { - if (write(h->fd, bl_packet, bl_size) != bl_size) + if (send(h->fd, bl_packet, bl_size, 0) != bl_size) mp_msg(MSGT_VO, MSGL_ERR, "unable to send to %s\n", h->name); }