* udp.c: raw UDP & RTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.26 2003/12/04 16:49:43 sam Exp $
+ * $Id: udp.c,v 1.27 2004/01/21 10:22:31 fenrir Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Tristan Leteurtre <tooney@via.ecp.fr>
+ * Laurent Aimar <fenrir@via.ecp.fr>
*
* Reviewed: 23 October 2003, Jean-Paul Saman <jpsaman@wxs.nl>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.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>
-#endif
-
#include "network.h"
-#define RTP_HEADER_LEN 12
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-static ssize_t Read ( input_thread_t *, byte_t *, size_t );
-static ssize_t RTPRead ( input_thread_t *, byte_t *, size_t );
-static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
"Allows you to modify the default caching value for udp streams. This " \
"value should be set in miliseconds units." )
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
vlc_module_begin();
set_description( _("UDP/RTP input") );
add_category_hint( N_("UDP"), NULL , VLC_TRUE );
set_callbacks( Open, Close );
vlc_module_end();
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+#define RTP_HEADER_LEN 12
+
+static ssize_t Read ( input_thread_t *, byte_t *, size_t );
+static ssize_t RTPRead ( input_thread_t *, byte_t *, size_t );
+static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
+
+struct access_sys_t
+{
+ int fd;
+};
+
/*****************************************************************************
* Open: open the socket
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- input_socket_t * p_access_data;
- module_t * p_network;
- char * psz_network = "";
+ input_thread_t *p_input = (input_thread_t *)p_this;
+ access_sys_t *p_sys;
+
char * psz_name = strdup(p_input->psz_name);
char * psz_parser = psz_name;
char * psz_server_addr = "";
char * psz_bind_addr = "";
char * psz_bind_port = "";
int i_bind_port = 0, i_server_port = 0;
- network_socket_t socket_desc;
vlc_value_t val;
- if( config_GetInt( p_input, "ipv4" ) )
- {
- psz_network = "ipv4";
- }
- if( config_GetInt( p_input, "ipv6" ) )
- {
- psz_network = "ipv6";
- }
+
+ /* First set ipv4/ipv6 */
+ var_Create( p_input, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
if( *p_input->psz_access )
{
/* Find out which shortcut was used */
- if( !strncmp( p_input->psz_access, "udp6", 5 ) )
+ if( !strncmp( p_input->psz_access, "udp4", 6 ) || !strncmp( p_input->psz_access, "rtp4", 6 ))
{
- psz_network = "ipv6";
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "ipv4", val );
+
+ val.b_bool = VLC_FALSE;
+ var_Set( p_input, "ipv6", val );
}
- else if( !strncmp( p_input->psz_access, "udp4", 5 ) )
+ else if( !strncmp( p_input->psz_access, "udp6", 6 ) || !strncmp( p_input->psz_access, "rtp6", 6 ) )
{
- psz_network = "ipv4";
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "ipv6", val );
+
+ val.b_bool = VLC_FALSE;
+ var_Set( p_input, "ipv4", val );
}
}
/* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
-
if( *psz_parser && *psz_parser != '@' )
{
/* Found server */
if( *psz_parser == ':' )
{
/* Found server port */
- *psz_parser = '\0'; /* Terminate server name */
- psz_parser++;
+ *psz_parser++ = '\0'; /* Terminate server name */
psz_server_port = psz_parser;
while( *psz_parser && *psz_parser != '@' )
if( *psz_parser == '@' )
{
/* Found bind address or bind port */
- *psz_parser = '\0'; /* Terminate server port or name if necessary */
- psz_parser++;
+ *psz_parser++ = '\0'; /* Terminate server port or name if necessary */
if( *psz_parser && *psz_parser != ':' )
{
if( *psz_parser == ':' )
{
/* Found bind port */
- *psz_parser = '\0'; /* Terminate bind address if necessary */
- psz_parser++;
-
+ *psz_parser++ = '\0'; /* Terminate bind address if necessary */
psz_bind_port = psz_parser;
}
}
- /* Convert ports format */
- if( *psz_server_port )
- {
- i_server_port = strtol( psz_server_port, &psz_parser, 10 );
- if( *psz_parser )
- {
- msg_Err( p_input, "cannot parse server port near %s", psz_parser );
- free(psz_name);
- return( -1 );
- }
- }
-
- if( *psz_bind_port )
- {
- i_bind_port = strtol( psz_bind_port, &psz_parser, 10 );
- if( *psz_parser )
- {
- msg_Err( p_input, "cannot parse bind port near %s", psz_parser );
- free(psz_name);
- return( -1 );
- }
- }
-
- if( i_bind_port == 0 )
+ i_server_port = strtol( psz_server_port, NULL, 10 );
+ if( ( i_bind_port = strtol( psz_bind_port, NULL, 10 ) ) == 0 )
{
i_bind_port = config_GetInt( p_this, "server-port" );
}
- p_input->pf_read = RTPChoose;
- p_input->pf_set_program = input_SetProgram;
- p_input->pf_set_area = NULL;
- p_input->pf_seek = NULL;
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.b_pace_control = 0;
- p_input->stream.b_seekable = 0;
- p_input->stream.p_selected_area->i_tell = 0;
- p_input->stream.i_method = INPUT_METHOD_NETWORK;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
if( *psz_server_addr || i_server_port )
{
msg_Err( p_input, "this UDP syntax is deprecated; the server argument will be");
i_server_port = 0;
psz_server_addr = "";
}
-
+
msg_Dbg( p_input, "opening server=%s:%d local=%s:%d",
psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
- /* Prepare the network_socket_t structure */
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = psz_bind_addr;
- socket_desc.i_bind_port = i_bind_port;
- socket_desc.psz_server_addr = psz_server_addr;
- socket_desc.i_server_port = i_server_port;
- socket_desc.i_ttl = 0;
-
- /* Find an appropriate network module */
- p_input->p_private = (void*) &socket_desc;
- p_network = module_Need( p_input, "network", psz_network );
- free(psz_name);
- if( p_network == NULL )
+ p_sys = p_input->p_access_data = malloc( sizeof( access_sys_t ) );
+ if( p_sys == NULL )
{
- return( -1 );
+ msg_Err( p_input, "out of memory" );
+ return VLC_EGENERIC;
}
- module_Unneed( p_input, p_network );
-
- p_access_data = malloc( sizeof(input_socket_t) );
- p_input->p_access_data = (access_sys_t *)p_access_data;
- if( p_access_data == NULL )
+ p_sys->fd = net_OpenUDP( p_input, psz_bind_addr, i_bind_port,
+ psz_server_addr, i_server_port );
+ if( p_sys->fd < 0 )
{
- msg_Err( p_input, "out of memory" );
- return( -1 );
+ msg_Err( p_input, "cannot open socket" );
+ free( psz_name );
+ free( p_sys );
+ return VLC_EGENERIC;
}
+ free( psz_name );
- p_access_data->i_handle = socket_desc.i_handle;
- p_input->i_mtu = socket_desc.i_mtu;
+ /* FIXME */
+ p_input->i_mtu = config_GetInt( p_this, "mtu" );
+
+ /* fill p_input fields */
+ p_input->pf_read = RTPChoose;
+ p_input->pf_set_program = input_SetProgram;
+ p_input->pf_set_area = NULL;
+ p_input->pf_seek = NULL;
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ p_input->stream.b_pace_control = VLC_FALSE;
+ p_input->stream.b_seekable = VLC_FALSE;
+ p_input->stream.p_selected_area->i_tell = 0;
+ p_input->stream.i_method = INPUT_METHOD_NETWORK;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
/* Update default_pts to a suitable value for udp access */
var_Create( p_input, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_input, "udp-caching", &val );
p_input->i_pts_delay = val.i_int * 1000;
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
+ input_thread_t *p_input = (input_thread_t *)p_this;
+ access_sys_t *p_sys = p_input->p_access_data;
msg_Info( p_input, "closing UDP target `%s'", p_input->psz_source );
-#ifdef UNDER_CE
- CloseHandle( (HANDLE)p_access_data->i_handle );
-#elif defined( WIN32 )
- closesocket( p_access_data->i_handle );
-#else
- close( p_access_data->i_handle );
-#endif
+ net_Close( p_sys->fd );
- free( p_access_data );
+ free( p_sys );
}
/*****************************************************************************
*****************************************************************************/
static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
{
-#ifdef UNDER_CE
- return -1;
-
-#else
- input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
- struct timeval timeout;
- fd_set fds;
- ssize_t i_recv;
- int i_ret;
-
- /* Initialize file descriptor set */
- FD_ZERO( &fds );
- FD_SET( p_access_data->i_handle, &fds );
-
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
-
- /* Find if some data is available */
- while( ((i_ret = select( p_access_data->i_handle + 1, &fds,
- NULL, NULL, &timeout )) == 0)
- || ((i_ret < 0) && (errno == EINTR)) )
- {
- FD_ZERO( &fds );
- FD_SET( p_access_data->i_handle, &fds );
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
-
- if( p_input->b_die || p_input->b_error )
- {
- return 0;
- }
- }
-
- if( i_ret < 0 )
- {
- msg_Err( p_input, "network select error (%s)", strerror(errno) );
- return -1;
- }
-
- i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 );
-
- if( i_recv < 0 )
- {
-#ifdef WIN32
- /* On win32 recv() will fail if the datagram doesn't fit inside
- * the passed buffer, even though the buffer will be filled with
- * the first part of the datagram. */
- if( WSAGetLastError() == WSAEMSGSIZE )
- {
- msg_Err( p_input, "recv() failed. "
- "Increase the mtu size (--mtu option)" );
- i_recv = i_len;
- }
- else
-#endif
- msg_Err( p_input, "recv failed (%s)", strerror(errno) );
- }
-
- return i_recv;
+ access_sys_t *p_sys = p_input->p_access_data;
-#endif
+ return net_Read( p_input, p_sys->fd, p_buffer, i_len, VLC_FALSE );
}
/*****************************************************************************
* net.c:
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: net.c,v 1.5 2004/01/09 12:23:46 gbazin Exp $
+ * $Id: net.c,v 1.6 2004/01/21 10:22:31 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@videolan.org>
*
return sock.i_handle;
}
+/*****************************************************************************
+ * __net_OpenUDP:
+ *****************************************************************************
+ * Open a UDP connection and return a handle
+ *****************************************************************************/
+int __net_OpenUDP( vlc_object_t *p_this, char *psz_bind, int i_bind, char *psz_server, int i_server )
+{
+ vlc_value_t val;
+ void *private;
+
+ char *psz_network = "";
+ network_socket_t sock;
+ module_t *p_network;
+
+
+ /* Check if we have force ipv4 or ipv6 */
+ var_Create( p_this, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ipv4", &val );
+ if( val.b_bool )
+ {
+ psz_network = "ipv4";
+ }
+
+ var_Create( p_this, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ipv6", &val );
+ if( val.b_bool )
+ {
+ psz_network = "ipv6";
+ }
+ if( psz_server == NULL ) psz_server = "";
+ if( psz_bind == NULL ) psz_bind = "";
+
+ /* Prepare the network_socket_t structure */
+ sock.i_type = NETWORK_UDP;
+ sock.psz_bind_addr = psz_bind;
+ sock.i_bind_port = i_bind;
+ sock.psz_server_addr = psz_server;
+ sock.i_server_port = i_server;
+ sock.i_ttl = 0;
+
+ msg_Dbg( p_this, "net: connecting to '%s:%d@%s:%d'",
+ psz_server, i_server, psz_bind, i_bind );
+ private = p_this->p_private;
+ p_this->p_private = (void*)&sock;
+ if( ( p_network = module_Need( p_this, "network", psz_network ) ) == NULL )
+ {
+ msg_Dbg( p_this, "net: connection to '%s:%d@%s:%d' failed",
+ psz_server, i_server, psz_bind, i_bind );
+ return -1;
+ }
+ module_Unneed( p_this, p_network );
+ p_this->p_private = private;
+
+ return sock.i_handle;
+}
+
/*****************************************************************************
* __net_Close:
*****************************************************************************
if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) < 0 )
{
+#ifdef WIN32
+ /* For udp only */
+ /* On win32 recv() will fail if the datagram doesn't fit inside
+ * the passed buffer, even though the buffer will be filled with
+ * the first part of the datagram. */
+ if( WSAGetLastError() == WSAEMSGSIZE )
+ {
+ msg_Err( p_input, "recv() failed. "
+ "Increase the mtu size (--mtu option)" );
+ i_recv = i_len;
+ }
+ else
+#endif
msg_Err( p_this, "recv failed (%s)", strerror(errno) );
return i_total > 0 ? i_total : -1;
}
projects / vlc / commitdiff