]> git.ipfire.org Git - thirdparty/asterisk.git/log
thirdparty/asterisk.git
18 years agoFix a typo where "vmpassword" should be "vmsecret"
Russell Bryant [Mon, 12 Feb 2007 15:38:39 +0000 (15:38 +0000)] 
Fix a typo where "vmpassword" should be "vmsecret"

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@54002 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix VLDTMF reception
Paul Cadach [Sat, 10 Feb 2007 09:09:49 +0000 (09:09 +0000)] 
Fix VLDTMF reception

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53881 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMuch simpler than previous one ;-)
Paul Cadach [Sat, 10 Feb 2007 09:08:55 +0000 (09:08 +0000)] 
Much simpler than previous one ;-)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53880 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoProvide correct DTMF duration
Paul Cadach [Sat, 10 Feb 2007 09:07:11 +0000 (09:07 +0000)] 
Provide correct DTMF duration

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoBring deprecated 'debug channel <x|all>' command back
Paul Cadach [Sat, 10 Feb 2007 09:04:47 +0000 (09:04 +0000)] 
Bring deprecated 'debug channel <x|all>' command back

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53878 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agodon't display the --with-imap message unless --with-imap was specified without a...
Kevin P. Fleming [Sat, 10 Feb 2007 06:06:08 +0000 (06:06 +0000)] 
don't display the --with-imap message unless --with-imap was specified without a path
use '-n' instead of '! -z' for tests

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53850 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd some output for "show application SLAStation/SLATrunk"
Russell Bryant [Sat, 10 Feb 2007 01:02:00 +0000 (01:02 +0000)] 
Add some output for "show application SLAStation/SLATrunk"

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53821 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoChange some text to properly state "On Hold", which was already done in trunk.
Russell Bryant [Sat, 10 Feb 2007 00:41:57 +0000 (00:41 +0000)] 
Change some text to properly state "On Hold", which was already done in trunk.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53818 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerge team/russell/sla_rewrite
Russell Bryant [Sat, 10 Feb 2007 00:35:09 +0000 (00:35 +0000)] 
Merge team/russell/sla_rewrite

This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4.  It is now functional and ready for testing.  However, I will be
adding some additional features over the next week, as well.

For information on how to set this up, see configs/sla.conf.sample
and doc/sla.txt.

In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:

chan_sip:
 - Add the ability to indicate HOLD state in NOTIFY messages.
 - Queue HOLD and UNHOLD control frames even if the channel is not bridged to
   another channel.

linkedlists.h:
 - Add support for rwlock based linked lists.

dial.c:
 - Add the ability to run ast_dial_start() without a reference channel to
   inherit information from.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53810 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWhen the Echo() application receives the digit '#', echo that back as well.
Russell Bryant [Sat, 10 Feb 2007 00:15:50 +0000 (00:15 +0000)] 
When the Echo() application receives the digit '#', echo that back as well.
Since we already sent the BEGIN frame for that digit, it makes sense to send
the END as well.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53783 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoanother dependency
Kevin P. Fleming [Fri, 9 Feb 2007 23:52:44 +0000 (23:52 +0000)] 
another dependency

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53781 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoadd some inter-module dependencies
Kevin P. Fleming [Fri, 9 Feb 2007 23:51:41 +0000 (23:51 +0000)] 
add some inter-module dependencies

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53780 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agofix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source...
Kevin P. Fleming [Fri, 9 Feb 2007 23:51:29 +0000 (23:51 +0000)] 
fix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source file

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53779 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoTemporarily change musicclass on channel to one specified in Dial so that the 'm...
Joshua Colp [Fri, 9 Feb 2007 19:33:31 +0000 (19:33 +0000)] 
Temporarily change musicclass on channel to one specified in Dial so that the 'm' option functions properly. (issue #8969 reported by christianbee)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53749 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoclarify the fact that voicemail IMAP storage cannot be built against a distro's binar...
Kevin P. Fleming [Fri, 9 Feb 2007 16:42:22 +0000 (16:42 +0000)] 
clarify the fact that voicemail IMAP storage cannot be built against a distro's binary c-client library package (at least not at this time)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53715 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDon't output debug unless we asked for it
Olle Johansson [Thu, 8 Feb 2007 23:18:59 +0000 (23:18 +0000)] 
Don't output debug unless we asked for it

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53672 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix timeout issue when utterance is longer then timeout itself.
Joshua Colp [Thu, 8 Feb 2007 17:54:32 +0000 (17:54 +0000)] 
Fix timeout issue when utterance is longer then timeout itself.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53601 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoIssue 9007 - Mutex not released on early return
Tilghman Lesher [Thu, 8 Feb 2007 13:47:54 +0000 (13:47 +0000)] 
Issue 9007 - Mutex not released on early return

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53532 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53529 via svnmerge from
Tilghman Lesher [Thu, 8 Feb 2007 13:40:02 +0000 (13:40 +0000)] 
Merged revisions 53529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53529 | tilghman | 2007-02-08 07:36:10 -0600 (Thu, 08 Feb 2007) | 2 lines

Issue 9003 - If fullname is empty, quote() passes back "\""

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53530 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWhen building libdb1.a, put the additional flags needed at the beginning of
Russell Bryant [Wed, 7 Feb 2007 23:52:45 +0000 (23:52 +0000)] 
When building libdb1.a, put the additional flags needed at the beginning of
ASTCFLAGS, instead of at the end.  This way, we ensure that we find the local
headers first before accidentally trying to use headers that exist in
locations specified in the ASTCFLAGS passed from the main Makefile.
(issue #8637, ovi)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53497 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoThe clean target actually needs to run "distclean" on editline. This is
Russell Bryant [Wed, 7 Feb 2007 20:07:39 +0000 (20:07 +0000)] 
The clean target actually needs to run "distclean" on editline.  This is
because we need to make sure that its configure script gets executed again,
because the CFLAGS we want to pass to editline may have changed.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53464 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWe can not reliably do P2P bridging with DTMF passing back with compensation if we...
Joshua Colp [Wed, 7 Feb 2007 17:53:03 +0000 (17:53 +0000)] 
We can not reliably do P2P bridging with DTMF passing back with compensation if we need to listen for DTMF frames. (issue #8962 reported by caio1982)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53434 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWhen parsing the NTP timestamp in a sender report message, you are supposed to
Russell Bryant [Wed, 7 Feb 2007 17:39:31 +0000 (17:39 +0000)] 
When parsing the NTP timestamp in a sender report message, you are supposed to
take the low 16 bits of the integer part, and the high 16 bits of the
fractional part.  However, the code here was erroneously taking the low 16 bits
of the fractional part.  It then shifted the result 16 bits down, so the result
was always zero.  This fix makes it grab the appropriate high 16 bits, instead.
(issue #8991, pointed out by andre_abrantes)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53429 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDirectly load say.conf in load_module instead of calling the reload function. (issue...
Joshua Colp [Wed, 7 Feb 2007 17:04:44 +0000 (17:04 +0000)] 
Directly load say.conf in load_module instead of calling the reload function. (issue #8946 reported by junky)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53399 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53357 via svnmerge from
Joshua Colp [Wed, 7 Feb 2007 15:43:39 +0000 (15:43 +0000)] 
Merged revisions 53357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53357 | file | 2007-02-07 10:38:48 -0500 (Wed, 07 Feb 2007) | 2 lines

Fix a few potential memory leaks with realtime users and peers. (issue #8999 reported by bsmithurst)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53358 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53354 via svnmerge from
Tilghman Lesher [Wed, 7 Feb 2007 15:33:51 +0000 (15:33 +0000)] 
Merged revisions 53354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53354 | tilghman | 2007-02-07 09:30:02 -0600 (Wed, 07 Feb 2007) | 2 lines

Issue 7440 - Macro called from Macro from the h extension exits prematurely

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52843 via svnmerge from
Christian Richter [Wed, 7 Feb 2007 09:22:44 +0000 (09:22 +0000)] 
Merged revisions 52843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52843 | crichter | 2007-01-30 15:38:08 +0100 (Di, 30 Jan 2007) | 1 line

fixed some possible segfaults. also fixed an very important bug which occurs on high load (when calls are very fast generated)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53324 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoText fix for jabber reload command (reported by bkruse via IRC)
Tilghman Lesher [Wed, 7 Feb 2007 05:24:31 +0000 (05:24 +0000)] 
Text fix for jabber reload command (reported by bkruse via IRC)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53294 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53245 via svnmerge from
Tilghman Lesher [Tue, 6 Feb 2007 07:00:52 +0000 (07:00 +0000)] 
Merged revisions 53245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53245 | tilghman | 2007-02-06 00:58:28 -0600 (Tue, 06 Feb 2007) | 2 lines

Issue 8987 - Status could return two responses (mnicholson)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53246 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFormatting
Olle Johansson [Mon, 5 Feb 2007 23:43:59 +0000 (23:43 +0000)] 
Formatting

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53222 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoEnsure say_cfg is NULL when the module is loaded. (issue #8946 reported by junky)
Joshua Colp [Mon, 5 Feb 2007 17:06:18 +0000 (17:06 +0000)] 
Ensure say_cfg is NULL when the module is loaded. (issue #8946 reported by junky)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53152 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoUnregister Playback CLI commands as well as dialplan application. (issue #8946 report...
Joshua Colp [Mon, 5 Feb 2007 16:02:00 +0000 (16:02 +0000)] 
Unregister Playback CLI commands as well as dialplan application. (issue #8946 reported by junky)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53150 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd some comments on queue system behaviour and how it affects the
Olle Johansson [Mon, 5 Feb 2007 00:18:34 +0000 (00:18 +0000)] 
Add some comments on queue system behaviour and how it affects the
SIP channel

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53143 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMake SIPDtmfMode application work with recent capability changes, and also fix an...
Joshua Colp [Sat, 3 Feb 2007 21:05:02 +0000 (21:05 +0000)] 
Make SIPDtmfMode application work with recent capability changes, and also fix an RTP stack issue when the auto option was used. (issue #8972 reported by mdu113)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53138 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53133 via svnmerge from
Russell Bryant [Sat, 3 Feb 2007 20:44:20 +0000 (20:44 +0000)] 
Merged revisions 53133 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53133 | russell | 2007-02-03 14:38:13 -0600 (Sat, 03 Feb 2007) | 4 lines

set the DIALSTATUS variable to contain "INVALIDARGS" when the dial application
exits early because of invalid arguments instead of just leaving it empty.
(issue #8975)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53136 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoBlocked revisions 53134 via svnmerge
Russell Bryant [Sat, 3 Feb 2007 20:40:26 +0000 (20:40 +0000)] 
Blocked revisions 53134 via svnmerge

........
r53134 | russell | 2007-02-03 14:39:45 -0600 (Sat, 03 Feb 2007) | 2 lines

Revert some changes that accidentally got committed as a part of another fix.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53135 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoRemove quote from H.323 vendor string because due to compatibilities with CS1000...
Paul Cadach [Sat, 3 Feb 2007 10:02:55 +0000 (10:02 +0000)] 
Remove quote from H.323 vendor string because due to compatibilities with CS1000 reported at www.voip-info.org

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53131 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years ago I'm baaaaaaaaaack. :)
BJ Weschke [Fri, 2 Feb 2007 21:26:45 +0000 (21:26 +0000)] 
 I'm baaaaaaaaaack. :)

 Post a warning to the console that things might possibly be misconfigured when queue member's states are still 'Not in Use' when we're about to bridge them with a caller from queue. Also, put some documentation quoted from oej's queues.txt efforts started in /trunk today.
 This commit puts #7433 into feedback state for 1.4, and pending no further negative feedback, it will finally be closed.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53129 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoCorrect a copy/pasted error message line for RTCP.
Joshua Colp [Fri, 2 Feb 2007 17:15:22 +0000 (17:15 +0000)] 
Correct a copy/pasted error message line for RTCP.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53120 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53117 via svnmerge from
Joshua Colp [Fri, 2 Feb 2007 16:59:53 +0000 (16:59 +0000)] 
Merged revisions 53117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53117 | file | 2007-02-02 10:58:09 -0600 (Fri, 02 Feb 2007) | 2 lines

Pass the glob expanded filename to process_text_line so that error messages contain the actual filename, not the original include one. (issue #8959 reported by tzafrir)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53118 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd systemname to asterisk.conf generation per recent discussions about it. (issue...
Joshua Colp [Fri, 2 Feb 2007 15:29:35 +0000 (15:29 +0000)] 
Add systemname to asterisk.conf generation per recent discussions about it. (issue #8968 reported by blitzrage)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53114 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDisable the direct p2p RTP call setup in SIP. You can enable it in sip.conf, but...
Olle Johansson [Fri, 2 Feb 2007 00:24:03 +0000 (00:24 +0000)] 
Disable the direct p2p RTP call setup in SIP. You can enable it in sip.conf, but it is now
considered experimental until we solve the AST_CONTROL_ANSWER with payload and videocaps
stuff.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53109 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoBlocked revisions 53107 via svnmerge
Jason Parker [Thu, 1 Feb 2007 23:16:08 +0000 (23:16 +0000)] 
Blocked revisions 53107 via svnmerge

........
r53107 | qwell | 2007-02-01 17:14:09 -0600 (Thu, 01 Feb 2007) | 2 lines

Fix a small typo.  Synopsis lines shouldn't have a newline

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53108 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53103 via svnmerge from
Joshua Colp [Thu, 1 Feb 2007 22:24:32 +0000 (22:24 +0000)] 
Merged revisions 53103 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53103 | file | 2007-02-01 16:21:56 -0600 (Thu, 01 Feb 2007) | 2 lines

Copy noncodeccapability over to the joint variable so that telephone-event will get transmitted in the sent INVITE.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53104 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoHuh... fix the berkeley DB to compile here as well, but it apparently required both...
Joshua Colp [Thu, 1 Feb 2007 22:04:58 +0000 (22:04 +0000)] 
Huh... fix the berkeley DB to compile here as well, but it apparently required both dev mode and no optimizations to creep up.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53099 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53095 via svnmerge from
Joshua Colp [Thu, 1 Feb 2007 21:54:28 +0000 (21:54 +0000)] 
Merged revisions 53095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53095 | file | 2007-02-01 15:47:11 -0600 (Thu, 01 Feb 2007) | 2 lines

Don't negotiate RFC2833 when not configured to do so. (issue #8799 reported by mdu113)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53097 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix the FIELDQTY function to not crash. (reported by blitzrage and Corydon on IRC)
Russell Bryant [Thu, 1 Feb 2007 21:24:52 +0000 (21:24 +0000)] 
Fix the FIELDQTY function to not crash. (reported by blitzrage and Corydon on IRC)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53093 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoGoing backwards, blame file.
Olle Johansson [Thu, 1 Feb 2007 21:15:50 +0000 (21:15 +0000)] 
Going backwards, blame file.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53084 via svnmerge from
Joshua Colp [Thu, 1 Feb 2007 21:11:28 +0000 (21:11 +0000)] 
Merged revisions 53084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53084 | file | 2007-02-01 15:03:10 -0600 (Thu, 01 Feb 2007) | 2 lines

Return previous behavior of having MOH pick up where it was left off. (issue #8672 reported by sinistermidget)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53088 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMake func_strings build under dev mode. Didn't I do this today already in the berkele...
Joshua Colp [Thu, 1 Feb 2007 21:06:02 +0000 (21:06 +0000)] 
Make func_strings build under dev mode. Didn't I do this today already in the berkeley DB?

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53086 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years ago- Clean INC_COUNT flag when we decrement call counter
Olle Johansson [Thu, 1 Feb 2007 21:05:34 +0000 (21:05 +0000)] 
- Clean INC_COUNT flag when we decrement call counter
- If it's still set at time of dialog destruction, make sure we decrement the device call counter properly
  before we destroy the dialog

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53085 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoChange debug level for state change message that is not really informative when debug...
Olle Johansson [Thu, 1 Feb 2007 20:38:58 +0000 (20:38 +0000)] 
Change debug level for state change message that is not really informative when debugging app_queue

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53081 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoCleaning up the devicestate callback function
Olle Johansson [Thu, 1 Feb 2007 20:28:54 +0000 (20:28 +0000)] 
Cleaning up the devicestate callback function

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoOops.
Tilghman Lesher [Thu, 1 Feb 2007 20:13:40 +0000 (20:13 +0000)] 
Oops.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53077 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53074 via svnmerge from
Tilghman Lesher [Thu, 1 Feb 2007 20:09:52 +0000 (20:09 +0000)] 
Merged revisions 53074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53074 | tilghman | 2007-02-01 14:07:35 -0600 (Thu, 01 Feb 2007) | 2 lines

Bug 8965 - Allow FIELDQTY to work with both variables and dialplan functions

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53075 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd missing 'F' letter to getopt so it magically becomes a valid option. (issue ...
Joshua Colp [Thu, 1 Feb 2007 19:33:33 +0000 (19:33 +0000)] 
Add missing 'F' letter to getopt so it magically becomes a valid option. (issue #8960 reported by tzafrir)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53072 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53069 via svnmerge from
Tilghman Lesher [Thu, 1 Feb 2007 19:21:20 +0000 (19:21 +0000)] 
Merged revisions 53069 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53069 | tilghman | 2007-02-01 13:13:53 -0600 (Thu, 01 Feb 2007) | 2 lines

No wonder FIELDQTY doesn't work with functions... the documentation in pbx.c was wrong

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53070 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix silly logic. We really want to write UDPTL frames out when the call is up.
Joshua Colp [Thu, 1 Feb 2007 17:37:44 +0000 (17:37 +0000)] 
Fix silly logic. We really want to write UDPTL frames out when the call is up.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53064 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd explanation of port= in combination with defaultip= (thanks jsmith)
Olle Johansson [Thu, 1 Feb 2007 16:35:12 +0000 (16:35 +0000)] 
Add explanation of port= in combination with defaultip= (thanks jsmith)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53062 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agowe update the name on any first reply of our setup
Christian Richter [Thu, 1 Feb 2007 13:17:18 +0000 (13:17 +0000)] 
we update the name on any first reply of our setup

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53060 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agochan_h323 is very stable, so let it built by default
Paul Cadach [Thu, 1 Feb 2007 11:07:41 +0000 (11:07 +0000)] 
chan_h323 is very stable, so let it built by default

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53057 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWhen going on hold have the side that was put on hold reinvite back to Asterisk....
Joshua Colp [Thu, 1 Feb 2007 00:24:20 +0000 (00:24 +0000)] 
When going on hold have the side that was put on hold reinvite back to Asterisk. When going off hold have the side that was taken off hold reinvited back to the other party.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd more frame types to forward in the RTP bridge loops.
Joshua Colp [Thu, 1 Feb 2007 00:19:48 +0000 (00:19 +0000)] 
Add more frame types to forward in the RTP bridge loops.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53050 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53045 via svnmerge from
Russell Bryant [Wed, 31 Jan 2007 21:32:08 +0000 (21:32 +0000)] 
Merged revisions 53045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines

Fix a bunch of places where pthread_attr_init() was called, but
pthread_attr_destroy() was not.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53046 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoRemove an extra \r\n from manager user events. (issue #8955, mnicholson)
Russell Bryant [Wed, 31 Jan 2007 18:18:25 +0000 (18:18 +0000)] 
Remove an extra \r\n from manager user events.  (issue #8955, mnicholson)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53042 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 53039 via svnmerge from
Russell Bryant [Wed, 31 Jan 2007 17:45:05 +0000 (17:45 +0000)] 
Merged revisions 53039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53039 | russell | 2007-01-31 11:41:51 -0600 (Wed, 31 Jan 2007) | 3 lines

Use the proper format string to print unsigned values in the rtp debug output.
(issue #8954, wmis)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53040 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoOnly changed the paused status in an existing queue member if the paused
Russell Bryant [Wed, 31 Jan 2007 17:39:28 +0000 (17:39 +0000)] 
Only changed the paused status in an existing queue member if the paused
column exists.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53037 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoInstead of always creating a realtime queue member as unpaused, read the
Russell Bryant [Wed, 31 Jan 2007 17:34:22 +0000 (17:34 +0000)] 
Instead of always creating a realtime queue member as unpaused, read the
"paused" column and use that value for the paused status of the member.
(issue #8949, jmls)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53035 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoUpdate init script for SuSE 10. (issue #8363, johnlange)
Russell Bryant [Tue, 30 Jan 2007 23:38:42 +0000 (23:38 +0000)] 
Update init script for SuSE 10.  (issue #8363, johnlange)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53001 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd documentation for using cdr_pgsql. (issue #8942, lters)
Russell Bryant [Tue, 30 Jan 2007 23:30:34 +0000 (23:30 +0000)] 
Add documentation for using cdr_pgsql.  (issue #8942, lters)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52999 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoWhen we are checking for a system installed version of libgsm, we need to check
Russell Bryant [Tue, 30 Jan 2007 23:23:24 +0000 (23:23 +0000)] 
When we are checking for a system installed version of libgsm, we need to check
for gsm.h as well.  Furthermore, when checking for this header, it may be
located in a gsm/ sub directory, so check for that, as well.
(issue #8773)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52997 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoBlocked revisions 52954 via svnmerge
Russell Bryant [Tue, 30 Jan 2007 19:43:59 +0000 (19:43 +0000)] 
Blocked revisions 52954 via svnmerge

........
r52954 | russell | 2007-01-30 13:41:52 -0600 (Tue, 30 Jan 2007) | 4 lines

Don't print a message indicating that we don't know what to do with a proceeding
control frame in ast_request_and_dial().  We just need to ignore it.
(reported by JerJer on #asterisk-dev)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52955 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoOnly set the DTMF flag on the rtp structure if the DTMF mode is actually
Russell Bryant [Tue, 30 Jan 2007 19:33:12 +0000 (19:33 +0000)] 
Only set the DTMF flag on the rtp structure if the DTMF mode is actually
RFC2833, not just that it is not INFO.  This makes it get set for inband DTMF
as well, which is not valid.
(issue #8936)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52952 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52903 via svnmerge from
Russell Bryant [Tue, 30 Jan 2007 17:19:39 +0000 (17:19 +0000)] 
Merged revisions 52903 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52903 | russell | 2007-01-30 11:12:04 -0600 (Tue, 30 Jan 2007) | 9 lines

The SIGHUP handler was implemented to allow admins to send SIGHUP to a running
Asterisk process to reload the configuration.  However, doing the actual reload
in the signal handler itself is a very bad thing to do, because the reload
process includes calling non-reentrant functions such as malloc/calloc/etc.
If Asterisk is running in the background, then the reload will happen
immediately.  However, if running in console mode, the reload doesn't work
until something is typed at the console.  That sort of defeats the purpose,
but I don't see an easy way to get around it at this point.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52904 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoBlocked revisions 52857 via svnmerge
Russell Bryant [Tue, 30 Jan 2007 15:36:36 +0000 (15:36 +0000)] 
Blocked revisions 52857 via svnmerge

........
r52857 | russell | 2007-01-30 09:35:23 -0600 (Tue, 30 Jan 2007) | 5 lines

Comment out the parts in the Makefile that make codec_zap get built.  It will
not yet build against zaptel 1.2, so I am disabling it to prevent further bug
reports until it gets merged.
(issue #8940)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52859 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDrop the deprecated show commands since the original ones were changed back. (issue...
Joshua Colp [Tue, 30 Jan 2007 15:29:50 +0000 (15:29 +0000)] 
Drop the deprecated show commands since the original ones were changed back. (issue #8937 reported by PCadach)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52856 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoRevert reprecation of h.323 gk cycle command from pre-1.4 version instead of duplicat...
Paul Cadach [Tue, 30 Jan 2007 08:46:31 +0000 (08:46 +0000)] 
Revert reprecation of h.323 gk cycle command from pre-1.4 version instead of duplicated h323 cycle gk

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52809 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDon't play with free()'d pointers
Paul Cadach [Tue, 30 Jan 2007 08:34:26 +0000 (08:34 +0000)] 
Don't play with free()'d pointers

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52808 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoHandle non-standard OpenH323/PWLib library names
Paul Cadach [Tue, 30 Jan 2007 08:33:22 +0000 (08:33 +0000)] 
Handle non-standard OpenH323/PWLib library names

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52807 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52762 via svnmerge from
Russell Bryant [Tue, 30 Jan 2007 00:15:50 +0000 (00:15 +0000)] 
Merged revisions 52762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52762 | russell | 2007-01-29 18:15:06 -0600 (Mon, 29 Jan 2007) | 5 lines

Fix the extraction of the timestamp from video frames.  It was using the
mapping for a mini-frame instead of a video-frame, which caused it to
get invalid data.
(issue #8795, mihai)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52763 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52716 via svnmerge from
Joshua Colp [Mon, 29 Jan 2007 23:43:40 +0000 (23:43 +0000)] 
Merged revisions 52716 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52716 | file | 2007-01-29 18:39:39 -0500 (Mon, 29 Jan 2007) | 2 lines

Now that filename is part of the structure and since it comes before postprocess... we have to add it to our postprocess line. (reported on asterisk-dev by Boris Bakchiev)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52717 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoAdd a missing quotation mark. This was pointed out by jcmoore on #asterisk-dev.
Russell Bryant [Mon, 29 Jan 2007 22:58:09 +0000 (22:58 +0000)] 
Add a missing quotation mark.  This was pointed out by jcmoore on #asterisk-dev.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52695 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoRemove a recursive lock of the manager session. This was pointed out by
Russell Bryant [Mon, 29 Jan 2007 22:55:41 +0000 (22:55 +0000)] 
Remove a recursive lock of the manager session.  This was pointed out by
zandbelt in issue #8711.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52688 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoArgument number correction
Tilghman Lesher [Mon, 29 Jan 2007 22:12:12 +0000 (22:12 +0000)] 
Argument number correction

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52679 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoASTLDFLAGS needs to be passed to the editline configure script as LDFLAGS.
Russell Bryant [Mon, 29 Jan 2007 21:36:56 +0000 (21:36 +0000)] 
ASTLDFLAGS needs to be passed to the editline configure script as LDFLAGS.
(issue #8928, zandbelt)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52647 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix a problem with packet-to-packet bridging and DTMF mode translation. P2P
Russell Bryant [Mon, 29 Jan 2007 21:26:27 +0000 (21:26 +0000)] 
Fix a problem with packet-to-packet bridging and DTMF mode translation.  P2P
bridging can only be used when the DTMF modes don't match if the core is
monitoring DTMF in both directions.  Then, the core will handle the translation.
Otherwise, this bridging method can not be used.
(issue #8936)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52645 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoThe session lock can not be held while calling action callbacks. If so, then
Russell Bryant [Mon, 29 Jan 2007 20:39:20 +0000 (20:39 +0000)] 
The session lock can not be held while calling action callbacks.  If so, then
when the WaitEvent callback gets called, then no event can happen because the
session can't be locked by another thread.  Also, the session needs to be
locked in the HTTP callback when it reads out the output string.  This fixes
the deadlock reported in both 8711 and 8934.
Regarding issue 8711, there still may be an issue.  If there is a second action
requested before the processing of the first action is finished, there could
still be some corruption of the output string buffer used to build the result.
(issue #8711, #8934)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52611 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoUse ast_calloc instead of malloc.
Joshua Colp [Mon, 29 Jan 2007 18:59:41 +0000 (18:59 +0000)] 
Use ast_calloc instead of malloc.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52572 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agothis is for 8778 (pt_BR backport to 1.4). It was committed to trunk via 7663. But...
Steve Murphy [Mon, 29 Jan 2007 17:57:08 +0000 (17:57 +0000)] 
this is for 8778 (pt_BR backport to 1.4). It was committed to trunk via 7663. But it wasn't so much an enhancement as a fix for the bad language output for portuguese in Brazil, so, after a lot of prodding from patient Brazilians, here is the same fix for 1.4

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52535 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoSet quota information to 0 when creating a vm_state. (issue #8924 reported by neutrino88)
Joshua Colp [Mon, 29 Jan 2007 17:33:19 +0000 (17:33 +0000)] 
Set quota information to 0 when creating a vm_state. (issue #8924 reported by neutrino88)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52523 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoClean up a few things in the last commit to the adaptive jitterbuffer code.
Russell Bryant [Mon, 29 Jan 2007 16:54:27 +0000 (16:54 +0000)] 
Clean up a few things in the last commit to the adaptive jitterbuffer code.
 - Specifically indicate to the compiler that the "dropem" variable only
   needs one but.
 - Change formatting to conform to coding guidelines.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52506 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFixed problem with jitterbuf, whereas it would not complain about, and
Jim Dixon [Mon, 29 Jan 2007 04:18:36 +0000 (04:18 +0000)] 
Fixed problem with jitterbuf, whereas it would not complain about, and
would allow itself to be overfilled (per the max_jitterbuf parameter). Now
it rejects any data over and above that size, and complains about it.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52494 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoSuggested change to fix normal usage of --with-tds=/usr/local (Sean Bright, via aster...
Tilghman Lesher [Sun, 28 Jan 2007 05:15:07 +0000 (05:15 +0000)] 
Suggested change to fix normal usage of --with-tds=/usr/local (Sean Bright, via asterisk-dev mailing list)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52462 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52415 via svnmerge from
Joshua Colp [Sat, 27 Jan 2007 02:13:41 +0000 (02:13 +0000)] 
Merged revisions 52415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52415 | file | 2007-01-26 21:09:10 -0500 (Fri, 26 Jan 2007) | 2 lines

Make COMPLETECALLER and COMPLETEAGENT output to queue_log follow documentation. (issue #7677 reported by amilcar)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52416 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoHave the manager interface send back an "Already logged in" message instead of "Inval...
Joshua Colp [Sat, 27 Jan 2007 00:44:51 +0000 (00:44 +0000)] 
Have the manager interface send back an "Already logged in" message instead of "Invalid/Unknown Command" when the client authenticates for a second time. (issue #8509 reported by pari)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52373 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52360 via svnmerge from
Joshua Colp [Sat, 27 Jan 2007 00:08:18 +0000 (00:08 +0000)] 
Merged revisions 52360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52360 | file | 2007-01-26 19:03:23 -0500 (Fri, 26 Jan 2007) | 2 lines

Make the last context entry read in the dominant one. (issue #8918 reported by pj)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoFix core show file formats CLI command.
Joshua Colp [Fri, 26 Jan 2007 23:46:47 +0000 (23:46 +0000)] 
Fix core show file formats CLI command.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52335 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoMerged revisions 52264 via svnmerge from
Joshua Colp [Thu, 25 Jan 2007 19:18:33 +0000 (19:18 +0000)] 
Merged revisions 52264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52264 | file | 2007-01-25 14:15:29 -0500 (Thu, 25 Jan 2007) | 2 lines

Allow dequeueing of frames with negative timestamp by moving jitterbuffer frames check to jb_next. (issue #8546 reported by harmen)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52265 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDrop out variables I accidentally put in.
Joshua Colp [Thu, 25 Jan 2007 17:49:39 +0000 (17:49 +0000)] 
Drop out variables I accidentally put in.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52210 65c4cc65-6c06-0410-ace0-fbb531ad65f3

18 years agoDecrement onHold count if we are hung up on and still on hold. (issue #8909 reported...
Joshua Colp [Thu, 25 Jan 2007 17:14:53 +0000 (17:14 +0000)] 
Decrement onHold count if we are hung up on and still on hold. (issue #8909 reported by alexh42)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52208 65c4cc65-6c06-0410-ace0-fbb531ad65f3