Separate socket/resolv stuff (network.h) from url stuff (vlc_url.h)

[vlc] / modules / access / mms / mmstu.c

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index a5a0dc81d2cf7cd9cad3b71c994dea9e294be8cc..1a220378d3aac5bb71cccb5f7164bf55ada54e69 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 
@@ -47,25 +47,8 @@
 #   include <sys/stat.h>
 #endif
 
-#if defined( UNDER_CE )
-#   include <winsock.h>
-#elif WIN32
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#   ifndef IN_MULTICAST
-#       define IN_MULTICAST(a) IN_CLASSD(a)
-#   endif
-#else
-#   include <sys/socket.h>
-#   include <netinet/in.h>
-#   if HAVE_ARPA_INET_H
-#      include <arpa/inet.h>
-#   elif defined( SYS_BEOS )
-#      include <net/netdb.h>
-#   endif
-#endif
-
 #include "network.h"
+#include "vlc_url.h"
 #include "asf.h"
 #include "buffer.h"
 
@@ -115,13 +98,13 @@ static int  mms_ReceivePacket( access_t * );
  * Merci :))
  */
 /*
- * Vous pourriez signer vos commentaires (même si on voit bien qui peut
- * écrire ce genre de trucs :p), et écrire en anglais, bordel de
+ * Vous pourriez signer vos commentaires (m�e si on voit bien qui peut
+ * �rire ce genre de trucs :p), et �rire en anglais, bordel de
  * merde :p.
  */
 /*
- * Alors la ouai ç'est fou les gens qui écrivent des commentaires sans les
- * signer. Ca mériterait un coup de pied dans le cul ça :)
+ * Alors la ouai �est fou les gens qui �rivent des commentaires sans les
+ * signer. Ca m�iterait un coup de pied dans le cul � :)
  */
 
 int  E_(MMSTUOpen)( access_t *p_access )
@@ -476,7 +459,7 @@ static int MMSOpen( access_t  *p_access, vlc_url_t *p_url, int  i_proto )
 
     /* *** Open a TCP connection with server *** */
     msg_Dbg( p_access, "waiting for connection..." );
-    p_sys->i_handle_tcp = net_OpenTCP( p_access, p_url->psz_host, p_url->i_port );
+    p_sys->i_handle_tcp = net_ConnectTCP( p_access, p_url->psz_host, p_url->i_port );
     if( p_sys->i_handle_tcp < 0 )
     {
         msg_Err( p_access, "failed to open a connection (tcp)" );
@@ -695,7 +678,7 @@ static int MMSOpen( access_t  *p_access, vlc_url_t *p_url, int  i_proto )
         GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 );
 
     msg_Dbg( p_access,
-             "answer 0x06 flags:0x%8.8x media_length:%ds packet_length:%d packet_count:%d max_bit_rate:%d header_size:%d",
+             "answer 0x06 flags:0x%8.8x media_length:%us packet_length:%u packet_count:%u max_bit_rate:%d header_size:%d",
              p_sys->i_flags_broadcast,
              p_sys->i_media_length,
              p_sys->i_packet_length,
@@ -944,15 +927,13 @@ static void MMSClose( access_t  *p_access )
  * MMS specific functions
  *
  ****************************************************************************/
-static int mms_CommandSend( access_t *p_access,
-                             int i_command,
-                             uint32_t i_prefix1, uint32_t i_prefix2,
-                             uint8_t *p_data, int i_data_old )
+static int mms_CommandSend( access_t *p_access, int i_command,
+                            uint32_t i_prefix1, uint32_t i_prefix2,
+                            uint8_t *p_data, int i_data_old )
 {
     var_buffer_t buffer;
-
-    access_sys_t        *p_sys = p_access->p_sys;
-    int i_data_by8;
+    access_sys_t *p_sys = p_access->p_sys;
+    int i_data_by8, i_ret;
     int i_data = i_data_old;
 
     while( i_data & 0x7 ) i_data++;
@@ -984,10 +965,9 @@ static int mms_CommandSend( access_t *p_access,
     var_buffer_add64( &buffer, 0 );
 
     /* send it */
-    if( send( p_sys->i_handle_tcp,
-              buffer.p_data,
-              buffer.i_data - ( 8 - ( i_data - i_data_old ) ),
-              0 ) == -1 )
+    i_ret = net_Write( p_access, p_sys->i_handle_tcp, NULL, buffer.p_data,
+                       buffer.i_data - ( 8 - ( i_data - i_data_old ) ) );
+    if( i_ret != buffer.i_data - ( 8 - ( i_data - i_data_old ) ) )
     {
         msg_Err( p_access, "failed to send command" );
         return VLC_EGENERIC;
@@ -1034,7 +1014,7 @@ static int NetFillBuffer( access_t *p_access )
 
     if( i_handle_max == 0 )
     {
-        msg_Warn( p_access, "nothing to read %d:%d", i_tcp, i_udp );
+        msg_Warn( p_access, "nothing to read %d:%d", (int)i_tcp, (int)i_udp );
         return 0;
     }
     else
@@ -1319,7 +1299,7 @@ static int mms_ReceivePacket( access_t *p_access )
             if( GetDWLE( p_sys->buffer_tcp + 4 ) == 0xb00bface  )
             {
                 if( GetDWLE( p_sys->buffer_tcp + 8 ) + 16 <=
-                    p_sys->i_buffer_tcp )
+                    (uint32_t)p_sys->i_buffer_tcp )
                 {
                     b_refill = VLC_FALSE;
                 }