Skip to content

V
vlc-1.1
Commit 3e784cb1 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/misc/net.c, include/network.h: added net_vaPrintf() and net_Accept(). 

* modules/control/rc.c: added option to listen on a socket instead of only stdin.
   Inspired from a patch by Bernhard Rosenkraenzer <bero at arklinux dot org>.
parent 32d2dd2e
Show whitespace changes
Inline Side-by-side
Showing with 487 additions and 249 deletions
include/network.h
View file @ 3e784cb1
...@@ -169,6 +169,9 @@ VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, char *psz_host, int i_po ...@@ -169,6 +169,9 @@ VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, char *psz_host, int i_po
#define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c) #define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __net_ListenTCP, ( vlc_object_t *p_this, char *psz_localaddr, int i_port ) ); VLC_EXPORT( int, __net_ListenTCP, ( vlc_object_t *p_this, char *psz_localaddr, int i_port ) );
#define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __net_Accept, ( vlc_object_t *p_this, int fd_listen, mtime_t i_wait ) );
#define net_OpenUDP(a, b, c, d, e ) __net_OpenUDP(VLC_OBJECT(a), b, c, d, e) #define net_OpenUDP(a, b, c, d, e ) __net_OpenUDP(VLC_OBJECT(a), b, c, d, e)
VLC_EXPORT( int, __net_OpenUDP, ( vlc_object_t *p_this, char *psz_bind, int i_bind, char *psz_server, int i_server ) ); VLC_EXPORT( int, __net_OpenUDP, ( vlc_object_t *p_this, char *psz_bind, int i_bind, char *psz_server, int i_server ) );
...@@ -186,5 +189,7 @@ VLC_EXPORT( int, __net_Write, ( vlc_object_t *p_this, int fd, uint8_t *p_data, i ...@@ -186,5 +189,7 @@ VLC_EXPORT( int, __net_Write, ( vlc_object_t *p_this, int fd, uint8_t *p_data, i
#define net_Gets(a,b) __net_Gets(VLC_OBJECT(a),b) #define net_Gets(a,b) __net_Gets(VLC_OBJECT(a),b)
VLC_EXPORT( char *, __net_Gets, ( vlc_object_t *p_this, int fd ) ); VLC_EXPORT( char *, __net_Gets, ( vlc_object_t *p_this, int fd ) );
VLC_EXPORT( int, net_Printf, ( vlc_object_t *p_this, int fd, char *psz_fmt, ... ) ); VLC_EXPORT( int, net_Printf, ( vlc_object_t *p_this, int fd, const char *psz_fmt, ... ) );
#define net_vaPrintf(a,b,c,d) __net_vaPrintf(VLC_OBJECT(a),b,c,d)
VLC_EXPORT( int, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const char *psz_fmt, va_list args ) );
modules/control/rc.c
View file @ 3e784cb1
...@@ -47,6 +47,14 @@ ...@@ -47,6 +47,14 @@
#include <sys/types.h> #include <sys/types.h>
#include "vlc_error.h" #include "vlc_error.h"
#include "network.h"
#if defined(PF_UNIX) || defined(PF_LOCAL)
# include <sys/un.h>
# if !defined(PF_UNIX)
# define PF_UNIX PF_LOCAL
# endif
#endif
#define MAX_LINE_LENGTH 256 #define MAX_LINE_LENGTH 256
...@@ -54,7 +62,10 @@ ...@@ -54,7 +62,10 @@
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Activate ( vlc_object_t * ); static int Activate ( vlc_object_t * );
static void Run ( intf_thread_t *p_intf ); static void Deactivate ( vlc_object_t * );
static void Run ( intf_thread_t * );
static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
static int Input ( vlc_object_t *, char const *, static int Input ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
...@@ -71,6 +82,30 @@ static int VolumeMove ( vlc_object_t *, char const *, ...@@ -71,6 +82,30 @@ static int VolumeMove ( vlc_object_t *, char const *,
static int AudioConfig ( vlc_object_t *, char const *, static int AudioConfig ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
struct intf_sys_t
{
int i_socket_listen;
int i_socket;
#ifdef WIN32
HANDLE hConsoleIn;
#endif
};
#ifdef HAVE_VARIADIC_MACROS
# define printf( psz_format, args... ) \
Printf( p_intf, psz_format, ## args )
#endif
void Printf( intf_thread_t *p_intf, const char *psz_fmt, ... )
{
va_list args;
va_start( args, psz_fmt );
if( p_intf->p_sys->i_socket == -1 ) vprintf( psz_fmt, args );
else net_vaPrintf( p_intf, p_intf->p_sys->i_socket, psz_fmt, args );
va_end( args );
}
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -80,14 +115,19 @@ static int AudioConfig ( vlc_object_t *, char const *, ...@@ -80,14 +115,19 @@ static int AudioConfig ( vlc_object_t *, char const *,
#define TTY_TEXT N_("Fake TTY") #define TTY_TEXT N_("Fake TTY")
#define TTY_LONGTEXT N_("Force the rc module to use stdin as if it was a TTY.") #define TTY_LONGTEXT N_("Force the rc module to use stdin as if it was a TTY.")
#define CF_TEXT N_("Command input")
#define CF_LONGTEXT N_("Accept commands over a socket rather than stdin. " \
"You can set the address and port the interface will bind to." )
vlc_module_begin(); vlc_module_begin();
set_description( _("Remote control interface") ); set_description( _("Remote control interface") );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY #ifdef HAVE_ISATTY
add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE ); add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE );
#endif #endif
add_string( "rc-host", 0, NULL, CF_TEXT, CF_LONGTEXT, VLC_TRUE );
set_capability( "interface", 20 ); set_capability( "interface", 20 );
set_callbacks( Activate, NULL ); set_callbacks( Activate, Deactivate );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
...@@ -96,16 +136,101 @@ vlc_module_end(); ...@@ -96,16 +136,101 @@ vlc_module_end();
static int Activate( vlc_object_t *p_this ) static int Activate( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t*)p_this; intf_thread_t *p_intf = (intf_thread_t*)p_this;
char *psz_host;
int i_socket = -1;
#if defined(HAVE_ISATTY) && !defined(WIN32) #if defined(HAVE_ISATTY) && !defined(WIN32)
/* Check that stdin is a TTY */ /* Check that stdin is a TTY */
if( !config_GetInt( p_intf, "fake-tty" ) && !isatty( 0 ) ) if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) )
{ {
msg_Warn( p_intf, "fd 0 is not a TTY" ); msg_Warn( p_intf, "fd 0 is not a TTY" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#endif #endif
psz_host = config_GetPsz( p_intf, "rc-host" );
if( psz_host && (psz_host[0] == '/' || psz_host[0] == '.' ) )
{
#if !defined(PF_UNIX) && !defined(PF_LOCAL)
msg_Warn( p_intf, "your OS doesn't support filesystem sockets" );
free( psz_host );
return VLC_EGENERIC;
#else
struct sockaddr_un addr;
int i_ret;
memset( &addr, 0, sizeof(struct sockaddr_un) );
msg_Dbg( p_intf, "trying UNIX socket" );
if( (i_socket = socket( PF_UNIX, SOCK_STREAM, 0 ) ) < 0 )
{
msg_Warn( p_intf, "can't open socket: %s", strerror(errno) );
free( psz_host );
return VLC_EGENERIC;
}
addr.sun_family = AF_UNIX;
strcpy( addr.sun_path, psz_host );
if( (i_ret = bind( i_socket, (struct sockaddr*)&addr,
sizeof(struct sockaddr_un) ) ) < 0 )
{
msg_Warn( p_intf, "couldn't bind socket to address: %s",
strerror(errno) );
free( psz_host );
close( i_socket );
return VLC_EGENERIC;
}
if( ( i_ret = listen( i_socket, 1 ) ) < 0 )
{
msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno));
free( psz_host );
close( i_socket );
return VLC_EGENERIC;
}
#endif
}
else if( psz_host && *psz_host )
{
char *psz_addr;
vlc_url_t url;
memset( &url, 0, sizeof(vlc_url_t) );
/* If it doesn't include a :, it's a port number rather than an URL */
if( strchr( psz_host, ':' ) ) vlc_UrlParse( &url, psz_host, 0 );
else url.i_port = atoi( psz_host );
/* By default, we listen on localhost only for security reasons.
* If you need to listen on all IP addresses, specify 0.0.0.0
*/
psz_addr = url.psz_host ? url.psz_host : "127.0.0.1";
msg_Dbg( p_intf, "base %s:%d", psz_addr, url.i_port );
if( (i_socket = net_ListenTCP( p_this, psz_addr, url.i_port )) == -1 )
{
msg_Warn( p_intf, "can't listen to %s:%i", psz_addr, url.i_port );
vlc_UrlClean( &url );
free( psz_host );
return VLC_EGENERIC;
}
vlc_UrlClean( &url );
}
if( psz_host ) free( psz_host );
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
{
msg_Err( p_intf, "no memory" );
return VLC_ENOMEM;
}
p_intf->p_sys->i_socket_listen = i_socket;
p_intf->p_sys->i_socket = -1;
/* Non-buffered stdout */ /* Non-buffered stdout */
setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
...@@ -117,6 +242,20 @@ static int Activate( vlc_object_t *p_this ) ...@@ -117,6 +242,20 @@ static int Activate( vlc_object_t *p_this )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/*****************************************************************************
* Deactivate: uninitialize and cleanup
*****************************************************************************/
static void Deactivate( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
if( p_intf->p_sys->i_socket_listen != -1 )
net_Close( p_intf->p_sys->i_socket_listen );
if( p_intf->p_sys->i_socket != -1 )
net_Close( p_intf->p_sys->i_socket );
free( p_intf->p_sys );
}
/***************************************************************************** /*****************************************************************************
* Run: rc thread * Run: rc thread
***************************************************************************** *****************************************************************************
...@@ -131,16 +270,11 @@ static void Run( intf_thread_t *p_intf ) ...@@ -131,16 +270,11 @@ static void Run( intf_thread_t *p_intf )
char p_buffer[ MAX_LINE_LENGTH + 1 ]; char p_buffer[ MAX_LINE_LENGTH + 1 ];
vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" ); vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" );
int i_dummy; int i_size = 0;
int i_oldpos = 0; int i_oldpos = 0;
int i_newpos; int i_newpos;
#ifdef WIN32 p_buffer[0] = 0;
HANDLE hConsoleIn;
INPUT_RECORD input_record;
DWORD i_dummy2;
#endif
p_input = NULL; p_input = NULL;
p_playlist = NULL; p_playlist = NULL;
...@@ -193,8 +327,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -193,8 +327,8 @@ static void Run( intf_thread_t *p_intf )
#ifdef WIN32 #ifdef WIN32
/* Get the file descriptor of the console input */ /* Get the file descriptor of the console input */
hConsoleIn = GetStdHandle(STD_INPUT_HANDLE); p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE);
if( hConsoleIn == INVALID_HANDLE_VALUE ) if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE )
{ {
msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" ); msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" );
p_intf->b_die = VLC_TRUE; p_intf->b_die = VLC_TRUE;
...@@ -203,97 +337,17 @@ static void Run( intf_thread_t *p_intf ) ...@@ -203,97 +337,17 @@ static void Run( intf_thread_t *p_intf )
while( !p_intf->b_die ) while( !p_intf->b_die )
{ {
vlc_bool_t b_complete = VLC_FALSE; char *psz_cmd, *psz_arg;
vlc_bool_t b_complete;
#ifndef WIN32
fd_set fds;
struct timeval tv;
/* Check stdin */
tv.tv_sec = 0;
tv.tv_usec = (long)INTF_IDLE_SLEEP;
FD_ZERO( &fds );
FD_SET( STDIN_FILENO, &fds );
i_dummy = select( STDIN_FILENO + 1, &fds, NULL, NULL, &tv );
#else
/* On Win32, select() only works on socket descriptors */
i_dummy = ( WaitForSingleObject( hConsoleIn, INTF_IDLE_SLEEP/1000 )
== WAIT_OBJECT_0 );
#endif
if( i_dummy > 0 )
{
int i_size = 0;
while( !p_intf->b_die
&& i_size < MAX_LINE_LENGTH
#ifndef WIN32
&& read( STDIN_FILENO, p_buffer + i_size, 1 ) > 0
#else
&& ReadConsoleInput( hConsoleIn, &input_record, 1,
&i_dummy2 )
#endif
)
{
#ifdef WIN32
if( input_record.EventType != KEY_EVENT ||
!input_record.Event.KeyEvent.bKeyDown ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_MENU ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_CAPITAL )
{
/* nothing interesting */
continue;
}
p_buffer[ i_size ] =
input_record.Event.KeyEvent.uChar.AsciiChar;
/* Echo out the command */
putc( p_buffer[ i_size ], stdout );
/* Handle special keys */
if( p_buffer[ i_size ] == '\r' || p_buffer[ i_size ] == '\n' )
{
putc( '\n', stdout );
break;
}
switch( p_buffer[ i_size ] )
{
case '\b':
if( i_size )
{
i_size -= 2;
putc( ' ', stdout );
putc( '\b', stdout );
}
break;
case '\r':
i_size --;
break;
}
i_size++;
#else
if( p_buffer[ i_size ] == '\r' || p_buffer[ i_size ] == '\n' ) if( p_intf->p_sys->i_socket_listen != - 1 &&
p_intf->p_sys->i_socket == -1 )
{ {
break; p_intf->p_sys->i_socket =
net_Accept( p_intf, p_intf->p_sys->i_socket_listen, 0 );
} }
i_size++; b_complete = ReadCommand( p_intf, p_buffer, &i_size );
#endif
}
if( i_size == MAX_LINE_LENGTH
|| p_buffer[ i_size ] == '\r'
|| p_buffer[ i_size ] == '\n' )
{
p_buffer[ i_size ] = 0;
b_complete = VLC_TRUE;
}
}
/* Manage the input part */ /* Manage the input part */
if( p_input == NULL ) if( p_input == NULL )
...@@ -331,9 +385,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -331,9 +385,8 @@ static void Run( intf_thread_t *p_intf )
} }
/* Is there something to do? */ /* Is there something to do? */
if( b_complete ) if( !b_complete ) continue;
{
char *psz_cmd, *psz_arg;
/* Skip heading spaces */ /* Skip heading spaces */
psz_cmd = p_buffer; psz_cmd = p_buffer;
...@@ -384,7 +437,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -384,7 +437,7 @@ static void Run( intf_thread_t *p_intf )
} }
else if( !strcmp( psz_cmd, "info" ) ) else if( !strcmp( psz_cmd, "info" ) )
{ {
if ( p_input ) if( p_input )
{ {
int i, j; int i, j;
vlc_mutex_lock( &p_input->input.p_item->lock ); vlc_mutex_lock( &p_input->input.p_item->lock );
...@@ -468,14 +521,18 @@ static void Run( intf_thread_t *p_intf ) ...@@ -468,14 +521,18 @@ static void Run( intf_thread_t *p_intf )
printf("| \n"); printf("| \n");
printf(_("+----[ end of help ]\n")); printf(_("+----[ end of help ]\n"));
break; break;
case '\0': case '\0':
/* Ignore empty lines */ /* Ignore empty lines */
break; break;
default: default:
printf( _("unknown command `%s', type `help' for help\n"), psz_cmd ); printf(_("unknown command `%s', type `help' for help\n"), psz_cmd);
break; break;
} }
}
/* Command processed */
i_size = 0; p_buffer[0] = 0;
} }
if( p_input ) if( p_input )
...@@ -494,15 +551,12 @@ static void Run( intf_thread_t *p_intf ) ...@@ -494,15 +551,12 @@ static void Run( intf_thread_t *p_intf )
static int Input( vlc_object_t *p_this, char const *psz_cmd, static int Input( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
input_thread_t * p_input; intf_thread_t *p_intf = (intf_thread_t*)p_this;
input_thread_t *p_input;
vlc_value_t val; vlc_value_t val;
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( !p_input ) return VLC_ENOOBJ;
if( !p_input )
{
return VLC_ENOOBJ;
}
/* Parse commands that only require an input */ /* Parse commands that only require an input */
if( !strcmp( psz_cmd, "pause" ) ) if( !strcmp( psz_cmd, "pause" ) )
...@@ -547,9 +601,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -547,9 +601,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
/* Get. */ /* Get. */
var_Get( p_input, "chapter", &val ); var_Get( p_input, "chapter", &val );
var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
printf( _("Currently playing chapter %d/%d\n"), val.i_int, val_list.p_list->i_count ); &val_list, NULL );
var_Change( p_this, "chapter", VLC_VAR_FREELIST, &val_list, NULL ); printf( _("Currently playing chapter %d/%d\n"),
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "chapter", VLC_VAR_FREELIST,
&val_list, NULL );
} }
} }
else if( !strcmp( psz_cmd, "chapter_n" ) ) else if( !strcmp( psz_cmd, "chapter_n" ) )
...@@ -584,9 +641,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -584,9 +641,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
/* Get. */ /* Get. */
var_Get( p_input, "title", &val ); var_Get( p_input, "title", &val );
var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input, "title", VLC_VAR_GETCHOICES,
printf( _("Currently playing title %d/%d\n"), val.i_int, val_list.p_list->i_count ); &val_list, NULL );
var_Change( p_this, "title", VLC_VAR_FREELIST, &val_list, NULL ); printf( _("Currently playing title %d/%d\n"),
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "title", VLC_VAR_FREELIST,
&val_list, NULL );
} }
} }
else if( !strcmp( psz_cmd, "title_n" ) ) else if( !strcmp( psz_cmd, "title_n" ) )
...@@ -611,7 +671,8 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -611,7 +671,8 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
static int Playlist( vlc_object_t *p_this, char const *psz_cmd, static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
playlist_t * p_playlist; intf_thread_t *p_intf = (intf_thread_t*)p_this;
playlist_t *p_playlist;
p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
...@@ -699,6 +760,7 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd, ...@@ -699,6 +760,7 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd,
static int Volume( vlc_object_t *p_this, char const *psz_cmd, static int Volume( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
intf_thread_t *p_intf = (intf_thread_t*)p_this;
int i_error; int i_error;
if ( *newval.psz_string ) if ( *newval.psz_string )
...@@ -734,6 +796,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, ...@@ -734,6 +796,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
intf_thread_t *p_intf = (intf_thread_t*)p_this;
audio_volume_t i_volume; audio_volume_t i_volume;
int i_nb_steps = atoi(newval.psz_string); int i_nb_steps = atoi(newval.psz_string);
int i_error = VLC_SUCCESS; int i_error = VLC_SUCCESS;
...@@ -761,6 +824,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, ...@@ -761,6 +824,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
intf_thread_t *p_intf = (intf_thread_t*)p_this;
aout_instance_t * p_aout; aout_instance_t * p_aout;
const char * psz_variable; const char * psz_variable;
vlc_value_t val_name; vlc_value_t val_name;
...@@ -831,3 +895,106 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, ...@@ -831,3 +895,106 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
return i_error; return i_error;
} }
#ifdef WIN32
vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
{
INPUT_RECORD input_record;
DWORD i_dw;
/* On Win32, select() only works on socket descriptors */
while( WaitForSingleObject( p_intf->p_sys->hConsoleIn,
INTF_IDLE_SLEEP/1000 ) == WAIT_OBJECT_0 )
{
while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
ReadConsoleInput( p_sys->hConsoleIn, &input_record, 1, &i_dw ) )
{
if( input_record.EventType != KEY_EVENT ||
!input_record.Event.KeyEvent.bKeyDown ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_MENU ||
input_record.Event.KeyEvent.wVirtualKeyCode == VK_CAPITAL )
{
/* nothing interesting */
continue;
}
p_buffer[ *pi_size ] = input_record.Event.KeyEvent.uChar.AsciiChar;
/* Echo out the command */
putc( p_buffer[ *pi_size ], stdout );
/* Handle special keys */
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
{
putc( '\n', stdout );
break;
}
switch( p_buffer[ *pi_size ] )
{
case '\b':
if( *pi_size )
{
*pi_size -= 2;
putc( ' ', stdout );
putc( '\b', stdout );
}
break;
case '\r':
(*pi_size) --;
break;
}
(*pi_size)++;
}
if( *pi_size == MAX_LINE_LENGTH ||
p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
{
p_buffer[ *pi_size ] = 0;
return VLC_TRUE;
}
}
return VLC_FALSE;
}
#endif
vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
{
int i_read = 0;
#ifdef WIN32
if( p_intf->p_sys->i_socket == -1 )
return ReadWin32( p_intf, p_buffer, pi_size, pb_complete );
#endif
while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
(i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
STDIN_FILENO : p_intf->p_sys->i_socket,
p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
{
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
break;
(*pi_size)++;
}
/* Connection closed */
if( i_read == -1 )
{
p_intf->p_sys->i_socket = -1;
p_buffer[ *pi_size ] = 0;
return VLC_TRUE;
}
if( *pi_size == MAX_LINE_LENGTH ||
p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
{
p_buffer[ *pi_size ] = 0;
return VLC_TRUE;
}
return VLC_FALSE;
}
src/misc/net.c
View file @ 3e784cb1
...@@ -162,6 +162,61 @@ int __net_ListenTCP( vlc_object_t *p_this, char *psz_host, int i_port ) ...@@ -162,6 +162,61 @@ int __net_ListenTCP( vlc_object_t *p_this, char *psz_host, int i_port )
return sock.i_handle; return sock.i_handle;
} }
/*****************************************************************************
* __net_Accept:
*****************************************************************************
* Accept a connection on a listening socket and return it
*****************************************************************************/
int __net_Accept( vlc_object_t *p_this, int fd, mtime_t i_wait )
{
vlc_bool_t b_die = p_this->b_die, b_block = (i_wait < 0);
struct timeval timeout;
fd_set fds_r, fds_e;
int i_ret;
while( p_this->b_die == b_die )
{
/* Initialize file descriptor set */
FD_ZERO( &fds_r );
FD_SET( fd, &fds_r );
FD_ZERO( &fds_e );
FD_SET( fd, &fds_e );
timeout.tv_sec = 0;
timeout.tv_usec = b_block ? 500000 : i_wait;
i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout);
if( (i_ret < 0 && errno == EINTR) || i_ret == 0 )
{
if( b_block ) continue;
else return -1;
}
else if( i_ret < 0 )
{
#ifdef WIN32
msg_Err( p_this, "network select error (%s)", WSAGetLastError() );
#else
msg_Err( p_this, "network select error (%s)", strerror(errno) );
#endif
return -1;
}
if( ( i_ret = accept( fd, 0, 0 ) ) <= 0 )
{
#ifdef WIN32
msg_Err( p_this, "accept failed (%i)", WSAGetLastError() );
#else
msg_Err( p_this, "accept failed (%s)", strerror(errno) );
#endif
return -1;
}
return i_ret;
}
return -1;
}
/***************************************************************************** /*****************************************************************************
* __net_OpenUDP: * __net_OpenUDP:
***************************************************************************** *****************************************************************************
...@@ -356,7 +411,9 @@ int __net_ReadNonBlock( vlc_object_t *p_this, int fd, uint8_t *p_data, ...@@ -356,7 +411,9 @@ int __net_ReadNonBlock( vlc_object_t *p_this, int fd, uint8_t *p_data,
} }
else else
{ {
if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) < 0 ) if( fd == STDIN_FILENO ) i_recv = read( fd, p_data, i_data ); else
if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) <= 0 )
{ {
#ifdef WIN32 #ifdef WIN32
/* For udp only */ /* For udp only */
...@@ -375,8 +432,10 @@ int __net_ReadNonBlock( vlc_object_t *p_this, int fd, uint8_t *p_data, ...@@ -375,8 +432,10 @@ int __net_ReadNonBlock( vlc_object_t *p_this, int fd, uint8_t *p_data,
#endif #endif
return -1; return -1;
} }
return i_recv;
return i_recv ? i_recv : -1; /* !i_recv -> connection closed if tcp */
} }
/* We will never be here */ /* We will never be here */
return -1; return -1;
} }
...@@ -479,18 +538,25 @@ char *__net_Gets( vlc_object_t *p_this, int fd ) ...@@ -479,18 +538,25 @@ char *__net_Gets( vlc_object_t *p_this, int fd )
return psz_line; return psz_line;
} }
int net_Printf( vlc_object_t *p_this, int fd, char *psz_fmt, ... ) int net_Printf( vlc_object_t *p_this, int fd, const char *psz_fmt, ... )
{ {
int i_ret;
va_list args; va_list args;
va_start( args, psz_fmt );
i_ret = net_vaPrintf( p_this, fd, psz_fmt, args );
va_end( args );
return i_ret;
}
int __net_vaPrintf( vlc_object_t *p_this, int fd, const char *psz_fmt,
va_list args )
{
char *psz; char *psz;
int i_size, i_ret; int i_size, i_ret;
va_start( args, psz_fmt );
vasprintf( &psz, psz_fmt, args ); vasprintf( &psz, psz_fmt, args );
va_end( args );
i_size = strlen( psz ); i_size = strlen( psz );
i_ret = __net_Write( p_this, fd, psz, i_size ) < i_size ? -1 : i_size; i_ret = __net_Write( p_this, fd, psz, i_size ) < i_size ? -1 : i_size;
free( psz ); free( psz );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment