[svn-commits] murf: branch group/newcdr r162872 - in /team/group/newcdr: ./ apps/ build_too...

Wed Dec 10 15:26:48 CST 2008

Author: murf
Date: Wed Dec 10 15:26:47 2008
New Revision: 162872

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162872
Log:
Merged revisions 159818,159853,159898,159911,160004,160062,160097,160170-160172,160208,160308,160319,160333,160344,160346,160447,160481,160552,160555,160559,160562,160585,160626,160663,160699-160700,160760,160765,160791,160854,160856,160896,160938,160945,161014,161077,161115,161147,161181,161218,161252,161288,161349-161350,161427,161493,161536,161571,161604,161637,161679,161721,161726,161787,161790,161830 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r159818 | kpfleming | 2008-11-29 10:57:39 -0700 (Sat, 29 Nov 2008) | 18 lines
  
  incorporates r159808 from branches/1.4:
  ------------------------------------------------------------------------
  r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines
  
  update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors
  
  since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them
  
  format attributes in a consistent way
  
  
  ------------------------------------------------------------------------
  
  in addition:
  
  move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings
................
  r159853 | tilghman | 2008-11-29 11:33:18 -0700 (Sat, 29 Nov 2008) | 2 lines
  
  Allow the '#' sign to exist within an extension (inspired by issue #13330)
................
  r159898 | mvanbaak | 2008-12-01 07:09:59 -0700 (Mon, 01 Dec 2008) | 11 lines
  
  Merged revisions 159897 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159897 | mvanbaak | 2008-12-01 15:05:41 +0100 (Mon, 01 Dec 2008) | 4 lines
    
    make manager compile on OpenBSD.
    The last (10th) argument to ast_channel_alloc here should be a pointer
    and NULL is not really a pointer.
  ........
................
  r159911 | russell | 2008-12-01 07:56:10 -0700 (Mon, 01 Dec 2008) | 10 lines
  
  Merged revisions 159900 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r159900 | russell | 2008-12-01 08:52:56 -0600 (Mon, 01 Dec 2008) | 2 lines
  
  Force a "make clean" to avoid a bizarre build issue ...
  
  ........
................
  r160004 | russell | 2008-12-01 10:34:31 -0700 (Mon, 01 Dec 2008) | 14 lines
  
  Merged revisions 160003 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r160003 | russell | 2008-12-01 11:27:30 -0600 (Mon, 01 Dec 2008) | 6 lines
  
  Apply some logic used in iax2_indicate() to iax2_setoption(), as well, since they
  both have the potential to send control frames in the middle of call setup.  We
  have to wait until we have received a message back from the remote end before
  we try to send any more frames.  Otherwise, the remote end will consider it
  invalid, and we'll get stuck in an INVAL/VNAK storm.
  
  ........
................
  r160062 | eliel | 2008-12-01 11:52:14 -0700 (Mon, 01 Dec 2008) | 13 lines
  
  Introduce CLI permissions.
  Based on cli_permissions.conf configuration file, we are able to permit or deny
  cli commands based on some patterns and the local user and group running rasterisk.
  
  (Sorry if I missed some of the testers).
  
  Reviewboard: http://reviewboard.digium.com/r/11/
  
  (closes issue #11123)
  Reported by: eliel
  Tested by: eliel, IgorG, Laureano, otherwiseguy, mvanbaak
................
  r160097 | tilghman | 2008-12-01 14:23:37 -0700 (Mon, 01 Dec 2008) | 2 lines
  
  Use AST_EXT_LIB_SETUP before using AST_EXT_LIB_CHECK or bad things happen.
................
  r160170 | seanbright | 2008-12-01 16:08:24 -0700 (Mon, 01 Dec 2008) | 1 line
  
  Pay attention to the return value of system(), even if we basically ignore it.
................
  r160171 | seanbright | 2008-12-01 16:18:48 -0700 (Mon, 01 Dec 2008) | 1 line
  
  Silence a build warning. (chan_phone.c:810: warning: value computed is not used)
................
  r160172 | seanbright | 2008-12-01 16:37:49 -0700 (Mon, 01 Dec 2008) | 10 lines
  
  Merged revisions 159976 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159976 | mvanbaak | 2008-12-01 11:08:36 -0500 (Mon, 01 Dec 2008) | 3 lines
    
    Get rid of the useless format string and argument in the Bogus/ manager channelname.
    Noted by kpfleming and name Bogus/manager suggested by eliel
  ........
................
  r160208 | tilghman | 2008-12-01 17:37:21 -0700 (Mon, 01 Dec 2008) | 10 lines
  
  Merged revisions 160207 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160207 | tilghman | 2008-12-01 18:25:16 -0600 (Mon, 01 Dec 2008) | 3 lines
    
    Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc
    and glibc.
  ........
................
  r160308 | tilghman | 2008-12-02 10:56:24 -0700 (Tue, 02 Dec 2008) | 17 lines
  
  Merged revisions 160297 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160297 | tilghman | 2008-12-02 11:42:09 -0600 (Tue, 02 Dec 2008) | 10 lines
    
    When the text does not match exactly (e.g. RTP/SAVP), then the %n conversion
    fails, and the resulting integer is garbage.  Thus, we must initialize the
    integer and check it afterwards for success.
    (closes issue #14000)
     Reported by: folke
     Patches: 
           asterisk-sipbg-sscanf-1.4.22.diff uploaded by folke (license 626)
           asterisk-sipbg-sscanf-1.6.0.1.diff uploaded by folke (license 626)
           asterisk-sipbg-sscanf-trunk-r159896.diff uploaded by folke (license 626)
  ........
................
  r160319 | jpeeler | 2008-12-02 11:00:24 -0700 (Tue, 02 Dec 2008) | 7 lines
  
  (closes issue #13786)
  Reported by: tzafrir
  
  Readding DAHDI_CHECK_HOOKSTATE define that was removed in r134260 which fixes not being able to make outgoing calls on some FXO adapters:
  http://lists.digium.com/pipermail/asterisk-users/2008-November/thread.html#221553
................
  r160333 | jpeeler | 2008-12-02 11:04:51 -0700 (Tue, 02 Dec 2008) | 1 line
  
  remove duplicate comment that I accidentally merged
................
  r160344 | tilghman | 2008-12-02 11:39:12 -0700 (Tue, 02 Dec 2008) | 2 lines
  
  Add LOCAL_PEEK function, as requested by lmadsen.
................
  r160346 | tilghman | 2008-12-02 11:48:51 -0700 (Tue, 02 Dec 2008) | 2 lines
  
  Info on LOCAL_PEEK function.
................
  r160447 | eliel | 2008-12-03 04:01:23 -0700 (Wed, 03 Dec 2008) | 4 lines
  
  - Avoid setting .synopsis and .syntax if we are using XML documentation (or the
  xml documentation wont be loaded).
  - Use <variable></variable> to refer to a dialplan variable.
................
  r160481 | tilghman | 2008-12-03 07:11:53 -0700 (Wed, 03 Dec 2008) | 14 lines
  
  Merged revisions 160480 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160480 | tilghman | 2008-12-03 08:09:35 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    Jon Bonilla (Manwe) pointed out on the -dev list:
    "I guess that having only ip-phones in mind is not a good approach. Since it is
    possible to have a sip proxy connected to asterisk we could receive a 407
    (unauthorized) or 483 (too many hops) as response and dialog ending would not be
    a good behavior."
    So modified.
  ........
................
  r160552 | tilghman | 2008-12-03 10:01:03 -0700 (Wed, 03 Dec 2008) | 11 lines
  
  Merged revisions 160551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160551 | tilghman | 2008-12-03 10:58:34 -0600 (Wed, 03 Dec 2008) | 4 lines
    
    Don't start scanning the directory until all modules are loaded, because some
    required modules (channels, apps, functions) may not yet be in memory yet.
    Fixes AST-149.
  ........
................
  r160555 | mmichelson | 2008-12-03 10:07:09 -0700 (Wed, 03 Dec 2008) | 11 lines
  
  When investigating issue #13548, I found that gosub
  handling in app_queue was just completely wrong, mostly
  because the channel operations being performed were being
  done on the incorrect channel.
  
  With this set of changes, a gosub will correctly run on
  the answering queue member's channel. There are still crash
  issues which occur if there are dialplan syntax errors, so
  I cannot yet close the referenced issue.
................
  r160559 | tilghman | 2008-12-03 10:38:59 -0700 (Wed, 03 Dec 2008) | 14 lines
  
  Merged revisions 160558 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160558 | tilghman | 2008-12-03 11:34:34 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    If an entry is added to the directory during a scan when another entry expires,
    then that new entry will not be processed promptly, but must wait for either a
    future entry to start or a current entry's retry to occur.  If no other entries
    exist in the directory (other than the new entries) when a bunch expire, then
    the new entries must wait until another new entry is added to be processed.
    This was a rather weird race condition, really.  Fixes AST-147.
  ........
................
  r160562 | eliel | 2008-12-03 10:48:47 -0700 (Wed, 03 Dec 2008) | 4 lines
  
  - Add <variable /> tags when naming a channel variable.
  - Add <filename /> tags when naming a filename.
  - Simplify the xml formatting putting some enters.
................
  r160585 | tilghman | 2008-12-03 10:59:36 -0700 (Wed, 03 Dec 2008) | 11 lines
  
  Blocked revisions 160570 via svnmerge
  
  ........
    r160570 | tilghman | 2008-12-03 11:55:12 -0600 (Wed, 03 Dec 2008) | 5 lines
    
    During bridge code, the channel bridge may return a retry code, if a transfer
    was initiated but not yet completed.  If the bridge is immediately retried,
    then we may send a storm of TXREQ packets, even though the first set is sent
    reliably (retransmitted).  Fixes AST-137.
  ........
................
  r160626 | mmichelson | 2008-12-03 11:37:46 -0700 (Wed, 03 Dec 2008) | 16 lines
  
  Add some safety measures when using gosub, especially when using the options
  for app_dial and app_queue to run a gosub when the call is answered.
  
  * Check for the existence of the gosub target in gosub_exec. If it is nonexistent,
    then this will cause errors when we attempt to actually run the gosub, including
    a definite memory leak and potential crashes. Return an error in this situation
  * Check the return value of pbx_exec in app_dial and app_queue before attempting
    to actually run the gosub routine. If there was an error, we should not attempt
    to run the gosub.
  * Change a '|' to a ',' in app_queue.
  * Add some extra curly braces where they had been missing previously.
  
  (closes issue #13548)
  Reported by: fiddur
................
  r160663 | eliel | 2008-12-03 12:25:30 -0700 (Wed, 03 Dec 2008) | 13 lines
  
  - iax2-provision was not freeing iax_templates structure when unloading the chan_iax2.so module.
  - Move the code to start using the LIST macros.
  
  Review: http://reviewboard.digium.com/r/72
  
  (closes issue #13232)
  Reported by: eliel
  Patches:
        iax2-provision.patch.txt uploaded by eliel (license 64)
        (with minor changes pointed by Mark Michelson on review board)
  Tested by: eliel
................
  r160699 | qwell | 2008-12-03 13:32:20 -0700 (Wed, 03 Dec 2008) | 7 lines
  
  Fix typo when ListCategories returns none.
  
  (closes issue #13994)
  Reported by: mika
  Patches:
        ListCategoriesActionPatch.diff uploaded by mika (license 624)
................
  r160700 | qwell | 2008-12-03 13:35:36 -0700 (Wed, 03 Dec 2008) | 1 line
  
  Another place this is missing
................
  r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines
  
  Merged revisions 160703 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines
  
  (closes issue #13597)
  Reported by: john8675309
  Patches:
        patch.13597 uploaded by murf (license 17)
  Tested by: murf, john8675309
  
  This patch causes the setcid func to update the CDR
  clid after setting the channel field.
  
  I also notice that in trunk, the num/number of 1.4 is
  left out; I decided to include the option to use
  either in trunk, so as not to have 1.4 upgraders
  not to have problems.
  
  
  ........
................
  r160765 | qwell | 2008-12-03 14:38:50 -0700 (Wed, 03 Dec 2008) | 13 lines
  
  Blocked revisions 160764 via svnmerge
  
  ........
    r160764 | qwell | 2008-12-03 15:38:07 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    Only show this warning when we want to show it.
    
    (closes issue #13982)
    Reported by: coolmig
    Patches:
          chan_agent.c.patch uploaded by coolmig (license 621)
  ........
................
  r160791 | tilghman | 2008-12-03 14:58:21 -0700 (Wed, 03 Dec 2008) | 9 lines
  
  Merged revisions 160770 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160770 | tilghman | 2008-12-03 15:54:07 -0600 (Wed, 03 Dec 2008) | 2 lines
    
    Some compilers warn on null format strings; some don't (caught by buildbot)
  ........
................
  r160854 | rmudgett | 2008-12-03 18:14:22 -0700 (Wed, 03 Dec 2008) | 4 lines
  
  *  Found a couple more places where num/number needed to be done
  so 1.4 upgraders will not have problems.
  *  Added curly braces and minor tweaks.
................
  r160856 | rmudgett | 2008-12-03 18:36:39 -0700 (Wed, 03 Dec 2008) | 1 line
  
  Jcolp pointed out that num will also match number
................
  r160896 | eliel | 2008-12-04 06:45:32 -0700 (Thu, 04 Dec 2008) | 7 lines
  
  Added XML documentation for the following AGI commands:
          - get option
          - get variable
          - hangup
          - noop
................
  r160938 | mvanbaak | 2008-12-04 09:37:13 -0700 (Thu, 04 Dec 2008) | 9 lines
  
  Add debug flag so skinny debug will show information about packets.
  We dont want to scare users with this, so we added a devmode compile flag
  
  (closes issue #13952)
  Reported by: wedhorn
  Patches:
        packetdebug3.diff uploaded by wedhorn (license 30)
  Tested by: mvanbaak, wedhorn
................
  r160945 | mmichelson | 2008-12-04 09:45:06 -0700 (Thu, 04 Dec 2008) | 23 lines
  
  Merged revisions 160943 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r160943 | mmichelson | 2008-12-04 10:44:18 -0600 (Thu, 04 Dec 2008) | 15 lines
  
  Fix a callerid parsing issue. If someone formatted callerid like the
  following: "name <number>" (including the quotation marks), then the parts
  would be parsed as 
  
  name: "name
  number: number
  
  This is because the closing quotation mark was not discovered since the number
  and everything after was parsed out of the string earlier. Now, there is a check
  to see if the closing quote occurs after the number, so that we can know if we
  should strip off the opening quote on the name.
  
  Closes AST-158
  
  
  ........
................
  r161014 | jpeeler | 2008-12-04 11:32:20 -0700 (Thu, 04 Dec 2008) | 17 lines
  
  Merged revisions 161013 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r161013 | jpeeler | 2008-12-04 12:30:41 -0600 (Thu, 04 Dec 2008) | 9 lines
  
  (closes issue #13835)
  Reported by: matt_b
  Tested by: jpeeler
  
  This mirrors a check that was present in ast_rtp_read to also be in ast_rtp_raw_write to not schedule sending the receiver report if the remote RTCP endpoint address isn't present in the RTCP structure.
  
  Closes AST-142.
  
  
  ........
................
  r161077 | eliel | 2008-12-04 12:31:48 -0700 (Thu, 04 Dec 2008) | 2 lines
  
  Fix minor coding guidelines introduced with CLI permissions.
................
  r161115 | dhubbard | 2008-12-04 16:00:30 -0700 (Thu, 04 Dec 2008) | 11 lines
  
  If 'faxdetect=yes' in sip.conf, switch to a 'fax' extension (if it exists) after T38 is negotiated.  
  Terry Wilson created the original patch for this functionality, which I slightly modified and added 
  the faxdetect=yes|no configuration option.  This patch is only for T38 fax detection and does not 
  do anything for G711 over SIP fax detection.  By default, this option is disabled. 
  
  Reviewboard: http://reviewboard.digium.com/r/69/
  
  This functionality is for issue AST-140.
................
  r161147 | seanbright | 2008-12-04 19:47:54 -0700 (Thu, 04 Dec 2008) | 3 lines
  
  Check the return value of fread/fwrite so the compiler doesn't complain.  Only a
  problem when IMAP_STORAGE is enabled.
................
  r161181 | tilghman | 2008-12-04 22:41:41 -0700 (Thu, 04 Dec 2008) | 11 lines
  
  The first file should have a blank config filename in the structure, so that
  when a save occurs to a different filename, everything goes to the alternate
  filename, instead of appending to the original.  This is important for the
  AMI command UpdateConfig.
  (closes issue #13301)
   Reported by: trevo
   Patches: 
         20081113__bug13301.diff.txt uploaded by Corydon76 (license 14)
         20081113__bug13301__1.6.0.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, blitzrage
................
  r161218 | eliel | 2008-12-05 03:31:25 -0700 (Fri, 05 Dec 2008) | 8 lines
  
  Janitor, use ARRAY_LEN() when possible.
  
  (closes issue #13990)
  Reported by: eliel
  Patches:
        array_len.diff uploaded by eliel (license 64)
................
  r161252 | russell | 2008-12-05 06:46:01 -0700 (Fri, 05 Dec 2008) | 2 lines
  
  Resolve a compiler warning from buildbot about a NULL format string.
................
  r161288 | russell | 2008-12-05 07:16:24 -0700 (Fri, 05 Dec 2008) | 10 lines
  
  Merged revisions 161287 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r161287 | russell | 2008-12-05 08:12:14 -0600 (Fri, 05 Dec 2008) | 2 lines
  
  Fix a NULL format string warning found by buildbot.
  
  ........
................
  r161349 | seanbright | 2008-12-05 08:56:15 -0700 (Fri, 05 Dec 2008) | 5 lines
  
  When using IMAP_STORAGE, it's important to convert bare newlines (\n) in
  emailbody and pagerbody to CR-LF so that the IMAP server doesn't spit out an
  error.  This was informally reported on #asterisk-dev a few weeks ago.  Reviewed
  by Mark M. on IRC.
................
  r161350 | seanbright | 2008-12-05 09:04:36 -0700 (Fri, 05 Dec 2008) | 2 lines
  
  Use ast_free() instead of free(), pointed out by eliel on IRC.
................
  r161427 | seanbright | 2008-12-05 14:08:43 -0700 (Fri, 05 Dec 2008) | 22 lines
  
  Merged revisions 161426 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r161426 | seanbright | 2008-12-05 16:02:20 -0500 (Fri, 05 Dec 2008) | 15 lines
    
    Merged revisions 161421 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r161421 | seanbright | 2008-12-05 15:50:23 -0500 (Fri, 05 Dec 2008) | 8 lines
      
      Fix build errors on FreeBSD (uint -> unsigned int).
      
      (closes issue #14006)
      Reported by: alphaque
      Patches:
            astobj2.h-patch uploaded by alphaque (license 259)
            (Slightly modified by seanbright)
    ........
  ................
................
  r161493 | mmichelson | 2008-12-05 16:24:38 -0700 (Fri, 05 Dec 2008) | 8 lines
  
  If the autoloop flag is set on a channel, then we need to 
  add 1 to the priority when checking if the extension exists. Otherwise,
  gosubs will fail.
  
  This was discovered when investigating an asterisk-users mailing list post
  made by Gary Hawkins.
................
  r161536 | eliel | 2008-12-06 14:18:51 -0700 (Sat, 06 Dec 2008) | 2 lines
  
  Move Speech* applications and functions documentation to XML.
................
  r161571 | eliel | 2008-12-07 15:43:46 -0700 (Sun, 07 Dec 2008) | 2 lines
  
  Introduce SMS() application XML documentation.
................
  r161604 | eliel | 2008-12-07 20:35:55 -0700 (Sun, 07 Dec 2008) | 10 lines
  
  Add voicemail related applications and functions XML documentation:
      applications:
        - VoiceMail()
        - VoiceMailMain()
        - MailboxExists()
        - VMAuthenticate()
      functions:
        - MAILBOX_EXISTS()
................
  r161637 | eliel | 2008-12-07 21:23:50 -0700 (Sun, 07 Dec 2008) | 4 lines
  
  - Fix a leak while printing an argument description.
  - Avoid printing the name of an argument in the [Arguments] tag if there is no description
    for that argument.
................
  r161679 | twilson | 2008-12-08 09:02:42 -0700 (Mon, 08 Dec 2008) | 2 lines
  
  Add the ability to play a courtesy tone to the transfer target in a native SIP attended transfer by setting the variable ATTENEDED_TRANSFER_COMPLETE_SOUND.
................
  r161721 | mnicholson | 2008-12-08 10:23:41 -0700 (Mon, 08 Dec 2008) | 7 lines
  
  Fix a crash that can occur on a transfer in chan_sip when attempting to collect
  rtp stats.
  
  (closes issue #13956)
  Reported by: chris-mac
  Tested by: chris-mac
................
  r161726 | file | 2008-12-08 10:53:32 -0700 (Mon, 08 Dec 2008) | 13 lines
  
  Merged revisions 161725 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r161725 | file | 2008-12-08 13:52:10 -0400 (Mon, 08 Dec 2008) | 6 lines
    
    Make the usereqphone option work again.
    (closes issue #13474)
    Reported by: mmaguire
    Patches:
          20080912_bug13474.diff uploaded by mmaguire (license 571)
  ........
................
  r161787 | file | 2008-12-08 11:47:32 -0700 (Mon, 08 Dec 2008) | 6 lines
  
  Fix a regression introduced when the PBX timeouts were converted to milliseconds. collect_digits now gets milliseconds fed to it, not seconds.
  (closes issue #14012)
  Reported by: dveiga
  Patches:
        14012.patch uploaded by bkruse (license 132)
................
  r161790 | tilghman | 2008-12-08 11:49:50 -0700 (Mon, 08 Dec 2008) | 6 lines
  
  Allocate enough space initially for the message.
  (closes issue #14027)
   Reported by: junky
   Patches: 
         M14027.diff uploaded by junky (license 177)
................
  r161830 | file | 2008-12-08 13:53:50 -0700 (Mon, 08 Dec 2008) | 2 lines
  
  Update autosupport script with a few changes.
................

Added:
    team/group/newcdr/configs/cli_permissions.conf.sample
      - copied unchanged from r161830, trunk/configs/cli_permissions.conf.sample
Modified:
    team/group/newcdr/   (props changed)
    team/group/newcdr/.cleancount
    team/group/newcdr/CHANGES
    team/group/newcdr/Makefile
    team/group/newcdr/apps/app_dial.c
    team/group/newcdr/apps/app_minivm.c
    team/group/newcdr/apps/app_mixmonitor.c
    team/group/newcdr/apps/app_playback.c
    team/group/newcdr/apps/app_queue.c
    team/group/newcdr/apps/app_readexten.c
    team/group/newcdr/apps/app_rpt.c
    team/group/newcdr/apps/app_sms.c
    team/group/newcdr/apps/app_speech_utils.c
    team/group/newcdr/apps/app_stack.c
    team/group/newcdr/apps/app_voicemail.c
    team/group/newcdr/build_tools/cflags-devmode.xml
    team/group/newcdr/cdr/cdr_tds.c
    team/group/newcdr/channels/chan_agent.c
    team/group/newcdr/channels/chan_alsa.c
    team/group/newcdr/channels/chan_dahdi.c
    team/group/newcdr/channels/chan_features.c
    team/group/newcdr/channels/chan_iax2.c
    team/group/newcdr/channels/chan_misdn.c
    team/group/newcdr/channels/chan_oss.c
    team/group/newcdr/channels/chan_phone.c
    team/group/newcdr/channels/chan_sip.c
    team/group/newcdr/channels/chan_skinny.c
    team/group/newcdr/channels/chan_usbradio.c
    team/group/newcdr/channels/chan_vpb.cc
    team/group/newcdr/channels/iax2-provision.c
    team/group/newcdr/configs/sip.conf.sample
    team/group/newcdr/configure
    team/group/newcdr/configure.ac
    team/group/newcdr/contrib/scripts/autosupport
    team/group/newcdr/contrib/scripts/autosupport.8
    team/group/newcdr/funcs/func_callerid.c
    team/group/newcdr/include/asterisk/_private.h
    team/group/newcdr/include/asterisk/astmm.h
    team/group/newcdr/include/asterisk/astobj2.h
    team/group/newcdr/include/asterisk/autoconfig.h.in
    team/group/newcdr/include/asterisk/channel.h
    team/group/newcdr/include/asterisk/cli.h
    team/group/newcdr/include/asterisk/compat.h
    team/group/newcdr/include/asterisk/config.h
    team/group/newcdr/include/asterisk/devicestate.h
    team/group/newcdr/include/asterisk/dlinkedlists.h
    team/group/newcdr/include/asterisk/dundi.h
    team/group/newcdr/include/asterisk/enum.h
    team/group/newcdr/include/asterisk/linkedlists.h
    team/group/newcdr/include/asterisk/lock.h
    team/group/newcdr/include/asterisk/logger.h
    team/group/newcdr/include/asterisk/manager.h
    team/group/newcdr/include/asterisk/module.h
    team/group/newcdr/include/asterisk/res_odbc.h
    team/group/newcdr/include/asterisk/stringfields.h
    team/group/newcdr/include/asterisk/strings.h
    team/group/newcdr/include/asterisk/utils.h
    team/group/newcdr/include/jitterbuf.h
    team/group/newcdr/main/ast_expr2.c
    team/group/newcdr/main/asterisk.c
    team/group/newcdr/main/astmm.c
    team/group/newcdr/main/astobj2.c
    team/group/newcdr/main/callerid.c
    team/group/newcdr/main/channel.c
    team/group/newcdr/main/cli.c
    team/group/newcdr/main/config.c
    team/group/newcdr/main/db.c
    team/group/newcdr/main/dns.c
    team/group/newcdr/main/event.c
    team/group/newcdr/main/features.c
    team/group/newcdr/main/file.c
    team/group/newcdr/main/frame.c
    team/group/newcdr/main/http.c
    team/group/newcdr/main/logger.c
    team/group/newcdr/main/manager.c
    team/group/newcdr/main/pbx.c
    team/group/newcdr/main/rtp.c
    team/group/newcdr/main/srv.c
    team/group/newcdr/main/translate.c
    team/group/newcdr/main/udptl.c
    team/group/newcdr/main/utils.c
    team/group/newcdr/main/xmldoc.c
    team/group/newcdr/makeopts.in
    team/group/newcdr/pbx/pbx_ael.c
    team/group/newcdr/pbx/pbx_config.c
    team/group/newcdr/pbx/pbx_dundi.c
    team/group/newcdr/pbx/pbx_spool.c
    team/group/newcdr/res/res_agi.c
    team/group/newcdr/res/res_config_ldap.c
    team/group/newcdr/res/res_config_pgsql.c
    team/group/newcdr/res/res_config_sqlite.c
    team/group/newcdr/res/res_convert.c
    team/group/newcdr/res/res_crypto.c
    team/group/newcdr/res/res_indications.c
    team/group/newcdr/res/res_jabber.c
    team/group/newcdr/res/res_musiconhold.c
    team/group/newcdr/res/res_odbc.c
    team/group/newcdr/res/res_realtime.c
    team/group/newcdr/utils/astman.c
    team/group/newcdr/utils/check_expr.c
    team/group/newcdr/utils/conf2ael.c
    team/group/newcdr/utils/extconf.c
    team/group/newcdr/utils/frame.c
    team/group/newcdr/utils/smsq.c

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/newcdr/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 10 15:26:47 2008
@@ -1,1 +1,1 @@
-/trunk:1-159781
+/trunk:1-161835

Modified: team/group/newcdr/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/.cleancount?view=diff&rev=162872&r1=162871&r2=162872
==============================================================================
--- team/group/newcdr/.cleancount (original)
+++ team/group/newcdr/.cleancount Wed Dec 10 15:26:47 2008
@@ -1,1 +1,1 @@
-35
+36

Modified: team/group/newcdr/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/CHANGES?view=diff&rev=162872&r1=162871&r2=162872
==============================================================================
--- team/group/newcdr/CHANGES (original)
+++ team/group/newcdr/CHANGES Wed Dec 10 15:26:47 2008
@@ -25,6 +25,11 @@
    remote services. For backwards compatibility, "secret" still has the
    same function as before, but now you can configure both a remote secret and a
    local secret for mutual authentication.
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf.  When this
+   option is enabled, a SIP channel will go to the fax extension (if it exists)
+   after T38 is negotiated.  This option is disabled by default.
+ * If ATTENDED_TRANSFER_COMPLETE_SOUND is set, the sound will be played to the
+   target of an attended transfer
 
 Skinny Changes
 --------------
@@ -52,6 +57,9 @@
    and FIELDQTY dialplan functions, which also manage lists.
  * Added REALTIME_FIELD and REALTIME_HASH, which should aid users in better
    obtaining realtime data from the dialplan.
+ * Added LOCAL_PEEK, which I have no idea how to use, but Leif Madsen wanted it.
+   Russell says it's, like, a scope resolution function for LOCAL variables.
+   Totally.  Hopefully, that means more to you than it does to me.
 
 Applications
 ------------
@@ -402,6 +410,12 @@
 
 CLI Changes
 -----------
+  * Added CLI permissions, config file: cli_permissions.conf
+     default is to allow all commands for every local user/group.
+     Also this new feature added three new CLI commands:
+      - cli check permissions {<username>|@<groupname>|<username>@<groupname>} [<command>]
+      - cli reload permissions
+      - cli show permissions
   * New CLI command "core show hint" (usage: core show hint <exten>)
   * New CLI command "core show settings"
   * Added 'core show channels count' CLI command.

Modified: team/group/newcdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/Makefile?view=diff&rev=162872&r1=162871&r2=162872
==============================================================================
--- team/group/newcdr/Makefile (original)
+++ team/group/newcdr/Makefile Wed Dec 10 15:26:47 2008
@@ -237,7 +237,13 @@
 ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat=2
+  ASTCFLAGS+=-Werror
+  ASTCFLAGS+=-Wunused
+  ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+  ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+  ASTCFLAGS+=-Wundef 
+  ASTCFLAGS+=-Wmissing-format-attribute
+  ASTCFLAGS+=-Wformat=2
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)

Modified: team/group/newcdr/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_dial.c?view=diff&rev=162872&r1=162871&r2=162872
==============================================================================
--- team/group/newcdr/apps/app_dial.c (original)
+++ team/group/newcdr/apps/app_dial.c Wed Dec 10 15:26:47 2008
@@ -2086,14 +2086,16 @@
 
 				if (gosub_args) {
 					res9 = pbx_exec(peer, theapp, gosub_args);
-					ast_pbx_run(peer);
+					if (!res9) {
+						ast_pbx_run(peer);
+					}
 					ast_free(gosub_args);
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Gosub exited with status %d\n", res9);
-				} else
+				} else {
 					ast_log(LOG_ERROR, "Could not Allocate string for Gosub arguments -- Gosub Call Aborted!\n");
-
-				res9 = 0;
+				}
+
 			} else if (!res9) {
 				ast_log(LOG_ERROR, "Could not find application Gosub\n");
 				res9 = -1;

Modified: team/group/newcdr/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_minivm.c?view=diff&rev=162872&r1=162871&r2=162872
==============================================================================
--- team/group/newcdr/apps/app_minivm.c (original)
+++ team/group/newcdr/apps/app_minivm.c Wed Dec 10 15:26:47 2008
@@ -198,17 +198,21 @@
 					<argument name="gain">
 						<para>Amount of gain to use</para>
 					</argument>
-					<para>Use the specified amount of gain when recording the voicemail message.  The units are whole-number decibels (dB).</para>
+					<para>Use the specified amount of gain when recording the voicemail message.
+					The units are whole-number decibels (dB).</para>
 				</option>
 			</optionlist>
 		</parameter>
 	</syntax>
 	<description>
-		<para>his application is part of the Mini-Voicemail system, configured in minivm.conf</para>
+		<para>This application is part of the Mini-Voicemail system, configured in <filename>minivm.conf</filename></para>
 		<para>MiniVM records audio file in configured format and forwards message to e-mail and pager.</para>
 		<para>If there's no user account for that address, a temporary account will be used with default options.</para>
-		<para>The recorded file name and path will be stored in MINIVM_FILENAME and the duration of the message will be stored in MINIVM_DURATION</para>
-		<para>Note: If the caller hangs up after the recording, the only way to send the message and clean up is to execute in the <literal>h</literal> extension.  The application will exit if any of the following DTMF digits are received and the requested extension exist in the current context.</para>
+		<para>The recorded file name and path will be stored in <variable>MINIVM_FILENAME</variable> and the duration
+		of the message will be stored in <variable>MINIVM_DURATION</variable></para>
+		<note><para>If the caller hangs up after the recording, the only way to send the message and clean up is to
+		execute in the <literal>h</literal> extension. The application will exit if any of the following DTMF digits
+		are received and the requested extension exist in the current context.</para></note>
 		<variablelist>
 			<variable name="MINIVM_RECORD_STATUS">
 				<para>This is the status of the record operation</para>
@@ -219,7 +223,6 @@
 		</variablelist>
 	</description>
 </application>
-
 <application name="MinivmGreet" language="en_US">
 	<synopsis>
 		Play Mini-Voicemail prompts.
@@ -250,7 +253,8 @@
 	<description>
 		<para>This application is part of the Mini-Voicemail system, configured in minivm.conf.</para>
 		<para>MinivmGreet() plays default prompts or user specific prompts for an account.</para>
-		<para>Busy and unavailable messages can be choosen, but will be overridden if a temporary message exists for the account.</para>
+		<para>Busy and unavailable messages can be choosen, but will be overridden if a temporary
+		message exists for the account.</para>
 		<variablelist>
 			<variable name="MINIVM_GREET_STATUS">
 				<para>This is the status of the greeting playback.</para>
@@ -261,7 +265,6 @@
 		</variablelist>
 	</description>
 </application>
-
 <application name="MinivmNotify" language="en_US">
 	<synopsis>
 		Notify voicemail owner about new messages.
@@ -285,9 +288,13 @@
 	</syntax>
 	<description>
 		<para>This application is part of the Mini-Voicemail system, configured in minivm.conf.</para>
-		<para>MiniVMnotify forwards messages about new voicemail to e-mail and pager.  If there's no user account for that address, a temporary account will be used with default options (set in minivm.conf).</para>
-		<para>If the channel variable MVM_COUNTER is set, this will be used in the message file name and available in the template for the message.</para>
-		<para>If no template is given, the default email template will be used to send email and default pager template to send paging message (if the user account is configured with a paging address.</para>
+		<para>MiniVMnotify forwards messages about new voicemail to e-mail and pager. If there's no user
+		account for that address, a temporary account will be used with default options (set in
+		<filename>minivm.conf</filename>).</para>
+		<para>If the channel variable <variable>MVM_COUNTER</variable> is set, this will be used in the message
+		file name and available in the template for the message.</para>
+		<para>If no template is given, the default email template will be used to send email and default pager
+		template to send paging message (if the user account is configured with a paging address.</para>
 		<variablelist>
 			<variable name="MINIVM_NOTIFY_STATUS">
 				<para>This is the status of the notification attempt</para>
@@ -297,10 +304,9 @@
 		</variablelist>
 	</description>
 </application>
-
 <application name="MinivmDelete" language="en_US">
 	<synopsis>
-		Delete Mini-Voicemail voicemail messages
+		Delete Mini-Voicemail voicemail messages.
 	</synopsis>
 	<syntax>
 		<parameter name="filename" required="true">
@@ -308,7 +314,7 @@
 		</parameter>
 	</syntax>
 	<description>
-		<para>This application is part of the Mini-Voicemail system, configured in minivm.conf.</para>
+		<para>This application is part of the Mini-Voicemail system, configured in <filename>minivm.conf</filename>.</para>
 		<para>It deletes voicemail file set in MVM_FILENAME or given filename.</para>
 		<variablelist>
 			<variable name="MINIVM_DELETE_STATUS">
@@ -351,8 +357,9 @@
 		</parameter>
 	</syntax>
 	<description>
-		<para>This application is part of the Mini-Voicemail system, configured in minivm.conf.</para>
-		<para>Use this application to record account specific audio/video messages for busy, unavailable and temporary messages.</para>
+		<para>This application is part of the Mini-Voicemail system, configured in <filename>minivm.conf</filename>.</para>
+		<para>Use this application to record account specific audio/video messages for busy, unavailable
+		and temporary messages.</para>
 		<para>Account specific directories will be created if they do not exist.</para>
 		<variablelist>
 			<variable name="MINIVM_ACCMESS_STATUS">
@@ -364,7 +371,6 @@
 		</variablelist>
 	</description>
 </application>
-
 <application name="MinivmMWI" language="en_US">
 	<synopsis>
 		Send Message Waiting Notification to subscriber(s) of mailbox.
@@ -389,8 +395,9 @@
 		</parameter>
 	</syntax>
 	<description>
-		<para>This application is part of the Mini-Voicemail system, configured in minivm.conf.</para>
-		<para>MinivmMWI is used to send message waiting indication to any devices whose channels have subscribed to the mailbox passed in the first parameter.</para>
+		<para>This application is part of the Mini-Voicemail system, configured in <filename>minivm.conf</filename>.</para>
+		<para>MinivmMWI is used to send message waiting indication to any devices whose channels have
+		subscribed to the mailbox passed in the first parameter.</para>
 	</description>
 </application>
 ***/
@@ -3272,7 +3279,7 @@
 	if ((res = load_config(0)))
 		return(res);
 
-	ast_cli_register_multiple(cli_minivm, sizeof(cli_minivm)/sizeof(cli_minivm[0]));
+	ast_cli_register_multiple(cli_minivm, ARRAY_LEN(cli_minivm));
 
 	/* compute the location of the voicemail spool directory */
 	snprintf(MVM_SPOOL_DIR, sizeof(MVM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR);
@@ -3316,7 +3323,7 @@
 	res |= ast_unregister_application(app_minivm_notify);
 	res |= ast_unregister_application(app_minivm_delete);
 	res |= ast_unregister_application(app_minivm_accmess);
-	ast_cli_unregister_multiple(cli_minivm, sizeof(cli_minivm)/sizeof(cli_minivm[0]));
+	ast_cli_unregister_multiple(cli_minivm, ARRAY_LEN(cli_minivm));
 	ast_custom_function_unregister(&minivm_account_function);
 	ast_custom_function_unregister(&minivm_counter_function);
 

Modified: team/group/newcdr/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_mixmonitor.c?view=diff&rev=162872&r1=162871&r2=162872

[... 5226 lines stripped ...]

