Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
450
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
c1acae62
Commit
c1acae62
authored
18 years ago
by
dionoea
Browse files
Options
Downloads
Patches
Plain Diff
Also show telnet specific commands when using "help" command in the telnet interface.
parent
82fd7dc7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/control/telnet.c
+19
-8
19 additions, 8 deletions
modules/control/telnet.c
with
19 additions
and
8 deletions
modules/control/telnet.c
+
19
−
8
View file @
c1acae62
...
...
@@ -126,31 +126,31 @@ struct intf_sys_t
vlm_t
*
mediatheque
;
};
/*
/*
* getPort: Decide which port to use. There are two possibilities to
* specify a port: integrated in the --telnet-host option with :PORT
* or using the --telnet-port option. The --telnet-port option has
* precedence.
* This code relies upon the fact the url.i_port is 0 if the :PORT
* precedence.
* This code relies upon the fact the url.i_port is 0 if the :PORT
* option is missing from --telnet-host.
*/
static
int
getPort
(
intf_thread_t
*
p_intf
,
vlc_url_t
url
,
int
i_port
)
{
// Print error if two different ports have been specified
if
(
url
.
i_port
!=
0
&&
i_port
!=
TELNETPORT_DEFAULT
&&
i_port
!=
TELNETPORT_DEFAULT
&&
url
.
i_port
!=
i_port
)
{
msg_Err
(
p_intf
,
"ignoring port %d and using %d"
,
url
.
i_port
,
msg_Err
(
p_intf
,
"ignoring port %d and using %d"
,
url
.
i_port
,
i_port
);
}
if
(
i_port
!=
TELNETPORT_DEFAULT
)
{
return
i_port
;
return
i_port
;
}
if
(
url
.
i_port
!=
0
)
{
return
url
.
i_port
;
return
url
.
i_port
;
}
return
i_port
;
}
...
...
@@ -193,7 +193,7 @@ static int Open( vlc_object_t *p_this )
free
(
p_intf
->
p_sys
);
return
VLC_EGENERIC
;
}
msg_Info
(
p_intf
,
msg_Info
(
p_intf
,
"telnet interface started on interface %s %d"
,
url
.
psz_host
,
url
.
i_port
);
...
...
@@ -444,8 +444,19 @@ static void Run( intf_thread_t *p_intf )
vlm_ExecuteCommand
(
p_sys
->
mediatheque
,
cl
->
buffer_read
,
&
message
);
if
(
!
strncmp
(
cl
->
buffer_read
,
"help"
,
4
)
)
{
vlm_message_t
*
p_my_help
=
vlm_MessageNew
(
"Telnet Specific Commands:"
,
NULL
);
vlm_MessageAdd
(
p_my_help
,
vlm_MessageNew
(
"logout, quit, exit"
,
NULL
)
);
vlm_MessageAdd
(
p_my_help
,
vlm_MessageNew
(
"shutdown"
,
NULL
)
);
vlm_MessageAdd
(
message
,
p_my_help
);
}
Write_message
(
cl
,
message
,
NULL
,
WRITE_MODE_CMD
);
vlm_MessageDelete
(
message
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment