6708 Commits (0b0cb8733bc618108b52e0da74194b77cbdec3ce)

Author	SHA1	Message	Date
George Joseph	0b0cb8733b	Fix incorrect application and function documentation references ... There were a few references in the embedded documentation XML where the case didn't match or where the referenced app or function simply didn't exist any more. These were causing 404 responses in docs.asterisk.org.	2 years ago
Naveen Albert	afdce6fc53	say: Don't prepend ampersand erroneously. ... Some logic in say.c for determining if we need to also add an ampersand for file seperation was faulty, as non-successful files would increment the count, causing a leading ampersand to be added improperly. This is fixed, and a unit test that captures this regression is also added. ASTERISK-30248 #close Change-Id: I02c1d3a11d82fe4ea8b462070cbd1effb5834d2b (cherry picked from commit bf6194be45)	3 years ago
Mike Bradeen	282e1cbf9f	manager: prevent file access outside of config dir ... Add live_dangerously flag to manager and use this flag to determine if a configuation file outside of AST_CONFIG_DIR should be read. ASTERISK-30176 Change-Id: I46b26af4047433b49ae5c8a85cb8cda806a07404	3 years ago
Mike Bradeen	14e1ba19ee	audiohook: add directional awareness ... Add enum to allow setting optional direction. If set to only one direction, only feed matching-direction frames to the associated slin factory. This prevents mangling the transcoder on non-mixed frames when the READ and WRITE frames would have otherwise required it. Also removes the need to mute or discard the un-wanted frames as they are no longer added in the first place. res_stasis_snoop is changed to use this addition to set direction on audiohook based on spy direction. If no direction is set, the ast_audiohook_init will init this enum to BOTH which maintains existing functionality. ASTERISK-30252 Change-Id: If8716bad334562a5d812be4eeb2a92e4f3be28eb	3 years ago
Naveen Albert	a587258733	cdr: Allow bridging and dial state changes to be ignored. ... Allows bridging, parking, and dial messages to be globally ignored for all CDRs such that only a single CDR record is generated per channel. This is useful when CDRs should endure for the lifetime of an entire channel and bridging and dial updates in the dialplan should not result in multiple CDR records being created for the call. With the ignore bridging option, bridging changes have no impact on the channel's CDRs. With the ignore dial state option, multiple Dials and their outcomes have no impact on the channel's CDRs. The last disposition on the channel is preserved in the CDR, so the actual disposition of the call remains available. These two options can reduce the amount of "CDR hacks" that have hitherto been necessary to ensure that CDR was not "spoiled" by these messages if that was undesired, such as putting a dummy optimization-disabled local channel between the caller and the actual call and putting the CDR on the channel in the middle to ensure that CDR would persist for the entire call and properly record start, answer, and end times. Enabling these options is desirable when calls correspond to the entire lifetime of channels and the CDR should reflect that. Current default behavior remains unchanged. ASTERISK-30091 #close Change-Id: I393981af42732ec5ac3ff9266444abb453b7c832	3 years ago
Naveen Albert	7c6538c7f1	db: Fix incorrect DB tree count for AMI. ... The DBGetTree AMI action's ListItem previously always reported 1, regardless of the count. This is corrected to report the actual count. ASTERISK-30245 #close patches: gettreecount.diff submitted by Birger Harzenetter (license 5870) Change-Id: I46d8992710f1b8524426b1255f57d1ef4a4934d4	3 years ago
Naveen Albert	7400939d73	features: Add no answer option to Bridge. ... Adds the n "no answer" option to the Bridge application so that answer supervision can not automatically be provided when Bridge is executed. Additionally, a mechanism (dialplan variable) is added to prevent bridge targets (typically the target of a masquerade) from answering the channel when they enter the bridge. ASTERISK-30223 #close Change-Id: I76f73fcd8e403bcd18f2abb40c658f537ac1ba6d	3 years ago
Philip Prindeville	5b9f91d0a1	test: initialize capture structure before freeing ... ASTERISK-30232 #close Change-Id: I2603e2cef8f93f6b0a6ef39f7eac744251bb3902	3 years ago
Jaco Kroon	86735ebfc2	manager: be more aggressive about purging http sessions. ... If we find that n_max (currently hard wired to 1) sessions were purged, schedule the next purge for 1ms into the future rather than 5000ms (as per current). This way we will purge up to 1000 sessions per second rather than 1 every 5 seconds. This mitigates a build-up of sessions should http sessions gets established faster than 1 per 5 seconds. Change-Id: I9820d39aa080109df44fe98c1325cafae48d54f5 Signed-off-by: Jaco Kroon <jaco@uls.co.za>	3 years ago
George Joseph	148d077b52	res_crypto: Memory issues and uninitialized variable errors ... ASTERISK-30235 Change-Id: Ia1e326e7b52cd06fd5e6c9009e3e63193c92f6cd	3 years ago
George Joseph	f18d20e28e	res_geolocation: Fix segfault when there's an empty element ... Fixed a segfault caused by var_list_from_loc_info() encountering an empty location info element. Fixed an issue in ast_strsep() where a value with only whitespace wasn't being preserved. Fixed an issue in ast_variable_list_from_quoted_string() where an empty value was considered a failure. ASTERISK-30215 Reported by: Dan Cropp Change-Id: Ieca64e061a6d9298f0196c694b60d986ef82613a	3 years ago
Philip Prindeville	e7f34d1591	main/utils: allow checking for command in $PATH ... ASTERISK-30037 Change-Id: I4b6f7264c8c737c476c798d2352f3232b263bbdf	3 years ago
Philip Prindeville	18a466a08d	test: Add ability to capture child process output ... ASTERISK-30037 Change-Id: Icbf84ce05addb197a458361c35d784e460d8d6c2	3 years ago
Naveen Albert	148549122c	lock.c: Add AMI event for deadlocks. ... Adds an AMI event to indicate that a deadlock has likely started, when Asterisk is compiled with DETECT_DEADLOCKS enabled. This can make it easier to perform automated deadlock detection and take appropriate action (such as doing a core dump). Unlike the deadlock warnings, the AMI event is emitted only once per deadlock. ASTERISK-30161 #close Change-Id: Ifc6ed3e390f8b4cff7f8077a50e4d7a5b54e42fb	3 years ago
Naveen Albert	393b903adc	cli: Prevent assertions on startup from bad ao2 refs. ... If "core show channels" is run before startup has completed, it is possible for bad ao2 refs to occur because the system is not yet fully initialized. This will lead to an assertion failing. To prevent this, initialization of CLI builtins is moved to be later along in the main load sequence. Core CLI commands are loaded at the same time, but channel-related commands are loaded later on. ASTERISK-29846 #close Change-Id: If6b3cde802876bd738c1b4cf2683bea6ddc615b6	3 years ago
Naveen Albert	393356a7c5	features: Add transfer initiation options. ... Adds additional control options over the transfer feature functionality to give users more control in how the transfer feature sounds and works. First, the "transfer" sound that plays when a transfer is initiated can now be customized by the user in features.conf, just as with the other transfer sounds. Secondly, the user can now specify the transfer extension in advance by using the TRANSFER_EXTEN variable. If a valid extension is contained in this variable, the call will automatically be transferred to this destination. Otherwise, it will fall back to collecting the extension from the user as is always done now. ASTERISK-29899 #close Change-Id: Ibff309caa459a2b958706f2ed0ca393b1ef502e3	3 years ago
Naveen Albert	86c5d1222e	general: Very minor coding guideline fixes. ... Fixes a few coding guideline violations: * Use of C99 comments * Opening brace on same line as function prototype ASTERISK-30163 #close Change-Id: I07771c4c89facd41ce8d323859f022ddbddf6ca7	4 years ago
George Joseph	065b7c3aef	res_geolocation: Address user issues, remove complexity, plug leaks ... * Added processing for the 'confidence' element. * Added documentation to some APIs. * removed a lot of complex code related to the very-off-nominal case of needing to process multiple location info sources. * Create a new 'ast_geoloc_eprofile_to_pidf' API that just takes one eprofile instead of a datastore of multiples. * Plugged a huge leak in XML processing that arose from insufficient documentation by the libxml/libxslt authors. * Refactored stylesheets to be more efficient. * Renamed 'profile_action' to 'profile_precedence' to better reflect it's purpose. * Added the config option for 'allow_routing_use' which sets the value of the 'Geolocation-Routing' header. * Removed the GeolocProfileCreate and GeolocProfileDelete dialplan apps. * Changed the GEOLOC_PROFILE dialplan function as follows: * Removed the 'profile' argument. * Automatically create a profile if it doesn't exist. * Delete a profile if 'inheritable' is set to no. * Fixed various bugs and leaks * Updated Asterisk WiKi documentation. ASTERISK-30167 Change-Id: If38c23f26228e96165be161c2f5e849cb8e16fa0	4 years ago
Naveen Albert	4060e56f80	manager: Remove documentation for nonexistent action. ... The manager XML documentation documents a "FilterList" action, but there is no such action. Therefore, this can lead to confusion when people try to use a documented action that does not, in fact, exist. This is removed as the action never did exist in the past, nor would it be trivial to add since we only store the regex_t objects, so the filter list can't actually be provided without storing that separately. Most likely, the documentation was originally added (around version 10) in anticipation of something that never happened. ASTERISK-29917 #close Change-Id: I846b16fd6f80a91d4ddc5d8a861b522d7c6f8f97	4 years ago
Naveen Albert	7703330142	general: Improve logging levels of some log messages. ... Adjusts some logging levels to be more or less important, that is more prominent when actual problems occur and less prominent for less noteworthy things. ASTERISK-30153 #close Change-Id: Ifc8f7df427aa018627db462125ae744986d3261b	4 years ago
Naveen Albert	bc0bd5aa5d	pbx_functions.c: Manually update ast_str strlen. ... When ast_func_read2 is used to read a function using its read function (as opposed to a native ast_str read2 function), the result is copied directly by the function into the ast_str buffer. As a result, the ast_str length remains initialized to 0, which is a bug because this is not the real string length. This can cascade and have issues elsewhere, such as when reading substrings of functions that only register read as opposed to read2 callbacks. In this case, since reading ast_str_strlen returns 0, the returned substring is empty as opposed to the actual substring. This has caused the ast_str family of functions to behave inconsistently and erroneously, in contrast to the pbx_variables substitution functions which work correctly. This fixes this issue by manually updating the ast_str length when the result is copied directly into the ast_str buffer. Additionally, an assertion and a unit test that previously exposed these issues are added, now that the issue is fixed. ASTERISK-29966 #close Change-Id: I4e2dba41410f9d4dff61c995d2ca27718248e07f	4 years ago
Naveen Albert	4efea4780b	manager: Fix incomplete filtering of AMI events. ... The global event filtering code was only in one possible execution path, so not all events were being properly filtered out if requested. This moves that into the universal AMI handling code so all events are properly handled. Additionally, the CLI listing of disabled events can also get truncated, so we now print out everything. ASTERISK-30137 #close Change-Id: If8c42edcb2abc5158552da7eba2a8ff6b20e1959	4 years ago
Naveen Albert	e8205fb166	db: Add AMI action to retrieve DB keys at prefix. ... Adds the DBGetTree action, which can be used to retrieve all of the DB keys beginning with a particular prefix, similar to the capability provided by the database show CLI command. ASTERISK-30136 #close Change-Id: I3be9425e53be71f24303fdd4d2923c14e84337e6	4 years ago
Naveen Albert	5177bb9f34	chan_dahdi: Fix buggy and missing Caller ID parameters ... There are several things wrong with analog Caller ID handling that are fixed by this commit: callerid.c's Caller ID generation function contains the logic to use the presentation to properly send the proper Caller ID. However, currently, DAHDI does not pass any presentation information to the Caller ID module, which means that presentation is completely ignored on all calls. This means that lines could be getting Caller ID information they aren't supposed to. Part of the reason this has been obscured is because the simple switch logic for handling the built in *67 and *82 is completely wrong. Rather than modifying the presentation for the call accordingly (which is what it's supposed to do), it simply blanks out the Caller ID or fills it in. This is wrong, so wrong that it makes a mockery of the specification. Additionally, it would leave to the "UNAVAILABLE" disposition being used for Caller ID generation as opposed to the "PRIVATE" disposition that it should have been using. This is now fixed to only update the presentation and not modify the number and name, so that the simple switch *67/*82 work correctly. Next, sig_analog currently only copies over the name and number, nothing else, when it is filling in a duplicated caller id structure. Thus, we also now copy over the presentation information so that is available for the Caller ID spill. Additionally, this meant that "valid" was implicitly 0, and as such presentation would always fail to "Unavailable". The validity is therefore also copied over so it can be used by ast_party_id_presentation. As part of this fix, new API is added so that all the relevant Caller ID information can be passed in to the Caller ID generation functions. Parameters that are also completely missing from the Caller ID spill have also been added, to enhance the compatibility, correctness, and completeness of the Asterisk Caller ID implementation. ASTERISK-29991 #close Change-Id: Icc44a5e09979916f4c18a440f96e10dc1c76ae15	4 years ago
Sean Bright	a0c3eb3b08	pbx.c: Simplify ast_context memory management. ... Allocate all of the ast_context's character data in the structure's flexible array member and eliminate the clunky fake_context. This will simplify future changes to ast_context. Change-Id: I98357de75d8ac2b3c4c9f201223632e6901021ea	4 years ago
Naveen Albert	a8395c9420	general: Fix various typos. ... ASTERISK-30089 #close Change-Id: I1f5db911fd05a3a211c522c13e990fa1d0e62275	4 years ago
Trevor Peirce	14144af7a6	features: Update documentation for automon and automixmon ... The current documentation is out of date and does not reflect actual behaviour. This change makes documentation clearer and accurately reflect the purpose of relevant channel variables. ASTERISK-30123 Change-Id: I160d0b01fce862477ad55ac1aa708a730473eb6f	4 years ago
George Joseph	d0ef2164d9	Geolocation: Base Asterisk Prereqs ... * Added ast_variable_list_from_quoted_string() Parse a quoted string into an ast_variable list. * Added ast_str_substitute_variables_full2() Perform variable/function/expression substitution on an ast_str. * Added ast_strsep_quoted() Like ast_strsep except you can specify a specific quote character. Also added unit test. * Added ast_xml_find_child_element() Find a direct child element by name. * Added ast_xml_doc_dump_memory() Dump the specified document to a buffer * ast_datastore_free() now checks for a NULL datastore before attempting to destroy it. Change-Id: I5dcefed2f5f93a109e8b489e18d80d42e45244ec	4 years ago
Naveen Albert	51a79fd4fd	db: Notify user if deleted DB entry didn't exist. ... Currently, if using the CLI to delete a DB entry, "Database entry removed" is always returned, regardless of whether or not the entry actually existed in the first place. This meant that users were never told if entries did not exist. The same issue occurs if trying to delete a DB key using AMI. To address this, new API is added that is more stringent in deleting values from AstDB, which will not return success if the value did not exist in the first place, and will print out specific error details if available. ASTERISK-30001 #close Change-Id: Ic84e3eddcd66c7a6ed7fea91cdfd402568378b18	4 years ago
Naveen Albert	12f693d401	cli: Fix CLI blocking forever on terminating backslash ... A corner case exists in CLI parsing where if a CLI user in a remote console ends with a backslash and then invokes command completion (using TAB or ?), then the console will freeze forever until a SIGQUIT signal is sent to the process, due to getting blocked forever reading the command completion. CTRL+C and other key combinations have no impact on the CLI session. This occurs because, in such cases, the CLI process is waiting for AST_CLI_COMPLETE_EOF to appear in the buffer from the main process, but instead the main process is confused by the funny syntax and thus prints out the CLI help. As a result, the CLI process is stuck on the read call, waiting for the completion that will never come. This prevents blocking forever by checking if the data from the main process starts with "Usage:". If it does, that means that CLI help was sent instead of the tab complete vector, and thus the CLI should bail out and not wait any longer. ASTERISK-29822 #close Change-Id: I9810ac59304fec162da701653c9c834f0ec8f670	4 years ago
Naveen Albert	c76a107cdf	say: Abort play loop if caller hangs up. ... If the caller has hung up, break out of the play loop so we don't try to play remaining files and fail to do so. ASTERISK-30075 #close Change-Id: I55e85be28ee90b48c0fe4ce20ac136a7dbb49f14	4 years ago
Naveen Albert	b1359bdfcf	pbx: Add helper function to execute applications. ... Finding an application and executing it if found is a common task throughout Asterisk. This adds a helper function around pbx_exec to do this, to eliminate redundant code and make it easier for modules to substitute variables and execute applications by name. ASTERISK-30061 #close Change-Id: Ifee4d2825df7545fb515d763d393065675140c84	4 years ago
Naveen Albert	b7107b4dd4	asterisk.c: Fix incompatibility warnings for remote console. ... A previous review fixing ASTERISK_22246 and ASTERISK_26582 got a couple of the options mixed up as to whether or not they are compatible with the remote console. This fixes those to the best of my knowledge. ASTERISK-30097 #close Change-Id: Id54166991aa79f04fb02699cc499bedda854253b	4 years ago
Christof Efkemann	58cf5d3912	app_sayunixtime: Use correct inflection for German time. ... In function ast_say_date_with_format_de(), take special care when the hour is one o'clock. In this case, the German number "eins" must be inflected to its neutrum form, "ein". This is achieved by playing "digits/1N" instead of "digits/1". Fixes both 12- and 24-hour formats. ASTERISK-30092 Change-Id: Ica9b80125c0b317e378d89c1ea786816e2635510	4 years ago
Naveen Albert	ea8d2ca17c	loader: Prevent deadlock using tab completion. ... If tab completion using ast_module_helper is attempted during startup, deadlock will ensue because the CLI will attempt to lock the module list while it is already locked by the loader. This causes deadlock because when the loader tries to acquire the CLI lock, they are blocked on each other. Waiting for startup to complete is not feasible because the CLI lock is acquired while waiting, so deadlock will ensure regardless of whether or not a lock on the module list is attempted. To prevent deadlock, we immediately abort if tab completion is attempted on the module list before Asterisk is fully booted. ASTERISK-30039 #close Change-Id: Idd468906c512bb196631e366a8f597a0e2e9271d	4 years ago
Moritz Fain	4f2bd069a4	ari: expose channel driver's unique id to ARI channel resource ... This change exposes the channel driver's unique id (i.e. the Call-ID for chan_sip/chan_pjsip based channels) to ARI channel resources as `protocol_id`. ASTERISK-30027 Reported by: Moritz Fain Tested by: Moritz Fain Change-Id: I7cc6e7a9d29efe74bc27811d788dac20fe559b87	4 years ago
Sean Bright	95daff54ca	loader.c: Use portable printf conversion specifier for int64. ... ASTERISK-30060 #close Change-Id: I88d47a1488be2f39017b8d562f993f081844fcb8	4 years ago
George Joseph	01dc630b8c	GCC12: Fixes for 16+ ... Most issues were in stringfields and had to do with comparing a pointer to an constant/interned string with NULL. Since the string was a constant, a pointer to it could never be NULL so the comparison was always "true". gcc now complains about that. There were also a few issues where determining if there was enough space for a memcpy or s(n)printf which were fixed by defining some of the involved variables as "volatile". There were also a few other miscellaneous fixes. ASTERISK-30044 Change-Id: Ia081ca1bcfb329df6487c4660aaf1944309eb570	4 years ago
Naveen Albert	467505d1da	asterisk.c: Warn of incompatibilities with remote console. ... Some command line options to Asterisk only apply when Asterisk is started and cannot be used with remote console mode. If a user tries to use any of these, they are currently simply silently ignored. This prints out a warning if incompatible options are used, informing users that an option used cannot be used with remote console mode. Additionally, some clarifications are added to the help text and man page. ASTERISK-22246 ASTERISK-26582 Change-Id: I980a5380ef2c19e8ea348596396d5382893c4337	4 years ago
Naveen Albert	4199afd360	func_evalexten: Extension evaluation function. ... This adds the EVAL_EXTEN function, which may be used to retrieve the variable-substituted data at any extension. ASTERISK-29486 Change-Id: Iad81019689674c9f4ac77d235f5d7234adbb1432	4 years ago
Naveen Albert	237defce8a	file.c: Prevent formats from seeking negative offsets. ... Currently, if a user uses an application like ControlPlayback to try to rewind a file past the beginning, this can throw warnings when the file format (e.g. PCM) tries to seek to a negative offset. Instead of letting file formats try (and fail) to seek a negative offset, we instead now catch this in the rewind function to ensure that we never seek an offset less than 0. This prevents legitimate user actions from triggering warnings from any particular file formats. ASTERISK-29943 #close Change-Id: Ia53f2623f57898f4b8e5c894b968b01e95426967	4 years ago
Naveen Albert	74e28c1270	cli: Add command to evaluate dialplan functions. ... Adds the dialplan eval function commands to evaluate a dialplan function from the CLI. The return value and function result are printed out and can be used for testing or debugging. ASTERISK-29820 #close Change-Id: I833e97ea54c49336aca145330a2adeebfad05209	4 years ago
Naveen Albert	7e18d42479	documentation: Adds versioning information. ... Adds version information for applications, functions, and manager events/actions. This is not completely exhaustive by any means but covers most new things added that have release versioning information in the issue tracker. ASTERISK-29940 #close Change-Id: I506401e93c799715dbbe97c0a8ba18af2bf5e131	4 years ago
Joshua C. Colp	d33050f172	manager: Terminate session on write error. ... On a write error to an AMI session a flag was set to indicate that the write error had occurred, with the expected result being that the session be terminated. This was not actually happening and instead writing would continue to be attempted. This change adds a check for the write error and causes the session to actually terminate. ASTERISK-29948 Change-Id: Icaf5d413d4c0d5dc78292a17287fecc8720a31a5	4 years ago
Maximilian Fridrich	163abe6934	core_unreal & app_dial: Flip stream direction of second channel. ... When executing dial, the topology of the inbound channel is cloned and used for the outbound channel. This creates issues when an incoming stream is sendonly or recvonly as the stream state of the outbound channel will be the same as the stream state of the inbound channel. Now the stream state is flipped for the outgoing stream in dial_exec_full if the incoming stream topology is recvonly or sendonly. The same is the case for unreal (local) channels which create a second (;2) channel as a counterpart which clones the topology of the first channel. Now the stream state is flipped for the streams of the 2nd channel in ast_unreal_new_channels if the incoming stream topology is recvonly or sendonly. ASTERISK-29655 Reported by: Michael Auracher ASTERISK-29638 Reported by: Michael Auracher Change-Id: I294dc834ac9a5f048b101b691669959e9df630e1	4 years ago
Naveen Albert	8442c83229	pbx.c: Warn if there are too many includes in a context. ... The PBX core uses the stack when it comes to includes, which means that a context can only contain strictly fewer than AST_PBX_MAX_STACK includes. If this is exceeded, then warnings will be emitted for each number of includes beyond this if searching for an extension in the including context, and if the extension's inclusion is beyond the stack size, it will simply not be found. To address this, we now check if there are too many includes in a context when the dialplan is reloaded so that if there is an issue, the user is aware of at "compile time" as opposed to "run time" only. Secondly, more details are printed out when this message is encountered so it's clear what has happened. ASTERISK-26719 Change-Id: Ia3700452e75a7af3391b3e82ee69f06a669f8958	4 years ago
Philip Prindeville	7f8803ba1c	time: add support for time64 libcs ... Treat time_t's as entirely unique and use the POSIX API's for converting to/from strings. Lastly, a 64-bit integer formats as 20 digits at most in base10. Don't need to have any 100 byte buffers to hold that. ASTERISK-29674 #close Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Change-Id: Id7b25bdca8f92e34229f6454f6c3e500f2cd6f56	4 years ago
Sean Bright	2dce4f6579	conversions.c: Specify that we only want to parse decimal numbers. ... Passing 0 as the last argument to strtoimax() or strtoumax() causes octal and hexadecimal to be accepted which was not originally intended. So we now force to only accept decimal. ASTERISK-29950 #close Change-Id: I93baf0f273441e8280354630a463df263a8c0edd	4 years ago
Philip Prindeville	309c8da206	logger: workaround woefully small BUFSIZ in MUSL ... MUSL defines BUFSIZ as 1024 which is not reasonable for log messages. More broadly, BUFSIZ is the amount of buffering stdio.h does, which is arbitrary and largely orthogonal to what logging should accept as the maximum message size. ASTERISK-29928 Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Change-Id: Iaa49fbbab029c64ae3d95e4b18270e0442cce170	4 years ago
Naveen Albert	a9c4c8461a	pbx_builtins: Add missing options documentation ... BackGround and WaitExten both accept options that are not currently documented. This adds documentation for these options to the xml documentation for each application. ASTERISK-29967 #close Change-Id: If812a9f1ccbba3e4d427a0e7a6dea923c2f905f7	4 years ago