[svn-commits] rmudgett: branch rmudgett/misdn_facility r160181 - in /team/rmudgett/misdn_fa...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Dec 1 17:54:54 CST 2008


Author: rmudgett
Date: Mon Dec  1 17:54:53 2008
New Revision: 160181

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160181
Log:
Resolved conflicts and restarted automerge.

Merged revisions 158490,158552,158613,158668,158695,158798-158799,158816,158846,158850,158862,158901,158915,158919,158931,158964,158997,159059,159106,159169,159225,159258,159323,159379,159407,159443,159484,159540,159579,159637,159670,159706,159740,159780,159862,159907,159971,160013,160067,160106 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/issue8824

................
  r158490 | root | 2008-11-21 15:53:45 -0600 (Fri, 21 Nov 2008) | 31 lines
  
  Merged revisions 158482,158484 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r158482 | mattf | 2008-11-21 15:06:59 -0600 (Fri, 21 Nov 2008) | 1 line
  
  Fix for #13963.  Make physical channel mapping unconfigured default
  ................
  r158484 | murf | 2008-11-21 15:47:16 -0600 (Fri, 21 Nov 2008) | 19 lines
  
  Merged revisions 158483 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158483 | murf | 2008-11-21 14:19:47 -0700 (Fri, 21 Nov 2008) | 11 lines
  
  (closes issue #13871)
  Reported by: mdu113
  
  This one is totally my fault. The code doesn't even
  create a bridge CDR if the channel CDR has POST_DISABLED.
  I didn't check for that at the end of the bridge.
  Fixed with a few small insertions. Tested. Looks
  good. No cdr generated, no crash, no unnecc. data
  objects created either.
  
  
  ........
  
  ................
................
  r158552 | root | 2008-11-21 16:53:41 -0600 (Fri, 21 Nov 2008) | 18 lines
  
  Merged revisions 158540 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r158540 | russell | 2008-11-21 16:12:37 -0600 (Fri, 21 Nov 2008) | 10 lines
  
  Merged revisions 158539 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158539 | russell | 2008-11-21 16:05:55 -0600 (Fri, 21 Nov 2008) | 2 lines
  
  When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock
  
  ........
  
  ................
................
  r158613 | root | 2008-11-21 17:56:58 -0600 (Fri, 21 Nov 2008) | 48 lines
  
  Merged revisions 158602,158605-158606 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r158602 | tilghman | 2008-11-21 17:14:11 -0600 (Fri, 21 Nov 2008) | 12 lines
  
  Merged revisions 158600 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r158600 | tilghman | 2008-11-21 17:07:46 -0600 (Fri, 21 Nov 2008) | 5 lines
    
    The passed extension may not be the same in the list as the current entry,
    because we strip spaces when copying the extension into the structure.
    Therefore, use the copied item to place the item into the list.
    (found by lmadsen on -dev, fixed by me)
  ........
  
  ................
  r158605 | tilghman | 2008-11-21 17:33:22 -0600 (Fri, 21 Nov 2008) | 3 lines
  
  Allow space within an extension, when the space is within a character class.
  (requested by lmadsen on -dev, patch by me)
  
  ................
  r158606 | murf | 2008-11-21 17:40:46 -0600 (Fri, 21 Nov 2008) | 19 lines
  
  Merged revisions 158603 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r158603 | murf | 2008-11-21 16:14:50 -0700 (Fri, 21 Nov 2008) | 11 lines
  
  In reference to the fix made for 13871, I was
  merging the fix into 1.6.0 and realized I missed
  the code in the h-exten block, and didn't catch it
  because my test case had the h-exten commented out.
  
  So, this corrects the code I missed, as a 
  preventative against another crash report.
  Tested with the h-exten defined, all is well.
  
  
  
  ........
  
  ................
................
  r158668 | root | 2008-11-21 18:55:10 -0600 (Fri, 21 Nov 2008) | 20 lines
  
  Merged revisions 158632 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r158632 | jpeeler | 2008-11-21 18:05:33 -0600 (Fri, 21 Nov 2008) | 12 lines
  
  Blocked revisions 158629 via svnmerge
  
  ........
  r158629 | jpeeler | 2008-11-21 18:04:36 -0600 (Fri, 21 Nov 2008) | 5 lines
  
  (closes issue #13786)
  Reported by: tzafrir
  
  When compiling against Zaptel dahdi_compat will now only define all the DAHDI defines if the Zaptel define is present. Also, there is no such thing as DAHDI_PRI.
  
  ........
  
  ................
................
  r158695 | root | 2008-11-22 10:57:19 -0600 (Sat, 22 Nov 2008) | 1 line
  
  automerge cancel
................
  r158798 | rmudgett | 2008-11-24 10:50:39 -0600 (Mon, 24 Nov 2008) | 52 lines
  
  Resolved conflict and restarted automerge.
  
  Merged revisions 158686,158688,158690,158694,158723,158754,158756 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r158686 | mvanbaak | 2008-11-22 09:58:49 -0600 (Sat, 22 Nov 2008) | 2 lines
    
    make this compile under devmode
  ........
    r158688 | mvanbaak | 2008-11-22 10:06:38 -0600 (Sat, 22 Nov 2008) | 4 lines
    
    fix a very occasional core dump in chan_skinny found by wedhorn.
    
    (issue #13948)
  ........
    r158690 | mvanbaak | 2008-11-22 10:48:09 -0600 (Sat, 22 Nov 2008) | 4 lines
    
    Add Media Source Update to skinny's control2str
    
    (issue #13948)
  ........
    r158694 | mvanbaak | 2008-11-22 10:57:11 -0600 (Sat, 22 Nov 2008) | 8 lines
    
    dont send reorder tone after a device is hungup if a dialout is abandoned or failed.
    Without this reorder tone will play after hangup and both wedhorn's and my wife have threatened to use an axe on our asterisk box
    
    (closes issue #13948)
    Reported by: wedhorn
    Patches:
    	switch.diff uploaded by wedhorn (license 30)
  ........
    r158723 | mvanbaak | 2008-11-22 11:17:33 -0600 (Sat, 22 Nov 2008) | 4 lines
    
    last commit worked on OpenBSD but still generated warning on Ubuntu.
    
    Initialise a variable so --enable-dev-mode does not complain
  ........
    r158754 | seanbright | 2008-11-22 21:30:46 -0600 (Sat, 22 Nov 2008) | 3 lines
    
    No need to use a separate structure for this since we can just pass
    our sip_pvt pointer in directly.
  ........
    r158756 | seanbright | 2008-11-22 21:36:52 -0600 (Sat, 22 Nov 2008) | 6 lines
    
    If you enabled 'notifycid' one of the limitations is that the calling channel
    is only found if it dialed the extension that was subscribed to.  You can now
    specify 'ignore-context' for the 'notifycid' option in sip.conf which will, as
    it's value implies, ignore the current context of the caller when doing the
    lookup.
  ........
................
  r158799 | rmudgett | 2008-11-24 10:52:53 -0600 (Mon, 24 Nov 2008) | 1 line
  
  Add Redirecting to skinny's control2str
................
  r158816 | root | 2008-11-24 12:54:02 -0600 (Mon, 24 Nov 2008) | 16 lines
  
  Merged revisions 158808 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158808 | twilson | 2008-11-24 12:11:08 -0600 (Mon, 24 Nov 2008) | 8 lines
  
  This patch adds a new application for sending MWI to phones via Asterisk's event subsystem.  Also, the minivm documentation is all converted to use xmldocs.
  
  (closes issue #13946)
  Reported by: Marquis
  Patches: 
        minivmmwi_plus_xmldocs.patch uploaded by Marquis (license 32)
  Tested by: otherwiseguy, Marquis
  
  ........
................
  r158846 | mmichelson | 2008-11-24 15:18:49 -0600 (Mon, 24 Nov 2008) | 5 lines
  
  Make the 'I' flags to app_dial and app_queue apply to
  AST_CONTROL_REDIRECTING control frames in addition to
  AST_CONTROL_CONNECTED_LINE frames.
................
  r158850 | mmichelson | 2008-11-24 15:25:24 -0600 (Mon, 24 Nov 2008) | 3 lines
  
  Fix typo
................
  r158862 | root | 2008-11-24 15:53:34 -0600 (Mon, 24 Nov 2008) | 20 lines
  
  Merged revisions 158851,158857 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158851 | mnicholson | 2008-11-24 15:27:26 -0600 (Mon, 24 Nov 2008) | 6 lines
  
  Make ast_streamfile() check the result of ast_openstream() before doing
  anything with it.
  
  (closes issue #13955)
  Reported by: chris-mac
  
  ........
  r158857 | tilghman | 2008-11-24 15:52:34 -0600 (Mon, 24 Nov 2008) | 3 lines
  
  Add a bit of documentation (thanks, I-MOD) on what the silence threshold
  constant actually does and what values are valid for it.
  
  ........
................
  r158901 | root | 2008-11-24 16:53:30 -0600 (Mon, 24 Nov 2008) | 15 lines
  
  Merged revisions 158876 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158876 | mnicholson | 2008-11-24 15:56:22 -0600 (Mon, 24 Nov 2008) | 7 lines
  
  Added EVENT_FLAG_AGI and used it for manager calls in res_agi.c
  
  (closes issue #13873)
  Reported by: fnordian
  Patches:
        ami_agievent.patch uploaded by fnordian (license 110)
  
  ........
................
  r158915 | mmichelson | 2008-11-24 17:18:22 -0600 (Mon, 24 Nov 2008) | 4 lines
  
  Update CHANGES to indicate that redirecting party information
  is suppressed with the 'I' flag to app_dial and app_queue
................
  r158919 | mmichelson | 2008-11-24 17:39:25 -0600 (Mon, 24 Nov 2008) | 4 lines
  
  Add documentation to app_dial and app_queue about
  'I' option change
................
  r158931 | root | 2008-11-24 18:53:28 -0600 (Mon, 24 Nov 2008) | 19 lines
  
  Merged revisions 158924-158925 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158924 | mnicholson | 2008-11-24 18:05:41 -0600 (Mon, 24 Nov 2008) | 6 lines
  
  Make the Join event from app_queue use CallerIDNum insead of CallerID for
  indicating the callerid number just like the rest of asterisk.
  
  (closes issue #13883)
  Reported by: davidw
  
  ........
  r158925 | mnicholson | 2008-11-24 18:19:55 -0600 (Mon, 24 Nov 2008) | 2 lines
  
  Fix compiling in dev mode.
  
  ........
................
  r158964 | root | 2008-11-24 19:53:39 -0600 (Mon, 24 Nov 2008) | 16 lines
  
  Merged revisions 158959 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158959 | seanbright | 2008-11-24 19:01:49 -0600 (Mon, 24 Nov 2008) | 8 lines
  
  This is basically a complete rollback of r155401, as it was determined that
  it would be best to maintain API compatibility.  Instead, this commit introduces
  ao2_callback_data() which is functionally identical to ao2_callback() except
  that it allows you to pass arbitrary data to the callback.
  
  Reviewed by Mark Michelson via ReviewBoard:
  	http://reviewboard.digium.com/r/64
  
  ........
................
  r158997 | root | 2008-11-24 21:54:10 -0600 (Mon, 24 Nov 2008) | 10 lines
  
  Merged revisions 158992 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r158992 | twilson | 2008-11-24 21:49:30 -0600 (Mon, 24 Nov 2008) | 2 lines
  
  Make chan_usbradio compile under dev mode
  
  ........
................
  r159059 | root | 2008-11-24 23:54:11 -0600 (Mon, 24 Nov 2008) | 26 lines
  
  Merged revisions 159050,159054 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159050 | tilghman | 2008-11-24 23:02:11 -0600 (Mon, 24 Nov 2008) | 10 lines
  
  Merged revisions 159025 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159025 | tilghman | 2008-11-24 22:50:00 -0600 (Mon, 24 Nov 2008) | 3 lines
    
    System call ioperm is non-portable, so check for its existence in autoconf.
    (Closes issue #13863)
  ........
  
  ................
  r159054 | tilghman | 2008-11-24 23:19:53 -0600 (Mon, 24 Nov 2008) | 5 lines
  
  Copyright clarification; also, have variable set to "t" or "i" on timeout or
  invalid extension, respectively.
  (closes issue #13944)
   Reported by: chappell
  
  ................
................
  r159106 | root | 2008-11-25 10:53:55 -0600 (Tue, 25 Nov 2008) | 10 lines
  
  Merged revisions 159093 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159093 | twilson | 2008-11-25 10:18:53 -0600 (Tue, 25 Nov 2008) | 2 lines
  
  Add missing variable declaration for PPC code
  
  ........
................
  r159169 | root | 2008-11-25 11:53:59 -0600 (Tue, 25 Nov 2008) | 24 lines
  
  Merged revisions 159159,159162 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159159 | russell | 2008-11-25 11:35:33 -0600 (Tue, 25 Nov 2008) | 9 lines
  
  Blocked revisions 159158 via svnmerge
  
  ........
  r159158 | russell | 2008-11-25 11:34:50 -0600 (Tue, 25 Nov 2008) | 2 lines
  
  Add ao2_trylock() to go along with ao2_lock() and ao2_unlock()
  
  ........
  
  ................
  r159162 | tilghman | 2008-11-25 11:44:30 -0600 (Tue, 25 Nov 2008) | 4 lines
  
  Don't limit the length of the hint at the final step (from ~8100 chars max
  (or ~500 chars max on LOW_MEMORY) to 80 chars max).  This will allow more
  channels to be used in a single hint.
  
  ................
................
  r159225 | root | 2008-11-25 12:53:33 -0600 (Tue, 25 Nov 2008) | 11 lines
  
  Merged revisions 159189 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159189 | tilghman | 2008-11-25 12:01:02 -0600 (Tue, 25 Nov 2008) | 3 lines
  
  Don't actually do anything with a negative priority, because we ignore it in
  the result, anyway.
  
  ........
................
  r159258 | root | 2008-11-25 15:54:27 -0600 (Tue, 25 Nov 2008) | 41 lines
  
  Merged revisions 159247,159250 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159247 | tilghman | 2008-11-25 15:42:42 -0600 (Tue, 25 Nov 2008) | 21 lines
  
  Merged revisions 159246 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r159246 | tilghman | 2008-11-25 15:40:28 -0600 (Tue, 25 Nov 2008) | 14 lines
    
    Merged revisions 159245 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r159245 | tilghman | 2008-11-25 15:37:06 -0600 (Tue, 25 Nov 2008) | 7 lines
      
      Regression fix for last security fix.  Set the iseqno correctly.
      (closes issue #13918)
       Reported by: ffloimair
       Patches: 
             20081119__bug13918.diff.txt uploaded by Corydon76 (license 14)
       Tested by: ffloimair
    ........
  ................
  
  ................
  r159250 | mmichelson | 2008-11-25 15:49:42 -0600 (Tue, 25 Nov 2008) | 9 lines
  
  Make the options for the general and profiles more consistent
  for the "pls_hold_prompt" option. This does not affect any released
  version of Asterisk, so there is no need to update the CHANGES
  file for this.
  
  (closes issue #13893)
  Reported by: eliel
  
  
  ................
................
  r159323 | root | 2008-11-25 16:54:01 -0600 (Tue, 25 Nov 2008) | 34 lines
  
  Merged revisions 159276,159317 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159276 | tilghman | 2008-11-25 15:57:59 -0600 (Tue, 25 Nov 2008) | 14 lines
  
  Merged revisions 159269 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159269 | tilghman | 2008-11-25 15:56:48 -0600 (Tue, 25 Nov 2008) | 7 lines
    
    Don't try to send a response on a NULL pvt.
    (closes issue #13919)
     Reported by: barthpbx
     Patches: 
           chan_iax2.c.patch uploaded by eliel (license 64)
     Tested by: barthpbx
  ........
  
  ................
  r159317 | tilghman | 2008-11-25 16:45:59 -0600 (Tue, 25 Nov 2008) | 9 lines
  
  Add an option, waitfordialtone, for UK analog lines which do not end a call
  until the originating line hangs up.
  (closes issue #12382)
   Reported by: one47
   Patches: 
         zap-waitfordialtone-trunk.080901.patch uploaded by one47 (license 23)
         zap-waitfordialtone-bra-1.4.21.2.patch uploaded by fleed (license 463)
   Tested by: fleed
  
  ................
................
  r159379 | root | 2008-11-25 17:53:33 -0600 (Tue, 25 Nov 2008) | 31 lines
  
  Merged revisions 159360 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159360 | murf | 2008-11-25 17:03:01 -0600 (Tue, 25 Nov 2008) | 23 lines
  
  Merged revisions 159316 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r159316 | murf | 2008-11-25 15:41:10 -0700 (Tue, 25 Nov 2008) | 15 lines
  
  (closes issue #12694)
  Reported by: yraber
  Patches:
        12694.2nd.diff uploaded by murf (license 17)
  Tested by: murf, laurav
  
  Thanks to file (Joshua Colp) for his IAX fix.
  
  the change to cdr.c allows no-answer to percolate
  up into CDR's, and feels like the right place to
  locate this fix; if BUSY is done here, no-answer
  should be, too.
  
  
  
  ........
  
  ................
................
  r159407 | root | 2008-11-25 21:54:20 -0600 (Tue, 25 Nov 2008) | 11 lines
  
  Merged revisions 159402 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159402 | jpeeler | 2008-11-25 21:18:01 -0600 (Tue, 25 Nov 2008) | 3 lines
  
  Always parse arguments in park_call_exec so that app_args is valid. This prevents a crash when executing Park from the dialplan with no arguments.
  
  
  ........
................
  r159443 | root | 2008-11-26 09:54:09 -0600 (Wed, 26 Nov 2008) | 18 lines
  
  Merged revisions 159437 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159437 | mmichelson | 2008-11-26 08:58:17 -0600 (Wed, 26 Nov 2008) | 10 lines
  
  Don't allow for configuration options to overwrite options
  set via channel variables on a reload.
  
  (closes issue #13921)
  Reported by: davidw
  Patches:
        13921.patch uploaded by putnopvut (license 60)
  Tested by: davidw
  
  
  ........
................
  r159484 | root | 2008-11-26 12:54:17 -0600 (Wed, 26 Nov 2008) | 15 lines
  
  Merged revisions 159475 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159475 | tilghman | 2008-11-26 12:33:04 -0600 (Wed, 26 Nov 2008) | 7 lines
  
  If the config file does not exist, then the first use crashes Asterisk.
  (closes issue #13848)
   Reported by: klaus3000
   Patches: 
         udptl.c.patch uploaded by eliel (license 64)
   Tested by: blitzrage
  
  ........
................
  r159540 | root | 2008-11-26 13:53:38 -0600 (Wed, 26 Nov 2008) | 19 lines
  
  Merged revisions 159534 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159534 | kpfleming | 2008-11-26 13:08:56 -0600 (Wed, 26 Nov 2008) | 11 lines
  
  Merged revisions 159476 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159476 | kpfleming | 2008-11-26 12:36:24 -0600 (Wed, 26 Nov 2008) | 7 lines
    
    simplify (and slightly bug-fix) the recent developer-oriented COMPILE_DOUBLE mode
    
    ensure that 'make clean' removes dependency files for .i files that are created in COMPILE_DOUBLE mode
  ........
  
  ................
................
  r159579 | root | 2008-11-26 14:53:59 -0600 (Wed, 26 Nov 2008) | 38 lines
  
  Merged revisions 159554,159573 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159554 | mmichelson | 2008-11-26 13:57:11 -0600 (Wed, 26 Nov 2008) | 19 lines
  
  Add some necessary hangup commands in the case that forwarding
  a call fails
  
  1) Hang up the original destination if the local channel cannot
     be requested.
  2) Hang up the local channel (in addition to the original destination)
     if ast_call fails when calling the newly created local channel.
  
  This prevents channels from sticking around forever in the
  case of a botched call forward (e.g. to an extension which does not
  exist).
  
  (closes issue #13764)
  Reported by: davidw
  Patches:
        13764_v2.patch uploaded by putnopvut (license 60)
  Tested by: putnopvut, davidw
  
  
  ................
  r159573 | kpfleming | 2008-11-26 14:35:14 -0600 (Wed, 26 Nov 2008) | 8 lines
  
  Blocked revisions 159571 via svnmerge
  
  ........
    r159571 | kpfleming | 2008-11-26 14:21:04 -0600 (Wed, 26 Nov 2008) | 2 lines
    
    rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
  ........
  
  ................
................
  r159637 | root | 2008-11-26 15:53:42 -0600 (Wed, 26 Nov 2008) | 17 lines
  
  Merged revisions 159629,159631 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159629 | kpfleming | 2008-11-26 15:09:58 -0600 (Wed, 26 Nov 2008) | 1 line
  
  add support for event suppression for AMI-over-HTTP
  ........
  r159631 | kpfleming | 2008-11-26 15:20:50 -0600 (Wed, 26 Nov 2008) | 5 lines
  
  improve handling of API calls provided by loaded modules through use of some GCC features; this makes app_stack's usage of AGI APIs even cleaner, and will allow it to work 'as expected' either with or without res_agi being loaded
  
  reviewed at http://reviewboard.digium.com/r/62
  
  
  ........
................
  r159670 | root | 2008-11-26 16:53:37 -0600 (Wed, 26 Nov 2008) | 26 lines
  
  Merged revisions 159664-159666 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159664 | russell | 2008-11-26 16:01:34 -0600 (Wed, 26 Nov 2008) | 4 lines
  
  Make a formatting change to test a new post-commit hook for reviewboard.
  
  http://reviewboard.digium.com/r/65/
  
  ........
  r159665 | russell | 2008-11-26 16:08:33 -0600 (Wed, 26 Nov 2008) | 4 lines
  
  Make a formatting change to test a new post-commit hook for reviewboard.
  
  http://reviewboard.digium.com/r/65/
  
  ........
  r159666 | russell | 2008-11-26 16:11:55 -0600 (Wed, 26 Nov 2008) | 4 lines
  
  Make a formatting change to test a new post-commit hook for reviewboard.
  
  http://reviewboard.digium.com/r/65/
  
  ........
................
  r159706 | root | 2008-11-27 14:54:16 -0600 (Thu, 27 Nov 2008) | 9 lines
  
  Merged revisions 159701 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159701 | phsultan | 2008-11-27 14:29:21 -0600 (Thu, 27 Nov 2008) | 1 line
  
  Removed duplicate code
  ........
................
  r159740 | root | 2008-11-28 08:54:15 -0600 (Fri, 28 Nov 2008) | 16 lines
  
  Merged revisions 159734 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159734 | mvanbaak | 2008-11-28 08:20:11 -0600 (Fri, 28 Nov 2008) | 8 lines
  
  Make res_config_ldap compile with the official OpenLDAP 2.3.X versions.
  They removed the LDAP_DEPRECATED define from their source and since we are using a couple
  of deprecated function calls we should define it with a CFLAG.
  
  Tested by me on OpenBSD 4.4 and snuff-home on Linux to make sure everything keeps compiling.
  It shouldn't break, we only define the LDAP_DEPRECATED with this which is what 
  all 2.2.X and older versions of OpenLDAP did in their own tree.
  
  ........
................
  r159780 | root | 2008-11-29 09:55:46 -0600 (Sat, 29 Nov 2008) | 13 lines
  
  Merged revisions 159774 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159774 | kpfleming | 2008-11-29 09:29:33 -0600 (Sat, 29 Nov 2008) | 5 lines
  
  we can now build with -Wformat=2, which found a couple of real bugs
  
  because SPRINTF() use non-literal format strings (which cannot be checked), move it into its own module so the rest of func_strings can benefit from format string checking
  
  
  ........
................
  r159862 | root | 2008-11-29 12:55:06 -0600 (Sat, 29 Nov 2008) | 31 lines
  
  Merged revisions 159818,159853 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r159818 | kpfleming | 2008-11-29 11:57:39 -0600 (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 12:33:18 -0600 (Sat, 29 Nov 2008) | 2 lines
  
  Allow the '#' sign to exist within an extension (inspired by issue #13330)
  
  ........
................
  r159907 | root | 2008-12-01 08:55:17 -0600 (Mon, 01 Dec 2008) | 19 lines
  
  Merged revisions 159898 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159898 | mvanbaak | 2008-12-01 08:09:59 -0600 (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.
  ........
  
  ................
................
  r159971 | root | 2008-12-01 09:54:08 -0600 (Mon, 01 Dec 2008) | 18 lines
  
  Merged revisions 159911 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r159911 | russell | 2008-12-01 08:56:10 -0600 (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 ...
  
  ........
  
  ................
................
  r160013 | root | 2008-12-01 11:54:32 -0600 (Mon, 01 Dec 2008) | 22 lines
  
  Merged revisions 160004 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
  r160004 | russell | 2008-12-01 11:34:31 -0600 (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.
  
  ........
  
  ................
................
  r160067 | root | 2008-12-01 12:54:49 -0600 (Mon, 01 Dec 2008) | 21 lines
  
  Merged revisions 160062 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r160062 | eliel | 2008-12-01 12:52:14 -0600 (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
  
  
  ........
................
  r160106 | root | 2008-12-01 15:55:00 -0600 (Mon, 01 Dec 2008) | 10 lines
  
  Merged revisions 160097 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
  r160097 | tilghman | 2008-12-01 15:23:37 -0600 (Mon, 01 Dec 2008) | 2 lines
  
  Use AST_EXT_LIB_SETUP before using AST_EXT_LIB_CHECK or bad things happen.
  
  ........
................

Added:
    team/rmudgett/misdn_facility/configs/cli_permissions.conf.sample
      - copied unchanged from r160106, team/group/issue8824/configs/cli_permissions.conf.sample
    team/rmudgett/misdn_facility/funcs/func_sprintf.c
      - copied unchanged from r160106, team/group/issue8824/funcs/func_sprintf.c
    team/rmudgett/misdn_facility/include/asterisk/optional_api.h
      - copied unchanged from r160106, team/group/issue8824/include/asterisk/optional_api.h
Modified:
    team/rmudgett/misdn_facility/   (props changed)
    team/rmudgett/misdn_facility/.cleancount
    team/rmudgett/misdn_facility/CHANGES
    team/rmudgett/misdn_facility/Makefile
    team/rmudgett/misdn_facility/Makefile.moddir_rules
    team/rmudgett/misdn_facility/Makefile.rules
    team/rmudgett/misdn_facility/UPGRADE.txt
    team/rmudgett/misdn_facility/agi/Makefile
    team/rmudgett/misdn_facility/apps/app_dial.c
    team/rmudgett/misdn_facility/apps/app_festival.c
    team/rmudgett/misdn_facility/apps/app_followme.c
    team/rmudgett/misdn_facility/apps/app_minivm.c
    team/rmudgett/misdn_facility/apps/app_queue.c
    team/rmudgett/misdn_facility/apps/app_readexten.c
    team/rmudgett/misdn_facility/apps/app_rpt.c
    team/rmudgett/misdn_facility/apps/app_stack.c
    team/rmudgett/misdn_facility/autoconf/ast_gcc_attribute.m4
    team/rmudgett/misdn_facility/cdr/cdr_tds.c
    team/rmudgett/misdn_facility/channels/chan_agent.c
    team/rmudgett/misdn_facility/channels/chan_console.c
    team/rmudgett/misdn_facility/channels/chan_dahdi.c
    team/rmudgett/misdn_facility/channels/chan_iax2.c
    team/rmudgett/misdn_facility/channels/chan_misdn.c
    team/rmudgett/misdn_facility/channels/chan_sip.c
    team/rmudgett/misdn_facility/channels/chan_skinny.c
    team/rmudgett/misdn_facility/channels/chan_usbradio.c
    team/rmudgett/misdn_facility/channels/chan_vpb.cc
    team/rmudgett/misdn_facility/channels/misdn/ie.c
    team/rmudgett/misdn_facility/channels/misdn_config.c
    team/rmudgett/misdn_facility/channels/xpmr/xpmr.c
    team/rmudgett/misdn_facility/configs/chan_dahdi.conf.sample
    team/rmudgett/misdn_facility/configs/sip.conf.sample
    team/rmudgett/misdn_facility/configure
    team/rmudgett/misdn_facility/configure.ac
    team/rmudgett/misdn_facility/contrib/asterisk-ng-doxygen
    team/rmudgett/misdn_facility/funcs/Makefile
    team/rmudgett/misdn_facility/funcs/func_dialgroup.c
    team/rmudgett/misdn_facility/funcs/func_realtime.c
    team/rmudgett/misdn_facility/funcs/func_strings.c
    team/rmudgett/misdn_facility/include/asterisk/_private.h
    team/rmudgett/misdn_facility/include/asterisk/agi.h
    team/rmudgett/misdn_facility/include/asterisk/astmm.h
    team/rmudgett/misdn_facility/include/asterisk/astobj2.h
    team/rmudgett/misdn_facility/include/asterisk/autoconfig.h.in
    team/rmudgett/misdn_facility/include/asterisk/channel.h
    team/rmudgett/misdn_facility/include/asterisk/cli.h
    team/rmudgett/misdn_facility/include/asterisk/compat.h
    team/rmudgett/misdn_facility/include/asterisk/config.h
    team/rmudgett/misdn_facility/include/asterisk/devicestate.h
    team/rmudgett/misdn_facility/include/asterisk/dlinkedlists.h
    team/rmudgett/misdn_facility/include/asterisk/dsp.h
    team/rmudgett/misdn_facility/include/asterisk/dundi.h
    team/rmudgett/misdn_facility/include/asterisk/enum.h
    team/rmudgett/misdn_facility/include/asterisk/linkedlists.h
    team/rmudgett/misdn_facility/include/asterisk/lock.h
    team/rmudgett/misdn_facility/include/asterisk/logger.h
    team/rmudgett/misdn_facility/include/asterisk/manager.h
    team/rmudgett/misdn_facility/include/asterisk/module.h
    team/rmudgett/misdn_facility/include/asterisk/res_odbc.h
    team/rmudgett/misdn_facility/include/asterisk/stringfields.h
    team/rmudgett/misdn_facility/include/asterisk/strings.h
    team/rmudgett/misdn_facility/include/asterisk/utils.h
    team/rmudgett/misdn_facility/include/jitterbuf.h
    team/rmudgett/misdn_facility/main/Makefile
    team/rmudgett/misdn_facility/main/ast_expr2.c
    team/rmudgett/misdn_facility/main/asterisk.c
    team/rmudgett/misdn_facility/main/astobj2.c
    team/rmudgett/misdn_facility/main/cdr.c
    team/rmudgett/misdn_facility/main/cli.c
    team/rmudgett/misdn_facility/main/config.c
    team/rmudgett/misdn_facility/main/dns.c
    team/rmudgett/misdn_facility/main/dsp.c
    team/rmudgett/misdn_facility/main/event.c
    team/rmudgett/misdn_facility/main/features.c
    team/rmudgett/misdn_facility/main/file.c
    team/rmudgett/misdn_facility/main/logger.c
    team/rmudgett/misdn_facility/main/manager.c
    team/rmudgett/misdn_facility/main/pbx.c
    team/rmudgett/misdn_facility/main/srv.c
    team/rmudgett/misdn_facility/main/taskprocessor.c
    team/rmudgett/misdn_facility/main/udptl.c
    team/rmudgett/misdn_facility/main/utils.c
    team/rmudgett/misdn_facility/main/xmldoc.c
    team/rmudgett/misdn_facility/makeopts.in
    team/rmudgett/misdn_facility/pbx/pbx_realtime.c
    team/rmudgett/misdn_facility/res/Makefile
    team/rmudgett/misdn_facility/res/res_agi.c
    team/rmudgett/misdn_facility/res/res_clialiases.c
    team/rmudgett/misdn_facility/res/res_config_sqlite.c
    team/rmudgett/misdn_facility/res/res_jabber.c
    team/rmudgett/misdn_facility/res/res_phoneprov.c
    team/rmudgett/misdn_facility/res/res_timing_pthread.c
    team/rmudgett/misdn_facility/res/res_timing_timerfd.c
    team/rmudgett/misdn_facility/utils/Makefile
    team/rmudgett/misdn_facility/utils/astman.c
    team/rmudgett/misdn_facility/utils/check_expr.c
    team/rmudgett/misdn_facility/utils/conf2ael.c
    team/rmudgett/misdn_facility/utils/extconf.c
    team/rmudgett/misdn_facility/utils/frame.c
    team/rmudgett/misdn_facility/utils/hashtest2.c

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- misdn-facility (original)
+++ misdn-facility Mon Dec  1 17:54:53 2008
@@ -1,1 +1,1 @@
-/team/group/issue8824:1-158470
+/team/group/issue8824:1-160147

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec  1 17:54:53 2008
@@ -1,1 +1,1 @@
-/trunk:1-158454
+/trunk:1-160105

Modified: team/rmudgett/misdn_facility/.cleancount
URL: http://svn.digium.com/view/asterisk/team/rmudgett/misdn_facility/.cleancount?view=diff&rev=160181&r1=160180&r2=160181
==============================================================================
--- team/rmudgett/misdn_facility/.cleancount (original)
+++ team/rmudgett/misdn_facility/.cleancount Mon Dec  1 17:54:53 2008
@@ -1,1 +1,1 @@
-35
+36

Modified: team/rmudgett/misdn_facility/CHANGES
URL: http://svn.digium.com/view/asterisk/team/rmudgett/misdn_facility/CHANGES?view=diff&rev=160181&r1=160180&r2=160181
==============================================================================
--- team/rmudgett/misdn_facility/CHANGES (original)
+++ team/rmudgett/misdn_facility/CHANGES Mon Dec  1 17:54:53 2008
@@ -21,7 +21,7 @@
 -------------
   * A new option, 'I' has been added to both app_queue and app_dial.
     By setting this option, Asterisk will not update the caller with
-    connected line changes when they occur.
+    connected line changes or redirecting party changes when they occur.
 
 mISDN channel driver (chan_misdn) changes
 ----------------------------------------
@@ -67,6 +67,11 @@
  * The configuration file now holds seperate sections for devices and lines.
    Please have a look at configs/skinny.conf.sample and change your skinny.conf
    accordingly.
+
+DAHDI Changes
+-------------
+ * The UK option waitfordialtone has been added for use with BT analog
+   lines.
 
 Dialplan Functions
 ------------------
@@ -108,6 +113,21 @@
    which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
  * All deprecated CLI commands are removed from the sourcecode. They are now handled
    by the new clialiases module. See cli_aliases.conf.sample file.
+
+Asterisk Manager Interface
+--------------------------
+ * When using the AMI over HTTP, you can now include a 'SuppressEvents' header (with
+   a non-empty value) in your request. If you do this, any pending AMI events will
+   *not* be included in the response to your request as they would normally, but
+   will be left in the event queue for the next request you make to retrieve. For
+   some applications, this will allow you to guarantee that you will only see
+   events in responses to 'WaitEvent' actions, and can better know when to expect them.
+   To know whether the Asterisk server supports this header or not, your client can
+   inspect the first response back from the server to see if it includes this header:
+
+   Pragma: SuppressEvents
+
+   If this is included, the server supports event suppression.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
@@ -418,6 +438,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/rmudgett/misdn_facility/Makefile
URL: http://svn.digium.com/view/asterisk/team/rmudgett/misdn_facility/Makefile?view=diff&rev=160181&r1=160180&r2=160181
==============================================================================
--- team/rmudgett/misdn_facility/Makefile (original)
+++ team/rmudgett/misdn_facility/Makefile Mon Dec  1 17:54:53 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-security #-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/rmudgett/misdn_facility/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/rmudgett/misdn_facility/Makefile.moddir_rules?view=diff&rev=160181&r1=160180&r2=160181
==============================================================================
--- team/rmudgett/misdn_facility/Makefile.moddir_rules (original)
+++ team/rmudgett/misdn_facility/Makefile.moddir_rules Mon Dec  1 17:54:53 2008
@@ -111,7 +111,7 @@
 
 clean::
 	rm -f *.so *.o *.oo *.eo *.i *.ii
-	rm -f .*.o.d .*.oo.d
+	rm -f .*.d
 	rm -f *.s *.i
 	rm -f modules.link
 
@@ -124,7 +124,6 @@
 dist-clean::
 	rm -f .*.moduleinfo .moduleinfo
 	rm -f .*.makeopts .makeopts
-	rm -f .*.d
 
 .%.moduleinfo: %.c

[... 6475 lines stripped ...]



More information about the svn-commits mailing list