dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

21563 Commits

Author SHA1 Message Date
Patrick McHardy 2b9be10b17 Merge branch 'master' of 192.168.0.100:/repos/git/asterisk 2011-07-22 16:44:20 +02:00
russell 28da2a199d Merged revisions 329257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329257 | russell | 2011-07-21 15:22:36 -0500 (Thu, 21 Jul 2011) | 2 lines
  
  s/1.10/10.0/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329258 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 20:26:44 +00:00
rmudgett dc502a7e58 Merged revisions 329204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329204 | rmudgett | 2011-07-21 13:05:18 -0500 (Thu, 21 Jul 2011) | 13 lines
  
  Merged revisions 329203 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329203 | rmudgett | 2011-07-21 13:04:09 -0500 (Thu, 21 Jul 2011) | 6 lines
    
    Document parkinglot in chan_dahdi.conf.sample.
    
    * Document existing feature in chan_dahdi.conf.sample.
    
    * Remove some dead code related to the parkinglot option.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329205 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 18:06:47 +00:00
rmudgett 42df093d7a Merged revisions 329200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329200 | rmudgett | 2011-07-21 12:32:02 -0500 (Thu, 21 Jul 2011) | 24 lines
  
  Merged revisions 329199 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329199 | rmudgett | 2011-07-21 12:30:57 -0500 (Thu, 21 Jul 2011) | 17 lines
    
    Update PickupChan documentation.
    
    The PickupChan uses the ampersand as the argument separator.
    Was documented as:
    PickupChan(channel[,channel2[,...][,options]])
    
    Fixed documentation to:
    PickupChan(Technology/Resource[&Technology2/Resource2[&...]][,options])
    
    This is a continuation of ASTERISK-17494 for v1.8 and later.
    
    (closes issue ASTERISK-18144)
    Reported by: Erik Smith
    Patches:
          pickupchan_ducumentation-v2.patch (License #6263) patch uploaded by Erik Smith
    Tested by: Erik Smith
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329201 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 17:33:06 +00:00
rmudgett ce2f61013b Merged revisions 329145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329145 | rmudgett | 2011-07-21 11:52:17 -0500 (Thu, 21 Jul 2011) | 16 lines
  
  Merged revisions 329144 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329144 | rmudgett | 2011-07-21 11:46:21 -0500 (Thu, 21 Jul 2011) | 9 lines
    
    Dialplan bridge() app mutex 'current_dest_chan' freed more times than we've locked!
    
    This appears to be a leftover from when ast_channel was converted to ao2
    objects.
    
    Simply removed the extraneous unlock.
    
    (closes issue ASTERISK-17772)
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329146 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 16:59:38 +00:00
qwell c3f386fc6b Fix UPGRADE.txt files for Asterisk 10.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329130 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 16:22:58 +00:00
qwell a3b49410b4 Remove another 2.0 property.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329106 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 16:14:44 +00:00
russell 1e1f6e6192 Fix merge properties to reflect Asterisk 10 branch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329105 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-21 16:05:33 +00:00
pabelanger 6c19532b04 Merged revisions 329055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r329055 | pabelanger | 2011-07-20 17:27:50 -0400 (Wed, 20 Jul 2011) | 9 lines
  
  Merged revisions 329027 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329027 | pabelanger | 2011-07-20 17:20:36 -0400 (Wed, 20 Jul 2011) | 2 lines
    
    Asterisk now requires libpri 1.4.11+ for PRI support.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329056 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-20 21:31:29 +00:00
twilson b8c96cbf21 Merged revisions 328992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r328992 | twilson | 2011-07-20 15:18:25 -0500 (Wed, 20 Jul 2011) | 12 lines
  
  Merged revisions 328987 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328987 | twilson | 2011-07-20 15:16:58 -0500 (Wed, 20 Jul 2011) | 5 lines
    
    We can't guarantee an eth0 is present
    
    FreeBSD test fails on this case presumably because there is no eth0 on the test
    machine. Better to just remove this test for now.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328996 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-20 20:19:16 +00:00
kmoore 9b58d1a3da Merged revisions 328936 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r328936 | kmoore | 2011-07-20 14:01:37 -0500 (Wed, 20 Jul 2011) | 15 lines
  
  Merged revisions 328935 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328935 | kmoore | 2011-07-20 14:00:23 -0500 (Wed, 20 Jul 2011) | 8 lines
    
    Inband DTMF regression
    
    The functionality of inband DTMF in chan_sip relied upon
    ast_rtp_instance_dtmf_mode_get/set not working properly to avoid calling
    ast_rtp_instance_dtmf_begin/end on RTP streams with inband DTMF. According to
    documentation, ast_rtp_instance_dtmf_begin/end is meant only for RFC2833 DTMF,
    never inband.  This fixes the regression introduced in revision 328823.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328937 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-20 19:03:17 +00:00
kpfleming d271a946b1 Merged revisions 328879 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/2.0

................
  r328879 | kpfleming | 2011-07-19 16:31:16 -0500 (Tue, 19 Jul 2011) | 23 lines
  
  Merged revisions 328878 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328878 | kpfleming | 2011-07-19 16:29:07 -0500 (Tue, 19 Jul 2011) | 17 lines
    
    Revert partial attempt at handling pathnames with spaces.
    
    Revision 299794 attempted to improve the build system to be able to handle
    pathnames (primarily DESTDIR) with spaces in them, since this is common on
    some platforms (including Mac OSX). Unfortunately, the changes were incomplete
    and did not actually provide the desired behavior, and as a side effect the
    functionality that ensured that stale headers in the Asterisk 'include' directory
    were removed got broken. In addition, the check for stale (and possibly
    incompatible) modules in the Asterisk 'modules' directory also got broken, and
    would never report any stale modules. Users upgrading to this version or later
    versions would then see unexpected module load errors.
    
    Since there are few users who actually want to install Asterisk into paths
    that contain spaces, and a proper fix for the build system would take many hours,
    the best solution for now is to just revert the partial solution.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328881 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 21:32:54 +00:00
kpfleming c3f7a9eab8 Edit the merge properties to match their names.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328880 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 21:32:35 +00:00
russell 136bf9c5f4 Fix properties after twilson's change so merges still work
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328877 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 21:21:53 +00:00
kmoore 4b03897207 Merged revisions 328824 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328824 | kmoore | 2011-07-19 13:05:21 -0500 (Tue, 19 Jul 2011) | 18 lines
  
  Merged revisions 328823 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328823 | kmoore | 2011-07-19 12:57:18 -0500 (Tue, 19 Jul 2011) | 11 lines
    
    RTP bridge away with inband DTMF and feature detection
    
    When deciding whether Asterisk was allowed to bridge the call away from the
    core, chan_sip did not take into account the usage of features on dialed
    channels that require monitoring of DTMF on channels utilizing inband DTMF.
    This would cause Asterisk to allow the call to be locally or remotely bridged, 
    preventing access to the data required to detect activations of such features.
    
    (closes 17237)
    Review: https://reviewboard.asterisk.org/r/1302/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328825 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 18:07:22 +00:00
kmoore b7854890e0 Merged revisions 328771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328771 | kmoore | 2011-07-19 10:46:54 -0500 (Tue, 19 Jul 2011) | 18 lines
  
  Merged revisions 328770 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328770 | kmoore | 2011-07-19 10:43:32 -0500 (Tue, 19 Jul 2011) | 11 lines
    
    MeetMe requests a PIN twice in some circumstances
    
    If a call to MeetMe includes both the dynamic(D) and always request PIN(P)
    options, MeetMe will ask for the PIN two times: once for creating the
    conference and once for entering the conference.  This behavior was introduced
    in rev 311616 when adding the CONFFLAG_ALWAYSPROMPT option to the logic branch
    controlling PIN entry for joining a conference.
    
    (closes AST-601)
    Review: https://reviewboard.asterisk.org/r/1305/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328772 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 15:49:55 +00:00
twilson ce69aa8bf4 Merged revisions 328717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328717 | twilson | 2011-07-18 20:55:32 -0500 (Mon, 18 Jul 2011) | 14 lines
  
  Merged revisions 328716 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328716 | twilson | 2011-07-18 20:35:53 -0500 (Mon, 18 Jul 2011) | 7 lines
    
    Make AST_LIST_REMOVE safer
    
    AST_LIST_REMOVE shouldn't modify the element passed in if it isn't found. This
    commit also adds linked list unit tests.
    
    Review: https://reviewboard.asterisk.org/r/1321/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328718 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-19 02:00:56 +00:00
markm 8084274bec Merged revisions 328664 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328664 | markm | 2011-07-18 16:50:13 -0400 (Mon, 18 Jul 2011) | 15 lines
  
  Merged revisions 328663 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328663 | markm | 2011-07-18 16:47:04 -0400 (Mon, 18 Jul 2011) | 9 lines
    
    app_dial may double free a channel datastore
    
    When starting a call with originate, and having the callee channel run Bridge() on pickup, we will double free the dialed_interface_info datastore, causing a crash.  Make sure to check if the datastore still exists before trying to free it.
    
    (closes issue ASTERISK-17917)
    Reported by: Mark Murawski
    Tested by: Mark Murawski
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328665 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-18 20:51:47 +00:00
markm 36b69d0c2c Merged revisions 328611 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328611 | markm | 2011-07-18 08:56:49 -0400 (Mon, 18 Jul 2011) | 15 lines
  
  Merged revisions 328608 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328608 | markm | 2011-07-18 08:35:57 -0400 (Mon, 18 Jul 2011) | 9 lines
    
    If the sip private structure is null, sip_setoption() will defref the null pointer and crash.
    
    Ideally, sip_setoption shouldn't be called if there is a lack of a sip private structure.  But this will fix a crash.
    
    (closes issue ASTERISK-17909)
    Reported by: Mark Murawski
    Tested by: Mark Murawski
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328612 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-18 12:58:02 +00:00
markm 79206e6052 Merged revisions 328609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328609 | markm | 2011-07-18 08:37:53 -0400 (Mon, 18 Jul 2011) | 15 lines
  
  Merged revisions 328593 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328593 | markm | 2011-07-18 08:06:50 -0400 (Mon, 18 Jul 2011) | 8 lines
    
    Fixed invalid read and null pointer deref on asterisk shutdown.
    
    In some cases when starting asterisk with -c and hitting control-c to shutdown, there will be an invalid read and null pointer deref causing a crash.
    
    (closes issue ASTERISK-17927)
    Reported by: Mark Murawski
    Tested by: Mark Murawski, Kinsey Moore, Tilghman Lesher
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328610 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-18 12:54:29 +00:00
tilghman 8fcfd89723 Merged revisions 328541 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328541 | tilghman | 2011-07-18 02:11:26 -0500 (Mon, 18 Jul 2011) | 9 lines
  
  Merged revisions 328540 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328540 | tilghman | 2011-07-18 02:10:15 -0500 (Mon, 18 Jul 2011) | 2 lines
    
    Typo
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328542 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-18 07:12:22 +00:00
may 7f5a82e677 Merged revisions 328428-328429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328428 | may | 2011-07-15 23:31:09 +0400 (Fri, 15 Jul 2011) | 13 lines
  
  Merged revisions 328427 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328427 | may | 2011-07-15 23:22:24 +0400 (Fri, 15 Jul 2011) | 7 lines
    
    small gk processing fixes:
    - decrease for 1 second registration ttl for very low expirations (some
      providers expire few earlier than TTL)
    - delete rrq and registration expire timers on URQ received as we make
      new registration.
  ........
................
  r328429 | may | 2011-07-15 23:35:50 +0400 (Fri, 15 Jul 2011) | 2 lines
  
  delete unproperly changed svn props
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328502 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-15 21:41:46 +00:00
lmadsen d44b47240b Merged revisions 328451 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328451 | lmadsen | 2011-07-15 16:17:25 -0500 (Fri, 15 Jul 2011) | 1 line
  
  Build app_macro by default because things depend on it.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328459 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-15 21:19:08 +00:00
lmadsen ca43a479c8 Merged revisions 328448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328448 | lmadsen | 2011-07-15 16:57:15 -0400 (Fri, 15 Jul 2011) | 2 lines
  
  Update UPGRADE.txt and CHANGES files.
  Update documentation files stating that deprecated modules are no longer built by default.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328449 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-15 21:01:41 +00:00
wedhorn f63908a68a Add SLA to skinny.
Adds sublines to skinny lines. Each subline can be attached to an 
SLA station/trunk combo. Includes the following functionality:

Callid is persistent for both in/out calls on all skinny devices.
Can join, hold, resume.
All sublines appear under a single line button.

See: https://wiki.asterisk.org/wiki/display/~wedhorn/Skinny+SLA for doc.

(closes issue ASTERISK-17947)

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



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328381 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-15 08:19:46 +00:00
rmudgett 2abe989c60 Merged revisions 328329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328329 | rmudgett | 2011-07-14 19:19:32 -0500 (Thu, 14 Jul 2011) | 2 lines
  
  Make hint watcher callback take const strings for context and exten parameters.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328344 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-15 00:23:14 +00:00
rmudgett 567a2cc04c Merged revisions 328317 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328317 | rmudgett | 2011-07-14 18:28:49 -0500 (Thu, 14 Jul 2011) | 13 lines
  
  Merged revisions 328302 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328302 | rmudgett | 2011-07-14 18:12:06 -0500 (Thu, 14 Jul 2011) | 6 lines
    
    Missing SIP pvt and channel unlock in sip_set_rtp_peer().
    
    Regression introduced by -r326144.
    
    Add missing SIP pvt and channel unlock in sip_set_rtp_peer().
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328318 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-14 23:34:43 +00:00
lmadsen e73cab2f3f Merged revisions 328247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328247 | lmadsen | 2011-07-14 16:25:31 -0400 (Thu, 14 Jul 2011) | 14 lines
  
  Merged revisions 328209 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328209 | lmadsen | 2011-07-14 16:13:06 -0400 (Thu, 14 Jul 2011) | 6 lines
    
    Introduce <support_level> tags in MODULEINFO.
    This change introduces MODULEINFO into many modules in Asterisk in order to show
    the community support level for those modules. This is used by changes committed
    to menuselect by Russell Bryant recently (r917 in menuselect). More information about
    the support level types and what they mean is available on the wiki at
    https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328259 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-14 20:28:54 +00:00
jrose 8e91a16c45 Merged revisions 328207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328207 | jrose | 2011-07-14 14:45:18 -0500 (Thu, 14 Jul 2011) | 13 lines
  
  Merged revisions 328205 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328205 | jrose | 2011-07-14 14:21:02 -0500 (Thu, 14 Jul 2011) | 6 lines
    
    Monitor application arguments requirements fixed.
    
    Monitor was requiring options in spite of no individual option on Monitor being required.
    
    Review: https://reviewboard.asterisk.org/r/1320/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328208 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-14 19:56:19 +00:00
mnicholson 5911bed316 Merged revisions 328162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328162 | mnicholson | 2011-07-14 12:46:32 -0500 (Thu, 14 Jul 2011) | 3 lines
  
  tune the v21 preamble detector to properly detect the desired sequence of hits
  and misses
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328163 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-14 17:47:40 +00:00
dvossel fb85b96719 Merged revisions 328120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328120 | dvossel | 2011-07-13 17:09:34 -0500 (Wed, 13 Jul 2011) | 15 lines
  
  Preserve sample rate quality of wideband mixmonitor recordings.
  
  MixMonitor has the ability to record in any file format Asterisk supports,
  but the quality of wideband audio is not preserved.  This is because
  regardless of the sample rate the call is being recorded in, the audio
  is always downsampled to 8khz and then upsampled to whatever wideband
  format it is being written as.  This patch resolves this by requesting
  the audio from the audiohook in the signed linear format closest to the
  sample rate of the format we are writing.  This fix is only possible for
  Asterisk 1.10 because audio hooks in 1.8 are not capable of wideband
  audio.
  
  Review: https://reviewboard.asterisk.org/r/1314/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328121 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-13 22:10:26 +00:00
lmadsen 53890401ac Add UPGRADE-1.10.txt file from UPGRADE.txt.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328079 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-13 21:06:23 +00:00
russell 96d6735f65 set 1.10 merge properties
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328076 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-13 20:40:19 +00:00
russell 542b2133ca remove 1.8 merge properties
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328075 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-13 20:37:13 +00:00
rmudgett d7d1aee4e3 Merged revisions 328014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r328014 | rmudgett | 2011-07-13 13:46:38 -0500 (Wed, 13 Jul 2011) | 1 line
  
  Add ATXFER_NULL_TECH note in features.conf.sample.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328016 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-13 18:47:16 +00:00
kpfleming ef8cbd8771 Merged revisions 327950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327950 | kpfleming | 2011-07-12 17:53:53 -0500 (Tue, 12 Jul 2011) | 14 lines
  
  Correct double-free situation in manager output processing.
  
  The process_output() function calls ast_str_append() and xml_translate() on its
  'out' parameter, which is a pointer to an ast_str buffer. If either of these
  functions need to reallocate the ast_str so it will have more space, they will
  free the existing buffer and allocate a new one, returning the address of the
  new one. However, because process_output only receives a pointer to the ast_str,
  not a pointer to its caller's variable holding the pointer, if the original
  ast_str is freed, the caller will not know, and will continue to use it (and
  later attempt to free it).
  
  (reported by jkroon on #asterisk-dev)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327953 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 23:02:31 +00:00
mnicholson 6324f36910 Merged revisions 327890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327890 | mnicholson | 2011-07-12 15:07:20 -0500 (Tue, 12 Jul 2011) | 2 lines
  
  search in the current context for 'a' and 'o' instead of 'default'
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327891 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 20:08:04 +00:00
qwell 8af76f640f Merged revisions 327888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327888 | qwell | 2011-07-12 14:38:44 -0500 (Tue, 12 Jul 2011) | 1 line
  
  Fix uninstall target, so that modules dir gets cleared again.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327889 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 19:39:04 +00:00
mjordan b7bcb3bd7a Merged revisions 327852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327852 | mjordan | 2011-07-12 14:10:34 -0500 (Tue, 12 Jul 2011) | 12 lines
  
  Added additional checks for mailbox / password beginning with '*' character
  
  A bug existed such that if a user entered a password with '*', and the extension 'a' did not exist, an invalid mailbox would be created and the user authenticated.  The code was changed to prevent this from occurring, and to prevent users from having mailboxes or passwords defined that begin with the '*' character.
  
  (closes issue ASTERISK-17443)
  Reported by: Kevin Scott Adams
  Tested by: Matt Jordan
  
  Review: https://reviewboard.asterisk.org/r/1316/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327856 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 19:18:08 +00:00
tilghman 9b87fa23c7 Merged revisions 327793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327793 | tilghman | 2011-07-12 10:35:46 -0500 (Tue, 12 Jul 2011) | 14 lines
  
  Use 'printf' (POSIX issue 4) instead of 'echo -n', for portability.
  
  The problem with using 'echo -n' is that it is not portable.  While BSD systems
  required that the '-n' option be removed and interpreted, System V required
  that all strings should be echoed with no interpretation of options.  This
  fundamental difference of behavior means that it is never possible to use the
  '-n' flag to echo in tests which are meant to be portable.
  
  In this case, on Mac OS X 10.6, the /bin/sh shell builtin 'echo' uses the
  System V semantics of the command, and thus the SHELL test failed on that
  platform.
  
  http://pubs.opengroup.org/onlinepubs/009695399/utilities/echo.html#tag_04_41_16
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327794 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 15:38:47 +00:00
mnicholson f4348dccf2 do v21 detection instead of CED detection for the fax gateway
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327769 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 15:23:24 +00:00
dvossel d75b0b09d3 Send video update frame to new video source in follow_talker correctly.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327749 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 14:55:51 +00:00
kmoore d8b274bfd0 Segfault on shutdown when confbridge is active
When undergoing a shutdown and channels are kicked out of a bridge, a segfault
occurs because ConfBridge tries to play sounds on the bridge after the
underlying channels have been blown away due to the shutdown.

(closes ASTERISK-18040)
Review: https://reviewboard.asterisk.org/r/1283/


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327748 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-12 14:40:16 +00:00
mnicholson bdb6e57e72 use printf instead of echo -n in substitution test
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327684 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 20:06:28 +00:00
twilson f422ffb348 Merged revisions 327682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327682 | twilson | 2011-07-11 12:41:59 -0700 (Mon, 11 Jul 2011) | 9 lines
  
  Update chan_gtalk to work with changed GMail-based calls
  
  The messages sent by the GMail client have changed, but include the
  old-style messages as well. This patch checks for this case and
  uses the old-style offer.
  
  (closes issue ASTERISK-18084)
  Review: https://reviewboard.asterisk.org/r/1312/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327683 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 19:49:35 +00:00
dvossel d499868966 Updates follow_talker video_mode in confbridge application.
follow_talker mode originally echoed the same video stream
to all participants. As the primary talker switched around, the
video stream would result in the talker seeing themselves.  Now
the primary talker sees the last person who was talking rather than
themselves.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327640 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 18:44:06 +00:00
mnicholson 2b37cbc87b renamed fax_gateway_send_ced() to fax_gateway_request_t38()
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327598 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 17:23:54 +00:00
mnicholson f14aa92f10 actually do something with the ced timeout, also added more debug output
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327570 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 16:27:08 +00:00
mnicholson 9374cf84f9 write silence on the channel during t.38 negotiation
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327514 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 14:13:24 +00:00
mnicholson 959deafb08 Merged revisions 327512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327512 | mnicholson | 2011-07-11 08:53:59 -0500 (Mon, 11 Jul 2011) | 2 lines
  
  reset our buffer each iteration when doing variable substitution
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327513 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-11 13:55:28 +00:00