Commit 553bc045 authored by Pierre Ynard's avatar Pierre Ynard

lua telnet: handle <host>:<port> syntax

That's what the old interface did
parent 7cee3d4b
...@@ -262,10 +262,20 @@ int Open_LuaIntf( vlc_object_t *p_this ) ...@@ -262,10 +262,20 @@ int Open_LuaIntf( vlc_object_t *p_this )
else if( !strcmp( psz_name, "telnet" ) ) else if( !strcmp( psz_name, "telnet" ) )
{ {
char *psz_telnet_host = var_CreateGetString( p_intf, "telnet-host" ); char *psz_telnet_host = var_CreateGetString( p_intf, "telnet-host" );
vlc_url_t url;
vlc_UrlParse( &url, psz_telnet_host, 0 );
int i_telnet_port = var_CreateGetInteger( p_intf, "telnet-port" ); int i_telnet_port = var_CreateGetInteger( p_intf, "telnet-port" );
if ( url.i_port != 0 )
{
if ( i_telnet_port == TELNETPORT_DEFAULT )
i_telnet_port = url.i_port;
else if ( url.i_port != i_telnet_port )
msg_Warn( p_intf, "ignoring port %d (using %d)", url.i_port, i_telnet_port );
}
char *psz_telnet_passwd = var_CreateGetString( p_intf, "telnet-password" ); char *psz_telnet_passwd = var_CreateGetString( p_intf, "telnet-password" );
char *psz_esc_host = config_StringEscape( psz_telnet_host ); char *psz_esc_host = config_StringEscape( url.psz_host );
char *psz_esc_passwd = config_StringEscape( psz_telnet_passwd ); char *psz_esc_passwd = config_StringEscape( psz_telnet_passwd );
asprintf( &psz_config, "telnet={host='%s:%d',password='%s'}", psz_esc_host ? psz_esc_host : "", i_telnet_port, psz_esc_passwd ); asprintf( &psz_config, "telnet={host='%s:%d',password='%s'}", psz_esc_host ? psz_esc_host : "", i_telnet_port, psz_esc_passwd );
...@@ -274,6 +284,7 @@ int Open_LuaIntf( vlc_object_t *p_this ) ...@@ -274,6 +284,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
free( psz_esc_passwd ); free( psz_esc_passwd );
free( psz_telnet_passwd ); free( psz_telnet_passwd );
free( psz_telnet_host ); free( psz_telnet_host );
vlc_UrlClean( &url );
} }
else if( !strcmp( psz_name, "rc" ) ) else if( !strcmp( psz_name, "rc" ) )
{ {
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
#define TELNETPORT_TEXT N_( "Port" ) #define TELNETPORT_TEXT N_( "Port" )
#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \ #define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \
"interface will listen. It defaults to 4212." ) "interface will listen. It defaults to 4212." )
#define TELNETPORT_DEFAULT 4212
#define TELNETPWD_TEXT N_( "Password" ) #define TELNETPWD_TEXT N_( "Password" )
#define TELNETPWD_LONGTEXT N_( "A single administration password is used " \ #define TELNETPWD_LONGTEXT N_( "A single administration password is used " \
"to protect this interface. The default value is \"admin\"." ) "to protect this interface. The default value is \"admin\"." )
......
...@@ -50,6 +50,7 @@ int FindArt( vlc_object_t * ); ...@@ -50,6 +50,7 @@ int FindArt( vlc_object_t * );
int Import_LuaPlaylist( vlc_object_t * ); int Import_LuaPlaylist( vlc_object_t * );
void Close_LuaPlaylist( vlc_object_t * ); void Close_LuaPlaylist( vlc_object_t * );
#define TELNETPORT_DEFAULT 4212
int Open_LuaIntf( vlc_object_t * ); int Open_LuaIntf( vlc_object_t * );
void Close_LuaIntf( vlc_object_t * ); void Close_LuaIntf( vlc_object_t * );
......
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