/*****************************************************************************
* mms.c: MMS access plug-in
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <string.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+
#include <errno.h>
#ifdef HAVE_UNISTD_H
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef 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_network.h>
+#include "vlc_url.h"
#include "asf.h"
#include "buffer.h"
static int mms_ReceivePacket( access_t * );
-/*
- * XXX DON'T FREE MY MEMORY !!! XXX
- * non mais :P
- */
-/*
- * Ok, ok, j'le ferai plus...
- */
-/*
- * 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
- * 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 :)
- */
-
int E_(MMSTUOpen)( access_t *p_access )
{
access_sys_t *p_sys;
{
msg_Err( p_access, "invalid server name" );
vlc_UrlClean( &p_sys->url );
+ free( p_sys );
return VLC_EGENERIC;
}
if( p_sys->url.i_port <= 0 )
{
msg_Err( p_access, "cannot connect to server" );
vlc_UrlClean( &p_sys->url );
+ free( p_sys );
return VLC_EGENERIC;
}
if( MMSStart( p_access, 0xffffffff ) < 0 )
{
msg_Err( p_access, "cannot start stream" );
- MMSClose( p_access );
- vlc_UrlClean( &p_sys->url );
+ E_(MMSTUClose) ( p_access );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
+ int i_int;
vlc_value_t val;
switch( i_query )
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = p_sys->b_seekable;
break;
+
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
+ pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ *pb_bool = VLC_FALSE;
+ break;
+
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+
+#if 0 /* Disable for now until we have a clock synchro algo
+ * which works with something else than MPEG over UDP */
*pb_bool = VLC_FALSE;
+#endif
+ *pb_bool = VLC_TRUE;
break;
/* */
*pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * I64C(1000);
break;
+ case ACCESS_GET_PRIVATE_ID_STATE:
+ i_int = (int)va_arg( args, int );
+ pb_bool = (vlc_bool_t *)va_arg( args, vlc_bool_t * );
+
+ if( i_int < 0 || i_int > 127 )
+ return VLC_EGENERIC;
+ *pb_bool = p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE;
+ break;
+
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
+
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
i_data = 0;
/* *** now send data if needed *** */
- while( i_data < i_len )
+ while( i_data < (size_t)i_len )
{
if( p_access->info.i_pos < p_sys->i_header )
{
/* *** 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)" );
/* *** Bind port if UDP protocol is selected *** */
if( b_udp )
{
- struct sockaddr_storage name;
- socklen_t i_namelen = sizeof( name );
-
- if( getsockname( p_sys->i_handle_tcp,
- (struct sockaddr*)&name, &i_namelen ) < 0 )
+ if( net_GetSockAddress( p_sys->i_handle_tcp, p_sys->sz_bind_addr,
+ NULL ) )
{
net_Close( p_sys->i_handle_tcp );
return VLC_EGENERIC;
}
- /* FIXME: not thread-safe for IPv4 */
- /* FIXME: not sure if it works fine for IPv6 */
- if( name.ss_family == AF_INET )
- p_sys->psz_bind_addr = inet_ntoa( ((struct sockaddr_in *)&name)->sin_addr );
- else
- p_sys->psz_bind_addr = p_url->psz_host;
-
- p_sys->i_handle_udp = net_OpenUDP( p_access, p_sys->psz_bind_addr, 7000, "", 0 );
+ p_sys->i_handle_udp = net_ListenUDP1( (vlc_object_t *)p_access, p_sys->sz_bind_addr,
+ 7000 );
if( p_sys->i_handle_udp < 0 )
{
msg_Err( p_access, "failed to open a connection (udp)" );
}
msg_Dbg( p_access,
"connection(udp) at \"%s:%d\" successful",
- p_sys->psz_bind_addr, 7000 );
- }
- else
- {
- p_sys->psz_bind_addr = NULL;
+ p_sys->sz_bind_addr, 7000 );
}
/* *** Init context for mms prototcol *** */
psz[i] = p[i]; \
} \
psz[size] = '\0'; \
- p += 2 * ( size ); \
+ p += ( size ); \
}
GETUTF16( p_sys->psz_server_version, i_server_version );
GETUTF16( p_sys->psz_tool_version, i_tool_version );
{
sprintf( tmp,
"\\\\%s\\UDP\\%d",
- p_sys->psz_bind_addr,
+ p_sys->sz_bind_addr,
7000 ); // FIXME
}
else
switch( GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) )
{
case 0x0001:
- msg_Dbg( p_access, "Media file name/path accepted" );
+ msg_Dbg( p_access, "media file name/path accepted" );
break;
case 0x0002:
- msg_Dbg( p_access, "Authentication accepted" );
+ msg_Dbg( p_access, "authentication accepted" );
break;
case -1:
default:
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:%ul packet_count:%d max_bit_rate:%d "
+ "header_size:%d",
p_sys->i_flags_broadcast,
p_sys->i_media_length,
- p_sys->i_packet_length,
+ (unsigned)p_sys->i_packet_length,
p_sys->i_packet_count,
p_sys->i_max_bit_rate,
p_sys->i_header_size );
var_buffer_free( &buffer );
- msg_Info( p_access, "connection sucessful" );
+ msg_Info( p_access, "connection successful" );
return VLC_SUCCESS;
}
{
/* get a packet */
mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA );
- msg_Dbg( p_access, "Streaming started" );
+ msg_Dbg( p_access, "streaming started" );
return( 0 );
}
}
net_Close( p_sys->i_handle_udp );
}
- FREE( p_sys->p_cmd );
- FREE( p_sys->p_media );
- FREE( p_sys->p_header );
+ FREENULL( p_sys->p_cmd );
+ FREENULL( p_sys->p_media );
+ FREENULL( p_sys->p_header );
- FREE( p_sys->psz_server_version );
- FREE( p_sys->psz_tool_version );
- FREE( p_sys->psz_update_player_url );
- FREE( p_sys->psz_encryption_type );
+ FREENULL( p_sys->psz_server_version );
+ FREENULL( p_sys->psz_tool_version );
+ FREENULL( p_sys->psz_update_player_url );
+ FREENULL( p_sys->psz_encryption_type );
}
/****************************************************************************
* 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 )
+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, i_ret;
+ int i_data = i_data_old;
- access_sys_t *p_sys = p_access->p_sys;
- int i_data_by8;
-
- i_data_by8 = ( i_data + 7 ) / 8;
+ while( i_data & 0x7 ) i_data++;
+ i_data_by8 = i_data >> 3;
- /* first init uffer */
+ /* first init buffer */
var_buffer_initwrite( &buffer, 0 );
var_buffer_add32( &buffer, 0x00000001 ); /* start sequence */
/* specific command data */
if( p_data && i_data > 0 )
{
- var_buffer_addmemory( &buffer, p_data, i_data );
+ var_buffer_addmemory( &buffer, p_data, i_data_old );
}
+ /* Append padding to the command data */
+ var_buffer_add64( &buffer, 0 );
+
/* send it */
- if( send( p_sys->i_handle_tcp,
- buffer.p_data,
- buffer.i_data,
- 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;
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
i_udp + MMS_BUFFER_SIZE/2, 0 );
}
-#if MMS_DEBUG
+#ifdef MMS_DEBUG
if( p_sys->i_proto == MMS_PROTO_UDP )
{
msg_Dbg( p_access, "filling buffer TCP:%d+%d UDP:%d+%d",
if( i_packet_length > i_data || i_packet_length <= 8)
{
- msg_Dbg( p_access,
+ /* msg_Dbg( p_access,
"truncated packet (Declared %d bytes, Actual %d bytes)",
- i_packet_length, i_data );
+ i_packet_length, i_data ); */
*pi_used = 0;
return -1;
}
if( i_packet_seq_num != p_sys->i_packet_seq_num )
{
+#if 0
/* FIXME for udp could be just wrong order ? */
msg_Warn( p_access,
"detected packet lost (%d != %d)",
i_packet_seq_num,
p_sys->i_packet_seq_num );
- p_sys->i_packet_seq_num = i_packet_seq_num;
+#endif
}
- p_sys->i_packet_seq_num++;
+ p_sys->i_packet_seq_num = i_packet_seq_num + 1;
if( i_packet_id == p_sys->i_header_packet_id_type )
{
}
else
{
- FREE( p_sys->p_media );
+ FREENULL( p_sys->p_media );
p_sys->p_media = p_packet;
p_sys->i_media = i_packet_length - 8;
p_sys->i_media_used = 0;
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;
}
projects / vlc / blobdiff