Commit Graph

20450 Commits

Author SHA1 Message Date
Jan Kalab
e7603921cf Support for calendar events priorities and categories
Review 880


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-03 11:27:04 +00:00
Brett Bryant
781978c65e Merged revisions 284778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284778 | bbryant | 2010-09-02 16:54:33 -0400 (Thu, 02 Sep 2010) | 14 lines
  
  Merged revisions 284777 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284777 | bbryant | 2010-09-02 16:25:03 -0400 (Thu, 02 Sep 2010) | 7 lines
    
    Fixes a bug in manager.c where the default configuration values weren't reset when the manager configuration was reloaded.
    
    (closes issue #17917)
    Reported by: lmadsen
    
    Review: https://reviewboard.asterisk.org/r/883/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 21:04:51 +00:00
Richard Mudgett
5f2b40c699 Simplified pri_dchannel() poll timeout duration code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 21:02:54 +00:00
Richard Mudgett
c271acacda Made output libpri event names if pri debugging is enabled when sig_pri processes them.
* Simplified CLI "pri debug xx span xx" command code and removed redundant
debugging enabled messages.

* Made CLI "pri debug xx span xx" command only close the debugging log
file if it was opened.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 20:59:12 +00:00
David Vossel
b5f428dee5 Merged revisions 284704 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284704 | dvossel | 2010-09-02 11:48:51 -0500 (Thu, 02 Sep 2010) | 13 lines
  
  Merged revisions 284703 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284703 | dvossel | 2010-09-02 11:47:15 -0500 (Thu, 02 Sep 2010) | 7 lines
    
    Removed relatedpeer code from sip_autodestruct
    
    Handling of the relatedpeer structure associated with a
    sip_pvt should be done during the final sip_destruction
    function, not in sip_autodestruct.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:56:43 +00:00
Jason Parker
6089cb662d Add slin16 support for format_wav (new wav16 file extension)
(closes issue #15029)
Reported by: andrew
Patches: 
      wav16.patch uploaded by andrew (license 240)
Tested by: qwell, andrew


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:43:09 +00:00
Richard Mudgett
44cc294c89 Added documentation for CONNECTEDLINE and REDIRECTING functions.
(closes issue #17808)
Reported by: jtodd

Review: https://reviewboard.asterisk.org/r/875/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:34:32 +00:00
Tilghman Lesher
90264f386e Fixing build
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:27:52 +00:00
Tilghman Lesher
c69a826812 Merged revisions 284665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r284665 | tilghman | 2010-09-02 11:07:19 -0500 (Thu, 02 Sep 2010) | 2 lines
  
  Fixing build.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:11:15 +00:00
Tilghman Lesher
8bc90ad39a Merged revisions 284631 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r284631 | tilghman | 2010-09-02 00:30:16 -0500 (Thu, 02 Sep 2010) | 7 lines
  
  Don't reset queue stats on a module reload.
  
  (closes issue #17535)
   Reported by: raarts
   Patches: 
         20100819__issue17535.diff.txt uploaded by tilghman (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 05:31:02 +00:00
Tilghman Lesher
7e3f95e00a When optional_api is non-optional, force dependent modules to be loaded.
(closes issue #17707)
 Reported by: ira
 Patches: 
       20100819__issue17707__asterisk1.8.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman
 
Review: https://reviewboard.asterisk.org/r/876/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 05:20:59 +00:00
Tilghman Lesher
6c61e312c6 Merged revisions 284593,284595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284593 | tilghman | 2010-09-01 17:59:50 -0500 (Wed, 01 Sep 2010) | 18 lines
  
  Merged revisions 284478 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284478 | tilghman | 2010-09-01 13:49:11 -0500 (Wed, 01 Sep 2010) | 11 lines
    
    Ensure that all areas that previously used select(2) now use poll(2), with implementations that need poll(2) implemented with select(2) safe against 1024-bit overflows.
    
    This is a followup to the fix for the pthread timer in 1.6.2 and beyond, fixing
    a potential crash bug in all supported releases.
    
    (closes issue #17678)
     Reported by: russell
    Branch: https://origsvn.digium.com/svn/asterisk/team/tilghman/ast_select 
    
    Review: https://reviewboard.asterisk.org/r/824/
  ........
................
  r284595 | tilghman | 2010-09-01 22:57:43 -0500 (Wed, 01 Sep 2010) | 2 lines
  
  Failed to rerun bootstrap.sh after last commit
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 05:00:34 +00:00
David Vossel
ed423183d6 During request to dialog matching, verify init_ruri is present before comparing.
During request to dialog matching, we attempt a best effort routine for fork
detection which requires several elements to be in place.  The dialog's
initial request uri is one of those elements.  Since it is best effort,
if the init_ruri is not present for some reason we can not proceed with that
routine.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-01 21:47:01 +00:00
Terry Wilson
8a112de270 Fix SRTP for changing SSRC and multiple a=crypto SDP lines
Adding code to Asterisk that changed the SSRC during bridges and masquerades
broke SRTP functionality. Also broken was handling the situation where an
incoming INVITE had more than one crypto offer. This patch caches the SRTP
policies the we use so that we can change the ssrc and inform libsrtp of the
new streams. It also uses the first acceptable a=crypto line from the incoming
INVITE.

(closes issue #17563)
Reported by: Alexcr
Patches: 
      srtp.diff uploaded by twilson (license 396)
Tested by: twilson

Review: https://reviewboard.asterisk.org/r/878/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-01 18:44:36 +00:00
Tilghman Lesher
6ade370974 Merged revisions 284472 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r284472 | tilghman | 2010-09-01 13:13:35 -0500 (Wed, 01 Sep 2010) | 5 lines
  
  Don't warn on floats and timestamps
  
  (closes issue #17082)
  Reported by: coolmig
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-01 18:16:37 +00:00
Tilghman Lesher
b8dbf411e8 Merged revisions 284399 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284399 | tilghman | 2010-08-31 15:18:32 -0500 (Tue, 31 Aug 2010) | 14 lines
  
  Merged revisions 284393 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284393 | tilghman | 2010-08-31 15:13:21 -0500 (Tue, 31 Aug 2010) | 7 lines
    
    Don't send a devstate change on poke_noanswer if the state did not change.
    
    (closes issue #17741)
     Reported by: schmidts
     Patches: 
           chan_sip.c.patch uploaded by schmidts (license 1077)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-31 20:22:10 +00:00
Leif Madsen
c11481ee80 Merged revisions 284317 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284317 | lmadsen | 2010-08-31 13:59:31 -0500 (Tue, 31 Aug 2010) | 15 lines
  
  Merged revisions 284316 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284316 | lmadsen | 2010-08-31 13:57:59 -0500 (Tue, 31 Aug 2010) | 7 lines
    
    Update say.conf.sample to match the rules in say.c
    
    (closes issue #17835)
    Reported by: RoadKill
    Patches:
          say.conf.sample.patch.rules uploaded by RoadKill (license 933)
    Tested by: RoadKill
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-31 19:00:15 +00:00
Tilghman Lesher
96f182bec0 Merged revisions 284280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r284280 | tilghman | 2010-08-30 17:27:06 -0500 (Mon, 30 Aug 2010) | 11 lines
  
  Fix 3 coding errors:
    1) After we close FD, we should not be trying to write to it.
    2) Call _exit(0), not exit(0), to avoid running shutdown routines in a child.
    3) Use endian, not processor, detection to ensure bytes are written in the correct order.
  
  (closes issue #15706)
   Reported by: modelnine
   Patches: 
         asterisk-1.6.1.1-festival-debug.patch uploaded by modelnine (license 865)
   Tested by: gmartinez
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-30 22:28:47 +00:00
Tilghman Lesher
1bc38e10d8 Missed adding this file
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-29 07:05:27 +00:00
Tilghman Lesher
401d3219ee Also ignore the checksums
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-29 05:17:37 +00:00
Tilghman Lesher
84e1990637 Rename CEL adaptive driver to plain driver, since there isn't another ODBC driver
(and the other CEL drivers have adaptive capabilities, anyway).


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-29 02:51:14 +00:00
Russell Bryant
8629c83f71 Be more flexible with whitespace on AMI action headers.
Previously, this code required exactly one space to be after the ':' in headers
for an AMI action.  This now makes whitespace optional, and allows whitespace that
is there to vary in amount.

(closes issue #17862)
Reported by: cmoye
Patches:
      manager.c.patch_trunk uploaded by cmoye (license 858)
      manager.c.patch_1.8 uploaded by cmoye (license 858)
Tested by: cmoye


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-28 21:29:45 +00:00
David Vossel
962f12b524 Merged revisions 284002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284002 | dvossel | 2010-08-27 17:27:50 -0500 (Fri, 27 Aug 2010) | 14 lines
  
  Merged revisions 283960 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283960 | dvossel | 2010-08-27 17:17:26 -0500 (Fri, 27 Aug 2010) | 8 lines
    
    Parse all "Accept" headers for SIP SUBSCRIBE requests.
    
    (closes issue #17758)
    Reported by: ibc
    Patches:
          multiple_accept_headers_1.4.diff uploaded by dvossel (license 671)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@284032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-27 22:37:11 +00:00
Russell Bryant
f222d17fcf Print exten@context:priority in verbose messages from pbx_realtime.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-27 21:33:55 +00:00
Jason Parker
1aec6b69ba Merged revisions 283881 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283881 | qwell | 2010-08-27 15:30:27 -0500 (Fri, 27 Aug 2010) | 15 lines
  
  Merged revisions 283880 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283880 | qwell | 2010-08-27 15:29:11 -0500 (Fri, 27 Aug 2010) | 8 lines
    
    Fix issue with decoding ^-escaped characters in realtime.
    
    (closes issue #17790)
    Reported by: denzs
    Patches: 
          17790-chunky.diff uploaded by qwell (license 4)
    Tested by: qwell, denzs
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-27 20:31:55 +00:00
Tilghman Lesher
ee69a68943 Convert MOH to use generic timers.
(closes issue #17726)
 Reported by: lmadsen
 Patches: 
       20100825__issue17726__2.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 23:47:02 +00:00
David Vossel
9bb986156a Merged revisions 283691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283691 | dvossel | 2010-08-26 10:24:40 -0500 (Thu, 26 Aug 2010) | 25 lines
  
  Merged revisions 283690 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283690 | dvossel | 2010-08-26 10:22:28 -0500 (Thu, 26 Aug 2010) | 19 lines
    
    Fixed how Asterisk destroys a dialog on channel hangup before invite receives a response.
    
    If an ast_channel with a SIP tech pvt hangs up before the sip dialog gets a response
    to its outgoing INVITE, Asterisk used to pretend_ack the INVITE.  This is not rfc
    compliant and results in confusion at the other endpoint.  sip_pretend_ack will ack
    and remove all the packets in the retransmit queue.  This means that the INVITE will
    stop retransmitting, and that any response to that INVITE that comes after the pretend_ack
    occurs will be ignored.
    
    Instead of faking any sort of acknowledgement for an outgoing INVITE during an internal
    hangup, we should let the protocol stack process the INVITE transaction and terminate
    the dialog properly.  This is achieved by setting the PENDING_BYE flag.  When this flag
    is used, once the dialog proceeds to an escapable state the transaction will either be
    canceled with a SIP_CANCEL or completed followed immediately by a BYE.  Attempting to do
    this any other way is incorrect.  If the endpoint is not responding to the INVITE request,
    the INVITE must continue to be retransmitted until it times out which will result in the
    dialog being destroyed.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 15:26:37 +00:00
Russell Bryant
0a02e9bcc1 Slight improvement to a debug message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 13:26:14 +00:00
Russell Bryant
4bdc111ce9 Remove public keys that are no longer useful.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 12:48:45 +00:00
Russell Bryant
fcfc87d54f Move httptimeout out from in between port and bindaddr.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 12:26:22 +00:00
David Vossel
e781f27150 Merged revisions 283594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r283594 | dvossel | 2010-08-25 17:56:42 -0500 (Wed, 25 Aug 2010) | 7 lines
  
  Add to and from tags to NOTIFY dialog-info xml body so pickup can occur.
  
  When pedantic mode is used, the dialog-info xml generated during a
  ringing event must contain the to and from tag values.  Otherwise if
  a pickup occurs using INVITE with replaces, Astrisk will not be able
  to locate the subscription.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 22:57:56 +00:00
Tilghman Lesher
919021ee72 Initialize connect timeout on each time through the loop.
(closes issue #17911)
 Reported by: wurstsalat


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 16:12:43 +00:00
David Vossel
8ae2b6a612 Merged revisions 283558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r283558 | dvossel | 2010-08-25 10:52:54 -0500 (Wed, 25 Aug 2010) | 10 lines
  
  Asterisk will not advertise session timers are supported when 'session-timers=refuse' is used.
  
  Asterisk now dynamically builds the "Supported" header depending
  on what is enabled/disabled in sip.conf.  Session timers used
  to always be advertised as being supported even when they were disabled
  in the configuration.  This caused problems with some end points.
  
  (issue #17005)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 15:54:11 +00:00
Russell Bryant
abca511f03 Convert ast_log(LOG_DEBUG, ...) to ast_debug(...)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 14:55:00 +00:00
David Vossel
2787a14001 Changes the default behavior for sip.conf's pedantic option from "no" to "yes".
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 20:34:03 +00:00
Leif Madsen
5c82781efe Fix issue where TOS is no longer set on RTP packets.
Fix issue where the tos is no longer being set on RTP packets through res_rtp_asterisk.

(closes issue #17890)
Reported by: elguero
Patches:
      qos_18.diff uploaded by elguero (license 37)

Review: https://reviewboard.asterisk.org/r/868

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 18:56:29 +00:00
David Vossel
6f3a4b0511 Merged revisions 283381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283381 | dvossel | 2010-08-24 11:07:37 -0500 (Tue, 24 Aug 2010) | 18 lines
  
  Merged revisions 283380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283380 | dvossel | 2010-08-24 11:01:51 -0500 (Tue, 24 Aug 2010) | 11 lines
    
    This fix makes sure the ast_channel hangs up correctly when the dialog's PENDING_BYE flag is set.
    
    When the pending bye flag is used, it is possible that the dialog will terminate
    and leave the sip_pvt->owner channel up.  This is because we never hangup the
    ast_channel after sending the SIP_BYE request.  When we receive the response for
    the SIP_BYE we set need_destroy which we would expect to destroy the dialog on the
    next do_monitor loop, but this is not the case.  The dialog will only be destroyed
    once the owner is hungup even with the need_destroy flag set.  This patch sets the
    softhangup flag on the ast_channel when a SIP_BYE request is sent as a result of the
    pending bye flag.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 16:11:18 +00:00
Russell Bryant
9d1909c9b4 Don't attempt to release a NULL ODBC handle.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 12:49:41 +00:00
Tilghman Lesher
37e25116a1 Merged revisions 283318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r283318 | tilghman | 2010-08-23 16:32:14 -0500 (Mon, 23 Aug 2010) | 2 lines
  
  CDR drivers depend upon res_odbc, not directly on the ODBC libraries
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 21:33:47 +00:00
Russell Bryant
ad3543e691 Add sample configuration for cel_radius.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 13:35:35 +00:00
Russell Bryant
b246f8691e Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.
Really, having 2 enums for this is silly and error prone, demonstrated by
the crash that I hit because there was an assumption in the code that the
values in each matched up.  However, this is a quick fix to get them to
match up so it will work.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283230 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 13:23:12 +00:00
Russell Bryant
a5dbf66ea1 Don't blow up on an invalid AMA flag.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 13:06:57 +00:00
Russell Bryant
339fc67060 Tack on ${eventextra} to the sample cel_custom.conf.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 12:31:20 +00:00
Russell Bryant
759ca228f6 Cut down on excessive quotation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 12:12:53 +00:00
Tilghman Lesher
4c2e1000a0 Don't fail to start if the config file is missing.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 12:06:26 +00:00
Russell Bryant
06272f054e Expand cel_custom.conf.sample.
Include the usage of CSV_QUOTE() to ensure data has valid CSV formatting.  Also list
the special CEL variables that are available for use in the mapping.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-23 11:58:34 +00:00
Richard Mudgett
95632201df Recorded merge of revisions 283124 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283124 | rmudgett | 2010-08-20 11:48:10 -0500 (Fri, 20 Aug 2010) | 16 lines
  
  Merged revisions 283123 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r283123 | rmudgett | 2010-08-20 11:46:22 -0500 (Fri, 20 Aug 2010) | 9 lines
    
    Merged revision 278274 from
    https://origsvn.digium.com/svn/asterisk/trunk
    
    ..........
      r278274 | rmudgett | 2010-07-20 17:38:13 -0500 (Tue, 20 Jul 2010) | 1 line
    
      Reference correct struct member for unlikely event PRI_EVENT_CONFIG_ERR.
    ..........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-20 16:51:16 +00:00
Richard Mudgett
c453d72423 Merged revisions 283049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283049 | rmudgett | 2010-08-20 10:31:03 -0500 (Fri, 20 Aug 2010) | 29 lines
  
  Merged revisions 283048 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283048 | rmudgett | 2010-08-20 10:24:36 -0500 (Fri, 20 Aug 2010) | 22 lines
    
    Q931 - Sending PROGRESS after sending ALERTING is a protocol error
    
    The PRI layer in chan_dadhi will check if a PROGRESS message has already
    been sent, and not allow sending another (although that is technically
    allowed by the Q931 spec), however it does not protect against sending an
    ALERTING and then sending a PROGRESS message, which is a violation of the
    specification.
    
    Most switches don't seem to care too deeply about this, but some do, and
    will disconnect the call when receiving this invalid sequence.
    
    Protocol specification reference: T-REC-Q.931-199805-I page 223, "Figure
    A.5/Q.931 -- Overview protocol control (network side) point-point
    (sheet 3 of 8)"
    
    (closes issue #17874)
    Reported by: nic_bellamy
    Patches:
          asterisk-1.4-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
          asterisk-1.6.2-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
          asterisk-trunk-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-20 15:35:38 +00:00
Russell Bryant
7b15e58654 Fix a typo in a column name.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-20 12:45:12 +00:00
Russell Bryant
c3ad0f569d Add an argument missing from the CELGenUserEvent documentation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@282979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-20 11:52:37 +00:00