[svn-commits] mnicholson: branch group/newcdr r197258 - in /team/group/newcdr: ./ apps/ aut...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed May 27 15:02:54 2009
New Revision: 197258

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197258
Log:
Merged revisions 196072,196114,196117,196187-196188,196227,196246,196268,196270,196272,196308,196344,196377,196381,196416-196417,196456,196488,196520,196554,196585,196622,196658,196721,196725,196758,196792,196843,196893,196907,196945-196946,196948,196988,197025,197089,197125,197189,197209 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r196072 | kpfleming | 2009-05-21 16:13:09 -0500 (Thu, 21 May 2009) | 16 lines
  
  Const-ify the world (or at least a good part of it)
  
  This patch adds 'const' tags to a number of Asterisk APIs where they are appropriate (where the API already demanded that the function argument not be modified, but the compiler was not informed of that fact). The list includes:
  
  - CLI command handlers
  - CLI command handler arguments
  - AGI command handlers
  - AGI command handler arguments
  - Dialplan application handler arguments
  - Speech engine API function arguments
  
  In addition, various file-scope and function-scope constant arrays got 'const' and/or 'static' qualifiers where they were missing.
  
  Review: https://reviewboard.asterisk.org/r/251/
................
  r196114 | eliel | 2009-05-22 08:34:01 -0500 (Fri, 22 May 2009) | 5 lines
  
  Avoid using prototypes when not necessary (it is already defined in the header
  file).
  Make log_match_char_tree() static to main/pbx.c (only used there).
................
  r196117 | file | 2009-05-22 08:56:47 -0500 (Fri, 22 May 2009) | 12 lines
  
  Merged revisions 196116 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r196116 | file | 2009-05-22 10:54:17 -0300 (Fri, 22 May 2009) | 5 lines
    
    Fix a bug where using immediate with mISDN caused a cause code of 16 to get sent back instead of 1 if the 's' extension did not exist.
    
    (closes issue #12286)
    Reported by: lmamane
  ........
................
  r196187 | rmudgett | 2009-05-22 10:07:21 -0500 (Fri, 22 May 2009) | 1 line
  
  Make chan_misdn compile.
................
  r196188 | rmudgett | 2009-05-22 10:07:48 -0500 (Fri, 22 May 2009) | 1 line
  
  Fix constify the world compile problem.
................
  r196227 | seanbright | 2009-05-22 11:10:33 -0500 (Fri, 22 May 2009) | 3 lines
  
  Fix build under dev mode and remove some casts that are no longer necessary as
  a result of the const-ify the world patch.
................
  r196246 | russell | 2009-05-22 11:20:16 -0500 (Fri, 22 May 2009) | 1 line
  
  resolve compiler warning
................
  r196268 | mmichelson | 2009-05-22 11:50:31 -0500 (Fri, 22 May 2009) | 3 lines
  
  s/it's/its/
................
  r196270 | seanbright | 2009-05-22 11:51:22 -0500 (Fri, 22 May 2009) | 9 lines
  
  Fix res_agi compilation after the const-ify the world merge.
  
  Since we are dealing with a 'const char * const' now, we have to create a
  temporary copy of the string to work on rather than the original.  Fix inspired
  by reporter.  Reviewed by everyone-and-their-mother in #asterisk-dev.
  
  (closes issue #15184)
  Reported by: andrew
................
  r196272 | tilghman | 2009-05-22 11:53:41 -0500 (Fri, 22 May 2009) | 2 lines
  
  Two more minor fixes due to constification
................
  r196308 | eliel | 2009-05-22 12:52:35 -0500 (Fri, 22 May 2009) | 30 lines
  
  Implement a new element in AstXML for AMI actions documentation.
  
  A new xml element was created to manage the AMI actions documentation,
  using AstXML.
  To register a manager action using XML documentation it is now possible
  using ast_manager_register_xml().
  The CLI command 'manager show command' can be used to show the parsed
  documentation.
  
  Example manager xml documentation:
  <manager name="ami action name" language="en_US">
      <synopsis>
          AMI action synopsis.
      </synopsis>
      <syntax>
          <xi:include xpointer="xpointer(...)" /> <-- for ActionID
          <parameter name="header1" required="true">
  	    <para>Description</para>
  	</parameter>
  	...
      </syntax>
      <description>
          <para>AMI action description</para>
      </description>
      <see-also>
      	...
      </see-also>
  </manager>
................
  r196344 | eliel | 2009-05-22 14:11:44 -0500 (Fri, 22 May 2009) | 6 lines
  
  Moved static documentation to the AstXML form.
  
  Moved AGI commands static documentation to XML docs ('say alpha', 'say digits',
  'say number', 'say phonetic', 'say date' and 'say time').
................
  r196377 | eliel | 2009-05-22 14:38:33 -0500 (Fri, 22 May 2009) | 11 lines
  
  Unregister every registered application by MiniVM.
  
  The MinivmMWI application was not being unregistered on unload and we were not
  able to load again the module or reload it.
  
  (closes issue #15174)
  Reported by: junky
  Patches:
        unregister_minivm_mwi.diff uploaded by junky (license 177)
................
  r196381 | seanbright | 2009-05-22 15:01:11 -0500 (Fri, 22 May 2009) | 3 lines
  
  Don't crash if an RTP instance can't be created.  This could occur when an
  invalid bindaddr was specified in gtalk.conf.
................
  r196416 | dvossel | 2009-05-22 16:09:45 -0500 (Fri, 22 May 2009) | 19 lines
  
  SIP set outbound transport type from Registration
  
  In sip.conf the transport option allows for the configuration of what transport types (udp, tcp, and tls) a peer will accept, but only the first type listed was used for outbound connections.  This patch changes this.  Now the default transport type is only used until the peer registers.  When registration takes place the transport type is parsed out of the Contact header.  If the Contact header's transport type is equal to one that the peer supports, the peer's default transport type for outbound connections is set to match the Contact header's type.  If the Contact header's transport type is not present, then the peer's default transport type is set to match the one the peer registered with.  When a peer unregisters or the registration expires, the default transport type for that peer is reset.
  
  (closes issue #12282)
  Reported by: rjain
  Patches:
        reg_patch_1.diff uploaded by dvossel (license 671)
  Tested by: dvossel
  
  (closes issue #14727)
  Reported by: pj
  Patches:
        reg_patch_3.diff uploaded by dvossel (license 671)
  Tested by: pj, dvossel
  
  Review: https://reviewboard.asterisk.org/r/249/
................
  r196417 | seanbright | 2009-05-22 16:11:03 -0500 (Fri, 22 May 2009) | 3 lines
  
  Call ast_stun_init() when we're initializing to get the 'stun debug set'
  commands.
................
  r196456 | moy | 2009-05-22 23:27:47 -0500 (Fri, 22 May 2009) | 1 line
  
  set MFCR2_CATEGORY just when starting the pbx
................
  r196488 | kpfleming | 2009-05-23 08:31:56 -0500 (Sat, 23 May 2009) | 5 lines
  
  Correct example for CLI autocompletion (generation)
  
  Reported by Atis on #asterisk-dev
................
  r196520 | seanbright | 2009-05-23 10:16:59 -0500 (Sat, 23 May 2009) | 11 lines
  
  Fix errors in cdr_custom that cause reference errors when non-CDR variable
  substitution is done.
  
  cdr_custom was creating a ast_channel struct directly and passing it into the
  core for variable substition.  This was fine as long as the format string
  contained only calls to the CDR() function.  Doing something like ${EPOCH} on
  the other hand tried to lock the channel, which would fail and throw an error
  because the passed channel hadn't been allocated as an ao2 object.  So now we
  create the dummy channel with ast_channel_alloc, and everything works as
  expected.
................
  r196554 | eliel | 2009-05-23 16:11:31 -0500 (Sat, 23 May 2009) | 6 lines
  
  Move static AGI commands documentation to XML.
  
  Move AGI commands ('say datetime', 'send image', 'send text', 'set autohangup',
  'set callerid', 'set context', 'set extension') documentation to the AstXML
  form.
................
  r196585 | eliel | 2009-05-24 11:17:31 -0500 (Sun, 24 May 2009) | 20 lines
  
  Move AGI static documentation to the new AstXML form.
  
  Move AGI commands documentation to XML docs:
  'set priority'
  'set variable'
  'stream file'
  'control stream file'
  'tdd mode'
  'verbose'
  'wait for digit'
  'speech create'
  'speech set'
  'speech destroy'
  'speech load grammar'
  'speech unload grammar'
  'speech activate grammar'
  'speech deactivate grammar'
  'speech recognize'
................
  r196622 | seanbright | 2009-05-26 07:14:14 -0500 (Tue, 26 May 2009) | 2 lines
  
  Use a properly allocated channel for substitution in cdr_manager.
................
  r196658 | file | 2009-05-26 08:06:50 -0500 (Tue, 26 May 2009) | 14 lines
  
  Merged revisions 196657 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r196657 | file | 2009-05-26 10:06:09 -0300 (Tue, 26 May 2009) | 7 lines
    
    Remove some bash specific stuff from safe_asterisk.
    
    (closes issue #10812)
    Reported by: paravoid
    Patches:
          safe_asterisk_bashism.diff uploaded by tzafrir (license 46)
  ........
................
  r196721 | file | 2009-05-26 08:43:13 -0500 (Tue, 26 May 2009) | 7 lines
  
  Fix a bug where the sip unregister CLI command did not completely unregister the peer.
  
  (closes issue #15118)
  Reported by: alecdavis
  Patches:
        chan_sip_unregister.diff2.txt uploaded by alecdavis (license 585)
................
  r196725 | seanbright | 2009-05-26 08:56:30 -0500 (Tue, 26 May 2009) | 2 lines
  
  Use a properly allocated channel for substitution in cdr_sqlite3_custom.
................
  r196758 | seanbright | 2009-05-26 09:36:11 -0500 (Tue, 26 May 2009) | 6 lines
  
  Add new ast_complete_applications function so that we can use it with the
  'channel originate ... application <app>' CLI command.
  
  (And yeah, I cleaned up some whitespace in res_clioriginate.c... big whoop,
  wanna fight about it!?)
................
  r196792 | seanbright | 2009-05-26 11:38:54 -0500 (Tue, 26 May 2009) | 2 lines
  
  Add a missing unref for queues in handle_statechange.
................
  r196843 | russell | 2009-05-26 13:20:57 -0500 (Tue, 26 May 2009) | 16 lines
  
  Merged revisions 196826 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r196826 | russell | 2009-05-26 13:14:36 -0500 (Tue, 26 May 2009) | 9 lines
    
    Resolve a file handle leak.
    
    The frames here should have always been freed.  However, out of luck, there was
    never any memory leaked.  However, after file streams became reference counted,
    this code would leak the file stream for the file being read.
    
    (closes issue #15181)
    Reported by: jkroon
  ........
................
  r196893 | mmichelson | 2009-05-26 14:50:07 -0500 (Tue, 26 May 2009) | 3 lines
  
  Remove some redundant or unnecessary connected line-related function calls.
................
  r196907 | seanbright | 2009-05-26 15:20:08 -0500 (Tue, 26 May 2009) | 10 lines
  
  Include startup and reload date in the CoreStatus manager message.
  
  The CoreStartupTime and CoreReloadTime name/value pairs in the CoreStatus
  response message only included the time and not the date.  This patch,
  inspired by the reporter's patch, adds 2 new fields - CoreStartupDate and
  CoreReloadDate - which contain the date portion of these values.
  
  (closes issue #15000)
  Reported by: sum
................
  r196945 | seanbright | 2009-05-26 17:38:05 -0500 (Tue, 26 May 2009) | 13 lines
  
  Add ActionID to CoreShowChannel event.
  
  There is inconsistency in how we handle manager responses that are lists of
  items and, unfortunately, third parties have come to rely on ActionID being on
  every event within those lists instead of just keeping track of the ActionID for
  the current response.  This change makes CoreShowChannels include the ActionID
  with each CoreShowChannel event generated as a result of it being called.
  
  (closes issue #15001)
  Reported by: sum
  Patches:
        patchactionid2.patch uploaded by sum (license 766)
................
  r196946 | russell | 2009-05-26 17:40:34 -0500 (Tue, 26 May 2009) | 8 lines
  
  Update configure script to check for OSP toolkit 3.5.0.
  
  (closes issue #14988)
  Reported by: tzafrir
  Patches:
        configure.ac.diff uploaded by homesick (license 91)
        new_ast_check_osptk.m4 uploaded by homesick (license 91)
................
  r196948 | seanbright | 2009-05-26 17:43:21 -0500 (Tue, 26 May 2009) | 8 lines
  
  Reset the terminal to the correct fg/bg after XML documenation is rendered.
  
  (closes issue #15200)
  Reported by: ajohnson
  Patches:
        05262009_xmldoc.patch uploaded by seanbright (license 71)
  Tested by: ajohnson
................
  r196988 | seanbright | 2009-05-27 08:02:54 -0500 (Wed, 27 May 2009) | 13 lines
  
  Display an error message when chan_alsa fails to load due to a missing
  or inaccessible configuration file.
  
  Before this change, when chan_alsa failed to load due to a missing or
  inaccessible configuration file, no message would be displayed.  With this
  change, when chan_alsa fails to load due to a missing or inaccessible
  configuration file, a message will be displayed.
  
  (closes issue #14760)
  Reported by: Nick_Lewis
  Patches:
        chan_alsa.c-confload.patch uploaded by Nick (license 657)
................
  r197025 | seanbright | 2009-05-27 09:03:01 -0500 (Wed, 27 May 2009) | 23 lines
  
  Blocked revisions 197024 via svnmerge
  
  ........
    r197024 | seanbright | 2009-05-27 09:54:35 -0400 (Wed, 27 May 2009) | 17 lines
    
    Fix handling of the 'state_interface' option of the 'queue add member' CLI
    command.
    
    This change relates to r184980, which was a backport of the state interface
    changes to app_queue from trunk.  trunk and all of the 1.6.x branches are not
    affected.
    
    'queue add member' allows for specifying an interface to use for device state
    when adding a queue member via CLI, but the validation code was not properly
    updated to reflect this optional argument.
    
    (closes issue #15198)
    Reported by: loloski
    Patches:
          05272009_app_queue.diff uploaded by seanbright (license 71)
    Tested by: loloski
  ........
................
  r197089 | seanbright | 2009-05-27 11:07:57 -0500 (Wed, 27 May 2009) | 6 lines
  
  Fix references to /etc/dahdi/system.conf and /etc/asterisk/chan_dahdi.conf in
  the sample configuration files.
  
  (closes issue #15207)
  Reported by: seandarcy
................
  r197125 | jpeeler | 2009-05-27 11:52:26 -0500 (Wed, 27 May 2009) | 17 lines
  
  Blocked revisions 197124 via svnmerge
  
  ........
    r197124 | jpeeler | 2009-05-27 11:49:38 -0500 (Wed, 27 May 2009) | 12 lines
    
    Fix broken attended transfers
    
    The bridge was terminating immediately after the attended transfer was 
    completed. The problem was because upon reentering ast_channel_bridge
    nexteventts was checked to see if it was set and if so could possibly
    return AST_BRIDGE_COMPLETE.
    
    (closes issue #15183)
    Reported by: andrebarbosa
    Tested by: andrebarbosa, tootai, loloski
  ........
................
  r197189 | seanbright | 2009-05-27 13:25:33 -0500 (Wed, 27 May 2009) | 2 lines
  
  Remove a file sample configuration file that is no longer used.
................
  r197209 | tilghman | 2009-05-27 14:20:56 -0500 (Wed, 27 May 2009) | 12 lines
  
  Recorded merge of revisions 197194 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r197194 | tilghman | 2009-05-27 14:09:42 -0500 (Wed, 27 May 2009) | 5 lines
    
    Use a different determinator on whether to print the delimiter, since leading fields may be blank.
    (closes issue #15208)
     Reported by: ramonpeek
     Patch by me, though inspired in part by a patch from ramonpeek
  ........
................

Added:
    team/group/newcdr/autoconf/ast_check_osptk.m4
      - copied unchanged from r197209, trunk/autoconf/ast_check_osptk.m4
Removed:
    team/group/newcdr/configs/adtranvofr.conf.sample
Modified:
    team/group/newcdr/   (props changed)
    team/group/newcdr/apps/app_adsiprog.c
    team/group/newcdr/apps/app_alarmreceiver.c
    team/group/newcdr/apps/app_amd.c
    team/group/newcdr/apps/app_authenticate.c
    team/group/newcdr/apps/app_cdr.c
    team/group/newcdr/apps/app_chanisavail.c
    team/group/newcdr/apps/app_channelredirect.c
    team/group/newcdr/apps/app_chanspy.c
    team/group/newcdr/apps/app_confbridge.c
    team/group/newcdr/apps/app_controlplayback.c
    team/group/newcdr/apps/app_dahdibarge.c
    team/group/newcdr/apps/app_dahdiras.c
    team/group/newcdr/apps/app_db.c
    team/group/newcdr/apps/app_dial.c
    team/group/newcdr/apps/app_dictate.c
    team/group/newcdr/apps/app_directed_pickup.c
    team/group/newcdr/apps/app_directory.c
    team/group/newcdr/apps/app_disa.c
    team/group/newcdr/apps/app_dumpchan.c
    team/group/newcdr/apps/app_echo.c
    team/group/newcdr/apps/app_exec.c
    team/group/newcdr/apps/app_externalivr.c
    team/group/newcdr/apps/app_fax.c
    team/group/newcdr/apps/app_festival.c
    team/group/newcdr/apps/app_flash.c
    team/group/newcdr/apps/app_followme.c
    team/group/newcdr/apps/app_forkcdr.c
    team/group/newcdr/apps/app_getcpeid.c
    team/group/newcdr/apps/app_ices.c
    team/group/newcdr/apps/app_image.c
    team/group/newcdr/apps/app_ivrdemo.c
    team/group/newcdr/apps/app_jack.c
    team/group/newcdr/apps/app_macro.c
    team/group/newcdr/apps/app_meetme.c
    team/group/newcdr/apps/app_milliwatt.c
    team/group/newcdr/apps/app_minivm.c
    team/group/newcdr/apps/app_mixmonitor.c
    team/group/newcdr/apps/app_morsecode.c
    team/group/newcdr/apps/app_mp3.c
    team/group/newcdr/apps/app_nbscat.c
    team/group/newcdr/apps/app_originate.c
    team/group/newcdr/apps/app_osplookup.c
    team/group/newcdr/apps/app_page.c
    team/group/newcdr/apps/app_parkandannounce.c
    team/group/newcdr/apps/app_playback.c
    team/group/newcdr/apps/app_playtones.c
    team/group/newcdr/apps/app_privacy.c
    team/group/newcdr/apps/app_queue.c
    team/group/newcdr/apps/app_read.c
    team/group/newcdr/apps/app_readexten.c
    team/group/newcdr/apps/app_readfile.c
    team/group/newcdr/apps/app_record.c
    team/group/newcdr/apps/app_rpt.c
    team/group/newcdr/apps/app_sayunixtime.c
    team/group/newcdr/apps/app_senddtmf.c
    team/group/newcdr/apps/app_sendtext.c
    team/group/newcdr/apps/app_setcallerid.c
    team/group/newcdr/apps/app_skel.c
    team/group/newcdr/apps/app_sms.c
    team/group/newcdr/apps/app_softhangup.c
    team/group/newcdr/apps/app_speech_utils.c
    team/group/newcdr/apps/app_stack.c
    team/group/newcdr/apps/app_system.c
    team/group/newcdr/apps/app_talkdetect.c
    team/group/newcdr/apps/app_test.c
    team/group/newcdr/apps/app_transfer.c
    team/group/newcdr/apps/app_url.c
    team/group/newcdr/apps/app_userevent.c
    team/group/newcdr/apps/app_verbose.c
    team/group/newcdr/apps/app_voicemail.c
    team/group/newcdr/apps/app_waitforring.c
    team/group/newcdr/apps/app_waitforsilence.c
    team/group/newcdr/apps/app_waituntil.c
    team/group/newcdr/apps/app_while.c
    team/group/newcdr/apps/app_zapateller.c
    team/group/newcdr/cdr/cdr_adaptive_odbc.c
    team/group/newcdr/cdr/cdr_custom.c
    team/group/newcdr/cdr/cdr_manager.c
    team/group/newcdr/cdr/cdr_sqlite.c
    team/group/newcdr/cdr/cdr_sqlite3_custom.c
    team/group/newcdr/channels/chan_agent.c
    team/group/newcdr/channels/chan_alsa.c
    team/group/newcdr/channels/chan_console.c
    team/group/newcdr/channels/chan_dahdi.c
    team/group/newcdr/channels/chan_gtalk.c
    team/group/newcdr/channels/chan_iax2.c
    team/group/newcdr/channels/chan_mgcp.c
    team/group/newcdr/channels/chan_misdn.c
    team/group/newcdr/channels/chan_nbs.c
    team/group/newcdr/channels/chan_oss.c
    team/group/newcdr/channels/chan_sip.c
    team/group/newcdr/channels/chan_skinny.c
    team/group/newcdr/channels/chan_unistim.c
    team/group/newcdr/channels/console_gui.c
    team/group/newcdr/channels/iax2-parser.c
    team/group/newcdr/channels/misdn/chan_misdn_config.h
    team/group/newcdr/channels/misdn_config.c
    team/group/newcdr/channels/vcodecs.c
    team/group/newcdr/configs/chan_dahdi.conf.sample
    team/group/newcdr/configs/extensions.conf.sample
    team/group/newcdr/configs/sip.conf.sample
    team/group/newcdr/configs/sla.conf.sample
    team/group/newcdr/configs/smdi.conf.sample
    team/group/newcdr/configs/vpb.conf.sample
    team/group/newcdr/configure
    team/group/newcdr/configure.ac
    team/group/newcdr/contrib/scripts/safe_asterisk
    team/group/newcdr/doc/appdocsxml.dtd
    team/group/newcdr/formats/format_gsm.c
    team/group/newcdr/funcs/func_cut.c
    team/group/newcdr/funcs/func_devstate.c
    team/group/newcdr/funcs/func_odbc.c
    team/group/newcdr/funcs/func_strings.c
    team/group/newcdr/include/asterisk/abstract_jb.h
    team/group/newcdr/include/asterisk/agi.h
    team/group/newcdr/include/asterisk/app.h
    team/group/newcdr/include/asterisk/autoconfig.h.in
    team/group/newcdr/include/asterisk/cli.h
    team/group/newcdr/include/asterisk/extconf.h
    team/group/newcdr/include/asterisk/features.h
    team/group/newcdr/include/asterisk/image.h
    team/group/newcdr/include/asterisk/manager.h
    team/group/newcdr/include/asterisk/module.h
    team/group/newcdr/include/asterisk/pbx.h
    team/group/newcdr/include/asterisk/speech.h
    team/group/newcdr/include/asterisk/strings.h
    team/group/newcdr/include/asterisk/taskprocessor.h
    team/group/newcdr/include/asterisk/utils.h
    team/group/newcdr/include/asterisk/xmldoc.h
    team/group/newcdr/main/abstract_jb.c
    team/group/newcdr/main/app.c
    team/group/newcdr/main/ast_expr2.fl
    team/group/newcdr/main/asterisk.c
    team/group/newcdr/main/astmm.c
    team/group/newcdr/main/astobj2.c
    team/group/newcdr/main/cdr.c
    team/group/newcdr/main/channel.c
    team/group/newcdr/main/cli.c
    team/group/newcdr/main/db.c
    team/group/newcdr/main/dsp.c
    team/group/newcdr/main/features.c
    team/group/newcdr/main/frame.c
    team/group/newcdr/main/image.c
    team/group/newcdr/main/loader.c
    team/group/newcdr/main/manager.c
    team/group/newcdr/main/pbx.c
    team/group/newcdr/main/taskprocessor.c
    team/group/newcdr/main/udptl.c
    team/group/newcdr/main/ulaw.c
    team/group/newcdr/main/utils.c
    team/group/newcdr/main/xmldoc.c
    team/group/newcdr/pbx/dundi-parser.c
    team/group/newcdr/pbx/pbx_ael.c
    team/group/newcdr/pbx/pbx_config.c
    team/group/newcdr/res/res_agi.c
    team/group/newcdr/res/res_clioriginate.c
    team/group/newcdr/res/res_convert.c
    team/group/newcdr/res/res_jabber.c
    team/group/newcdr/res/res_limit.c
    team/group/newcdr/res/res_monitor.c
    team/group/newcdr/res/res_musiconhold.c
    team/group/newcdr/res/res_odbc.c
    team/group/newcdr/res/res_rtp_asterisk.c
    team/group/newcdr/res/res_speech.c
    team/group/newcdr/utils/conf2ael.c
    team/group/newcdr/utils/extconf.c

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 May 27 15:02:54 2009
@@ -1,1 +1,1 @@
-/trunk:1-196017
+/trunk:1-197256

Modified: team/group/newcdr/apps/app_adsiprog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_adsiprog.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_adsiprog.c (original)
+++ team/group/newcdr/apps/app_adsiprog.c Wed May 27 15:02:54 2009
@@ -74,7 +74,7 @@
 	char *name;
 };
 
-static struct adsi_event events[] = {
+static const struct adsi_event events[] = {
 	{ 1, "CALLERID" },
 	{ 2, "VMWI" },
 	{ 3, "NEARANSWER" },
@@ -101,7 +101,7 @@
 	{ 24, "CPEID" },
 };
 
-static struct adsi_event justify[] = {
+static const struct adsi_event justify[] = {
 	{ 0, "CENTER" },
 	{ 1, "RIGHT" },
 	{ 2, "LEFT" },
@@ -232,7 +232,7 @@
 	return 0;
 }
 
-static char *get_token(char **buf, char *script, int lineno)
+static char *get_token(char **buf, const char *script, int lineno)
 {
 	char *tmp = *buf, *keyword;
 	int quoted = 0;
@@ -264,7 +264,7 @@
 
 static char *validdtmf = "123456789*0#ABCD";
 
-static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char dtmfstr[80], *a;
 	int bytes = 0;
@@ -294,7 +294,7 @@
 	return bytes;
 }
 
-static int goto_line(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int goto_line(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *page = get_token(&args, script, lineno);
 	char *gline = get_token(&args, script, lineno);
@@ -327,7 +327,7 @@
 	return 2;
 }
 
-static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *dir = get_token(&args, script, lineno);
 	char *gline = get_token(&args, script, lineno);
@@ -360,7 +360,7 @@
 	return 2;
 }
 
-static int send_delay(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int send_delay(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *gtime = get_token(&args, script, lineno);
 	int ms;
@@ -385,7 +385,7 @@
 	return 2;
 }
 
-static int set_state(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int set_state(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *gstate = get_token(&args, script, lineno);
 	int state;
@@ -406,7 +406,7 @@
 	return 2;
 }
 
-static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 
@@ -424,7 +424,7 @@
 	return 2;
 }
 
-static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
 {
 	int x;
 
@@ -449,7 +449,7 @@
 	return &state->flags[state->numflags-1];
 }
 
-static int setflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int setflag(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 	char sname[80];
@@ -476,7 +476,7 @@
 	return 2;
 }
 
-static int clearflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int clearflag(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 	struct adsi_flag *flag;
@@ -503,7 +503,7 @@
 	return 2;
 }
 
-static int starttimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int starttimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 	int secs;
@@ -549,7 +549,7 @@
 	return -1;
 }
 
-static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name, char *script, int lineno)
+static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name, const char *script, int lineno)
 {
 	int x;
 
@@ -570,7 +570,7 @@
 	return &state->keys[state->numkeys-1];
 }
 
-static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name, char *script, int lineno)
+static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name, const char *script, int lineno)
 {
 	int x;
 
@@ -591,7 +591,7 @@
 	return &state->subs[state->numsubs-1];
 }
 
-static struct adsi_state *getstatebyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_state *getstatebyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
 {
 	int x;
 
@@ -616,7 +616,7 @@
 	return &state->states[state->numstates-1];
 }
 
-static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
+static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *name, const char *script, int lineno, int create)
 {
 	int x;
 
@@ -641,7 +641,7 @@
 	return &state->displays[state->numdisplays-1];
 }
 
-static int showkeys(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int showkeys(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok, newkey[80];
 	int bytes, x, flagid = 0;
@@ -688,7 +688,7 @@
 	return 2 + x;
 }
 
-static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok, dispname[80];
 	int line = 0, flag = 0, cmd = 3;
@@ -739,7 +739,7 @@
 	return 3;
 }
 
-static int cleardisplay(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int cleardisplay(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 
@@ -751,7 +751,7 @@
 	return 2;
 }
 
-static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 
@@ -763,7 +763,7 @@
 	return 2;
 }
 
-static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 
@@ -775,7 +775,7 @@
 	return 2;
 }
 
-static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 
@@ -787,7 +787,7 @@
 	return 2;
 }
 
-static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 	char subscr[80];
@@ -812,7 +812,7 @@
 	return 2;
 }
 
-static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
+static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	char *tok = get_token(&args, script, lineno);
 	char subscr[80], sname[80];
@@ -879,10 +879,10 @@
 struct adsi_key_cmd {
 	char *name;
 	int id;
-	int (*add_args)(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno);
+	int (*add_args)(char *buf, char *name, int id, char *args, struct adsi_script *state, const char *script, int lineno);
 };
 
-static struct adsi_key_cmd kcmds[] = {
+static const struct adsi_key_cmd kcmds[] = {
 	{ "SENDDTMF", 0, send_dtmf },
 	/* Encoded DTMF would go here */
 	{ "ONHOOK", 0x81 },
@@ -924,7 +924,7 @@
 	{ "EXIT", 0xa0 },
 };
 
-static struct adsi_key_cmd opcmds[] = {
+static const struct adsi_key_cmd opcmds[] = {
 	
 	/* 1 - Branch on event -- handled specially */
 	{ "SHOWKEYS", 2, showkeys },
@@ -944,7 +944,7 @@
 };
 
 
-static int process_returncode(struct adsi_soft_key *key, char *code, char *args, struct adsi_script *state, char *script, int lineno)
+static int process_returncode(struct adsi_soft_key *key, char *code, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	int x, res;
 	char *unused;
@@ -973,7 +973,7 @@
 	return -1;
 }
 
-static int process_opcode(struct adsi_subscript *sub, char *code, char *args, struct adsi_script *state, char *script, int lineno)
+static int process_opcode(struct adsi_subscript *sub, char *code, char *args, struct adsi_script *state, const char *script, int lineno)
 {
 	int x, res, max = sub->id ? MAX_SUB_LEN : MAX_MAIN_LEN;
 	char *unused;
@@ -1010,7 +1010,7 @@
 	return -1;
 }
 
-static int adsi_process(struct adsi_script *state, char *buf, char *script, int lineno)
+static int adsi_process(struct adsi_script *state, char *buf, const char *script, int lineno)
 {
 	char *keyword = get_token(&buf, script, lineno);
 	char *args, vname[256], tmp[80], tmp2[80];
@@ -1358,7 +1358,7 @@
 	return 0;
 }
 
-static struct adsi_script *compile_script(char *script)
+static struct adsi_script *compile_script(const char *script)
 {
 	FILE *f;
 	char fn[256], buf[256], *c;
@@ -1451,7 +1451,7 @@
 }
 #endif
 
-static int adsi_prog(struct ast_channel *chan, char *script)
+static int adsi_prog(struct ast_channel *chan, const char *script)
 {
 	struct adsi_script *scr;
 	int x, bytes;
@@ -1562,7 +1562,7 @@
 	return 0;
 }
 
-static int adsi_exec(struct ast_channel *chan, void *data)
+static int adsi_exec(struct ast_channel *chan, const char *data)
 {
 	int res = 0;
 	

Modified: team/group/newcdr/apps/app_alarmreceiver.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_alarmreceiver.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_alarmreceiver.c (original)
+++ team/group/newcdr/apps/app_alarmreceiver.c Wed May 27 15:02:54 2009
@@ -416,7 +416,7 @@
 *
 * The function will return 0 when the caller hangs up, else a -1 if there was a problem.
 */
-static int receive_ademco_contact_id( struct ast_channel *chan, void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
+static int receive_ademco_contact_id(struct ast_channel *chan, const void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
 {
 	int i, j;
 	int res = 0;
@@ -564,7 +564,7 @@
 * This is the main function called by Asterisk Core whenever the App is invoked in the extension logic.
 * This function will always return 0.
 */
-static int alarmreceiver_exec(struct ast_channel *chan, void *data)
+static int alarmreceiver_exec(struct ast_channel *chan, const char *data)
 {
 	int res = 0;
 	event_node_t *elp, *efree;

Modified: team/group/newcdr/apps/app_amd.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_amd.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_amd.c (original)
+++ team/group/newcdr/apps/app_amd.c Wed May 27 15:02:54 2009
@@ -143,7 +143,7 @@
 /* Set to the lowest ms value provided in amd.conf or application parameters */
 static int dfltMaxWaitTimeForFrame  = 50;
 
-static void isAnsweringMachine(struct ast_channel *chan, void *data)
+static void isAnsweringMachine(struct ast_channel *chan, const char *data)
 {
 	int res = 0;
 	struct ast_frame *f = NULL;
@@ -404,7 +404,7 @@
 }
 
 
-static int amd_exec(struct ast_channel *chan, void *data)
+static int amd_exec(struct ast_channel *chan, const char *data)
 {
 	isAnsweringMachine(chan, data);
 

Modified: team/group/newcdr/apps/app_authenticate.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_authenticate.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_authenticate.c (original)
+++ team/group/newcdr/apps/app_authenticate.c Wed May 27 15:02:54 2009
@@ -105,7 +105,7 @@
 	</application>
  ***/
 
-static int auth_exec(struct ast_channel *chan, void *data)
+static int auth_exec(struct ast_channel *chan, const char *data)
 {
 	int res = 0, retries, maxdigits;
 	char passwd[256], *prompt = "agent-pass", *argcopy = NULL;

Modified: team/group/newcdr/apps/app_cdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_cdr.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_cdr.c (original)
+++ team/group/newcdr/apps/app_cdr.c Wed May 27 15:02:54 2009
@@ -44,9 +44,9 @@
 	</application>
  ***/
 
-static char *nocdr_app = "NoCDR";
+static const char nocdr_app[] = "NoCDR";
 
-static int nocdr_exec(struct ast_channel *chan, void *data)
+static int nocdr_exec(struct ast_channel *chan, const char *data)
 {
 	if (chan->cdr)
 		ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);

Modified: team/group/newcdr/apps/app_chanisavail.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_chanisavail.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_chanisavail.c (original)
+++ team/group/newcdr/apps/app_chanisavail.c Wed May 27 15:02:54 2009
@@ -92,7 +92,7 @@
 	</application>
  ***/
 
-static int chanavail_exec(struct ast_channel *chan, void *data)
+static int chanavail_exec(struct ast_channel *chan, const char *data)
 {
 	int inuse=-1, option_state=0, string_compare=0, option_all_avail=0;
 	int status;

Modified: team/group/newcdr/apps/app_channelredirect.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_channelredirect.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_channelredirect.c (original)
+++ team/group/newcdr/apps/app_channelredirect.c Wed May 27 15:02:54 2009
@@ -62,7 +62,7 @@
  ***/
 static char *app = "ChannelRedirect";
 
-static int asyncgoto_exec(struct ast_channel *chan, void *data)
+static int asyncgoto_exec(struct ast_channel *chan, const char *data)
 {
 	int res = -1;
 	char *info;

Modified: team/group/newcdr/apps/app_chanspy.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/apps/app_chanspy.c?view=diff&rev=197258&r1=197257&r2=197258
==============================================================================
--- team/group/newcdr/apps/app_chanspy.c (original)
+++ team/group/newcdr/apps/app_chanspy.c Wed May 27 15:02:54 2009
@@ -963,7 +963,7 @@
 	return res;
 }
 
-static int chanspy_exec(struct ast_channel *chan, void *data)
+static int chanspy_exec(struct ast_channel *chan, const char *data)
 {
 	char *myenforced = NULL;
 	char *mygroup = NULL;
@@ -985,9 +985,9 @@
 		AST_APP_ARG(options);
 	);

[... 10356 lines stripped ...]