diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-27 23:28:01 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-27 23:28:01 +0000 |
commit | eaa6eea1b706d3805a9631e7c0538afe05a6ea29 (patch) | |
tree | 93c135ca7da0541ca96d2bcee01b1c00bb7f8ffe | |
parent | 7c985dc90cb46291d355281664da74a103abb74e (diff) |
Fix -s socket option, and document it as well.
Closes issue #11645, patch by Laureano.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95070 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | doc/asterisk.8 | 6 | ||||
-rw-r--r-- | main/asterisk.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/asterisk.8 b/doc/asterisk.8 index 9e0e6880f..876721a93 100644 --- a/doc/asterisk.8 +++ b/doc/asterisk.8 @@ -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 -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" .PP @@ -117,6 +117,10 @@ to a running Asterisk process and provide a console interface for controlling it. Additionally, if connection to the Asterisk process is lost, attempt to reconnect for as long as 30 seconds. .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 Enable internal timing if Zaptel timer is available The default behaviour is that outbound packets are phase locked diff --git a/main/asterisk.c b/main/asterisk.c index ea464b76a..3e1ecad43 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2851,7 +2851,7 @@ int main(int argc, char *argv[]) ast_readconfig(); 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) 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"); |