dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

455 Commits

Author SHA1 Message Date
rmudgett adbee85b24 Merged revisions 320823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320823 | rmudgett | 2011-05-25 12:06:38 -0500 (Wed, 25 May 2011) | 18 lines
  
  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: http://svn.digium.com/svn/asterisk/trunk@320825 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-25 17:14:11 +00:00
rmudgett dc8ba0f195 Merged revisions 320237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r320237 | rmudgett | 2011-05-20 15:49:03 -0500 (Fri, 20 May 2011) | 27 lines
  
  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: http://svn.digium.com/svn/asterisk/trunk@320238 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-20 20:53:30 +00:00
russell 6526708208 Merged revisions 317969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317969 | russell | 2011-05-06 16:49:01 -0500 (Fri, 06 May 2011) | 10 lines
  
  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: http://svn.digium.com/svn/asterisk/trunk@317970 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06 21:49:47 +00:00
russell 59d1dda0dd Merged revisions 317967 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317967 | russell | 2011-05-06 16:38:54 -0500 (Fri, 06 May 2011) | 2 lines
  
  Fix some more "set but unused" compiler warnings.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317968 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06 21:47:05 +00:00
rmudgett 4a6f8b3b54 Merged revisions 316831 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316831 | rmudgett | 2011-05-04 13:51:40 -0500 (Wed, 04 May 2011) | 9 lines
  
  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: http://svn.digium.com/svn/asterisk/trunk@316832 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-04 18:57:02 +00:00
seanbright 0e8635ef59 Merged revisions 316476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316476 | seanbright | 2011-05-03 22:34:01 -0400 (Tue, 03 May 2011) | 17 lines
  
  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: http://svn.digium.com/svn/asterisk/trunk@316477 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-04 02:39:11 +00:00
pabelanger d6587fa725 Formatting change, remove red blobs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@316054 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-02 15:58:27 +00:00
oej c51ffa49ec Add explanation of strange flag setup in app_meetme (stolen from Mark's message to asterisk-dev)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@314158 f38db490-d61c-443f-a65b-d21fe96a405b
2011-04-19 08:22:18 +00:00
jrose 2d104b251c Minor change to 'L' option for meetme to include some verb statements for the option.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@312756 f38db490-d61c-443f-a65b-d21fe96a405b
2011-04-05 13:55:41 +00:00
bbryant dae83b5be0 Merged revisions 311615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311615 | bbryant | 2011-03-23 17:54:11 -0400 (Wed, 23 Mar 2011) | 8 lines
  
  This patch fixes a bug with MeetMe behavior where the 'P' option for always
  prompting for a pin is ignored for the first caller.
  
  (closes issue #18070)
  Reported by: mav3rick
  
  Review: https://reviewboard.asterisk.org/r/1132/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@311616 f38db490-d61c-443f-a65b-d21fe96a405b
2011-03-23 21:55:54 +00:00
dvossel 741b3cc233 Merged revisions 311497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r311497 | dvossel | 2011-03-22 10:25:24 -0500 (Tue, 22 Mar 2011) | 9 lines
  
  Merged revisions 311496 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r311496 | dvossel | 2011-03-22 10:24:45 -0500 (Tue, 22 Mar 2011) | 2 lines
    
    Fixes memory leak in MeetMe AMI action
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@311498 f38db490-d61c-443f-a65b-d21fe96a405b
2011-03-22 15:26:51 +00:00
jpeeler fb93734d3a Add new manager action MeetmeListRooms.
From the submitter:
I've added a new manager action to list only the active conferences on an
Asterisk system. It shows the same data displayed when you run a 'meetme list'
on the Asterisk CLI.

(closes issue #17905)
Reported by: rcasas
Patches: 
      app_meetme.c.patch uploaded by rcasas (license 641)

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



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@307359 f38db490-d61c-443f-a65b-d21fe96a405b
2011-02-09 22:48:02 +00:00
pabelanger 6705f03406 Replace ast_log(LOG_DEBUG, ...) with ast_debug()
(closes issue #18556)
Reported by: kkm

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306258 f38db490-d61c-443f-a65b-d21fe96a405b
2011-02-04 16:55:39 +00:00
dvossel 4aca3187a3 Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal.  For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal

The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs.  Functionally
no change in behavior should be present in this patch.  Thanks to twilson
and russell for all the time they spent reviewing these changes.

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



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306010 f38db490-d61c-443f-a65b-d21fe96a405b
2011-02-03 16:22:10 +00:00
seanbright 2d08e9b79e Merged revisions 304777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304777 | seanbright | 2011-01-29 13:09:37 -0500 (Sat, 29 Jan 2011) | 22 lines
  
  Merged revisions 304776 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304776 | seanbright | 2011-01-29 13:08:14 -0500 (Sat, 29 Jan 2011) | 15 lines
    
    If we fail to allocate our announcement objects, make sure we don't leak objects.
    
    The majority of this patch was committed already in r304726 and r304729.
    
    (issue #18225)
    Reported by: kenji
    
    (issue #18444)
    Reported by: junky
    
    (closes issue #18343)
    Reported by: kobaz
    Patches:
          meetme-refs.diff uploaded by kobaz (license 834)
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304778 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-29 18:10:34 +00:00
seanbright 48cc91d127 Merged revisions 304774 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304774 | seanbright | 2011-01-29 12:54:43 -0500 (Sat, 29 Jan 2011) | 16 lines
  
  Merged revisions 304773 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304773 | seanbright | 2011-01-29 12:51:28 -0500 (Sat, 29 Jan 2011) | 9 lines
    
    When we pass the S() or L() options to MeetMe, make sure that we honor C as well.
    
    Without this patch, if the user was kicked from the conference via the S() or L()
    mechanism, we would just hang up on them even if we also passed C (continue in
    dialplan when kicked).  With this patch we honor the C flag in those cases.
    
    (closes issue #17317)
    Reported by: var
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304775 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-29 17:57:01 +00:00
seanbright 488bd40cfe Merged revisions 304730 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304730 | seanbright | 2011-01-29 12:15:27 -0500 (Sat, 29 Jan 2011) | 22 lines
  
  Merged revisions 304729 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304729 | seanbright | 2011-01-29 12:01:51 -0500 (Sat, 29 Jan 2011) | 15 lines
    
    Make sure that we unref the correct object when ejecting the most recent caller.
    
    Currently, when we kick the last user to enter, we decrement our own reference
    count which results in a crash when we kick another user or when we exit the
    conference ourselves.
    
    This will fix #18225 in 1.8 and trunk, but that particular bug does not exist in
    1.6.2.
    
    (closes issue #18225)
    Reported by: kenji
    Patches:
          issue18225.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304772 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-29 17:34:22 +00:00
seanbright 2783460b03 Merged revisions 304727 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304727 | seanbright | 2011-01-29 11:28:27 -0500 (Sat, 29 Jan 2011) | 16 lines
  
  Merged revisions 304726 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304726 | seanbright | 2011-01-29 11:26:57 -0500 (Sat, 29 Jan 2011) | 9 lines
    
    Fix user reference leak in MeetMe.
    
    We were unlinking the user from the conferences user container, but not
    decrementing the reference count of the user as well, resulting in a leak.
    
    (closes issue #18444)
    Reported by: junky
    Tested by: seanbright
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304728 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-29 16:31:17 +00:00
seanbright 2c9b69c5bd Merged revisions 304683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304683 | seanbright | 2011-01-28 17:54:23 -0500 (Fri, 28 Jan 2011) | 16 lines
  
  Merged revisions 304659,304682 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304659 | seanbright | 2011-01-28 16:22:09 -0500 (Fri, 28 Jan 2011) | 5 lines
    
    Don't leak references if we can't create a pseudo channel for mixing in MeetMe.
    
    If there was a problem allocating a pseudo channel when building our meetme, we
    weren't destroying our user container or destroying the mutexes that we created.
  ........
    r304682 | seanbright | 2011-01-28 17:38:05 -0500 (Fri, 28 Jan 2011) | 2 lines
    
    Revert part of the previous commit that snuck in.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304684 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-28 22:59:27 +00:00
russell d60cbce132 Merged revisions 303549 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303549 | russell | 2011-01-24 14:51:37 -0600 (Mon, 24 Jan 2011) | 45 lines
  
  Merged revisions 303548 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r303548 | russell | 2011-01-24 14:49:53 -0600 (Mon, 24 Jan 2011) | 38 lines
    
    Merged revisions 303546 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r303546 | russell | 2011-01-24 14:32:21 -0600 (Mon, 24 Jan 2011) | 31 lines
      
      Fix channel redirect out of MeetMe() and other issues with channel softhangup.
      
      Mantis issue #18585 reports that a channel redirect out of MeetMe() stopped
      working properly.  This issue includes a patch that resolves the issue by
      removing a call to ast_check_hangup() from app_meetme.c.  I left that in my
      patch, as it doesn't need to be there.  However, the rest of the patch fixes
      this problem with or without the change to app_meetme.
      
      The key difference between what happens before and after this patch is the
      effect of the END_OF_Q control frame.  After END_OF_Q is hit in ast_read(),
      ast_read() will return NULL.  With the ast_check_hangup() removed, app_meetme
      sees this which causes it to exit as intended.  Checking ast_check_hangup()
      caused app_meetme to exit earlier in the process, and the target of the
      redirect saw the condition where ast_read() returned NULL.
      
      Removing ast_check_hangup() works around the issue in app_meetme, but doesn't
      solve the issue if another application did the same thing.  There are also
      other edge cases where if an application finishes at the same time that a
      redirect happens, the target of the redirect will think that the channel hung
      up.  So, I made some changes in pbx.c to resolve it at a deeper level.  There
      are already places that unset the SOFTHANGUP_ASYNCGOTO flag in an attempt to
      abort the hangup process.  My patch extends this to remove the END_OF_Q frame
      from the channel's read queue, making the "abort hangup" more complete.  This
      same technique was used in every place where a softhangup flag was cleared.
      
      (closes issue #18585)
      Reported by: oej
      Tested by: oej, wedhorn, russell
      
      Review: https://reviewboard.asterisk.org/r/1082/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@303551 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-24 20:57:28 +00:00
qwell 9dcc6c031e Merged revisions 301090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301090 | qwell | 2011-01-07 14:53:02 -0600 (Fri, 07 Jan 2011) | 15 lines
  
  Merged revisions 301089 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301089 | qwell | 2011-01-07 14:52:00 -0600 (Fri, 07 Jan 2011) | 8 lines
    
    Initialize useropts/adminopts in case there is no column in the realtime DB.
    
    (closes issue #18182)
    Reported by: dimas
    Patches: 
          v1-18182.patch uploaded by dimas (license 88)
    Tested by: dimas
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@301091 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-07 20:53:45 +00:00
russell f85546e84f Merged revisions 297245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297245 | russell | 2010-12-02 07:20:19 -0600 (Thu, 02 Dec 2010) | 20 lines
  
  Merged revisions 297229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297229 | russell | 2010-12-02 07:16:47 -0600 (Thu, 02 Dec 2010) | 13 lines
    
    Merged revisions 297228 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297228 | russell | 2010-12-02 07:16:15 -0600 (Thu, 02 Dec 2010) | 6 lines
      
      Add "DAHDI" to a couple of app_meetme error messages.
      
      This is in response to some questions on IRC.  To the user, there was nothing
      that made it obvious that this error had anything to do with DAHDI not being
      loaded.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297248 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-02 13:20:48 +00:00
tilghman 5c39a3d779 Merged revisions 296787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296787 | tilghman | 2010-11-30 13:12:48 -0600 (Tue, 30 Nov 2010) | 2 lines
  
  DOC: Conference number can be omitted; if omitted, all users in a meetme are listed.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296788 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-30 19:13:54 +00:00
tilghman 622ca0a012 Merged revisions 296467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296467 | tilghman | 2010-11-27 04:40:22 -0600 (Sat, 27 Nov 2010) | 12 lines
  
  Merged revisions 296466 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r296466 | tilghman | 2010-11-27 04:39:01 -0600 (Sat, 27 Nov 2010) | 5 lines
    
    18 characters is too short for most date/times (20 is the usual, but we add more in case of greater precision).
    
    (closes issue #18369)
     Reported by: tnakonz
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296468 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-27 10:41:20 +00:00
citywok c11f5b1732 Meetme use voicemail greet for join/leave announce
Added option v(mailbox@[context]) which tells MeetMe where to look for a users greet file.  If one does not exist it clears the v option and defers to the functionality of i/I as/if set by the MeetMe() command.

Review: https://reviewboard.asterisk.org/r/1009/
(closes issue #18297)
Reported by: parisioa
Patches:
	meetme_final_patch_v.diff uploaded by parisioa (license 1153)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296249 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 23:46:14 +00:00
bbryant 0ed81da5a8 Merged revisions 287760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287760 | bbryant | 2010-09-20 20:00:23 -0400 (Mon, 20 Sep 2010) | 30 lines
  
  Merged revisions 287759 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287759 | bbryant | 2010-09-20 19:58:26 -0400 (Mon, 20 Sep 2010) | 23 lines
    
    Merged revisions 287758 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287758 | bbryant | 2010-09-20 19:57:08 -0400 (Mon, 20 Sep 2010) | 16 lines
      
      Fix misvalidation of meetme pins in conjunction with the 'a' MeetMe flag.
      
      When using the 'a' MeetMe flag and having a user and admin pin setup for your
      conference, using the user pin would gain you admin priviledges. Also, when no
      user pin was set, an admin pin was, the 'a' MeetMe flag wasn't used, and the
      user tried to enter a conference then they were still prompted for a pin and
      forced to hit #.
      
      (closes issue #17908)
      Reported by: kuj
      Patches:
            pins_2.patch uploaded by kuj (license 1111)
            Tested by: kuj
      
            Review: [full review board URL with trailing slash]
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@287763 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21 00:04:54 +00:00
bbryant d25403f972 Merged revisions 285533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285533 | bbryant | 2010-09-08 16:58:43 -0400 (Wed, 08 Sep 2010) | 15 lines
  
  Merged revisions 285532 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r285532 | bbryant | 2010-09-08 16:56:12 -0400 (Wed, 08 Sep 2010) | 8 lines
    
    Fixes a bug with MeetMe where after announcing the amount of time left in a conference, if music on hold was playing, it doesn't restart.
    
    (closes issue #17408)
    Reported by: sysreq
    Patches: 
          asterisk-issue-17408_fixed.patch uploaded by sysreq (license 1009)
    Tested by: sysreq
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@285534 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-08 21:00:32 +00:00
jeang df49299e82 Merged revisions 280346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280346 | jeang | 2010-07-29 11:07:16 -0500 (Thu, 29 Jul 2010) | 17 lines
  
  Merged revisions 280345 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r280345 | jeang | 2010-07-29 11:01:35 -0500 (Thu, 29 Jul 2010) | 10 lines
    
    Merged revisions 280341 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r280341 | jeang | 2010-07-29 10:52:31 -0500 (Thu, 29 Jul 2010) | 2 lines
      
      Fix a dsp structure leak occuring when a local channel is put into a meetme
      conference, then masquaraded away.
      ABE-2422
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@280416 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-29 16:47:23 +00:00
tilghman 62e1479727 Ensure realtime conferences are treated the same as static conferences when trying to find an empty one.
Also, parse the useropts properly, when retrieving from realtime, and add them
to the existing flags.

(closes issue #17502)
 Reported by: kenji
 Patches: 
       20100720__issue17502.diff.txt uploaded by tilghman (license 14)
 Tested by: kenji


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278463 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-21 15:56:05 +00:00
tilghman 771cdeecd1 Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278132 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20 19:35:02 +00:00
rmudgett ad58aa92a2 ast_callerid restructuring
The purpose of this patch is to eliminate struct ast_callerid since it has
turned into a miscellaneous collection of various party information.

Eliminate struct ast_callerid and replace it with the following struct
organization:

struct ast_party_name {
	char *str;
	int char_set;
	int presentation;
	unsigned char valid;
};
struct ast_party_number {
	char *str;
	int plan;
	int presentation;
	unsigned char valid;
};
struct ast_party_subaddress {
	char *str;
	int type;
	unsigned char odd_even_indicator;
	unsigned char valid;
};
struct ast_party_id {
	struct ast_party_name name;
	struct ast_party_number number;
	struct ast_party_subaddress subaddress;
	char *tag;
};
struct ast_party_dialed {
	struct {
		char *str;
		int plan;
	} number;
	struct ast_party_subaddress subaddress;
	int transit_network_select;
};
struct ast_party_caller {
	struct ast_party_id id;
	char *ani;
	int ani2;
};

The new organization adds some new information as well.

* The party name and number now have their own presentation value that can
be manipulated independently.  ISDN supplies the presentation value for
the name and number at different times with the possibility that they
could be different.

* The party name and number now have a valid flag.  Before this change the
name or number string could be empty if the presentation were restricted.
Most channel drivers assume that the name or number is then simply not
available instead of indicating that the name or number was restricted.

* The party name now has a character set value.  SIP and Q.SIG have the
ability to indicate what character set a name string is using so it could
be presented properly.

* The dialed party now has a numbering plan value that could be useful to
have available.

The various channel drivers will need to be updated to support the new
core features as needed.  They have simply been converted to supply
current functionality at this time.


The following items of note were either corrected or enhanced:

* The CONNECTEDLINE() and REDIRECTING() dialplan functions were
consolidated into func_callerid.c to share party id handling code.

* CALLERPRES() is now deprecated because the name and number have their
own presentation values.

* Fixed app_alarmreceiver.c write_metadata().  The workstring[] could
contain garbage.  It also can only contain the caller id number so using
ast_callerid_parse() on it is silly.  There was also a typo in the
CALLERNAME if test.

* Fixed app_rpt.c using ast_callerid_parse() on the channel's caller id
number string.  ast_callerid_parse() alters the given buffer which in this
case is the channel's caller id number string.  Then using
ast_shrink_phone_number() could alter it even more.

* Fixed caller ID name and number memory leak in chan_usbradio.c.

* Fixed uninitialized char arrays cid_num[] and cid_name[] in
sig_analog.c.

* Protected access to a caller channel with lock in chan_sip.c.

* Clarified intent of code in app_meetme.c sla_ring_station() and
dial_trunk().  Also made save all caller ID data instead of just the name
and number strings.

* Simplified cdr.c set_one_cid().  It hand coded the ast_callerid_merge()
function.

* Corrected some weirdness with app_privacy.c's use of caller
presentation.

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@276347 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-14 15:48:36 +00:00
jpeeler e1bf60e202 Merged revisions 275773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r275773 | jpeeler | 2010-07-12 15:34:51 -0500 (Mon, 12 Jul 2010) | 12 lines
  
  Make user removals and traversals thread safe in meetme.
  
  Race conditions present in meetme involving the user list where a lack of
  locking has the potential for a user to be removed during a traversal or as in
  the case of the reporter after checking if the list is empty could cause a
  crash. Fixing this was done by convering the userlist to an ao2 container.
  
  (closes issue #17390)
  Reported by: Vince
  
  Review: https://reviewboard.asterisk.org/r/746/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@276074 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-13 17:37:40 +00:00
eliel 74360b0fee When creating a conference for a unit test, it is not mandatory to open a
dahdi pseudo channel, so if we fail doing it, continue creating the conference.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275509 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-10 20:49:30 +00:00
tilghman af4ffb86d0 Get more information about the Bamboo test failures
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275312 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09 20:01:01 +00:00
tilghman d42a4ac704 Weird, no output and Bamboo still fails...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275227 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09 18:55:02 +00:00
tilghman 801b8efe65 Add some diagnostic feedback to our data tests
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275172 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09 18:21:39 +00:00
tilghman cc07f75cb0 Kill some startup warnings and errors and make some messages more helpful in tracking down the source.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275105 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09 17:00:22 +00:00
eliel 7a61a43adb Implement AstData API data providers as part of the GSOC 2010 project,
midterm evaluation.

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



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@274727 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-08 14:48:42 +00:00
jpeeler f57bd9716b Merged revisions 273474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r273474 | jpeeler | 2010-07-01 15:19:16 -0500 (Thu, 01 Jul 2010) | 14 lines
  
  Allow admin user to join conference without using admin mode and no user pin.
  
  Configuring the conference in meetme.conf like the following:
  conf => 2345,,6666 
  did not prompt for pin when used without admin mode. This meant that the
  conference could not be joined as an admin even if the user knew the correct
  pin. The original bug report was submitted claiming that the blank user pin
  should deny entry into the conference. I think a better way to handle this
  would be with a feature enhancement that used the following syntax:
  conf => 2345,X,6666 - where X denotes no acceptable pin allowed
  
  (closes issue #15704)
  Reported by: modelnine
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@273522 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01 20:28:15 +00:00
jpeeler b5f418e343 Merged revisions 273354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r273354 | jpeeler | 2010-07-01 10:05:43 -0500 (Thu, 01 Jul 2010) | 12 lines
  
  Ensure channel placed in meetme in ringing state is properly hung up.
  
  An outgoing channel placed in meetme while still ringing which was then hung up
  would not exit meetme and the channel was not properly destroyed. Specifically
  checking for this scenario by looking at the appropriate control frames resolves
  the issue.
  
  (closes issue #15871)
  Reported by: Ivan
  Patches: 
        meetme_congestion_trunk_v2.patch uploaded by Ivan (license 229)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@273355 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01 15:12:31 +00:00
pabelanger ec319c0f70 Fix previous merge. ast_test_flag != ast_test_flag64
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272259 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23 21:06:15 +00:00
pabelanger 8ab621a913 Merged revisions 272255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines
  
  First caller into a dynamic conference now enter pin once.
  
  If MeetMe is configured to use dynamic conference
  numbers, then the first caller (which creates the
  conference) had to enter the PIN number twice.
  
  (closes issue #15878)
  Reported by: shawkris
  Patches:
        issue15878.patch uploaded by pabelanger (license 224)
  Tested by: pabelanger
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272257 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23 21:00:00 +00:00
twilson c2bbf5d36e Don't start the sla thread unless we realy need it
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272146 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23 18:39:20 +00:00
twilson bb77d2a218 Make sure reload updates SLA config
Even if there are no stations or trunks defined, we need to start the sla
thread to make sure we get the reload event. Also, when doing a reload we need
to remove the existing trunks and stations or they end up hanging around.

(closes issue #16818)
Reported by: mbonin
Patches: 
      sla_reload.patch uploaded by twilson (license 396)
Tested by: twilson


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272109 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23 17:21:40 +00:00
pabelanger dc60b45e55 option w[(secs)] incorrectly capitalized in xmldoc
(closes issue #17516)
Reported by: karlfife


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@271089 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-17 00:30:51 +00:00
lmadsen 8c11ad9504 Fix some doxygen warnings.
(closes issue #17336)
Reported by: snuffy
Patches:
      doxygen-fixes1.diff uploaded by snuffy (license 35)
Tested by: russell

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@268969 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-08 14:38:18 +00:00
dvossel 9767a849ee Merged revisions 262662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r262662 | dvossel | 2010-05-12 12:00:04 -0500 (Wed, 12 May 2010) | 11 lines
  
  fixes app_meetme dsp error
  
  We attempted to detect silence after translating a frame
  from signed linear.  This caused a flooding of errors.  To
  resolve this the code to detect silence was moved before the
  translation.
  
  (closes issue #17133)
  Reported by: jsdyer
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@262744 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-12 18:01:20 +00:00
jpeeler 9f7bd15fc5 Add new admin features to meetme: Roll call, eject all, mute all, record in-conf
This patch adds the following in-conference admin DTMF features:
*81 - Roll call (or simply user count if INTROUSER isn't enabled)
*82 - Eject all non-admins
*83 - Mute/unmute all non-admins
*84 - Start recording the conference on the fly

FWIW, this code uses newly recorded prompts.

(closes issue #16379)
Reported by: rfinnie
Patches:
      meetme-enhancements-232771-v1.patch uploaded by rfinnie (license 940)
      modified slightly by me


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@260757 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-03 22:13:24 +00:00
russell bad7a7d715 Export MEETMEBOOKID and fix pin-less conferences with realtime conferences
(closes issue #16866)
Reported by: DEA
Patches:
      rt-meetme-options.txt uploaded by DEA (license 3)
Tested by: DEA

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@256019 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02 23:55:57 +00:00
seanbright 44cc42f022 Resolve a crash in SLATrunk when the specified trunk doesn't exist.
Reported by philipp64 in #asterisk-dev.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@252623 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15 21:55:44 +00:00