summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2007-11-01This commits the performance mods that give the priority processing engine ↵Steve Murphy
in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01Switch res_jabber to use openssl rather than gnutls.Jason Parker
Closes issue #9972, patch by phsultan. Copied from branch at http://svn.digium.com/svn/asterisk/team/phsultan/res_jabber-openssl/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31Remove old whisper remnants from channel.hJoshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-30Merged revisions 87739 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87739 | tilghman | 2007-10-30 18:02:22 -0500 (Tue, 30 Oct 2007) | 5 lines Fix for uninitialized mutexes on *BSD Reported by: ys Fixed by: ys Closes issue #11116 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29Merged revisions 87396 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87396 | russell | 2007-10-29 15:22:07 -0500 (Mon, 29 Oct 2007) | 5 lines Add some more details to the output of "core show locks". When a thread is waiting for a lock, this will now show the details about who currently has it locked. (inspired by issue #11100) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29Add autoconf checks for extra suppserv definitions that are not present in ↵Joshua Colp
releases yet. chan_misdn should now build against the latest release. (closes issue #11103) Reported by: IgorG git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-26Merged revisions 87168 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87168 | murf | 2007-10-26 10:34:02 -0600 (Fri, 26 Oct 2007) | 1 line closes issue #11086 where a user complains that references to following contexts report a problem; The problem was REALLy that he was referring to empty contexts, which were being ignored. Reporter stated that empty contexts should be OK. I checked it out against extensions.conf, and sure enough, empty contexts ARE ok. So, I removed the restriction from AEL. This, though, highlighted a problem with multiple contexts of the same name. This should be OK, also. So, I added the extend keyword to AEL, and it can preceed the 'context' keyword (mixed with 'abstract', if nec.). This will turn off the warnings in AEL if the same context name is used 2 or more times. Also, I now call ast_context_find_or_create for contexts now, instead of just ast_context_create; I did this because pbx_config does this. The 'extend' keyword thus becomes a statement of intent. AEL can now duplicate the behavior of pbx_config, ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-26Use the same delimited character as the FILTER function in FIELDQTY and CUT.Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-25Merged revisions 87069 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87069 | kpfleming | 2007-10-25 18:03:11 -0500 (Thu, 25 Oct 2007) | 2 lines appending one list to another should leave the first list empty, and not require the user to do that ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22Merged revisions 86836 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86836 | russell | 2007-10-22 16:36:12 -0500 (Mon, 22 Oct 2007) | 9 lines If lock tracking is not enabled, then we can not attempt to log any mutex failures. If so, we could end up in infinite recursion. The only lock that is affected by this is a mutex in astmm.c used when MALLOC_DEBUG is enabled. (closes issue #11044) Reported by: ys Patches: lock.h.diff uploaded by ys (license 281) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86839 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former ↵Jason Parker
didn't make much sense git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22Merged revisions 86726 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86726 | russell | 2007-10-22 10:43:30 -0500 (Mon, 22 Oct 2007) | 4 lines Update the static mutex initializer to include the initialization of the internal mutex used to protect the lock debugging data. (closes issue #11044, patch suggested by Ivan) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-21Merged revisions 85532 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85532 | russell | 2007-10-13 00:24:33 -0500 (Sat, 13 Oct 2007) | 8 lines Properly handle the case where read() may return the text for more than one CLI command at once for a remote console. (closes issue #10888) Reported by: jamesgolovich Patches: asterisk-climultiple.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-19Convert NEW_CLI to AST_CLI.Jason Parker
Closes issue #11039, as suggested by seanbright. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-18Merged revisions 86330 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86330 | russell | 2007-10-18 13:03:10 -0500 (Thu, 18 Oct 2007) | 10 lines The channel needs to stay locked while running timer callbacks, as they access and modify channel data that may change elsewhere. I went through every timer callback in the source tree to make sure that none of them did any additional locking that could introduce deadlocks, and all is well. (closes issue #10765) Reported by: Ivan Patches: ast_1_4_11_svn_patch_channel_rc.diff uploaded by Ivan (license 229) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-16Merged revisions 85997 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85997 | russell | 2007-10-16 17:36:16 -0500 (Tue, 16 Oct 2007) | 1 line really picky formatting tweak ... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-16Merged revisions 85994 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85994 | russell | 2007-10-16 17:14:36 -0500 (Tue, 16 Oct 2007) | 16 lines Some locking errors exposed the fact that the lock debugging code itself was not thread safe. How ironic! Anyway, these changes ensure that the code that is accessing the lock debugging data is thread-safe. Many thanks to Ivan for finding and fixing the core issue here, and also thanks to those that tested the patch and provided test results. (closes issue #10571) (closes issue #10886) (closes issue #10875) (might close some others, as well ...) Patches: (from issue #10571) ivan_ast_1_4_12_rel_patch_lock.h.diff uploaded by Ivan (license 229) - a few small changes by me ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15Merged revisions 85561 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85561 | russell | 2007-10-15 11:34:13 -0500 (Mon, 15 Oct 2007) | 4 lines Make a few changes so that characters in the upper half of the ISO-8859-1 character set don't get stripped when reading configuration. (closes issue #10982, dandre) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-13Merged revisions 85533 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85533 | russell | 2007-10-13 01:48:10 -0400 (Sat, 13 Oct 2007) | 12 lines Fix an issue with console verbosity when running asterisk -rx to execute a command and retrieve its output. The issue was that there was no way for the main Asterisk process to know that the remote console was connecting in the -rx mode. The way that James has fixed this is to have all remote consoles muted by default. Then, regular remote consoles automatically execute a CLI command to unmute themselves when they first start up. (closes issue #10847) Reported by: atis Patches: asterisk-consolemute.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-10Merged revisions 85316 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85316 | russell | 2007-10-10 10:56:23 -0500 (Wed, 10 Oct 2007) | 6 lines I introduced a new member to the ast_filestream struct in 1.4.12, but put it in the middle of the struct, instead of at the end. One of the Debian folks, paravoid, pointed out that this breaks binary compatability with modules compiled against older headers. So, I'm moving the new member to the end of the struct to resolve the situation. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-10Merged revisions 85195 via svnmerge from Kevin P. Fleming
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85195 | kpfleming | 2007-10-10 08:24:41 +0200 (Wed, 10 Oct 2007) | 2 lines use a macro instead of an inline function, so that backtraces will report the caller of ast_frame_free() properly ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-09Merged revisions 85158 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85158 | tilghman | 2007-10-09 16:55:06 -0500 (Tue, 09 Oct 2007) | 5 lines This commit fixes the following issues: - Deadlock in ast_write (issue #10406) - Deadlock in ast_read (issue #10406) - Possible mutex initialization error in lock.h (issue #10571) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07Make the status and priority configurable.Philippe Sultan
Closes issue #10785, patch by Luke-Jr, thanks! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-03Create a universal exception handling extension, "e" (closes issue #9785)Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-01Merged revisions 84271 via svnmerge from Russell Bryant
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
2007-10-01Merged revisions 84206 via svnmerge from Russell Bryant
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
2007-09-30Merged revisions 84146 via svnmerge from Russell Bryant
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
2007-09-27Merged revisions 84018 via svnmerge from Dwayne M. Hubbard
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
2007-09-26fix a typo in a commentRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-26Change function documentation to use doxygen tags. (Really, I just neededRussell Bryant
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
2007-09-25Don't note that functions are deprecated in favor of themselves. This wasRussell Bryant
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
2007-09-25Comply with latest XEP-0166, XEP-0167, XEP-0176.Philippe Sultan
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
2007-09-22Fixes for FreeBSD... testing for every conceivable math function nowTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-21Merged revisions 83432 via svnmerge from Russell Bryant
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
2007-09-21Check for the presence of trunc and round, and make the ISOC99 detection a ↵Tilghman Lesher
little more sane (closes issue #10776) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83431 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-19Transmit proper invitation, thus conforming to XEP-0166 (Jingle generalPhilippe Sultan
specifications), XEP-0167 (Jingle Audio via RTP) and XEP-0176 (Jingle ICE Transport). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18Merged revisions 82929 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82929 | russell | 2007-09-18 17:42:27 -0500 (Tue, 18 Sep 2007) | 11 lines Add a new patch to handle interrupting the fgets() call when using FastAGI. This version of the patch maintains the original behavior of the code when not using FastAGI. (closes issue #10553) Reported by: juggie Patches: res_agi_fgets-4.patch uploaded by juggie (license 24) res_agi_fgets_1.4svn.patch uploaded by juggie (license 24) Slight mods by me Tested by: juggie, festr ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18Make sure that libpthread doesn't try to call free() directly when MALLOC_DEBUGRussell Bryant
is enabled. If it does, Asterisk will crash as the address isn't the real beginning of the allocation. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17Make the MALLOC_DEBUG output for free() useful again. After changing calls toRussell Bryant
free to be ast_free, astmm said all calls to free were coming from utils.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14Add a direct execute method to res_odbc (closes issue #10722)Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14Merged revisions 82385 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82385 | russell | 2007-09-14 10:50:49 -0500 (Fri, 14 Sep 2007) | 3 lines Add checking for libusb here, so nobody has to deal with conflicts in the chan_usbradio-1.4 branch every time the configure script gets changed ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82386 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13Merged revisions 82337 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82337 | russell | 2007-09-13 13:45:59 -0500 (Thu, 13 Sep 2007) | 4 lines Only compile in tracking astobj2 statistics if dev-mode is enabled. Also, when dev mode is enabled, register the CLI command that can be used to run the astobj2 test and print out statistics. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13Various code and documentation cleanups for res_config_sqliteRussell Bryant
(closes issue #10711, rbraun_proformatique) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13Assign namespace properlyPhilippe Sultan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13Changed Jingle and Jingle DTMF namespaces.Philippe Sultan
As both specifications are in the Experimental status, the namespaces specified therein shall be of the form "http://www.xmpp.org/extensions/xep-XXXX.html#ns". See the Namespace issuance section in XEP-0053 : http://www.xmpp.org/extensions/xep-0053.html#namespaces git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12Merged revisions 82285 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82285 | tilghman | 2007-09-12 15:12:06 -0500 (Wed, 12 Sep 2007) | 4 lines Working on issue #10531 exposed a rather nasty 64-bit issue on ast_mktime, so we updated the localtime.c file from source. Next we'll have to write ast_strptime to match. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-09Merged revisions 82028 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82028 | tilghman | 2007-09-08 21:35:18 -0500 (Sat, 08 Sep 2007) | 2 lines Fix inline compiles on really old compilers (who uses gcc 2.7 anymore, really?) (closes issue #10675) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-08Add doxygen documentation for slinfactory_destroy(), mainly just noting thatRussell Bryant
it doesn't free the slinfactory itself. (This isn't related to a bug, i'm just looking over random code) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06Merged revisions 81778 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81778 | qwell | 2007-09-06 14:59:07 -0500 (Thu, 06 Sep 2007) | 2 lines This should fix a build issue that people building against uClibc were seeing with the addition of astobj2 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06Merged revisions 81743 via svnmerge from Philippe Sultan
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81743 | phsultan | 2007-09-06 18:56:29 +0200 (Thu, 06 Sep 2007) | 1 line Various string length fixes. Removed an unused variable in aji_client structure (context) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81745 65c4cc65-6c06-0410-ace0-fbb531ad65f3