kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix -s socket option, and document it as well.

Browse Source 
Closes issue #11645, patch by Laureano.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-12-27 23:28:01 +00:00
parent 5e041a46dc
commit 03f68a8a3a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/asterisk.8
View File

@@ -12,7 +12,7 @@ asterisk \- All-purpose telephony server.
\fBasterisk\fR [ \fB-tThfdvVqpRgciIn\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ] \fBasterisk\fR [ \fB-tThfdvVqpRgciIn\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ]
\fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ] \fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-s \fIsocket\fB\fR ]
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
@@ -117,6 +117,10 @@ to a running Asterisk process and provide a console interface
for controlling it. Additionally, if connection to the Asterisk for controlling it. Additionally, if connection to the Asterisk
process is lost, attempt to reconnect for as long as 30 seconds. process is lost, attempt to reconnect for as long as 30 seconds.
.TP .TP
\fB-s \fIsocket\fB\fR
Allows to specify the socket file to be used to connect to the
Asterisk console. Used in conjunction with \fB-r\fR or \fB-R\fR.
.TP
\fB-I\fR \fB-I\fR
Enable internal timing if Zaptel timer is available Enable internal timing if Zaptel timer is available
The default behaviour is that outbound packets are phase locked The default behaviour is that outbound packets are phase locked

2
main/asterisk.c
View File

@@ -2851,7 +2851,7 @@ int main(int argc, char *argv[])
ast_readconfig(); ast_readconfig();
if (ast_opt_remote && remotesock != NULL) if (ast_opt_remote && remotesock != NULL)
ast_copy_string((char *) ast_config_AST_SOCKET, remotesock, sizeof(ast_config_AST_SOCKET)); ast_copy_string((char *) cfg_paths.socket_path, remotesock, sizeof(cfg_paths.socket_path));
if (!ast_language_is_prefix && !ast_opt_remote) if (!ast_language_is_prefix && !ast_opt_remote)
ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n"); ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n");