Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
553bc045
Commit
553bc045
authored
Feb 14, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lua telnet: handle <host>:<port> syntax
That's what the old interface did
parent
7cee3d4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
modules/misc/lua/intf.c
modules/misc/lua/intf.c
+12
-1
modules/misc/lua/vlc.c
modules/misc/lua/vlc.c
+0
-1
modules/misc/lua/vlc.h
modules/misc/lua/vlc.h
+1
-0
No files found.
modules/misc/lua/intf.c
View file @
553bc045
...
...
@@ -262,10 +262,20 @@ 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
(
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_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
);
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 )
free
(
psz_esc_passwd
);
free
(
psz_telnet_passwd
);
free
(
psz_telnet_host
);
vlc_UrlClean
(
&
url
);
}
else
if
(
!
strcmp
(
psz_name
,
"rc"
)
)
{
...
...
modules/misc/lua/vlc.c
View file @
553bc045
...
...
@@ -78,7 +78,6 @@
#define TELNETPORT_TEXT N_( "Port" )
#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \
"interface will listen. It defaults to 4212." )
#define TELNETPORT_DEFAULT 4212
#define TELNETPWD_TEXT N_( "Password" )
#define TELNETPWD_LONGTEXT N_( "A single administration password is used " \
"to protect this interface. The default value is \"admin\"." )
...
...
modules/misc/lua/vlc.h
View file @
553bc045
...
...
@@ -50,6 +50,7 @@ int FindArt( vlc_object_t * );
int
Import_LuaPlaylist
(
vlc_object_t
*
);
void
Close_LuaPlaylist
(
vlc_object_t
*
);
#define TELNETPORT_DEFAULT 4212
int
Open_LuaIntf
(
vlc_object_t
*
);
void
Close_LuaIntf
(
vlc_object_t
*
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment