[asterisk-commits] may: branch may/chan_ooh323_evo r331239 - in /team/may/chan_ooh323_evo: ./ ad...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Aug 9 12:45:12 CDT 2011


Author: may
Date: Tue Aug  9 12:45:05 2011
New Revision: 331239

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331239
Log:
Merged revisions 331140-331141,331144,331201-331202 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r331140 | qwell | 2011-08-09 19:51:38 +0400 (Tue, 09 Aug 2011) | 9 lines
  
  Merged revisions 331138 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ........
    r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line
    
    Revert merge of r306999, due to merge conflict.
  ........
................
  r331141 | qwell | 2011-08-09 19:53:26 +0400 (Tue, 09 Aug 2011) | 26 lines
  
  Merged revisions 331139 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r331139 | qwell | 2011-08-09 10:50:07 -0500 (Tue, 09 Aug 2011) | 19 lines
    
    Merged revisions 306999 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r306999 | lathama | 2011-02-08 14:22:35 -0600 (Tue, 08 Feb 2011) | 12 lines
      
      Documentation Updates
      
      Note default polling setting in voicemail.conf
      Add missing config to asterisk.conf
      Update manpage
      
      (issue #16505)
      Reported by: tzafrir
      Patches: 
            asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46)
      Tested by: lathama, tzafrir
    ........
  ................
................
  r331144 | qwell | 2011-08-09 20:02:45 +0400 (Tue, 09 Aug 2011) | 16 lines
  
  Merged revisions 331143 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r331143 | qwell | 2011-08-09 10:59:54 -0500 (Tue, 09 Aug 2011) | 9 lines
    
    Merged revisions 331142 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r331142 | qwell | 2011-08-09 10:58:16 -0500 (Tue, 09 Aug 2011) | 1 line
      
      Regenerate asterisk man page from sgml.
    ........
  ................
................
  r331201 | kmoore | 2011-08-09 21:08:33 +0400 (Tue, 09 Aug 2011) | 11 lines
  
  Allow ENUM query functions to report lookup errors
  
  The ENUM dialplan functions do not report DNS query errors properly. It is
  useful to differentiate between failed query (e.g. non-existent domain) vs. no
  data records of the appropriate type. This is required to make overlapped
  dialing work.
  
  (closes issue ASTERISK-13769)
  Review: https://reviewboard.asterisk.org/r/1355/
  Patch-by: Timo Teras
................
  r331202 | may | 2011-08-09 21:12:27 +0400 (Tue, 09 Aug 2011) | 28 lines
  
  Merged revisions 331147,331200 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r331147 | may | 2011-08-09 20:16:55 +0400 (Tue, 09 Aug 2011) | 11 lines
    
    Merged revisions 331146 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r331146 | may | 2011-08-09 20:13:09 +0400 (Tue, 09 Aug 2011) | 4 lines
      
      move ast_cond_signal for admitted call after all data filled/freed
      clear all log channels by pointed number not only first
      free allocated callToken in ooh323_answer
    ........
  ................
    r331200 | may | 2011-08-09 20:36:39 +0400 (Tue, 09 Aug 2011) | 9 lines
    
    Setup IP proto version for call in GK mode
    Added additional check for IP semantics before parse destination
    by ast_parse_args due to it can parse numeric as IP.
    
     (closes issue ASTERISK-18218)
     Reported by: slesru
     Patch: ASTERISK-18218.patch
  ................
................

Modified:
    team/may/chan_ooh323_evo/   (props changed)
    team/may/chan_ooh323_evo/UPGRADE.txt
    team/may/chan_ooh323_evo/addons/chan_ooh323.c
    team/may/chan_ooh323_evo/addons/ooh323c/src/ooGkClient.c
    team/may/chan_ooh323_evo/addons/ooh323c/src/ooLogChan.c
    team/may/chan_ooh323_evo/addons/ooh323c/src/ooq931.c
    team/may/chan_ooh323_evo/cel/cel_odbc.c   (props changed)
    team/may/chan_ooh323_evo/configs/cel_odbc.conf.sample   (props changed)
    team/may/chan_ooh323_evo/doc/asterisk.8
    team/may/chan_ooh323_evo/doc/asterisk.sgml
    team/may/chan_ooh323_evo/funcs/func_enum.c
    team/may/chan_ooh323_evo/main/enum.c
    team/may/chan_ooh323_evo/sounds/Makefile   (props changed)

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk:331140-331202

Propchange: team/may/chan_ooh323_evo/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  9 12:45:05 2011
@@ -1,1 +1,1 @@
-/trunk:1-331115
+/trunk:1-331238

Modified: team/may/chan_ooh323_evo/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/UPGRADE.txt?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/UPGRADE.txt (original)
+++ team/may/chan_ooh323_evo/UPGRADE.txt Tue Aug  9 12:45:05 2011
@@ -22,7 +22,10 @@
 
 From 10 to 12:
 
-* No significant changes as of yet.
+func_enum:
+ - ENUM query functions now return a count of -1 on lookup error to
+   differentiate between a failed query and a successful query with 0 results
+   matching the specified type.
 
 From 1.8 to 10:
 

Modified: team/may/chan_ooh323_evo/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/addons/chan_ooh323.c?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/addons/chan_ooh323.c (original)
+++ team/may/chan_ooh323_evo/addons/chan_ooh323.c Tue Aug  9 12:45:05 2011
@@ -1122,6 +1122,9 @@
 				ast_debug(1, "ooh323_answer(%s)\n", ast->name);
 			ast_channel_unlock(ast);
 			ooAnswerCall(p->callToken);
+		}
+		if (callToken) {
+			free(callToken);
 		}
 		ast_mutex_unlock(&p->lock);
 	}

Modified: team/may/chan_ooh323_evo/addons/ooh323c/src/ooGkClient.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/addons/ooh323c/src/ooGkClient.c?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/addons/ooh323c/src/ooGkClient.c (original)
+++ team/may/chan_ooh323_evo/addons/ooh323c/src/ooGkClient.c Tue Aug  9 12:45:05 2011
@@ -1947,8 +1947,11 @@
                                     ipAddress->ip.data[1],
                                     ipAddress->ip.data[2],
                                     ipAddress->ip.data[3]);
-         if(strcmp(ip, "0.0.0.0"))
+         if(strcmp(ip, "0.0.0.0")) {
+/* fix this when gk client will adopt to work with IPv6 */
+	    pCallAdmInfo->call->versionIP = 4;
             strcpy(pCallAdmInfo->call->remoteIP, ip);
+	 }
          pCallAdmInfo->call->remotePort = ipAddress->port;
          /* Update call model */
          if(pAdmissionConfirm->callModel.t == T_H225CallModel_direct)
@@ -1997,13 +2000,13 @@
                        pCallAdmInfo->call->callToken);
 
 	 pCallAdmInfo->call->callState = OO_CALL_CONNECTING;
-	 ast_cond_signal(&pCallAdmInfo->call->gkWait);
          /* ooH323CallAdmitted( pCallAdmInfo->call); */
 
          dListRemove(&pGkClient->callsPendingList, pNode);
          dListAppend(&pGkClient->ctxt, &pGkClient->callsAdmittedList, 
                                                         pNode->data);
          memFreePtr(&pGkClient->ctxt, pNode);
+	 ast_cond_signal(&pCallAdmInfo->call->gkWait);
          return OO_OK;
          break;
       }

Modified: team/may/chan_ooh323_evo/addons/ooh323c/src/ooLogChan.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/addons/ooh323c/src/ooLogChan.c?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/addons/ooh323c/src/ooLogChan.c (original)
+++ team/may/chan_ooh323_evo/addons/ooh323c/src/ooLogChan.c Tue Aug  9 12:45:05 2011
@@ -284,7 +284,7 @@
                  call->callType, call->callToken);
 
    pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo);
-   if(!pLogicalChannel)
+   do { if(!pLogicalChannel)
    {
       OOTRACEWARN4("Logical Channel %d doesn't exist, in clearLogicalChannel."
                    " (%s, %s)\n",
@@ -326,6 +326,7 @@
    ooRemoveLogicalChannel(call, channelNo);/* TODO: efficiency - This causes re-search of
                                                     of logical channel in the list. Can be
                                                     easily improved.*/
+   }  while ((pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo)));
    return OO_OK;
 }
 

Modified: team/may/chan_ooh323_evo/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/addons/ooh323c/src/ooq931.c?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/addons/ooh323c/src/ooq931.c (original)
+++ team/may/chan_ooh323_evo/addons/ooh323c/src/ooq931.c Tue Aug  9 12:45:05 2011
@@ -3624,7 +3624,8 @@
       return OO_OK;
    }
 
-   if (!ast_parse_arg(dest, PARSE_ADDR, &tmpaddr)) {
+   /* parse direct IP dest */
+   if ((strchr(dest, ':') || strchr(dest,'[') || strchr(dest,'.')) && !ast_parse_arg(dest, PARSE_ADDR, &tmpaddr)) {
       if(strlen(dest)+7>len)
       {
          OOTRACEERR1("Error:Insufficient buffer space for parsed ip - "

Propchange: team/may/chan_ooh323_evo/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  9 12:45:05 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/trunk/cel/cel_odbc.c:319427
+/trunk/cel/cel_odbc.c:319427,331140-331202

Propchange: team/may/chan_ooh323_evo/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  9 12:45:05 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/trunk/configs/cel_odbc.conf.sample:319427
+/trunk/configs/cel_odbc.conf.sample:319427,331140-331202

Modified: team/may/chan_ooh323_evo/doc/asterisk.8
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/doc/asterisk.8?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/doc/asterisk.8 (original)
+++ team/may/chan_ooh323_evo/doc/asterisk.8 Tue Aug  9 12:45:05 2011
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH 
		asterisk
	 8 2010-08-03 "asterisk 1.6" ""
+.TH "asterisk " 8 2011-02-08 "asterisk Trunk" ""
 .SH NAME
 asterisk
 \- All-purpose telephony server. 
@@ -16,7 +16,7 @@
 \fBasterisk\fR \kx
 .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
 'in \n(.iu+\nxu
-[\fB-BcdfFghiImnpqRtTvVW\fR] [\fB-C \fR\fIfile\fR] [\fB-e \fR\fImemory\fR] [\fB-G \fR\fIgroup\fR] [\fB-L \fR\fIloadaverage\fR] [\fB-M \fR\fIvalue\fR] [\fB-U \fR\fIuser\fR] [\fB-s \fR\fIsocket-file\fR] [\fB-x \fR\fIcommand\fR]
+[\fB-BcdfFghiImnpqRtTvVW\fR] [\fB-C \fR\fIfile\fR] [\fB-e \fR\fImemory\fR] [\fB-G \fR\fIgroup\fR] [\fB-L \fR\fIloadaverage\fR] [\fB-M \fR\fIvalue\fR] [\fB-U \fR\fIuser\fR] [\fB-s \fR\fIsocket-file\fR]
 'in \n(.iu-\nxu
 .ad b
 'hy
@@ -26,7 +26,17 @@
 \fBasterisk -r\fR \kx
 .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
 'in \n(.iu+\nxu
-[\fB-v\fR] [\fB-x \fR\fIcommand\fR]
+[\fB-v\fR] [\fB-d\fR] [\fB-x \fR\fIcommand\fR]
+'in \n(.iu-\nxu
+.ad b
+'hy
+'nh
+.fi
+.ad l
+\fBasterisk -R\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[\fB-v\fR] [\fB-d\fR] [\fB-x \fR\fIcommand\fR]
 'in \n(.iu-\nxu
 .ad b
 'hy
@@ -55,35 +65,56 @@
 .PP
 Asterisk is a trademark of Digium, Inc.
 .SH OPTIONS
+Running Asterisk starts the asterisk daemon (optionally running it
+in the foreground). However running it with \*(T<\fB\-r\fR\*(T> or
+\*(T<\fB\-R\fR\*(T> connects to an existing Asterisk instance through
+a remote console.
 .TP 
 -B
 Force the background of the terminal to be black, in order for
-terminal colors to show up properly.
+terminal colors to show up properly. Equivalent to
+\*(T<\fBforceblackbackground = yes\fR\*(T> in
+\*(T<\fIasterisk.conf\fR\*(T>. See also
+\*(T<\fB\-n\fR\*(T> and \*(T<\fB\-W\fR\*(T>.
 .TP 
 -C \fIfile\fR
 Use \*(T<\fIfile\fR\*(T> as master configuration file
 instead of the default, /etc/asterisk/asterisk.conf
 .TP 
 -c
-Provide a control console on the calling terminal.
-Specifying this option implies \fB-f\fR and will cause
-asterisk to no longer fork or detach from the controlling terminal.
+Provide a control console on the calling terminal. The
+console is similar to the remote console provided by
+\*(T<\fB\-r\fR\*(T>. Specifying this option implies 
+\fB-f\fR and will cause asterisk to no longer 
+fork or detach from the controlling terminal. Equivalent 
+to \*(T<\fBconsole = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
 .TP 
 -d
-Enable extra debugging statements.
-
-Note: This always sets the debug level in the asterisk process,
-even if it is running in the background. This may affect the size
-of your log files, if the debug level is specified in logger.conf.
+Enable extra debugging statements. This parameter may be used several
+times, and each increases the debug level. Equivalent to \*(T<\fBdebug = \fR\*(T>\fInum\fR
+in \*(T<\fIasterisk.conf\fR\*(T> to explicitly set the initian debug
+level to \fInum\fR. When given at startup, this
+option also implies \*(T<\fB\-f\fR\*(T> (no forking). However when
+connecting to an existing Asterisk instance (\*(T<\fB\-r\fR\*(T> or
+\*(T<\fB\-R\fR\*(T>), it may only increase the debug level.
 .TP 
 -e \fImemory\fR
-Limit the generation of new channels when the amount of free memory has decreased to under \fImemory\fR megabytes.
+Limit the generation of new channels when the amount of free memory 
+has decreased to under \fImemory\fR megabytes.
+Equivalent to \*(T<\fBminmemfree = \fR\*(T>\fImemory\fR in
+\*(T<\fIasterisk.conf\fR\*(T>.
 .TP 
 -f
-Do not fork or detach from controlling terminal. Overrides any preceding specification of \fB-F\fR on the command line.
+Do not fork or detach from controlling terminal. Overrides any
+preceding specification of \fB-F\fR on the command line.
+Equivalent to \*(T<\fBnofork = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
+See also \*(T<\fB\-c\fR\*(T>.
 .TP 
 -F
-Always fork and detach from controlling terminal. Overrides any preceding specification of \fB-f\fR on the command line.
+Always fork and detach from controlling terminal. Overrides any
+preceding specification of \fB-f\fR on the command line.
+May also be used to prevent \*(T<\fB\-d\fR\*(T> and \*(T<\fB\-v\fR\*(T> to imply
+no forking. Equivalent to \*(T<\fBalwaysfork = yes\fR\*(T> in \*(T<\fIasterisk.conf\fR\*(T>.
 .TP 
 -g
 Remove resource limit on core size, thus forcing Asterisk to dump
@@ -213,21 +244,13 @@
 .SH BUGS
 Bug reports and feature requests may be filed at https://issues.asterisk.org
 .SH "SEE ALSO"
-*CLI> \fBhelp\fR - Help on Asterisk CLI
-.PP
-*CLI> \fBcore show applications\fR - Show loaded dialplan applications
-.PP
-*CLI> \fBcore show functions\fR - Show loaded dialplan functions
-.PP
-*CLI> \fBdialplan show\fR - Show current dialplan
-.PP
 http://www.asterisk.org - The Asterisk Home Page
 .PP
 http://www.asteriskdocs.org - The Asterisk Documentation Project
 .PP
-http://www.voip-info.org/wiki-Asterisk - The Asterisk Wiki
-.PP
-http://www.digium.com/ - Asterisk sponsor and hardware supplier
+http://wiki.asterisk.org - The Asterisk Wiki
+.PP
+http://www.digium.com/ - Asterisk is sponsored by Digium
 .SH AUTHOR
 Mark Spencer <markster at digium.com>
 .PP

Modified: team/may/chan_ooh323_evo/doc/asterisk.sgml
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/doc/asterisk.sgml?view=diff&rev=331239&r1=331238&r2=331239
==============================================================================
--- team/may/chan_ooh323_evo/doc/asterisk.sgml (original)
+++ team/may/chan_ooh323_evo/doc/asterisk.sgml Tue Aug  9 12:45:05 2011
@@ -1,434 +1,449 @@
 <refentry>
-<refentryinfo>
-	<date>2011-02-08</date>
-</refentryinfo>
-<refmeta>
-	<refentrytitle>
-		<application>asterisk</application>
-	</refentrytitle>
-	<manvolnum>8</manvolnum>
-	<refmiscinfo>asterisk Trunk</refmiscinfo>
-</refmeta>
-<refnamediv>
-	<refname>
-		<application>asterisk</application>
-	</refname>
-	<refpurpose>
-	All-purpose telephony server.
-	</refpurpose>
-</refnamediv>
-<refsynopsisdiv>
-	<cmdsynopsis>
-	<command>asterisk</command>
-<arg><option>-BcdfFghiImnpqRtTvVW</option></arg>
-<arg><option>-C </option><replaceable class="parameter">file</replaceable></arg>
-<arg><option>-e </option><replaceable class="parameter">memory</replaceable></arg>
-<arg><option>-G </option><replaceable class="parameter">group</replaceable></arg>
-<arg><option>-L </option><replaceable class="parameter">loadaverage</replaceable></arg>
-<arg><option>-M </option><replaceable class="parameter">value</replaceable></arg>
-<arg><option>-U </option><replaceable class="parameter">user</replaceable></arg>
-<arg><option>-s </option><replaceable class="parameter">socket-file</replaceable></arg>
-<arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
-	</cmdsynopsis>
-	<cmdsynopsis>
-
-	<command>asterisk -r</command>
-	<arg><option>-v</option></arg>
-<arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
-	</cmdsynopsis>
-</refsynopsisdiv>
-<refsect1>
-	<refsect1info>
-		<date>2011-02-08</date>
-	</refsect1info>
-	<title>DESCRIPTION</title>
-	<para>
-	<command>asterisk</command> is a full-featured telephony server which
-	provides Private Branch eXchange (PBX), Interactive Voice Response (IVR),
-	Automated Call Distribution (ACD), Voice over IP (VoIP) gatewaying, 
-	Conferencing, and a plethora of other telephony applications to a broad
-	range of telephony devices including packet voice (SIP, IAX2, MGCP, Skinny,
-	H.323, Unistim) devices (both endpoints and proxies), as well as traditional TDM
-	hardware including T1, E1, ISDN PRI, GR-303, RBS, Loopstart, Groundstart,
-	ISDN BRI and many more.
-	</para>
-	<para>
-	At start, Asterisk reads the /etc/asterisk/asterisk.conf main configuration
-	file and locates the rest of the configuration files from the configuration
-	in that file. The -C option specifies an alternate main configuration file.
-	Virtually all aspects of the operation of asterisk's configuration files
-	can be found in the sample configuration files.  The format for those files
-	is generally beyond the scope of this man page.
-	</para>
-	<para>
-	When running with <command>-c</command>, <command>-r</command> or <command>-R</command>
-	options, Asterisk supplies a powerful command line, including command
-	completion, which may be used to monitors its status, perform a variety
-	of administrative actions and even explore the applications that are
-	currently loaded into the system.
-	</para>
-	<para>
-	Asterisk is a trademark of Digium, Inc.
-	</para>
-</refsect1>
-<refsect1>
-	<title>OPTIONS</title>
-	<variablelist>
-	<varlistentry>
-		<term>-B</term>
-		<listitem>
-			<para>
-			Force the background of the terminal to be black, in order for
-			terminal colors to show up properly.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-C <replaceable class="parameter">file</replaceable></term>
-		<listitem>
-			<para>
-			Use <filename>file</filename> as master configuration file
-			instead of the default, /etc/asterisk/asterisk.conf
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-c</term>
-		<listitem>
-			<para>
-			Provide a control console on the calling terminal.
-			Specifying this option implies <command>-f</command> and will cause
-			asterisk to no longer fork or detach from the controlling terminal.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-d</term>
-		<listitem>
-			<para>
-			Enable extra debugging statements.
-			</para>
-			<para>
-			Note: This always sets the debug level in the asterisk process,
-			even if it is running in the background. This may affect the size
-			of your log files, if the debug level is specified in logger.conf.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-e <replaceable class="parameter">memory</replaceable></term>
-		<listitem>
-			<para>
-			Limit the generation of new channels when the amount of free memory has decreased to under <replaceable>memory</replaceable> megabytes.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-f</term>
-		<listitem>
-			<para>
-			Do not fork or detach from controlling terminal.  Overrides any preceding specification of <command>-F</command> on the command line.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-F</term>
-		<listitem>
-			<para>
-			Always fork and detach from controlling terminal.  Overrides any preceding specification of <command>-f</command> on the command line.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-g</term>
-		<listitem>
-			<para>
-			Remove resource limit on core size, thus forcing Asterisk to dump
-			core in the unlikely event of a segmentation fault or abort signal.
-			<command>NOTE:</command> in some cases this may be incompatible
-			with the <command>-U</command> or <command>-G</command> flags.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-G <replaceable class="parameter">group</replaceable></term>
-		<listitem>
-			<para>
-			Run as group <replaceable>group</replaceable> instead of the
-			calling group.  <command>NOTE:</command> this requires substantial work
-			to be sure that Asterisk's environment has permission to write
-			the files required for its operation, including logs, its comm
-			socket, the asterisk database, etc.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-h</term>
-		<listitem>
-			<para>
-			Provide brief summary of command line arguments and terminate.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-i</term>
-		<listitem>
-			<para>
-			Prompt user to intialize any encrypted private keys for IAX2
-			secure authentication during startup.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-I</term>
-		<listitem>
-			<para>
-			Enable internal timing if DAHDI timing is available.
-			The default behaviour is that outbound packets are phase locked
-			to inbound packets. Enabling this switch causes them to be
-			locked to the internal DAHDI timer instead.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-L <replaceable class="parameter">loadaverage</replaceable></term>
-		<listitem>
-			<para>
-			Limits the maximum load average before rejecting new calls.  This can
-			be useful to prevent a system from being brought down by terminating
-			too many simultaneous calls.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-m</term>
-		<listitem>
-			<para>
-			Temporarily mutes output to the console and logs.  To return to normal,
-			use <command>logger mute</command>.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-M <replaceable class="parameter">value</replaceable></term>
-		<listitem>
-			<para>
-			Limits the maximum number of calls to the specified value.  This can
-			be useful to prevent a system from being brought down by terminating
-			too many simultaneous calls.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-n</term>
-		<listitem>
-			<para>
-			Disable ANSI colors even on terminals capable of displaying them.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-p</term>
-		<listitem>
-			<para>
-			If supported by the operating system (and executing as root),
-			attempt to run with realtime priority for increased performance and
-			responsiveness within the Asterisk process, at the expense of other
-			programs running on the same machine.
-			</para>
-			<para>
-			Note: <command>astcanary</command> will run concurrently with
-			<command>asterisk</command>. If <command>astcanary</command> stops
-			running or is killed, <command>asterisk</command> will slow down to
-			normal process priority, to avoid locking up the machine.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-q</term>
-		<listitem>
-			<para>
-			Reduce default console output when running in conjunction with
-			console mode (<command>-c</command>).
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-r</term>
-		<listitem>
-			<para>
-			Instead of running a new Asterisk process, attempt to connect
-			to a running Asterisk process and provide a console interface
-			for controlling it.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-R</term>
-		<listitem>
-			<para>
-			Much like <command>-r</command>.  Instead of running a new Asterisk process, attempt to connect
-			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.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-s <replaceable class="parameter">socket file name</replaceable></term>
-		<listitem>
-			<para>
-			In combination with <command>-r</command>, connect directly to a specified
-			Asterisk server socket.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-t</term>
-		<listitem>
-			<para>
-			When recording files, write them first into a temporary holding directory, 
-			then move them into the final location when done.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-T</term>
-		<listitem>
-			<para>
-			Add timestamp to all non-command related output going to the console
-			when running with verbose and/or logging to the console.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-U <replaceable class="parameter">user</replaceable></term>
-		<listitem>
-			<para>
-			Run as user <replaceable>user</replaceable> instead of the
-			calling user.  <command>NOTE:</command> this requires substantial work
-			to be sure that Asterisk's environment has permission to write
-			the files required for its operation, including logs, its comm
-			socket, the asterisk database, etc.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-v</term>
-		<listitem>
-			<para>
-			Increase the level of verboseness on the console.  The more times
-			<command>-v</command> is specified, the more verbose the output is.
-			Specifying this option implies <command>-f</command> and will cause
-			asterisk to no longer fork or detach from the controlling terminal.
-			This option may also be used in conjunction with <command>-r</command>
-			and <command>-R</command>.
-			</para>
-			<para>
-			Note: This always sets the verbose level in the asterisk process,
-			even if it is running in the background. This will affect the size
-			of your log files.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-V</term>
-		<listitem>
-			<para>
-			Display version information and exit immediately.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-W</term>
-		<listitem>
-			<para>
-			Display colored terminal text as if the background were white
-			or otherwise light in color.  Normally, terminal text is displayed
-			as if the background were black or otherwise dark in color.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-x <replaceable class="parameter">command</replaceable></term>
-		<listitem>
-			<para>
-			Connect to a running Asterisk process and execute a command on
-			a command line, passing any output through to standard out and
-			then terminating when the command execution completes.  Implies
-			<command>-r</command> when <command>-R</command> is not explicitly
-			supplied.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>-X</term>
-		<listitem>
-			<para>
-			Enables executing of includes via <command>#exec</command> directive.
-			This can be useful if You want to do <command>#exec</command> inside
-			<filename>asterisk.conf</filename>
-			</para>
-		</listitem>
-	</varlistentry>
-	</variablelist>
-</refsect1>
-<refsect1>
-	<title>EXAMPLES</title>
-	<para>
-	<command>asterisk</command> - Begin Asterisk as a daemon
-	</para>
-	<para>
-	<command>asterisk -vvvgc</command> - Run on controlling terminal
-	</para>
-	<para>
-	<command>asterisk -rx "core show channels"</command> - Display channels on running server
-	</para>
-</refsect1>
-<refsect1>
-	<title>BUGS</title>
-	<para>
-	Bug reports and feature requests may be filed at https://issues.asterisk.org
-	</para>
-</refsect1>
-<refsect1>
-	<title>SEE ALSO</title>
-	<para>
-	*CLI&gt; <command>help</command> - Help on Asterisk CLI
-	</para>
-	<para>
-	*CLI&gt; <command>core show applications</command> - Show loaded dialplan applications
-	</para>
-	<para>
-	*CLI&gt; <command>core show functions</command> - Show loaded dialplan functions
-	</para>
-	<para>
-	*CLI&gt; <command>dialplan show</command> - Show current dialplan
-	</para>
-	<para>
-	http://www.asterisk.org - The Asterisk Home Page
-	</para>
-	<para>
-	http://www.asteriskdocs.org - The Asterisk Documentation Project
-	</para>
-	<para>
-	http://wiki.asterisk.org - The Asterisk Wiki
-	</para>
-	<para>
-	http://www.digium.com/ - Asterisk sponsor and hardware supplier
-	</para>
-</refsect1>
-<refsect1>
-	<title>AUTHOR</title>
-	<para>
-	<author>
-		<firstname>Mark Spencer &lt;markster at digium.com&gt;</firstname> 
-	</author>
-	</para>
-	<para>
-	<author>
-		<firstname>Countless other contributors, see CREDITS with distribution for more information.</firstname> 
-	</author>
-	</para>
-</refsect1>
+ <refentryinfo>
+  <date>2011-02-08</date>
+ </refentryinfo>
+ <refmeta>
+  <refentrytitle>
+   <application>asterisk</application>
+  </refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo>asterisk Trunk</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+  <refname>
+   <application>asterisk</application>
+  </refname>
+  <refpurpose>
+   All-purpose telephony server.
+  </refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis>
+   <command>asterisk</command>
+   <arg><option>-BcdfFghiImnpqRtTvVW</option></arg>
+   <arg><option>-C </option><replaceable class="parameter">file</replaceable></arg>
+   <arg><option>-e </option><replaceable class="parameter">memory</replaceable></arg>
+   <arg><option>-G </option><replaceable class="parameter">group</replaceable></arg>
+   <arg><option>-L </option><replaceable class="parameter">loadaverage</replaceable></arg>
+   <arg><option>-M </option><replaceable class="parameter">value</replaceable></arg>
+   <arg><option>-U </option><replaceable class="parameter">user</replaceable></arg>
+   <arg><option>-s </option><replaceable class="parameter">socket-file</replaceable></arg>
+  </cmdsynopsis>
+  <cmdsynopsis>
+   <command>asterisk -r</command>
+   <arg><option>-v</option></arg>
+   <arg><option>-d</option></arg>
+   <arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
+  </cmdsynopsis>
+  <cmdsynopsis>
+   <command>asterisk -R</command>
+   <arg><option>-v</option></arg>
+   <arg><option>-d</option></arg>
+   <arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
+  </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+  <refsect1info>
+   <date>2011-02-08</date>
+  </refsect1info>
+  <title>DESCRIPTION</title>
+  <para>
+   <command>asterisk</command> is a full-featured telephony server which
+   provides Private Branch eXchange (PBX), Interactive Voice Response (IVR),
+   Automated Call Distribution (ACD), Voice over IP (VoIP) gatewaying, 
+   Conferencing, and a plethora of other telephony applications to a broad
+   range of telephony devices including packet voice (SIP, IAX2, MGCP, Skinny,
+   H.323, Unistim) devices (both endpoints and proxies), as well as traditional TDM
+   hardware including T1, E1, ISDN PRI, GR-303, RBS, Loopstart, Groundstart,
+   ISDN BRI and many more.
+  </para>
+  <para>
+   At start, Asterisk reads the /etc/asterisk/asterisk.conf main configuration
+   file and locates the rest of the configuration files from the configuration
+   in that file. The -C option specifies an alternate main configuration file.
+   Virtually all aspects of the operation of asterisk's configuration files
+   can be found in the sample configuration files.  The format for those files
+   is generally beyond the scope of this man page.
+  </para>
+  <para>
+   When running with <command>-c</command>, <command>-r</command> or <command>-R</command>
+   options, Asterisk supplies a powerful command line, including command
+   completion, which may be used to monitors its status, perform a variety
+   of administrative actions and even explore the applications that are
+   currently loaded into the system.
+  </para>
+  <para>
+   Asterisk is a trademark of Digium, Inc.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>OPTIONS</title>
+  <para>
+   Running Asterisk starts the asterisk daemon (optionally running it
+   in the foreground). However running it with <option>-r</option> or
+   <option>-R</option> connects to an existing Asterisk instance through
+   a remote console.
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term>-B</term>
+    <listitem>
+     <para>
+      Force the background of the terminal to be black, in order for
+      terminal colors to show up properly. Equivalent to
+      <option>forceblackbackground = yes</option> in
+      <filename>asterisk.conf</filename>. See also
+      <option>-n</option> and <option>-W</option>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-C <replaceable class="parameter">file</replaceable></term>
+    <listitem>
+     <para>
+      Use <filename>file</filename> as master configuration file
+      instead of the default, /etc/asterisk/asterisk.conf
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-c</term>
+    <listitem>
+     <para>
+      Provide a control console on the calling terminal. The
+      console is similar to the remote console provided by
+      <option>-r</option>. Specifying this option implies 
+      <command>-f</command> and will cause asterisk to no longer 
+      fork or detach from the controlling terminal. Equivalent 
+      to <option>console = yes</option> in <filename>asterisk.conf</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-d</term>
+    <listitem>
+     <para>
+      Enable extra debugging statements. This parameter may be used several
+      times, and each increases the debug level.  Equivalent to <option>debug = <replaceable>num</replaceable></option>
+      in <filename>asterisk.conf</filename> to explicitly set the initian debug
+      level to <replaceable>num</replaceable>. When given at startup, this
+      option also implies <option>-f</option> (no forking). However when
+      connecting to an existing Asterisk instance (<option>-r</option> or
+      <option>-R</option>), it may only increase the debug level.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-e <replaceable class="parameter">memory</replaceable></term>
+    <listitem>
+     <para>
+      Limit the generation of new channels when the amount of free memory 
+      has decreased to under <replaceable>memory</replaceable> megabytes.
+      Equivalent to <option>minmemfree = <replaceable>memory</replaceable></option> in
+      <filename>asterisk.conf</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-f</term>
+    <listitem>
+     <para>
+      Do not fork or detach from controlling terminal.  Overrides any
+      preceding specification of <command>-F</command> on the command line.
+      Equivalent to <option>nofork = yes</option> in <filename>asterisk.conf</filename>.
+      See also <option>-c</option>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-F</term>
+    <listitem>
+     <para>
+      Always fork and detach from controlling terminal.  Overrides any
+      preceding specification of <command>-f</command> on the command line.
+      May also be used to prevent <option>-d</option> and <option>-v</option> to imply
+      no forking. Equivalent to <option>alwaysfork = yes</option> in <filename>asterisk.conf</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-g</term>
+    <listitem>
+     <para>
+      Remove resource limit on core size, thus forcing Asterisk to dump
+      core in the unlikely event of a segmentation fault or abort signal.
+      <command>NOTE:</command> in some cases this may be incompatible
+      with the <command>-U</command> or <command>-G</command> flags.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-G <replaceable class="parameter">group</replaceable></term>
+    <listitem>
+     <para>
+      Run as group <replaceable>group</replaceable> instead of the
+      calling group.  <command>NOTE:</command> this requires substantial work
+      to be sure that Asterisk's environment has permission to write
+      the files required for its operation, including logs, its comm
+      socket, the asterisk database, etc.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-h</term>
+    <listitem>
+     <para>
+      Provide brief summary of command line arguments and terminate.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-i</term>
+    <listitem>
+     <para>
+      Prompt user to intialize any encrypted private keys for IAX2
+      secure authentication during startup.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-I</term>
+    <listitem>
+     <para>
+      Enable internal timing if DAHDI timing is available.
+      The default behaviour is that outbound packets are phase locked
+      to inbound packets. Enabling this switch causes them to be
+      locked to the internal DAHDI timer instead.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-L <replaceable class="parameter">loadaverage</replaceable></term>
+    <listitem>
+     <para>
+      Limits the maximum load average before rejecting new calls.  This can
+      be useful to prevent a system from being brought down by terminating
+      too many simultaneous calls.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-m</term>
+    <listitem>
+     <para>
+      Temporarily mutes output to the console and logs.  To return to normal,
+      use <command>logger mute</command>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-M <replaceable class="parameter">value</replaceable></term>
+    <listitem>
+     <para>
+      Limits the maximum number of calls to the specified value.  This can
+      be useful to prevent a system from being brought down by terminating
+      too many simultaneous calls.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>-n</term>
+    <listitem>
+     <para>

[... 263 lines stripped ...]



More information about the asterisk-commits mailing list