[asterisk-commits] rmudgett: branch dvossel/generic_aoc r258431 - in /team/dvossel/generic_aoc: ...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Apr 21 15:26:59 CDT 2010 

Author: rmudgett
Date: Wed Apr 21 15:26:55 2010
New Revision: 258431

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258431
Log:
Merged revisions 258328,258368,258388,258416 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/rmudgett/aoc_event

................
  r258328 | root | 2010-04-21 13:22:32 -0500 (Wed, 21 Apr 2010) | 26 lines
  
  Merged revisions 258307 via svnmerge from 
  file:///srv/subversion/repos/asterisk/team/group/CCSS
  
  ................
    r258307 | root | 2010-04-21 13:17:32 -0500 (Wed, 21 Apr 2010) | 19 lines
    
    Merged revisions 258305 via svnmerge from 
    file:///srv/subversion/repos/asterisk/trunk
    
    ........
      r258305 | dvossel | 2010-04-21 13:13:36 -0500 (Wed, 21 Apr 2010) | 12 lines
      
      fixes issue with double "sip:" in header field
      
      This is a clear mistake in logic.  Future discussions
      about how to avoid having to handle uri's like this
      should take place in the future, but this fix needs
      to go in for now.
      
      (closes issue #15847)
      Reported by: ebroad
      Patches:
            doublesip.patch uploaded by ebroad (license 878)
    ........
  ................
................
  r258368 | root | 2010-04-21 14:23:18 -0500 (Wed, 21 Apr 2010) | 1 line
  
  automerge cancel
................
  r258388 | rmudgett | 2010-04-21 15:06:42 -0500 (Wed, 21 Apr 2010) | 29 lines
  
  Merged revisions 258347 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/team/group/CCSS
  
  ................
    r258347 | root | 2010-04-21 14:17:44 -0500 (Wed, 21 Apr 2010) | 22 lines
    
    Merged revisions 258344-258345 via svnmerge from 
    file:///srv/subversion/repos/asterisk/trunk
    
    ........
      r258344 | lmadsen | 2010-04-21 14:02:45 -0500 (Wed, 21 Apr 2010) | 7 lines
      
      IAXpeers output now matches SIPpeers format for manager (AMI).
      
      (closes issue #17100)
      Reported by: secesh
      Tested by: pabelanger
      
      Review: https://reviewboard.asterisk.org/r/594/
    ........
      r258345 | mmichelson | 2010-04-21 14:07:25 -0500 (Wed, 21 Apr 2010) | 6 lines
      
      Add small documentation update to func_callcompletion.c.
      
      This directs users to documents which can help explain the
      concepts and configuration options settable with the function.
    ........
  ................
................
  r258416 | root | 2010-04-21 15:22:39 -0500 (Wed, 21 Apr 2010) | 45 lines
  
  Merged revisions 258390 via svnmerge from 
  file:///srv/subversion/repos/asterisk/team/group/CCSS
  
  ................
    r258390 | root | 2010-04-21 15:17:44 -0500 (Wed, 21 Apr 2010) | 38 lines
    
    Merged revisions 258351,258383,258387 via svnmerge from 
    file:///srv/subversion/repos/asterisk/trunk
    
    ........
      r258351 | lmadsen | 2010-04-21 14:18:35 -0500 (Wed, 21 Apr 2010) | 20 lines
      
      Add ability to generate ASCII documentation from the TeX files.
      
      These changes add the ability to run 'make asterisk.txt' just like the existing
      'make asterisk.pdf' commands to generate a text document from the TeX files we
      have in the doc/tex/ directory. I've also updated a few of the .tex files because
      they weren't properly escaping certain characters so they would show up as Unicode
      characters (like [U+021C]). Made changes to the configure scripts so it would
      detect the catdvi program which is required to convert the .dvi file generated
      by latex.
      
      I've also added a few lines to the build_tools/prep_tarball script so that the
      text documentation gets generated and added to future tarballs of Asterisk
      releases.
      
      (closes issue #17220)
      Reported by: lmadsen
      Patches: 
            asterisk.txt.patch uploaded by lmadsen (license 10)
            asterisk.txt.patch-v4 uploaded by pabelanger (license 224)
      Tested by: lmadsen, pabelanger
    ........
      r258383 | lmadsen | 2010-04-21 14:27:41 -0500 (Wed, 21 Apr 2010) | 3 lines
      
      Fix change in asterisk.tex that got merged in after testing.
      
      (issue #17220)
    ........
      r258387 | lmadsen | 2010-04-21 14:45:33 -0500 (Wed, 21 Apr 2010) | 1 line
      
      Missed this when reverting the bad version change in asterisk.tex.
    ........
  ................
................

Modified:
    team/dvossel/generic_aoc/   (props changed)
    team/dvossel/generic_aoc/CHANGES
    team/dvossel/generic_aoc/Makefile
    team/dvossel/generic_aoc/UPGRADE.txt
    team/dvossel/generic_aoc/build_tools/prep_tarball
    team/dvossel/generic_aoc/channels/chan_iax2.c
    team/dvossel/generic_aoc/channels/chan_sip.c
    team/dvossel/generic_aoc/configure
    team/dvossel/generic_aoc/configure.ac
    team/dvossel/generic_aoc/doc/tex/   (props changed)
    team/dvossel/generic_aoc/doc/tex/Makefile
    team/dvossel/generic_aoc/doc/tex/ael.tex
    team/dvossel/generic_aoc/doc/tex/asterisk.tex
    team/dvossel/generic_aoc/doc/tex/cel-doc.tex
    team/dvossel/generic_aoc/doc/tex/enum.tex
    team/dvossel/generic_aoc/doc/tex/localchannel.tex
    team/dvossel/generic_aoc/doc/tex/phoneprov.tex
    team/dvossel/generic_aoc/doc/tex/security-events.tex
    team/dvossel/generic_aoc/funcs/func_callcompletion.c
    team/dvossel/generic_aoc/include/asterisk/autoconfig.h.in
    team/dvossel/generic_aoc/makeopts.in

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
--- aoc_event-integrated (original)
+++ aoc_event-integrated Wed Apr 21 15:26:55 2010
@@ -1,1 +1,1 @@
-/team/group/CCSS:1-258300
+/team/group/CCSS:1-258415

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
--- generic_aoc-integrated (original)
+++ generic_aoc-integrated Wed Apr 21 15:26:55 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/aoc_event:1-258301
+/team/rmudgett/aoc_event:1-258424

Modified: team/dvossel/generic_aoc/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/CHANGES?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/CHANGES (original)
+++ team/dvossel/generic_aoc/CHANGES Wed Apr 21 15:26:55 2010
@@ -359,6 +359,8 @@
    status.
  * Added a "MixMonitorMute" AMI action for muting inbound and/or outbound audio
    in a MixMonitor recording.
+ * The 'iax2 show peers' output is now similar to the expected output of
+   'sip show peers'.
  * Added Advice-Of-Charge events (AOC-S, AOC-D, and AOC-E) in the new
    aoc event class.
 

Modified: team/dvossel/generic_aoc/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/Makefile?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/Makefile (original)
+++ team/dvossel/generic_aoc/Makefile Wed Apr 21 15:26:55 2010
@@ -987,6 +987,10 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
+txt: asterisk.txt
+asterisk.txt:
+	$(MAKE) -C doc/tex asterisk.txt
+
 .PHONY: menuselect
 .PHONY: main
 .PHONY: sounds

Modified: team/dvossel/generic_aoc/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/UPGRADE.txt?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/UPGRADE.txt (original)
+++ team/dvossel/generic_aoc/UPGRADE.txt Wed Apr 21 15:26:55 2010
@@ -74,6 +74,9 @@
   OSPCALLING to OSPOUTCALLING
   OSPCALLED to OSPOUTCALLED
   OSPRESULTS to OSPDESTREMAILS
+
+* The Manager event 'iax2 show peers' output has been updated.  It now has a
+  similar output of 'sip show peers'.
 
 From 1.6.1 to 1.6.2:
 

Modified: team/dvossel/generic_aoc/build_tools/prep_tarball
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/build_tools/prep_tarball?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/build_tools/prep_tarball (original)
+++ team/dvossel/generic_aoc/build_tools/prep_tarball Wed Apr 21 15:26:55 2010
@@ -15,6 +15,8 @@
     mv asterisk_local.tex asterisk.tex
     rubber --pdf asterisk.tex
     latex2html asterisk.tex
+    latex asterisk.tex
+    catdvi -e 1 -U asterisk.dvi | sed -re "s/\[U\+2022\]/*/g" | sed -re "s/\[U\+02C6\]/^/g" | sed -re "s/([^^[:space:]])\s+/\1 /g" > asterisk.txt
     # restore backup of asterisk.tex
     mv asterisk.tex.orig asterisk.tex
 }

Modified: team/dvossel/generic_aoc/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/chan_iax2.c?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/channels/chan_iax2.c (original)
+++ team/dvossel/generic_aoc/channels/chan_iax2.c Wed Apr 21 15:26:55 2010
@@ -6422,7 +6422,7 @@
 #undef FORMAT2
 }
 
-static int __iax2_show_peers(int manager, int fd, struct mansession *s, const int argc, const char * const argv[])
+static int __iax2_show_peers(int fd, int *total, struct mansession *s, const int argc, const char * const argv[])
 {
 	regex_t regexbuf;
 	int havepattern = 0;
@@ -6432,18 +6432,17 @@
 	int unmonitored_peers = 0;
 	struct ao2_iterator i;
 
-#define FORMAT2 "%-15.15s  %-15.15s %s  %-15.15s  %-8s  %s %-10s%s"
-#define FORMAT "%-15.15s  %-15.15s %s  %-15.15s  %-5d%s  %s %-10s%s"
+#define FORMAT2 "%-15.15s  %-15.15s %s  %-15.15s  %-8s  %s %-10s\n"
+#define FORMAT "%-15.15s  %-15.15s %s  %-15.15s  %-5d%s  %s %-10s\n"
 
 	struct iax2_peer *peer = NULL;
 	char name[256];
 	struct ast_str *encmethods = ast_str_alloca(256);
 	int registeredonly=0;
-	char *term = manager ? "\r\n" : "\n";
 	char idtext[256] = "";
 	switch (argc) {
 	case 6:
- 		if (!strcasecmp(argv[3], "registered"))
+		if (!strcasecmp(argv[3], "registered"))
 			registeredonly = 1;
 		else
 			return RESULT_SHOWUSAGE;
@@ -6476,10 +6475,10 @@
 
 
 	if (!s)
-		ast_cli(fd, FORMAT2, "Name/Username", "Host", "   ", "Mask", "Port", "   ", "Status", term);
+		ast_cli(fd, FORMAT2, "Name/Username", "Host", "   ", "Mask", "Port", "   ", "Status");
 
 	i = ao2_iterator_init(peers, 0);
-	for (peer = ao2_iterator_next(&i); peer; 
+	for (peer = ao2_iterator_next(&i); peer;
 		peer_unref(peer), peer = ao2_iterator_next(&i)) {
 		char nm[20];
 		char status[20];
@@ -6534,18 +6533,21 @@
 				ntohs(peer->addr.sin_port),
 				ast_test_flag64(peer, IAX_TRUNK) ? "(T)" : "   ",
 				peer->encmethods ? "(E)" : "   ",
-				status,
-				term);
+				status);
 		}
 		total_peers++;
 	}
 	ao2_iterator_destroy(&i);
 
 	if (!s)
-		ast_cli(fd,"%d iax2 peers [%d online, %d offline, %d unmonitored]%s", total_peers, online_peers, offline_peers, unmonitored_peers, term);
+		ast_cli(fd,"%d iax2 peers [%d online, %d offline, %d unmonitored]\n",
+			total_peers, online_peers, offline_peers, unmonitored_peers);
 
 	if (havepattern)
 		regfree(&regexbuf);
+
+	if (total)
+		*total = total_peers;
 
 	return RESULT_SUCCESS;
 #undef FORMAT
@@ -6704,7 +6706,7 @@
 		return NULL;
 	}
 
-	switch (__iax2_show_peers(0, a->fd, NULL, a->argc, a->argv)) {
+	switch (__iax2_show_peers(a->fd, NULL, NULL, a->argc, a->argv)) {
 	case RESULT_SHOWUSAGE:
 		return CLI_SHOWUSAGE;
 	case RESULT_FAILURE:
@@ -6758,12 +6760,23 @@
 	static const char * const a[] = { "iax2", "show", "peers" };
 	const char *id = astman_get_header(m,"ActionID");
 	char idtext[256] = "";
+	int total = 0;
 
 	if (!ast_strlen_zero(id))
 		snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
-	astman_send_ack(s, m, "Peer status list will follow");
-	return __iax2_show_peers(1, -1, s, 3, a);
-} 
+
+	astman_send_listack(s, m, "Peer status list will follow", "start");
+        /* List the peers in separate manager events */
+	__iax2_show_peers(-1, &total, s, 3, a);
+        /* Send final confirmation */
+        astman_append(s,
+        "Event: PeerlistComplete\r\n"
+        "EventList: Complete\r\n"
+        "ListItems: %d\r\n"
+        "%s"
+        "\r\n", total, idtext);
+        return 0;
+}
 
 /*! \brief callback to display iax peers in manager format */
 static int manager_iax2_show_peer_list(struct mansession *s, const struct message *m)

Modified: team/dvossel/generic_aoc/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/chan_sip.c?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/channels/chan_sip.c (original)
+++ team/dvossel/generic_aoc/channels/chan_sip.c Wed Apr 21 15:26:55 2010
@@ -10557,7 +10557,7 @@
  	} else {
  		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
  			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
-			snprintf(to, sizeof(to), "<%s%s>;tag=%s", (!strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
+			snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
  		} else if (p->options && p->options->vxml_url) {
  			/* If there is a VXML URL append it to the SIP URL */
  			snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);

Modified: team/dvossel/generic_aoc/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/configure.ac?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/configure.ac (original)
+++ team/dvossel/generic_aoc/configure.ac Wed Apr 21 15:26:55 2010
@@ -197,6 +197,7 @@
 AC_PATH_PROG([WGET], [wget], :)
 AC_PATH_PROG([CURL], [curl], :)
 AC_PATH_PROG([RUBBER], [rubber], :)
+AC_PATH_PROG([CATDVI], [catdvi], :)
 AC_PATH_PROG([KPATHSEA], [kpsewhich], :)
 AC_PATH_PROG([XMLSTARLET], [xmlstarlet], :)
 if test "${WGET}" != ":" ; then

Propchange: team/dvossel/generic_aoc/doc/tex/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 21 15:26:55 2010
@@ -3,3 +3,5 @@
 asterisk.out
 asterisk.log
 asterisk.toc
+asterisk.dvi
+asterisk.txt

Modified: team/dvossel/generic_aoc/doc/tex/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/Makefile?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/Makefile (original)
+++ team/dvossel/generic_aoc/doc/tex/Makefile Wed Apr 21 15:26:55 2010
@@ -20,7 +20,7 @@
 	@echo "WARNING:  The fncychap.sty document was not found"
 	@echo "On Ubuntu, install the texlive-latex-extra package."
 	@echo
-	@exit
+	@exit 1
 endif
 endif
 	@cp asterisk.tex asterisk.tex.orig
@@ -44,3 +44,33 @@
 	@latex2html asterisk.tex
 	@mv asterisk.tex.orig asterisk.tex
 
+txt: asterisk.txt
+
+asterisk.txt: $(wildcard *.tex)
+ifeq ($(findstring catdvi,$(CATDVI)),)
+	@echo "**********************************************"
+	@echo "** You must install the \"catdvi\" tool      ***"
+	@echo "** to generate the Asterisk reference TXT. ***"
+	@echo "**********************************************"
+else
+	@echo "**********************************************"
+	@echo "** The Asterisk reference TXT will now be  ***"
+	@echo "** generated.  When complete, it will be   ***"
+	@echo "** located at asterisk.txt.                ***"	
+	@echo "**********************************************"
+ifneq ($(findstring kpsewhich,$(KPATHSEA)),)
+ifeq ($(findstring fncychap.sty,$(shell find `$(KPATHSEA) --expand-braces='$${TEXMF}'| tr -d \! | sed 's/:/ /g'` -name fncychap.sty -print)),)
+	@echo
+	@echo "WARNING:  The fncychap.sty document was not found"
+	@echo "On Ubuntu, install the texlive-latex-extra package."
+	@echo
+	@exit 1
+endif
+endif
+	@cp asterisk.tex asterisk.tex.orig
+	@sed -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' asterisk.tex > asterisk_local.tex
+	@mv asterisk_local.tex asterisk.tex
+	@latex asterisk.tex
+	-@$(CATDVI) -e 1 -U asterisk.dvi | sed -re "s/\[U\+2022\]/*/g" | sed -re "s/\[U\+02C6\]/^/g" | sed -re "s/([^^[:space:]])\s+/\1 /g" > asterisk.txt
+	@mv asterisk.tex.orig asterisk.tex
+endif

Modified: team/dvossel/generic_aoc/doc/tex/ael.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/ael.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/ael.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/ael.tex Wed Apr 21 15:26:55 2010
@@ -128,7 +128,7 @@
 To reload extensions.ael, the following command can be issued at the
 CLI:
 
-    *CLI> ael reload
+    *CLI$>$ ael reload
 
 \section{Debugging}
 
@@ -735,7 +735,7 @@
 
 NOTE: These things are wrapped up in a \$[ ] expression: The while() test;
 the if() test; the middle expression in the for( x; y; z) statement
-(the y expression); Assignments - the right hand side, so a = b -> Set(a=\$[b])
+(the y expression); Assignments - the right hand side, so a = b -$>$ Set(a=\$[b])
 
 Writing to a dialplan function is treated the same as writing to a variable.
 

Modified: team/dvossel/generic_aoc/doc/tex/asterisk.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/asterisk.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/asterisk.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/asterisk.tex Wed Apr 21 15:26:55 2010
@@ -32,7 +32,7 @@
 
 
 \author{Asterisk Development Team \\ Asterisk.org}
-\title{Asterisk Reference Information \\ ASTERISKVERSION}
+\title{Asterisk Reference Information \\ Version ASTERISKVERSION}
 
 \begin{document}
 \maketitle

Modified: team/dvossel/generic_aoc/doc/tex/cel-doc.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/cel-doc.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/cel-doc.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/cel-doc.tex Wed Apr 21 15:26:55 2010
@@ -141,7 +141,7 @@
 
 "EV\_CHAN\_END","2007-05-09 12:49:26","","151","152","","","","extension","Zap/51-1","Bridged Call","Zap/50-1","DOCUMENTATION","","1178736378.4","",""                     ;;; 151 channel ends
 
-"EV\_CHAN\_END","2007-05-09 12:49:26","fxs.51","151","151","","","h","extension","Zap/51-2<ZOMBIE>","","","DOCUMENTATION","","1178736428.5","",""                          ;;; 152-2 channel ends (zombie)
+"EV\_CHAN\_END","2007-05-09 12:49:26","fxs.51","151","151","","","h","extension","Zap/51-2$<$ZOMBIE$>$","","","DOCUMENTATION","","1178736428.5","",""                          ;;; 152-2 channel ends (zombie)
 
 {\it (just 150 and 152 now)}
 
@@ -820,9 +820,9 @@
 correspond to the following two CDR records (at the moment!):
 
 \begin{astlisting}
-""fxs.52" <152>","152","h","extension","Zap/52-1","Zap/51-1","NoOp","More Hangup message after hopping around"","2007-05-09 17:35:56","2007-05-09 17:36:20","2007-05-09 17:36:36","40","16","ANSWERED","DOCUMENTATION","","1178753756.0",""
-
-""fxs.50" <150>","150","152","extension","Zap/50-1","Zap/51-1","NoOp","More Hangup message after hopping around"","2007-05-09 17:37:59","2007-05-09 17:38:06","2007-05-09 17:39:11","72","65","ANSWERED","DOCUMENTATION","","1178753871.3",""
+""fxs.52" $<$152$>$","152","h","extension","Zap/52-1","Zap/51-1","NoOp","More Hangup message after hopping around"","2007-05-09 17:35:56","2007-05-09 17:36:20","2007-05-09 17:36:36","40","16","ANSWERED","DOCUMENTATION","","1178753756.0",""
+
+""fxs.50" $<$150$>$","150","152","extension","Zap/50-1","Zap/51-1","NoOp","More Hangup message after hopping around"","2007-05-09 17:37:59","2007-05-09 17:38:06","2007-05-09 17:39:11","72","65","ANSWERED","DOCUMENTATION","","1178753871.3",""
 \end{astlisting}
 
 

Modified: team/dvossel/generic_aoc/doc/tex/enum.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/enum.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/enum.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/enum.tex Wed Apr 21 15:26:55 2010
@@ -53,7 +53,7 @@
      ALL. Default type is "sip".
      Special name of "ALL" will create a list of method types across
      all NAPTR records for the search number, and then put the results
-     in an ordinal list starting with 1. The position <number>
+     in an ordinal list starting with 1. The position $<$number$>$
      specified will then be returned, starting with 1 as the first
      record (lowest value) in the list.  The service types are not
      hardcoded in Asterisk except for the default (sip) if no other
@@ -75,11 +75,11 @@
   \item record\#
   \begin{itemize}
     \item which record to present if multiple answers are returned
-    <integer> = The record in priority/order sequence based on the
+    $<$integer$>$ = The record in priority/order sequence based on the
     total count of records passed back by the query. If a service\_type
     is specified, all entries of that type will be sorted into an
     ordinal list starting with 1 (by order first, then priority).
-    The default of <options> is "1"
+    The default of $<$options$>$ is "1"
   \end{itemize}
 
   \item zone\_suffix

Modified: team/dvossel/generic_aoc/doc/tex/localchannel.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/localchannel.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/localchannel.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/localchannel.tex Wed Apr 21 15:26:55 2010
@@ -383,11 +383,13 @@
 
 This following dialplan will not perform as expected.
 
+\begin{verbatim}
 [services]
 exten => 2,1,Dial(SIP/PHONE\_B,,L(60000:45000:15000))
 
 [internal]
-exten => 4,1,Dial(Local/2 at services);
+exten => 4,1,Dial(Local/2 at services)
+\end{verbatim}
 
 By default, the Local channel will try to optimize itself out of the call path.
 This means that once the Local channel has established the call between the

Modified: team/dvossel/generic_aoc/doc/tex/phoneprov.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/phoneprov.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/phoneprov.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/phoneprov.tex Wed Apr 21 15:26:55 2010
@@ -79,7 +79,7 @@
 
 Since phone-specific config files generally have file names based on phone-specifc data, 
 dynamic filenames in res\_phoneprov can be defined with Asterisk dialplan function and 
-variable substitution. In the above example, \$\{TOLOWER(\$\{MAC\})\}.cfg $\Rightarrow$ 
+variable substitution. In the above example, \$\{TOLOWER(\$\{MAC\})\}.cfg =$>$
 000000000000.cfg would define a relative URI to be served that matches the format of 
 MACADDRESS.cfg, all lower case. A request for that file would then point to the template 
 found at AST\_DATA\_DIR/phoneprov/000000000000.cfg. The template can be followed by a 
@@ -96,8 +96,8 @@
 dynamic filename.
 
 NOTE: Any dialplan function that is used for generation of dynamic file names MUST be 
-loaded before res\_phoneprov. Add "preload $\Rightarrow$ modulename.so" to 
-\path{modules.conf} for required functions. In the example above, "preload $\Rightarrow$ 
+loaded before res\_phoneprov. Add "preload =$>$ modulename.so" to 
+\path{modules.conf} for required functions. In the example above, "preload =$>$
 func\_strings.so" would be required.
 
 \section{Configuration of users.conf}

Modified: team/dvossel/generic_aoc/doc/tex/security-events.tex
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/doc/tex/security-events.tex?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/doc/tex/security-events.tex (original)
+++ team/dvossel/generic_aoc/doc/tex/security-events.tex Wed Apr 21 15:26:55 2010
@@ -147,7 +147,7 @@
     [Feb 11 07:57:03] SECURITY[23736] res_security_log.c: <...>
 \end{verbatim}
 
-    The part of the log entry identified by <...> is where the security event
+    The part of the log entry identified by $<$...$>$ is where the security event
 content resides.  The security event content is a comma separated list
 of key value pairs.  The key is the information element type, and the value is a
 quoted string that contains the associated meta data for that information

Modified: team/dvossel/generic_aoc/funcs/func_callcompletion.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/funcs/func_callcompletion.c?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/funcs/func_callcompletion.c (original)
+++ team/dvossel/generic_aoc/funcs/func_callcompletion.c Wed Apr 21 15:26:55 2010
@@ -56,7 +56,10 @@
 			<para>The CALLCOMPLETION function can be used to get or set a call
 			completion configuration parameter for a channel. Note that setting
 			a configuration parameter will only change the parameter for the
-			duration of the call.</para>
+			duration of the call.
+			
+			For more information on call completion in Asterisk, see <filename>doc/tex/ccss.tex</filename>.
+			For more information on call completion parameters, see <filename>configs/ccss.conf.sample</filename>.</para>
 		</description>
 	</function>
  ***/

Modified: team/dvossel/generic_aoc/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/include/asterisk/autoconfig.h.in?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/include/asterisk/autoconfig.h.in (original)
+++ team/dvossel/generic_aoc/include/asterisk/autoconfig.h.in Wed Apr 21 15:26:55 2010
@@ -1292,6 +1292,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
+
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1310,6 +1313,11 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
+
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+   second argument and the buffer pointer as the third, as on System V before
+   release 3. */
+#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1340,46 +1348,50 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: team/dvossel/generic_aoc/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/makeopts.in?view=diff&rev=258431&r1=258430&r2=258431
==============================================================================
--- team/dvossel/generic_aoc/makeopts.in (original)
+++ team/dvossel/generic_aoc/makeopts.in Wed Apr 21 15:26:55 2010
@@ -25,6 +25,7 @@
 FETCH=@FETCH@
 DOWNLOAD=@DOWNLOAD@
 RUBBER=@RUBBER@
+CATDVI=@CATDVI@
 KPATHSEA=@KPATHSEA@
 XMLSTARLET=@XMLSTARLET@
 MD5=@MD5@

More information about the asterisk-commits mailing list