Commit Graph

3921 Commits

Author SHA1 Message Date
Jason Parker
0688f632dc Use proper values for 64-bit option flags.
Also, reusing bits es no bueno, so change the value of a duplicate.

(issue ASTERISK-18239)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@331578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-11 21:46:39 +00:00
Richard Mudgett
42b5040b71 Misc minor items found in code.
* Add some reentrancy protection in pbx.c when creating the contexts_table
hash table.

* Fix inverted test in chan_sip.c conditional code.

* Fix uninitialized variable and use of the wrong variable in chan_iax2.c.

* Fix test of return value in app_parkandannounce.c.  Explicitly testing
for -1 is bad if the function does not actually return that value when it
fails.

* Fixup some comments and add some curly braces in features.c.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@331248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09 22:12:59 +00:00
Leif Madsen
ae2e5eea83 Change support for ConfBridge() in 1.8 to Extended.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-27 19:27:14 +00:00
Jonathan Rose
3b50c5a387 Changes sound file for prepend "then-press-pound" to "vm-then-pound" which is the same
prompt, only it turned out "then-press-pound" was part of extra sounds. Also, vm is more
appropriate anyway.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-26 14:04:55 +00:00
Jonathan Rose
31a1b94622 Fixes some voicemail forwarding behavior based around prepend mode.
Formerly, prepend forwarding would have the user record a message with no useful prompt
and an expectation for the user to push a button on the phone when finished recording.
If a length of silence was detected instead, the recording would be canceled and the user
would re-enter the voicemail forwarding menu. Subsequent time-outs in prepend recording
would also bug out in the sense that they would write over the original message and get
sent to the recipient regardless of whether they timed out or were accepted. This patch
fixes this issue and adds a prompt which will be played after a timeout informing the
user that they needed to press a button. Currently, the sound files that we have are
somewhat inadquate for this, so after the call we simply have Allison say "Please try
again. Then press pound." which actually relies on two separate sound files. Just one
would be more appropriate.

reporter: Vlad Povorozniuc
Review: https://reviewboard.asterisk.org/r/1327/ 


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-26 13:25:35 +00:00
Richard Mudgett
5c06d1dbb0 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@329199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-21 17:30:57 +00:00
Kinsey Moore
9769bb7d34 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@328770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-19 15:43:32 +00:00
Mark Murawki
f5ec4864bd 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@328663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-18 20:47:04 +00:00
Leif Madsen
fc0ea9d188 Revert changes to defaultenabled state for modules in Asterisk 1.8
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@328446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-15 20:41:12 +00:00
Leif Madsen
d4938a111e 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@328209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-14 20:13:06 +00:00
Matthew Nicholson
3769e99537 search in the current context for 'a' and 'o' instead of 'default'
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-12 20:07:20 +00:00
Matthew Jordan
cafd418c46 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@327852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-12 19:10:34 +00:00
Tilghman Lesher
9a3fd9a994 Removing type attributes, as a change to menuselect makes them no longer necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-06 14:35:01 +00:00
Tilghman Lesher
d104b4e701 Add the attribute "type" to each "<use>" for menuselect.
This matters only when autoconf fails to detect that weak linking is supported.
External optional dependencies will become optional in both cases, as they are
removed at compile time when not detected.  However, runtime-optional modules
are made mandatory when weak linking is not found.  This change affects only
the external optional dependencies; previously, they were incorrectly required
when weak linking support was not detected.

Patches:
	20110702__issue18062__asterisk_trunk.diff.txt by tilghman (License #5003)

Tested by: iasgoscouk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-05 22:08:29 +00:00
Matthew Jordan
40babd5582 Patched voicemail user option for emailbody / emailsubject
Incorporated changes per ASTERISK-16795; updated unit tests to check for vmu->emailbody / vmu->emailsubject

(closes issue ASTERISK-16795)
Reported by: mdeneen
Tested by: mjordan



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-30 20:09:48 +00:00
Richard Mudgett
1fe4351176 Fixed some error exit cleanup in app_queue.c.
* Fixed error exit cleanup in app_queue.c copy_rules() and
reload_queue_rules().


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 18:16:45 +00:00
Richard Mudgett
91b7dd582e Response to QueueRule manager command does not contain ActionID if it was specified.
* Add ActionID support as documented for the QueueRule AMI action.

* Remove documentation for ActionID with the Queues AMI action.  The
output does not follow normal AMI response output and there is no place to
put an ActionID header.

(closes issue AST-602)
Reported by: Vlad Povorozniuc
Patches:
      jira_ast_602_v1.8.patch (license #5621) patch uploaded by rmudgett
Tested by: Vlad Povorozniuc, rmudgett

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

JIRA SWP-3575


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 18:05:15 +00:00
Matthew Nicholson
3b216f2dc9 don't do native/remote bridging if a framehook is active on the channel
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 15:34:47 +00:00
Kinsey Moore
a9a8c0fa05 ConfBridge does not handle hangup properly
When playing back a prompt to a channel, confbridge neglects to check for
hangup events causing lockup condititions for hangups that occur before
actually joining the conference.  This change ensures that the user is removed 
from the conference in the event of a premature hangup.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-21 16:09:14 +00:00
Leif Madsen
211af7820d Fix typo in documentation.
Pointed out by Vlad Povorozniuc

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-17 18:38:40 +00:00
Richard Mudgett
aec1979e7f Remove potential deadlock in call pickup race.
Deadlock is possible in ast_do_pickup() when holding the target channel
lock and trying to get the chan channel lock.  Also, holding the target
lock when calling ast_channel_masquerade() is not a good idea because that
routine does deadlock avoidance.

* Removed the need to hold the target lock after marking the target with a
datastore and getting the connected line data off of the target channel.

* Moved can_pickup() to ast_can_pickup() in features.c.  Now all the call
pickup methods use the same basic call pickup availability check.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@322749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-09 16:31:53 +00:00
Richard Mudgett
e0b2c103f6 Ring all queue with more than 255 agents will cause crash.
1. Create a ring-all queue with 500 permanent agents.
2. Call it.
3. Asterisk will crash.

The watchers array in app_queue.c has a hard limit of 255.  Bounds
checking is not done on this array.  No sane person should put 255 people
in a ring-all queue, but we should not crash anyway.

* Added bounds checking to the watchers array.

JIRA AST-464
JIRA SWP-2903


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@322484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-08 20:46:55 +00:00
Brett Bryant
ce51fcfb6b This patch fixes an issue with using the wrong voicemail folders with greetings.
(closes issue #17871)
Reported by: edhorton
Patches: 
      digium_bug_17871_2 uploaded by fhackenberger (license 592)
Tested by: edhorton, fhackenberger


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-01 20:10:02 +00:00
Richard Mudgett
8323ef12bf The app_privacy args have undocumented "options" position, interferes with "context" position.
* Add documention for unused "options" position to match existing code.

(closes issue #19273)
Reported by: mdavenport


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-27 22:06:43 +00:00
Richard Mudgett
b1c397b5b7 The app_privacy args have undocumented "options" position, interferes with "context" position.
* Add documention for unused "options" position to match existing code.
The trunk(v1.10) version will remove the unused options position.

(closes issue #19273)
Reported by: mdavenport


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-27 21:31:25 +00:00
Richard Mudgett
59a41188a8 The AMI Newstate event contains different information between v1.4 and v1.8.
The addition of connected line support in v1.8 changes the behavior of the
channel caller ID somewhat.  The channel caller ID value no longer time
shares with the connected line ID on outgoing call legs.  The timing of
some AMI events/responses output the connected line ID as caller ID.
These party ID's are now separate.

* The ConnectedLineNum and ConnectedLineName headers were added to many
AMI events/responses if the CallerIDNum/CallerIDName headers were also
present.

(closes issue #18252)
Reported by: gje
Tested by: rmudgett

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-25 17:06:38 +00:00
Richard Mudgett
bf153ba6a4 Merged revisions 320236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r320236 | rmudgett | 2011-05-20 15:44:54 -0500 (Fri, 20 May 2011) | 20 lines
  
  Merged revisions 320235 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r320235 | rmudgett | 2011-05-20 15:38:22 -0500 (Fri, 20 May 2011) | 13 lines
    
    The meetme CLI command completion leaves conferences mutex locked.
    
    When issuing a meetme kick CLI command and an invalid (non-existent)
    conference number is specified, pressing Tab leaves the conferences mutex
    locked and, therefore, all conferences deadlock.
    
    Add missing unlock.
    
    (closes issue #19336)
    Reported by: zvision
    Patches:
          app_meetme.diff uploaded by zvision (license 798)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 20:49:03 +00:00
Jonathan Rose
164f61d029 Fixes an imapfolder related crash
imapfolders being set in the general section of voicemail would cause the inbox folder name to
change.  Since sound file names are made based on the names of the folders, this would cause
the audio related to that folder name to change and if Asterisk attempted to play it, the
channel would instantly hang up when the audio file couldn't be found.  This patch searches for
the name of the folder first to leave existing behavior in tact and if that fails, it uses
the normal inbox name to get the sound file instead.


(closes issue #16104)
Reported by: blkline

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 18:12:21 +00:00
Richard Mudgett
bf91f06f9f Change some variable names to make pickup code easier to understand.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 16:19:01 +00:00
Richard Mudgett
7e3bf4936e Crash when using directed pickup applications.
The directed pickup applications can cause a crash if the pickup was
successful because the dialplan keeps executing.

This patch does the following:

* Completes the channel masquerade on a successful pickup before the
application returns.  The channel is now guaranteed a zombie and must not
continue executing the dialplan.

* Changes the return value of the directed pickup applications to return
zero if the pickup failed and nonzero(-1) if the pickup succeeded.

* Made some code optimizations that no longer require re-checking the
pickup channel to see if it is still available to pickup.

(closes issue #19310)
Reported by: remiq
Patches:
      issue19310_v1.8_v2.patch uploaded by rmudgett (license 664)
Tested by: alecdavis, remiq, rmudgett

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@319997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 15:48:25 +00:00
Terry Wilson
249f4b9022 Merged revisions 319528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r319528 | twilson | 2011-05-18 13:02:06 -0700 (Wed, 18 May 2011) | 17 lines
  
  Merged revisions 319527 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r319527 | twilson | 2011-05-18 12:56:08 -0700 (Wed, 18 May 2011) | 10 lines
    
    Fix app_dial ring groups
    
    Revert part of r315643. We need to remove the datastore here as well.
    The code in bridging code will catch anything that app_dial might miss.
    
    (closes issue #19311)
    Reported by: mspuhler
    Patches: 
          issue_19311_no_answer.diff uploaded by elguero (license 37)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@319529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-18 20:05:34 +00:00
Leif Madsen
c23377d8f2 Don't create [general] voicemail context when using users.conf
Prior to this patch, app_voicemail would create a [general] context when parsing users.conf.

(closes issue #18891)
Reported by: pdugas
Patches: 
      app_voicemail-ignore-general.patch uploaded by pdugas (license 1222)
      app_voicemail-ignore-general-style-guidelines.patch uploaded by seanbright (license 71)
Tested by: pdugas

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@319367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-17 12:53:50 +00:00
Alec L Davis
87d80af96c Fix directed group pickup feature code *8 with pickupsounds enabled
Since 1.6.2, the new pickupsound and pickupfailsound in features.conf cause many issues.

1). chan_sip:handle_request_invite() shouldn't be playing out the fail/success audio, as it has 'netlock' locked.
2). dialplan applications for directed_pickups shouldn't beep.
3). feature code for directed pickup should beep on success/failure if configured.

Created a sip_pickup() thread to handle the pickup and playout the audio, spawned from handle_request_invite.

Moved app_directed:pickup_do() to features:ast_do_pickup().

Functions below, all now use the new ast_do_pickup()
app_directed_pickup.c:
   pickup_by_channel()
   pickup_by_exten()
   pickup_by_mark()
   pickup_by_part()
features.c:
   ast_pickup_call()

(closes issue #18654)
Reported by: Docent
Patches: 
      ast_do_pickup_1.8_trunk.diff.txt uploaded by alecdavis (license 585)
Tested by: lmadsen, francesco_r, amilcar, isis242, alecdavis, irroot, rymkus, loloski, rmudgett

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@318671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-12 22:52:08 +00:00
Russell Bryant
10e40660c7 Use the right variable to print the time in a debug message.
The original patch also increased some buffer sizes, but that was already
done in this version.

(closes issue #17034)
Reported by: sysreq
Patches:
      asterisk-issue-17034.patch uploaded by sysreq (license 1009)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-06 21:49:01 +00:00
Russell Bryant
91c8e4d297 Fix some more "set but unused" compiler warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-06 21:38:54 +00:00
Terry Wilson
6cf3280dd6 Merged revisions 317575 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r317575 | twilson | 2011-05-06 01:04:17 -0700 (Fri, 06 May 2011) | 13 lines
  
  Merged revisions 317574 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r317574 | twilson | 2011-05-06 00:55:21 -0700 (Fri, 06 May 2011) | 6 lines
    
    Re-fix queue round-robin
    
    This part of the change for r315596 was incorrect. No bridge occurs
    when doing a roundrobin dial and no one answers, so this code shouldn't
    have been removed.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-06 08:18:53 +00:00
Russell Bryant
bbf748d856 Fix potential memory leak, and use of uninitialized memory.
(closes issue #16476)
Reported by: junky
Patches:
      M16476.diff uploaded by junky (license 177)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 21:58:45 +00:00
Russell Bryant
a3d1ff1140 Increase buffer size to be PATH_MAX for a path.
(closes issue #19239)
Reported by: byronclark
Patches:
      queue_announce_length.patch uploaded by byronclark (license 1200)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 19:55:58 +00:00
Richard Mudgett
63579a892c Wait for leader with Music On Hold allows crosstalk between participants.
Parenthesis in the wrong position.  Regression from issue #14365 when
expanding conference flags to use 64 bits.

(closes issue #18418)
Reported by: MrHanMan
Tested by: rmudgett


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 18:51:40 +00:00
Sean Bright
6c3ea80a35 Merged revisions 316708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r316708 | seanbright | 2011-05-04 12:10:59 -0400 (Wed, 04 May 2011) | 15 lines
  
  Merged revisions 316707 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r316707 | seanbright | 2011-05-04 12:08:50 -0400 (Wed, 04 May 2011) | 8 lines
    
    If sox fails when processing a voicemail, don't delete the original file.
    
    (closes issue #18111)
    Reported by: sysreq
    Patches:
          issue18111_trunk.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 16:15:32 +00:00
David Vossel
eaf8673a16 Merged revisions 316644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r316644 | dvossel | 2011-05-04 09:23:39 -0500 (Wed, 04 May 2011) | 9 lines
  
  Fixes one-way-audio when chanspy activated with the 'o' option
  
  (closes issue #18382)
  Reported by: jkister
  Patches: 
        0001-Bugfix-18382-one-way-audio-when-chanspy-activated.patch.txt uploaded by malin (license )
  Tested by: firstsip, Greenlightcrm, malin, wdoekes, boroda, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 14:25:03 +00:00
Sean Bright
aa43b12c24 Merged revisions 316475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r316475 | seanbright | 2011-05-03 22:23:01 -0400 (Tue, 03 May 2011) | 10 lines
  
  Honor the C option to MeetMe when L is passed.
  
  This fixes a case that r304773 and friends missed.
  
  (closes issue #17317)
  Reported by: var
  Patches:
        meetme-continue-on-l_16218.diff uploaded by var (license 1227)
  Tested by: seanbright
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 02:34:01 +00:00
Russell Bryant
1a8df4dc53 Resolve another warning.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 21:41:11 +00:00
Russell Bryant
a82f1bb995 Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 19:55:49 +00:00
Terry Wilson
734ca12381 Merged revisions 315643 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r315643 | twilson | 2011-04-26 14:27:44 -0700 (Tue, 26 Apr 2011) | 25 lines
  
  Merged revisions 315596 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r315596 | twilson | 2011-04-26 14:16:10 -0700 (Tue, 26 Apr 2011) | 18 lines
    
    Allow transfer loops without allowing forwarding loops
    
    We try to avoid the situation where two phones may be forwarded to each other
    causing an infinite loop by storing each dialed interface in a channel
    datastore and checking the list before dialing out. This works, but currently
    breaks situations like A calls B, A transfers B to C, B transfers C to A, and A
    transfers C to B. Since human interaction is happening here and not an
    automated forwarding loop, it should be allowed.
    
    This patch removes the dialed_interfaces datastore when a call is bridged (a
    suggestion from the brilliant mmichelson). If a call is being bridged, it
    should be safe to assume that we aren't stuck in a loop.
    
    Since we are now handling this is the bridge code, the previous attempts at
    handling it in app_dial and app_queue are removed.
    
    Review: https://reviewboard.asterisk.org/r/1195/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@315644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-26 21:39:01 +00:00
Richard Mudgett
06223e643b Add missing set of name valid flag when dialing.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@315452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-26 18:00:34 +00:00
Leif Madsen
db02ef3704 Merged revisions 314202 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r314202 | lmadsen | 2011-04-19 09:23:39 -0500 (Tue, 19 Apr 2011) | 7 lines
  
  Update seconds to milliseconds in ast_verb output.
  
  (closes issue #19084)
  Reported by: smurfix
  Patches: 
        app_dial.patch uploaded by smurfix (license 547)
  Tested by: lmadsen, smurfix
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@314203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-19 14:24:25 +00:00
Richard Mudgett
bc620cd281 Unclear code in app_dial.c.
Make code formatting clear.

(closes issue #19134)
Reported by: oej


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@314068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-18 16:02:12 +00:00
Richard Mudgett
42882cd3bc Bring the dumpchan application inline with "core show channel".
* Added fields that are in "core show channel" to dumpchan output.

* Fixed reuse of formatbuf before the previous string stored there was
used by snprintf.  All output strings now have their own buffer.

* Adjusted the buffer sizes to not be so abusive of the stack now that
there are more buffers.

Change requested by oej.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-12 22:35:53 +00:00
Richard Mudgett
dde33a1e01 Frames from the inbound channel should go to all outbound channels in app_dial.c.
In app_dial.c:wait_for_answer() frames from the inbound channel should be
sent to all outbound channels instead of only if there is just one
outbound channel.

Control frames like AST_CONTROL_CONNECTED_LINE need to be passed to all of
the the outbound channels.  This can happen if a blond transfer is done by
a remote switch on the inbound channel.

JIRA AST-443
JIRA SWP-2730


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-11 23:08:02 +00:00