5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,519 Commits
2 Branches
0 Tags
243 MiB
fix-cqi
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '791c979063'
${ noResults }
Commit Graph

456 Commits (791c9790630d43a08d651c1927ae3539a97f25ad)

Author SHA1 Message Date
Xavier Arteaga 0edd8f74d8 fix memory leak in timer test 5 years ago
Xavier Arteaga b88a8635f1 Reduce stress timer test number of timers 5 years ago
Xavier Arteaga e0cc1fd697 Reduce time of timer_test; use unique_lock instead of guard 5 years ago
Xavier Arteaga 22da8dfbb1 srsLTE: protected priority queue in timers 5 years ago
Ismael Gomez 52716f8716 Process HO complete in the background to avoid heap-after-use bug when PHY measurements are reported during a HO 
rrc_meas refactor. Need to split commit

Fix typo

Temporal commit

Apply rx_gain_offset to neighbour cell measurements

srsLTE: modify TESTASSERT Macro to follow codeline

SRSUE: prevent RRC from having serving cell in neighbour list

SRSUE: DL HARQ does not need Time Aligment Timer. UL is disabled using PUCCH resources release

SRSUE: extend intra-frequency to CA SCell

SRSUE: fix confusing/ambiguous code in the RRC measurements and fix concurrency issue

SRSUE: remove RRC measurement report triggers when measurements are modified or HO succesful

SRSUE: fix compilation issues and Reest SIB indexes

Fixes sync using incorrect cell configuration when search cell does not find a correct cell

Small refactor to remove measurement report triggers always after removing measurement

SRSUE: Removed SIC PSS from UE

SRSUE: fix inter-frequency reestablishment and added more traces

SRSUE: Fix compilation issue
 5 years ago
Francisco Paisana c8cd12ac53 updated the test logging utils 5 years ago
Francisco Paisana c537d38650 separated sched tests based on output into a separate file. Added scheduler random tester to unit tests 5 years ago
Francisco Paisana 3e2de6dd3e new logmap class to store globally accessible logs 5 years ago
Francisco Paisana 07a9e889a4 added a singleton map to facilitate access to each layer logger 5 years ago
Francisco Paisana 91d83fc20d different way to retrieve a proc future 5 years ago
Xavier Arteaga d3537fc340 srsLTE: expanded RLC stress test with the addition of multiple PDU per TTI in reverse order 5 years ago
Francisco Paisana 5ae3afd2b8 created cbit_ref for unpacking const buffers 5 years ago
Francisco Paisana 58e555e86c update all asn1 files 5 years ago
Francisco Paisana 5468189cd9 fix some variables' naming (e.g. x2_ap -> x2ap, e_rab -> erab) 5 years ago
Francisco Paisana 2a83eee0ee fix security key setup 5 years ago
Francisco Paisana 25bb36cdc3 converted ho preparation to new s1ap asn1 lib. Extended s1ap test 5 years ago
Francisco Paisana 3066b404ac fix integer ext asn1 generation 5 years ago
Francisco Paisana c87de9d889 added s1ap_asn1_test 5 years ago
Francisco Paisana b6c53d786b updated s1ap rrc interface with new asn1 lib types 5 years ago
Andre Puschmann c54fa568be fixing typo in CMake for PHY DL test 5 years ago
Xavier Arteaga 11eafa8ab4 srsLTE: FFTW wisdom gets loaded and saved by default 5 years ago
Andre Puschmann 9e1b8bc95e disabling certain PHY DL tests that aren't working on ARM due to Turbo issues 5 years ago
Andre Puschmann 476f970ee1 replace FIXME with TODO 5 years ago
Pedro Alvarez c5979f59eb Clang format UE, eNB and lib (#850) 
* Clang-formated UE, eNB and lib.
* Fixed compiling errors from clang-format.
* Fix linking issues introduced by clang-format
* Fix poor formating in initializing arrays of arrays.
* Fix mistake in conflict resolution on rm_turbo.c
* Re-apply clang format to gtpc_ies.h
 5 years ago
Francisco Paisana a0d53b0d84 included ngap and rrc nr asn1 in asn1/ folder and added a ngap_test 5 years ago
Andre Puschmann cf1e742120 add a simple log_filter test to print a long hex message 
the purpose of this is to show that the hex message is cut if the
lenght exceeds the size of the preallocated buffer
 5 years ago
Francisco Paisana d59016ae68 use of srslte::log* type for ASN1 logging. Initialization of the asn1 and rrc_asn1 loggers done now in both the ue and enb 5 years ago
Francisco Paisana d270518d69 updated rrc to new srsasn1 version 5 years ago
Andre Puschmann 7885b5b9ee add CMake flag to enable 5G-NR components 5 years ago
Andre Puschmann e53910010e fix missing byte_buffer cleanup 5 years ago
Pedro Alvarez 41e911fd76 Replaced PRIu32 for %u in pdcp_nr_entity 5 years ago
Pedro Alvarez e1cdd51eba Clang-formated before pull request 5 years ago
Pedro Alvarez 61958af70b Timer removes itself from the map upon expiration 5 years ago
Pedro Alvarez 47a918d680 Split PDCP NR tests into multiple files 5 years ago
Pedro Alvarez c30eb2c166 Starting to add test for when the RLC notifies the PDCP of tx and disarms the discardTimer. 5 years ago
Pedro Alvarez 972d44be23 Remove printfs in test. PDCP seems to be notifing correctly the RLC when discard happens. 5 years ago
Pedro Alvarez 8810f35498 Adding test of SDU discard timout to PDCP NR tests. 5 years ago
Pedro Alvarez ea0fb00b22 Added test for PDCP SDU discard. 5 years ago
Pedro Alvarez e68956bcf6 Adding discard timer timeout to PDCP config. 5 years ago
Pedro Alvarez 2e7ddef038 Continue to add discard_sdu to RLC interfaces. 5 years ago
Francisco Paisana c9f092e8e9 created a nullsink and a TESTASSERT for C 5 years ago
Andre Puschmann 9493e7492c add initial RLC AM NR status PDU packing code including tests 5 years ago
Andre Puschmann cea212b9f9 add RLC AM NR PDU packing/unpacking test 5 years ago
Pedro Alvarez 15613465cf Moving some initialization from init function to constructor in the PDCP entities. 5 years ago
Andre Puschmann b20f7ba541 refactor RLC UM and add NR receiver 5 years ago
Francisco Paisana b0e0b3232f fix linking issue 5 years ago
Francisco Paisana 2de0eee9c7 clean up some comments 5 years ago
Francisco Paisana 76673d2d40 cleaned up socket util methods, and made the S1AP non-blocking. 5 years ago
Francisco Paisana 2c3e4a3daf creation of util class net_addr_t that provides methods for conversion of IP addr const char* to sockaddr_in 5 years ago
Francisco Paisana 31dffde6c3 simplified interface and made it more generic to different types of sockets 5 years ago
Francisco Paisana e37a718f21 created a sctp socket class 5 years ago
Francisco Paisana 131b1a7e41 added a class to handle multiple sockets via a select 5 years ago
Andre Puschmann 03bd63d9ab rename RLC AM class to RLC AM LTE 5 years ago
Andre Puschmann 2d126371f6 adopt PDCP NR to use new timer class 5 years ago
Pedro Alvarez 9998b3e857 Small white space fix and clang-format on pdcp_nr_test.h 5 years ago
Pedro Alvarez 900d535baa Added test for reception of duplicated packets 5 years ago
Pedro Alvarez 347e10d967 Adding test for reception of duplicate packets. 5 years ago
Pedro Alvarez 3614c1004e Fixed issue in test with out-of-order packets. 5 years ago
Pedro Alvarez 7542e5a936 Continue to change PDCP test to support timeouts. 5 years ago
Pedro Alvarez 6265325e20 Starting to change test to also run the clock. 5 years ago
Pedro Alvarez 8511fca940 Clang-formated to prepare for PR 5 years ago
Pedro Alvarez d3a07fdd38 Added check for overflow at RX. Adding more tests. 5 years ago
Pedro Alvarez eb1470621a Added function to generate vector of PDUs 5 years ago
Pedro Alvarez ed24544a63 Added debug print for out of order, wraparound and duplicate RX PDUs. Adding a helper function to help generate a vector of test PDUs 5 years ago
Pedro Alvarez a191eb6606 Fixed up some PDCP tx tests. 5 years ago
Pedro Alvarez 2752e3cff5 Starting to stop tx'ing packets if TX_NEXT overflows. 5 years ago
Pedro Alvarez 62230c6ab9 Starting to have overflow protection in PDCP NR tx 5 years ago
Pedro Alvarez f872c1b55a Added test for PDCP COUNT wraparound. (Needs to be changed, COUNT wraparound is not allowed.) 5 years ago
Pedro Alvarez f29dd3c5de Added test for reordering at COUNT wraparound. Failing at the moment (as expected). 5 years ago
Pedro Alvarez 1d56fa6308 Improved speed of tests for COUNT wraparound, by setting the PDCP initial state. 5 years ago
Pedro Alvarez ffc26a702d Changed the name of more PDUs 5 years ago
Pedro Alvarez cb0466bce7 Starting to change the expected pdus name. 5 years ago
Pedro Alvarez 49e0e3a24a Added helper function to generate expected PDUs 5 years ago
Pedro Alvarez 39943367ab Starting to add the ability to tweak the initial state of the PDCP NR state, so that the tests of counter wraparound don't take hours. 5 years ago
Pedro Alvarez 517ce8a220 Added test to test out of order COUNT wraparoung. Added setters to help with the testers. 5 years ago
Pedro Alvarez 727436ec0b Added helper function to compare two packets. Making generic function to test out of order packets. 5 years ago
Pedro Alvarez 43c68fe78b Sarting to add test for out of order wrap-around. 5 years ago
Pedro Alvarez ceea761ca4 Added append_bytes method to byte_buffer_t class. Continue to reduce boilerplate. 5 years ago
Pedro Alvarez 59bc2baf3f Continue to reduce boiler plate 5 years ago
Pedro Alvarez df7a020e5f removing some boiler plate 5 years ago
Pedro Alvarez 977238a79c Added pdcp_nr_test.h to reduce boiler code in the pdcp_nr_test.cc 5 years ago
Pedro Alvarez 837ca9e07e Changed name of helper class 5 years ago
Pedro Alvarez be090768c9 Making helper class to reduce boilerplate in PDCP NR tests. 5 years ago
Pedro Alvarez b7fdcaabc5 Starting to add reordering timers at PDCP NR entity. Timeout seems to be triggered correctly and pass the SDUs to the upper layers when it expires. First tests passing. 5 years ago
Pedro Alvarez 45d298507b Starting to move pdcp configs to rrc_interface_types. Starting to add test for reorder timeout. 5 years ago
Pedro Alvarez f06e1af4e0 Added test for receiving out of order NR PDCP packets 5 years ago
Pedro Alvarez ff15ed5018 Starting to add timers to the NR PDCP. 5 years ago
Andre Puschmann f4a0bebe1f fix handling of invalid MAC LCIDs 5 years ago
Andre Puschmann aa9733eb59 add packing for CCCH over UL-SCH for MAC NR 5 years ago
Francisco Paisana 9ae5563331 fixed timer issue with setting the duration. Setting the duration cannot reset the on-going timer run 5 years ago
Francisco Paisana d2c56caf7e applied new timer class to the whole code base 5 years ago
Francisco Paisana 5953d5ef96 fixed some potential bug related to timer getting stopped, but signaling that it expired 5 years ago
Francisco Paisana 551192705e allow for pre-reservation of timers vector and priority queue 5 years ago
Francisco Paisana 50a1c9d557 addressed potential overflow, and extended timer test to check if ordering is working correctly 5 years ago
Francisco Paisana 349646a9da created a new class for timers. It uses a priority queue to avoid incrementing all timers every tti (step_all() went from O(N) to O(1)), and that is not bounded in number of timers. Not being bounded will be useful for layers that require one or more timers per UE 5 years ago
Francisco Paisana f2d88e5a5b simplified NAS rrc connection request procedure 
move non-type-specific methods of proc_t to its base class.
procedure state machine was simplified via a future-type. Now procedures dont get stuck until the user reads the procedure outcome.
made the NAS procedures more event trigger/reaction-based.
 5 years ago
Francisco Paisana 8864787f59 added the continuation functionality to procedures via the "then()" method. 5 years ago
Francisco Paisana c1be118d1d new wrapper-based design for stack procedures. Removes extra base class, gets rid of spurious copies/moves during the pop(), and allows the use of a non-default ctor() 5 years ago
Andre Puschmann 89889d6df5 add packing and unpacking test for MAC PDU only containing padding bytes 5 years ago
Andre Puschmann f07a9277a0 fix RLC AM issue where an invalid status PDU was generated 
happens when very small grant is provided and the status
PDU generation fails because of a too small grant

add extra check to prevent that ACK_SN is also in NACKS list
 5 years ago
Francisco Paisana a2f1998350 fix issue with thread pool shut down 5 years ago
Francisco Paisana 3f1fad3f4e bug fix: avoid renaming thread in worker ctor 5 years ago
Francisco Paisana c413fadea9 created a queue-based thread pool. Tasks are inserted into a queue and then popped by the thread pool workers to be processed. 5 years ago
Andre Puschmann 2f47010eb6 fix various uninitialized vars 5 years ago
Andre Puschmann c99d5077c8 add RLC UM NR transmitter 5 years ago
Francisco Paisana 7e67aee839 resolved the uninit variable issue in the queue_test 5 years ago
Francisco Paisana b2bc05c50a make queue_test less dependent on thread timings 5 years ago
Francisco Paisana ceba00f00e extended multiqueue to support blocking push 5 years ago
Francisco Paisana 63457f195c extented queue test 5 years ago
Francisco Paisana 647c624423 created a multiqueue handler, and started using it for the ue stack 5 years ago
Andre Puschmann 6baa89cd2c add MAC NR PDU packing and associated unit tests 5 years ago
Ismael Gomez 6bb0790cf1
Fix coverty issues (#652) 5 years ago
Pedro Alvarez 004db4a067 Applied clang-format to zuc_support PR. 5 years ago
David Rupprecht f05bb12c78 Process with EIA3 test cases and fix EIA3 5 years ago
David Rupprecht d580a94dab Add EIA3 and test case 5 years ago
David Rupprecht 7e13860dd5 Add decryption function and all tests for enc 5 years ago
David Rupprecht ef4cf7aa52 First ZUC working test case 5 years ago
Ismael Gomez bfddc55148
RRC-PHY interface (#639) 
RRC-PHY interface refactor. Moved RRC-MAC interface to rrc_asn1_utils and created RRC-PHY interface also in rrc_asn1_utils. All ASN1 includes should be made from rrc_asn1_utils only keeping ue_interfaces clean of ASN1

Tested with different common and dedicated configurations (64QAM UL, 256QAM, CA, SRS enabled/disabled, etc)
 5 years ago
Ismael Gomez c92c61d560
Optimized front-end logging processing (#641) 
Avoid memory allocation and stringstream in log frontend calls (executed from worker threads). Uses a buffer pool of fixed buffer and vsnprintf
 5 years ago
Francisco Paisana 67d6a25194 Moving mac timers to stack timers (#638) 
* first step towards moving MAC timers to stack. Mac is still using its own timers. srslte::timers class can be restructured.

* moved timers out of the UE MAC
 5 years ago
Ismael Gomez 69edee4e6c
Fix issues in uplink QoS (#636) 
Fix bugs in Long BSR and Truncated BSR and added unit tests
 5 years ago
Francisco Paisana ad64207a32 added test for unknown group extensions, and the asn1 lib version in its generated files 5 years ago
Francisco Paisana c9d3b61038 added resumable procedures to make RRC and NAS non-blocking 5 years ago
Andre Puschmann e42449532b fix wrong namespace definition in various places 5 years ago
Pedro Alvarez 6efa944b5e Removed srslte prefix from pdcp_config_t 5 years ago
Pedro Alvarez 8c10eabf23 Changed PDCP LTE to use unique_lock. 5 years ago
Pedro Alvarez 494be243c0 Changed security direction to use an enum. 5 years ago
Pedro Alvarez 491695ab77 Clang-formated PDCP NR PR. 5 years ago
Pedro Alvarez 38bbc55631 Added tests for PDCP NR Rx with SN Len = 18. In-sequence reception seems to work. 5 years ago
Pedro Alvarez d4aeb12db8 Adding more TX tests to PDCP NR entity. 5 years ago
Pedro Alvarez 39e3800781 Fixed header packing for SN length 18 for PDCP NR. First TX test is passing. 5 years ago
Pedro Alvarez d399c65082 Starting to add PDCP SN len 18 unit tests. 5 years ago
Pedro Alvarez 7a69e8ba64 Removed comment. 5 years ago
Pedro Alvarez adfe9f950e Fixed issue in computing the SN. Added test for packets received in sequence for PDCP NR. Test is passing now. 5 years ago
Pedro Alvarez 2104e6bbcf Added test for more TX packets in PDCP NR. Tests passing for TX_NEXT = 0, 2048 and 4096 5 years ago
Pedro Alvarez ecd164ed65 Starting to add more tx tests to PDCP NR tests. 5 years ago
Pedro Alvarez af2b593b8c Added check for integrity in test. First Rx PDCP NR test passing. 5 years ago
Pedro Alvarez d3b6828082 Changed PDCP configuration to explicitly have tx and rx direction. Decrypt on PDCP NR seems fine. 5 years ago
Pedro Alvarez 7e6725f0a2 Fixing up PDCP NR tx test. Starting to add rx test. 5 years ago
Pedro Alvarez 378c8d247e Starting to add the mechanisms to store the last PDU in the PDCP tests. 5 years ago
Pedro Alvarez 73e30743d1 Added enum to PDCP config to replace two bools. 5 years ago
Pedro Alvarez 457f35699d Reverted back to a single config structure between PDCP NR and PDCP LTE. 5 years ago
Pedro Alvarez 810cacdc02 Adding write_data_header and append_mac helper functions to PDCP NR entity. 5 years ago
Pedro Alvarez d1ac121100 Writting PDU into PDCP in tx test. 5 years ago
Pedro Alvarez c9e99443d8 Adding PDCP NR Tx test. 5 years ago
Pedro Alvarez 4bb99464ed Starting to add PDCP NR tests. 5 years ago
yagoda 408400bee6 adding fixes and tests for eMBMS 5 years ago
Andre Puschmann 94cc61e4b1 add MAC PDU pack test for max size TB PDU 5 years ago
Andre Puschmann 2ae35e4ce0 make sure status PDU doens't exceed grant size 5 years ago
Xavier Arteaga 5e49aca835
Merge pull request #570 from softwareradiosystems/feature_256qam_fix 
Resource allocation extended tables and PDSCH table 2 for 256QAM
 5 years ago
Guillem Foreman 2a8ec5c9b9 More fixes 256QAM 5 years ago
Guillem Foreman eab73829f6 Changes requested 5 years ago
Ismael Gomez 8c41625599 Add RLC suspend and resume 5 years ago
Andre Puschmann db196cc052 add RLC AM test for status PDU generation with small and big MAC grants 5 years ago
Andre Puschmann 9f3a947c02 modify RLC AM retx test to provide exactly a MAC opportunity of the size 
that is reported as buffer state
 5 years ago
Andre Puschmann 6b2961fcee add MAC DL-SCH unpacking test 5 years ago
Andre Puschmann 92f0d58856 mac: move further init/config into ctor to allow early logging, etc. 5 years ago
Francisco Paisana 92b4b168fe added default rlc um and am in the interface as factories 5 years ago
Francisco Paisana b903c1a52c made default init for rlc um test 5 years ago
Francisco Paisana 58e2e51044 removed rlc_interfaces. The rlc_cnfg types are now part of the rrc_interface_types. Removed implicit RB initialization in the RLC. 5 years ago
Francisco Paisana c5509caece added extra operators and remove rrc_asn1 in some cmake targets 5 years ago
Francisco Paisana b936629221 removed rrc asn1 header from bcd_helpers, from rlc_interface, and rlc tests 5 years ago
Guillem Foreman 46724c336d Fixed errors for phy_dl_test and pdsch test 5 years ago
Guillem Foreman db4127ca64 Fixes 256QAM, added pdsch table 2, fixed warnings 5 years ago
Andre Puschmann 701db61fde rlc: extend stress tester to simulate MAC PDU corruption 5 years ago
Andre Puschmann 58763fb714 stack: move initialization of log object into ctor 
this fixes the issue when the stack is torn down if, for example,
the radio couldn't be loaded correctly. it will hence call stop() on all stack
components which are not initialzized yet, and logging therefore doesn't work.
the log object is know during contruction time and therefore can be passed
in as soon as possible.
 5 years ago
Andre Puschmann fab75592ec fix MAC PDU padding with only padding and add test accordingly 5 years ago
Andre Puschmann b6d7fd5def improve error handling in PDU packing 5 years ago
Andre Puschmann 6d586d84a8 extend MAC PDU test 5 years ago
Andre Puschmann b32254c5e2 use lock_guard for GW 6 years ago
Andre Puschmann 89416a67c7 increase timeout for rlc stress tests 
for valgrind where we sometimes hit the default timeout of 1500s
 6 years ago
Pedro Alvarez 2fcf8c1827 Starting to add packing and unpacking tests to activate EPS bearer context request. 6 years ago
Francisco Paisana 415d3418b6 reorganized enb to mirror ue director/class structure with a stack class 6 years ago
Andre Puschmann e8d6236975 remove init for all RLC TM/UM/AM 
- all RLC entities are now initialized during contruction
- there is no need to check for, e.g., existance of timers, during
  runtime
- there is also no need to call re-init during resume
- timers are freed in dtor
 6 years ago
Ismael Gomez ade720e032 Add RLC resume procedure 6 years ago
Andre Puschmann e47010130f extend thread class to set unique thread name in ctor 
this will also extend all classes that use srslte::thread
to specify the name of the thread in the ctor as well
as to set the name of the worker threads in the thread pool
the thread name will be displayed in gdb.
 6 years ago
Andre Puschmann ee1f910877 pdu: add unit test for packing and unpacking RAR PDUs 6 years ago
Pedro Alvarez 1031ea896d add NAS activate dedicated bearer request unpacking test 6 years ago
Andre Puschmann 65f50cd7ba introduce new UE layer design 
- abstract UE object now consists of a radio, a PHY, and a stack layer
- add new stack abstraction layer that combines MAC, RLC, RRC, PDCP, NAS and GW
- PHY layer now has a single stack interface and does not talk to MAC and RRC seperatly
 6 years ago
Andre Puschmann 3a6dd9b164 move UE RRC into own folder 6 years ago
Francisco Paisana 0e3baa0f2f Renamed the reset() method of byte_buffer_t to clear() 6 years ago
Francisco Paisana 3bedc93ba5 added _t to unique_byte_buffer type 6 years ago
Francisco Paisana f4aa03154d change queue read and other functions apis 6 years ago
Francisco Paisana f469e2178b replaced byte_buffer_t allocated by the buffer pool for unique_byte_buffer which is safer and easier to use 6 years ago
Francisco Paisana 7be183c223 rework scheduler 6 years ago
Andre Puschmann 780ea8867c fix asn1_m2ap test 
- there was an issue in the stack allocation of the large
  m2ap pdu struct that was fixed by heap-allocating it

- there was also an issue in the m2ap packing that used
  a temporary struct that was not initialized
 6 years ago
Andre Puschmann 723cd71a3a remove usage of <assert> in rlc_um_test 6 years ago
Andre Puschmann 46cc5a1985 use buffer pool in rlc_um_test 6 years ago
Andre Puschmann 498c1bae26 remove usage of <assert> in asn1_m2ap test 6 years ago
Pedro Alvarez f2530eb57b Fix rlc_am_data_test to avoid compiler warning from memset 6 years ago
Pedro Alvarez 3a502ccd13 Removed memset from rlc_status_pdu in test, to avoid compiler warnings. 6 years ago
Xavier Arteaga c18a59730c Solved PHY unit test memory leaks 6 years ago
Francisco Paisana 1674c8939f automatically resolve invalid prach_offset for prb6 6 years ago
Andre Puschmann 4b01a2e4a0 update copyright notice 6 years ago
Andre Puschmann 205db6f229 add missing license headers 6 years ago
Ismael Gomez 7780b1aba5 add tdd/ca support 6 years ago
Andre Puschmann 0aef6f8d4a fix various uninitialized variables 6 years ago
David Rupprecht 3d458319c9 fixed decoding of multiple s1ap plmns 6 years ago
Francisco Paisana 0204db2e12 new asn1 rrc library 6 years ago
Andre Puschmann db3ce8ade9 remove clang-tidy execution for srslte_upper 6 years ago