Philippe Sultan [Sun, 7 Oct 2007 16:18:49 +0000 (16:18 +0000)]
Merged revisions 84902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84902 | phsultan | 2007-10-07 18:15:39 +0200 (Sun, 07 Oct 2007) | 5 lines
Presence packets from a client who's connected with our Jabber ID are
valid, therefore, those clients must be considered as buddies. The resource
string helps us make the distinction between clients.
Closes issue #10707, reported by yusufmotiwala.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84918
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Philippe Sultan [Sun, 7 Oct 2007 15:56:22 +0000 (15:56 +0000)]
Fix indentation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84892
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Philippe Sultan [Sun, 7 Oct 2007 15:54:48 +0000 (15:54 +0000)]
Merged revisions 84890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84890 | phsultan | 2007-10-07 17:52:44 +0200 (Sun, 07 Oct 2007) | 5 lines
Prevent Asterisk from crashing when receiving a presence packet
without resource from a buddy that is known to have a resource list.
Revert a change I previously made, where Asterisk could point to a
freed memory location.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84891
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 5 Oct 2007 19:48:10 +0000 (19:48 +0000)]
Merged revisions 84851 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84851 | tilghman | 2007-10-05 14:42:21 -0500 (Fri, 05 Oct 2007) | 2 lines
Log exactly why we can't open the database, if we fail (closes issue #10887)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84852
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 5 Oct 2007 18:57:26 +0000 (18:57 +0000)]
Merged revisions 84818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84818 | file | 2007-10-05 15:55:36 -0300 (Fri, 05 Oct 2007) | 4 lines
Update the remembered RTP peer information when putting an endpoint on hold or taking it off hold so that the RTP stack does not initiate a needless reinvite.
(closes issue #10868)
Reported by: mavince
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84819
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 5 Oct 2007 16:49:16 +0000 (16:49 +0000)]
Merged revisions 84783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84783 | russell | 2007-10-05 11:44:21 -0500 (Fri, 05 Oct 2007) | 4 lines
Do deadlock avoidance in a couple more places. You can't lock two channels
at the same time without doing extra work to make sure it succeeds.
(closes issue #10895, patch by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84784
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 5 Oct 2007 01:40:20 +0000 (01:40 +0000)]
Merged revisions 84742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84742 | russell | 2007-10-04 20:39:07 -0500 (Thu, 04 Oct 2007) | 3 lines
Fix a copy/paste error in the description of UpdateConfig that was pointed
out by JerJer on #asterisk-dev
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84743
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 4 Oct 2007 22:58:26 +0000 (22:58 +0000)]
A two-in-one patch from the bugtracker
1) Fix some bad logic in the counting of statistics for QueueSummary manager event. Variables were not being
reset for each additional queue, so cumulative totals were reported on each successive queue.
2) Add a longest hold time stat to QueueSummary manager event.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84726
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 4 Oct 2007 22:00:10 +0000 (22:00 +0000)]
Merged revisions 84692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84692 | mmichelson | 2007-10-04 16:57:03 -0500 (Thu, 04 Oct 2007) | 5 lines
Don't allocate space for queue members unless it's needed. You end up deleting dynamic members on a reload. Not good.
closes issue (#10879, reported by dazza76, patched by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84693
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 4 Oct 2007 21:38:22 +0000 (21:38 +0000)]
Merged revisions 84690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84690 | kpfleming | 2007-10-04 16:36:56 -0500 (Thu, 04 Oct 2007) | 2 lines
callers of sig2str already add the word 'signalling' in the appropriate place, so don't duplicate it
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84691
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 4 Oct 2007 16:56:00 +0000 (16:56 +0000)]
Update to current coding standards, also changing the argument delimiter to ',' (Closes issue #10876)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84671
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 4 Oct 2007 14:54:30 +0000 (14:54 +0000)]
Merged revisions 84637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84637 | file | 2007-10-04 11:51:57 -0300 (Thu, 04 Oct 2007) | 4 lines
Create a duplicate of the channel's member name as the tab completion stuff will free it.
(closes issue #10884)
Reported by: adamg
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84638
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 4 Oct 2007 02:01:43 +0000 (02:01 +0000)]
Don't register the exception function with module information. Since it is in the core there is none and it will explode.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84613
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 3 Oct 2007 23:05:47 +0000 (23:05 +0000)]
Merged revisions 84581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84581 | tilghman | 2007-10-03 17:59:17 -0500 (Wed, 03 Oct 2007) | 2 lines
When an RFC 2833 event is sent that we don't recognize, ignore it, don't queue a NULL digit (closes issue #10877)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84582
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 3 Oct 2007 22:14:09 +0000 (22:14 +0000)]
Create a universal exception handling extension, "e" (closes issue #9785)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84580
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 3 Oct 2007 18:23:30 +0000 (18:23 +0000)]
blocked 84544 from trunk; it only applies to 1.4; 10870 -- the CUT in AEL
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84545
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 3 Oct 2007 14:39:05 +0000 (14:39 +0000)]
Merged revisions 84511 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84511 | murf | 2007-10-03 08:23:00 -0600 (Wed, 03 Oct 2007) | 1 line
closes issue #10834 ; where a null input to a switch statement results in a hangup; since switch is implemented with extensions, and the default case is implemented with a '.', and the '.' matches 1 or more remaining characters, the case where 0 characters exist isn't matched, and the extension isn't matched, and the goto fails, and a hangup occurs. Now, when a default case is generated, it also generates a single fixed extension that will match a null input. That extension just does a goto to the default extension for that switch. I played with an alternate solution, where I just tack an extra char onto all the patterns and the goto, but not the default case's pattern. Then even a null input will still have at least one char in it. But it made me nervous, having that extra char in , even if that's a pretty secret and low-level issue.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84512
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 2 Oct 2007 20:07:15 +0000 (20:07 +0000)]
Merged revisions 84474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84474 | russell | 2007-10-02 15:06:07 -0500 (Tue, 02 Oct 2007) | 5 lines
* Don't build the menuselect-tree for the tarball, as it requires running the
configure script first
* Change the Makefile to note that menuselect-tree depends on the configure
script.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84475
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 2 Oct 2007 19:02:33 +0000 (19:02 +0000)]
Blocked revisions 84437 via svnmerge
........
r84437 | qwell | 2007-10-02 14:01:59 -0500 (Tue, 02 Oct 2007) | 1 line
Fix some odd formatting I missed..
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84440
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 2 Oct 2007 18:59:39 +0000 (18:59 +0000)]
Merged revisions 84410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10821)
........
r84410 | qwell | 2007-10-02 13:52:55 -0500 (Tue, 02 Oct 2007) | 4 lines
Finish up on transferee channel before return on failure.
Issue 10821, patch by Ivan
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84432
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 2 Oct 2007 18:12:49 +0000 (18:12 +0000)]
Add MSet for people who prefer the old, deprecated syntax of Set (Closes issue #10549)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84405
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 2 Oct 2007 14:13:28 +0000 (14:13 +0000)]
Merged revisions 84370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84370 | russell | 2007-10-02 09:12:35 -0500 (Tue, 02 Oct 2007) | 6 lines
Use snprintf instead of sprintf in one place. There is no vulnerability here
due to various buffer sizes around the code, but I still didn't like seeing a
non length-limited copy of data coming off of the wire into a stack buffer, as
this would be a problem in the future if buffer sizes elsewhere got changed or
size limitations removed ...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84371
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 2 Oct 2007 13:58:19 +0000 (13:58 +0000)]
Don't swap channel priority if using epoll as polling should/will only happen off the first channel.
(closes issue #10867)
Reported by: phsultan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84368
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 1 Oct 2007 23:33:07 +0000 (23:33 +0000)]
OK. THis a DEBUG_THREADS situation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84331
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 1 Oct 2007 23:26:50 +0000 (23:26 +0000)]
picky gcc versions... sigh.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84330
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 1 Oct 2007 23:20:20 +0000 (23:20 +0000)]
This mod will allow check_expr to compile in the presence of DEBUG_THREAD situations. At least, it does for me. And it's less expensive than several other approaches I tried.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84329
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 1 Oct 2007 23:03:50 +0000 (23:03 +0000)]
Merged revisions 84239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84239 | murf | 2007-10-01 14:27:52 -0600 (Mon, 01 Oct 2007) | 1 line
closes issue #10777 -- by returning a null for the parse tree when there's really nothing there, and making sure we don't try to do checking on a null tree.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84327
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Mon, 1 Oct 2007 21:54:41 +0000 (21:54 +0000)]
Merged revisions 84291 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84291 | qwell | 2007-10-01 16:52:45 -0500 (Mon, 01 Oct 2007) | 6 lines
Add dist-clean support for subdirs.
Change h323 to only remove the Makefile on a dist-clean, rather than a clean.
This fixes a bug I found with trying to run make after a make clean
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84300
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Dwayne M. Hubbard [Mon, 1 Oct 2007 21:31:16 +0000 (21:31 +0000)]
Merged revisions 84274 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84274 | dhubbard | 2007-10-01 16:25:37 -0500 (Mon, 01 Oct 2007) | 1 line
moved get_base_channel() code from action_redirect to ast_channel_masquerade() for issue 7706 and BE-160
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84275
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 21:15:57 +0000 (21:15 +0000)]
Merged revisions 84271 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84271 | russell | 2007-10-01 16:07:06 -0500 (Mon, 01 Oct 2007) | 4 lines
Fulfull a feature request from Qwell on the "core show locks" output. It will
now note the lock type for each lock that a thread holds.
(mutex, rdlock, or wrlock)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84272
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 19:58:29 +0000 (19:58 +0000)]
Merged revisions 84236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84236 | russell | 2007-10-01 14:56:28 -0500 (Mon, 01 Oct 2007) | 5 lines
Add another sanity check in the AGI read loop. We really don't care about
EAGAIN unless we didn't read an entire line. If there is a newline at the
end if the read buffer, break, because we got the whole thing.
(reported and patched by bmd)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84237
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 19:40:21 +0000 (19:40 +0000)]
Merged revisions 84206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84206 | russell | 2007-10-01 14:34:12 -0500 (Mon, 01 Oct 2007) | 2 lines
Show rwlocks in the "core show locks" output. Before, it only showed mutexes.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84207
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 15:57:04 +0000 (15:57 +0000)]
Check to make sure a structure pointer is non-NULL before touching it... crashing is bad, mmmk?
(closes issue #10831)
Reported by: eliel
Patches:
chan_sip.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84176
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 15:34:34 +0000 (15:34 +0000)]
Change simple uses of snprintf to ast_copy_string. This was provided by
mvanbaak as a part of issue #10843, but this part didn't apply because of
a patch I applied right beforehand.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84174
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 15:23:19 +0000 (15:23 +0000)]
Corydon posted this janitor project to the bug tracker and mvanbaak provided
a patch for it. It replaces a bunch of simple calls to snprintf with ast_copy_string
(closes issue #10843)
Reported by: Corydon76
Patches:
2007092900_10843.diff uploaded by mvanbaak (license 7)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84173
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 15:17:15 +0000 (15:17 +0000)]
Simplify code by using the -= and %= operators.
(closes issue #10848)
Reported by: opticron
Patches:
saymod.diff uploaded by opticron (license 267)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84172
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 15:06:14 +0000 (15:06 +0000)]
The trunk version of this patch also includes a couple more small clean fixes
from IgorG.
Merged revisions 84170 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84170 | russell | 2007-10-01 10:00:56 -0500 (Mon, 01 Oct 2007) | 3 lines
Remove another file in "make clean".
(closes issue #10814, paravoid)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84171
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 14:55:10 +0000 (14:55 +0000)]
Don't set the full command string until after verifying that there is not
another CLI command with the same command text registered. This prevents
a crash if someone accidentally calls ast_cli_register() on the same CLI
command data twice. This also fixes a small bug where the helpers list
would get unlocked without being locked if building the full command failed.
(closes issue #10858, reported by jamesgolovich, patched by me)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84169
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 14:43:56 +0000 (14:43 +0000)]
Add a new option for files-based music on hold to ensure that the sort order
of the files is alphabetical.
(closes issue #10855)
Reported by: jamesgolovich
Patches:
asterisk-mohsortalpha.diff.txt uploaded by jamesgolovich (license 176)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84168
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 1 Oct 2007 14:27:02 +0000 (14:27 +0000)]
Merged revisions 84166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84166 | russell | 2007-10-01 09:24:49 -0500 (Mon, 01 Oct 2007) | 2 lines
Simplify the CAN_EARLY_BRIDGE macro a bit.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84167
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 14:21:06 +0000 (14:21 +0000)]
Add MP4 to part of the SDP code.
(closes issue #10820)
Reported by: ruikubo
Patches:
chan_sip.patch uploaded by ruikubo (license 250)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84165
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 14:12:05 +0000 (14:12 +0000)]
Blocked revisions 84163 via svnmerge
........
r84163 | file | 2007-10-01 11:10:47 -0300 (Mon, 01 Oct 2007) | 4 lines
Remove chan_usbradio config file from tree, it is not present in here.
(closes issue #10839)
Reported by: casper
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84164
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 14:02:26 +0000 (14:02 +0000)]
Don't register the dnsmgr refresh CLI command twice.
(closes issue #10856)
Reported by: jamesgolovich
Patches:
asterisk-dnsmgrclireg.diff.txt uploaded by jamesgolovich (license 176)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84162
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 13:59:13 +0000 (13:59 +0000)]
Merged revisions 84160 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84160 | file | 2007-10-01 10:57:42 -0300 (Mon, 01 Oct 2007) | 6 lines
Fix randomness. save_pos was being set to 0 initially instead of -1, causing it to jump to position 0 when moh started.
(closes issue #10859)
Reported by: jamesgolovich
Patches:
asterisk-mohpos2.diff.txt uploaded by jamesgolovich (license 176)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84161
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2007 13:53:09 +0000 (13:53 +0000)]
Merged revisions 84158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84158 | file | 2007-10-01 10:49:36 -0300 (Mon, 01 Oct 2007) | 4 lines
Only attempt early bridging if the options given to Dial() permit it.
(closes issue #10861)
Reported by: peekyb
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84159
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 30 Sep 2007 20:06:58 +0000 (20:06 +0000)]
Merged revisions 84146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84146 | russell | 2007-09-30 16:02:16 -0400 (Sun, 30 Sep 2007) | 4 lines
Fix the AST_MODULE_INFO macro for C++ modules. The load and reload parameters
were in the wrong place.
(closes issue #10846, alebm)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84147
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 30 Sep 2007 03:05:04 +0000 (03:05 +0000)]
* The documentation for the LOCK() function says that it will block for up to
3 seconds while waiting on a lock when other locks are currently held to
avoid deadlocks. Change the code to reflect this.
* Since trying to grab a lock may block for some time, put the channel in
autoservice so that audio is still read from the channel and that any
active generators on the channel don't pause.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84143
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 29 Sep 2007 23:47:59 +0000 (23:47 +0000)]
Merged revisions 84133 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84133 | murf | 2007-09-29 15:47:53 -0600 (Sat, 29 Sep 2007) | 1 line
This issue sort of closes 10786; All config files support #include with globbing (you know, *,[chars],?,{list,list},etc), so I've updated the AEL system to support this also.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84137
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 29 Sep 2007 22:40:58 +0000 (22:40 +0000)]
the last commit for AEL affected a small number of tests. Added a regression test for glob'd includes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84134
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 29 Sep 2007 18:21:36 +0000 (18:21 +0000)]
Set enablecdr at the end of re-reading the config file (Closes issue #10852)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84130
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Sat, 29 Sep 2007 00:19:15 +0000 (00:19 +0000)]
Let's use process time instead of wall clock time for show translation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84115
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 28 Sep 2007 14:35:36 +0000 (14:35 +0000)]
Autoconf requires version 2.60, not 2.59, to process (Closes issue #10842)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84080
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 28 Sep 2007 14:22:58 +0000 (14:22 +0000)]
Merged revisions 84078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84078 | tilghman | 2007-09-28 09:13:47 -0500 (Fri, 28 Sep 2007) | 2 lines
Correct pronunciations of numbers for .nl (Closes issue #10837)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84079
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 28 Sep 2007 05:37:16 +0000 (05:37 +0000)]
Merged revisions 84049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84049 | tilghman | 2007-09-28 00:30:22 -0500 (Fri, 28 Sep 2007) | 3 lines
Avoid a deadlock with ALL of the locks in the masquerade function, not just the
pairs of channels. (Closes issue #10406)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84050
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Dwayne M. Hubbard [Thu, 27 Sep 2007 23:18:09 +0000 (23:18 +0000)]
Merged revisions 84018 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84018 | dhubbard | 2007-09-27 18:12:25 -0500 (Thu, 27 Sep 2007) | 1 line
if an Agent is redirected, the base channel should actually be redirected. This was causing multiple issues, especially issue 7706 and BE-160
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84019
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 27 Sep 2007 00:08:47 +0000 (00:08 +0000)]
Merged revisions 83974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83974 | kpfleming | 2007-09-26 16:53:03 -0700 (Wed, 26 Sep 2007) | 2 lines
avoid the weird usage of assert() in the ALSA header files that gcc 4.2 wants to complain about
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83986
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 27 Sep 2007 00:06:06 +0000 (00:06 +0000)]
deal with more gcc 4.2 const pointer warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83978
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 27 Sep 2007 00:02:18 +0000 (00:02 +0000)]
Merged revisions 83976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83976 | russell | 2007-09-26 19:01:29 -0500 (Wed, 26 Sep 2007) | 1 line
remove a todo item that has been completed
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83977
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 26 Sep 2007 21:36:34 +0000 (21:36 +0000)]
Merged revisions 83943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83943 | russell | 2007-09-26 16:35:23 -0500 (Wed, 26 Sep 2007) | 2 lines
I changed my mind ... I think this should be a LOG_NOTICE.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83944
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 26 Sep 2007 21:17:41 +0000 (21:17 +0000)]
Merged revisions 83941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83941 | russell | 2007-09-26 16:15:15 -0500 (Wed, 26 Sep 2007) | 5 lines
Add a log message that was requested by the masses in the developer tutorial
session at Astricon. chan_sip did not output any message when a call was
rejected because the extension was not found. This adds a verbose message
(at verbose level 3) to note when this happens.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83942
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 26 Sep 2007 21:04:03 +0000 (21:04 +0000)]
Merged revisions 83910 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83910 | russell | 2007-09-26 15:50:09 -0500 (Wed, 26 Sep 2007) | 3 lines
Fix building chan_misdn under dev-mode. (please run the configure script
with --enable-dev-mode so this doesn't happen again ...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83911
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 26 Sep 2007 18:43:23 +0000 (18:43 +0000)]
Merged revisions 83879 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83879 | tilghman | 2007-09-26 13:35:56 -0500 (Wed, 26 Sep 2007) | 2 lines
Remove unused 4k of memory on the program stack (closes issue #10827)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83880
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 26 Sep 2007 06:53:43 +0000 (06:53 +0000)]
fix a typo in a comment
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83864
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 26 Sep 2007 06:31:05 +0000 (06:31 +0000)]
Change function documentation to use doxygen tags. (Really, I just needed
to make some minor change in trunk to test something with automerge ...)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83849
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Tue, 25 Sep 2007 23:14:03 +0000 (23:14 +0000)]
Fix typo in readme
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83834
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 25 Sep 2007 21:06:44 +0000 (21:06 +0000)]
Don't note that functions are deprecated in favor of themselves. This was
found by showing a very poor example doxygen function in a presentation this
morning. :)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83819
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Philippe Sultan [Tue, 25 Sep 2007 16:34:49 +0000 (16:34 +0000)]
Added a CLI command that shows our buddy list, as suggested by Daniel McKeehan, thanks!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83804
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 25 Sep 2007 14:18:09 +0000 (14:18 +0000)]
Merged revisions 83773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83773 | tilghman | 2007-09-25 09:13:25 -0500 (Tue, 25 Sep 2007) | 2 lines
jmls pointed out that unsetting the group and setting the group to the blank string aren't quite the same.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83774
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 25 Sep 2007 13:41:02 +0000 (13:41 +0000)]
Fix minor memory leak in pval.c. Overwriting a value without freeing the previous result is bad, mmmk?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83758
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Philippe Sultan [Tue, 25 Sep 2007 09:07:30 +0000 (09:07 +0000)]
Comply with latest XEP-0166, XEP-0167, XEP-0176.
No real Jingle implementation being available, testing was made using
two Asterisk servers relaying SIP calls over their Jingle channels:
SIP Phone 1 --- [chan_sip]Asterisk 1[chan_jingle] --- [chan_jingle]Asterisk 2[chan_sip] --- SIP Phone 2
Thus, it was possible to test the code in both ways, and make the
Jingle channel comply with the latest specifications. No sound available yet.
Main modifications include :
- modified the 'jingle_candidate' structure and the
'jingle_create_candidates' function according to XEP-0176 ;
- modified the 'jingle_action' function in order to properly terminate
a Jingle session, in conformance with XEP-0166 ;
- modified username format used in STUN requests ;
- actually make the bindaddr configuration field useable.
Todo :
- set audio paths up (no native bridging) ;
- make the CLI gtalk functions available to jingle ;
- clean up the storage space used in strings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83743
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 25 Sep 2007 08:09:01 +0000 (08:09 +0000)]
Add some files to the utils directory svn:ignore and Makefile clean target
(closes issue #10808, reported by mvanbaak)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83741
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 24 Sep 2007 22:06:19 +0000 (22:06 +0000)]
Permit custom locations for astdb and the keys directory (though default to the current locations) (Closes issue #10267)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83726
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 24 Sep 2007 17:29:02 +0000 (17:29 +0000)]
Merged revisions 83695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83695 | tilghman | 2007-09-24 12:22:08 -0500 (Mon, 24 Sep 2007) | 4 lines
In the source, keys are relative to the datadir, not varlib (which is the same
in most cases, but it's good to be accurate).
Closes issue #10811
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83696
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Dwayne M. Hubbard [Mon, 24 Sep 2007 17:10:14 +0000 (17:10 +0000)]
merged jcmoore's patch for configurable SDP origin-field username and session field, closes issue# 10795
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83671
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 24 Sep 2007 17:00:57 +0000 (17:00 +0000)]
interface_exists_global was never returning 1. Most likely an error from my merge on Friday.
(closes issue #10817, reported and patched by snar, patch simplified by me)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83656
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 24 Sep 2007 16:42:48 +0000 (16:42 +0000)]
Blocked revisions 83653 via svnmerge
........
r83653 | tilghman | 2007-09-24 11:37:52 -0500 (Mon, 24 Sep 2007) | 2 lines
Oops. Removed the unworkable workaround. This note should never have been in the release.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83655
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 24 Sep 2007 16:40:12 +0000 (16:40 +0000)]
Merged revisions 83637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83637 | tilghman | 2007-09-24 10:17:06 -0500 (Mon, 24 Sep 2007) | 3 lines
Making change to group splitting, as discussed on the -dev list. The main
effect of this will be to permit Set(GROUP([cat])=), i.e. unsetting a group.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83654
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 22 Sep 2007 19:54:10 +0000 (19:54 +0000)]
Merged revisions 83589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83589 | murf | 2007-09-22 13:39:16 -0600 (Sat, 22 Sep 2007) | 1 line
This closes issue #10788 -- The exact same fixes are made here for the first arg in the for(arg1; arg2; arg3) {} statement, as were done for the 3rd arg. It can now be an assignment that will embedded in a Set() app, or a macro call, or an app call.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83590
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 22 Sep 2007 17:39:37 +0000 (17:39 +0000)]
Merged revisions 83558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83558 | murf | 2007-09-22 10:41:43 -0600 (Sat, 22 Sep 2007) | 1 line
This closes issue #10788 -- the 3rd arg in the for statement is now wrapped in Set() only if there's an '=' in that string. Otherwise, if it begins with '&', then a Macro call is generated; otherwise it is made into an app call. A bit more accomodating, keeps the new guys happy, and the guys with ael-1 code should be happy, too
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83575
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Sat, 22 Sep 2007 17:37:07 +0000 (17:37 +0000)]
Fix potential point of confusion
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83574
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 22 Sep 2007 14:45:42 +0000 (14:45 +0000)]
Fix build of check_expr and hashtest2 when DEBUG_THREADLOCAL is defined
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83545
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 22 Sep 2007 14:03:48 +0000 (14:03 +0000)]
Add the MeetmeList and Reload manager commands, which supplement the need to have Command privilege. (closes issue #10736)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83532
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 22 Sep 2007 02:07:53 +0000 (02:07 +0000)]
Fixes for FreeBSD... testing for every conceivable math function now
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83517
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 21 Sep 2007 19:55:03 +0000 (19:55 +0000)]
Fix compilation errors in CLI command updates to SS7 CLI commands
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83500
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Fri, 21 Sep 2007 19:54:07 +0000 (19:54 +0000)]
Add an SS7 readme for setup and use of libss7 and asterisk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83499
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 21 Sep 2007 18:41:36 +0000 (18:41 +0000)]
Fix some areas where we were still using '|' for an argument delimiter (closes issue #10793)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83484
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 21 Sep 2007 18:27:56 +0000 (18:27 +0000)]
Update app_queue to use commas as application argument separators.
(closes issue #10793, snar)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83483
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 21 Sep 2007 17:36:17 +0000 (17:36 +0000)]
Fix cdr_manager, such that if the config file is created past load, it'll
start logging (and conversely, if the config file is destroyed or deactivated,
the logging is disabled). Reported by Juggie via IRC, fix by me.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83466
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 21 Sep 2007 14:40:10 +0000 (14:40 +0000)]
Merged revisions 83432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83432 | russell | 2007-09-21 09:37:20 -0500 (Fri, 21 Sep 2007) | 4 lines
gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of
changes gets all of Asterisk (minus chan_alsa for now) to compile with gcc 4.2.
(closes issue #10774, patch from qwell)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83433
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 21 Sep 2007 14:25:51 +0000 (14:25 +0000)]
Check for the presence of trunc and round, and make the ISOC99 detection a little more sane (closes issue #10776)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83431
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 21 Sep 2007 13:36:02 +0000 (13:36 +0000)]
Blocked revisions 83400 via svnmerge
........
r83400 | file | 2007-09-21 10:34:32 -0300 (Fri, 21 Sep 2007) | 4 lines
Fix video under certain circumstances. It would have been possible for the formats on the channel to not contain the video format.
(closes issue #10782)
Reported by: cwhuang
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83401
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 20 Sep 2007 23:14:30 +0000 (23:14 +0000)]
More NEW_CLI conversions.
(issue #10724)
Patches:
app_playback.c.patch uploaded by moy (license 222)
app_minivm.c.patch uploaded by eliel (license 64)
astmm.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83381
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 20 Sep 2007 21:37:28 +0000 (21:37 +0000)]
Oops. Getting rid of svnmerge-integrated and automerge stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83351
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 20 Sep 2007 21:21:28 +0000 (21:21 +0000)]
Merging changes from queue_refcount_trunk into trunk. Refcounted queues now in place.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83350
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 21:17:39 +0000 (21:17 +0000)]
Merged revisions 83348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83348 | russell | 2007-09-20 16:16:48 -0500 (Thu, 20 Sep 2007) | 4 lines
When daemonizing, don't change working directory to "/". It makes it not be
able to do a core dump when not running as uid=root.
(closes issue #10766, xrg)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83349
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 21:02:17 +0000 (21:02 +0000)]
Merged revisions 83316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83316 | russell | 2007-09-20 16:01:20 -0500 (Thu, 20 Sep 2007) | 3 lines
Change safe_asterisk to explicitly ask for /bin/bash, as it uses bashisms.
(closes issue #10772, reported by culrich)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83317
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 19:45:00 +0000 (19:45 +0000)]
trivial formatting change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83298
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 19:42:33 +0000 (19:42 +0000)]
trivial formatting change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83297
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 19:32:18 +0000 (19:32 +0000)]
minor spelling fixes in a comment
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83296
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 20 Sep 2007 19:22:10 +0000 (19:22 +0000)]
minor grammar fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83295
65c4cc65-6c06-0410-ace0-
fbb531ad65f3