[vlc-commits] lua telnet: support --telnet-host "*console" syntax

[Pierre Ynard]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Mon Feb 14 01:52:56 2011 +0100| [eb6a3a4e793eeb8a944c325348aacb25fe11c068] | committer: Pierre Ynard

lua telnet: support --telnet-host "*console" syntax

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb6a3a4e793eeb8a944c325348aacb25fe11c068
---

 modules/misc/lua/intf.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 31508a9..e906de1 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -262,29 +262,38 @@ int Open_LuaIntf( vlc_object_t *p_this )
         else if( !strcmp( psz_name, "telnet" ) )
         {
             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" );
-            if ( url.i_port != 0 )
+            if( !strcmp( psz_telnet_host, "*console" ) )
+                ;
+            else
             {
-                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 );
+                vlc_url_t url;
+                vlc_UrlParse( &url, psz_telnet_host, 0 );
+                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_esc_host = config_StringEscape( url.psz_host );
+                free( psz_telnet_host );
+                vlc_UrlClean( &url );
+
+                asprintf( &psz_telnet_host, "%s:%d", psz_esc_host ? psz_esc_host : "", i_telnet_port );
+                free( psz_esc_host );
             }
 
             char *psz_telnet_passwd = var_CreateGetString( p_intf, "telnet-password" );
 
-            char *psz_esc_host = config_StringEscape( url.psz_host );
             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',password='%s'}", psz_telnet_host, psz_esc_passwd );
 
-            free( psz_esc_host );
             free( psz_esc_passwd );
             free( psz_telnet_passwd );
             free( psz_telnet_host );
-            vlc_UrlClean( &url );
         }
         else if( !strcmp( psz_name, "rc" ) )
         {