PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,499 Commits 3 Branches 23 Tags 67 MiB
Commit Graph

866 Commits

Author SHA1 Message Date
Ismael Gomez 4a8d83721a Fix unnecessary memory usage in radio 2018-09-20 09:45:46 +02:00
IgnasJ 67c8bf1368 Fixes for srsLTE on ARM (#229) 
* Fix ARM NEON code compilation

Fix LV_HAVE_NEON defintion incorrecly used instead of HAVE_NEON in some places
Replace vqabsq_s32 with vabsq_f32 as vqabsq_s32 requires int type (fails to compile)
Fix missing NEON code path in mat.h in srslte_mat_2x2_mmse_csi_simd()

* Fix timestamp overflow issue on 32-bit systems with Soapy driver

'time_t secs' can be 32-bit on some systems. This causes calculation:
'secs * 1000000000;' to overflow.
 2018-09-19 17:34:59 +02:00
Ismael Gomez 0294923e2b Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-09-19 16:42:11 +02:00
Ismael Gomez 197d855d3f Fix issue #240 2018-09-19 16:41:59 +02:00
Xavier Arteaga a9fcd64b1f Fixes #259: Turbodecoder AVX2 instructions under LV_HAVE_AVX (instead of LV_HAVE_AVX2) 2018-09-19 12:35:37 +02:00
Andre Puschmann 184539b87d add LCID change API to UE interface, add method to reestablish single RLC bearer 2018-09-18 15:09:24 +02:00
Andre Puschmann 10bc01a7ae add API to change LCID of RLC bearers 2018-09-17 13:11:03 +02:00
Andre Puschmann 27459bf706 add API to change LCID of PDCP bearers 2018-09-17 13:10:44 +02:00
Andre Puschmann adbec3ee70 fix warning in common.h reported by clang-tidy 2018-09-13 17:12:32 +02:00
Ismael Gomez 243a7708d4 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-09-07 14:06:27 +02:00
Ismael Gomez 826fbccf11 Fixed memory leaks in new decoder 2018-09-07 14:05:45 +02:00
Andre Puschmann c0899ddda9 refactor RLC AM, add tx/rx subclasses 2018-09-07 10:49:52 +02:00
Ismael Gomez bc9d342959
New optimization on the PHY for both UE and eNodeB (#251) 
* New parallel Turbodecoder implementation in SSE/AVX 16-bit and 8-bit

* Optimised UL Interleaver

* Include TB CRC calculation in FEC encoder

* New threading priorities
 2018-09-04 17:51:35 +02:00
Pedro Alvarez 0d80ae795b Added IMSI attach from unknown UE as a static function. 2018-08-27 19:17:23 +01:00
Pedro Alvarez 860e1b5491 Changing Handling of initial UE NAS messages to use static methods. Handling of unknown GUTI attach request should be ok. 2018-08-27 16:06:18 +01:00
Pedro Alvarez 93222f582c Changed authentication response to use downlink_nas_transport(). 2018-08-21 15:17:08 +01:00
Pedro Alvarez f6b8982939 Moved most of the GUTI attach to nas.cc. 2018-08-20 15:48:23 +01:00
Pedro Alvarez 1fba7f0afa Moved function that gets NAS type string to liblte_mme.cc 2018-08-14 18:42:48 +01:00
Pedro Alvarez 127e214b07 Added function to print string of NAS message type based on the message code. 2018-08-14 17:19:19 +01:00
Pedro Alvarez 7077530a29 Merge branch 'next' into nas_cleanup 2018-08-13 11:59:23 +01:00
Andre Puschmann f56592b0fe add getter for PDCP ul/dl counter 2018-08-08 16:26:32 +02:00
Andre Puschmann 91492b87ef add del_bearer for RLC/PDCP 2018-08-06 13:17:51 +02:00
Andre Puschmann 3b8371d090 add detach support (for switch off) 2018-08-06 11:10:12 +02:00
Andre Puschmann 2ef2baf72a increase size of buffer_pool 
- This solves an issue where in the worst-case an RLC AM instance would
  block because no new data nor control PDUs could be created to flush
  the buffers, effectivly causing a system stall.
- Happens in RLC AM stress test regularly with higher drop rates.
 2018-07-30 15:11:31 +02:00
Andre Puschmann 89df8f1582 unify RLC interface for writing SDUs w/ and w/o blocking 2018-07-25 16:08:07 +02:00
Andre Puschmann 3950629a75 remove obsolete RLC_MODE struct and move existing one to rlc_interface.h 2018-07-25 16:06:42 +02:00
Andre Puschmann ee5b055829 rename pdcp function for GW to is_lcid_enabled() 2018-07-25 15:09:19 +02:00
David Rupprecht bf4c84ef7b Fixed clear function in blocked queue (#199) 2018-07-25 09:54:22 +02:00
Andre Puschmann 6a2dc8677b remove obsolete header 2018-07-24 16:44:40 +02:00
Andre Puschmann b8438e9cc3 extend PDCP interface to allow non-blocking write of SDUs 2018-07-24 15:49:09 +02:00
Andre Puschmann 27d3d697df refactor RLC part#2 
- move metrics into entities
- make configure interface return true/false on success/failure
- add own srslte mode type
 2018-07-23 17:30:32 +02:00
Pedro Alvarez de8679b536 Continuing to cleanup. Starting to compile again. 2018-07-23 15:30:19 +01:00
Andre Puschmann 8e8fab027b refactor RLC base class 
- add rwlock
- put RLC entities into map
- general cleanup
 2018-07-23 15:42:54 +02:00
Pedro Alvarez f03967776a Continuing to clean nas.cc 2018-07-20 19:50:46 +01:00
Pedro Alvarez b25c12a084 Fixing nas.cc 2018-07-18 19:25:59 +01:00
Pedro Alvarez 85672d4a3f Fixing up s1ap.cc 2018-07-18 17:25:37 +01:00
Andre Puschmann b8b5ad9755 Merge branch 'pdcp_refactor' into next 2018-07-17 17:42:13 +02:00
Xavier Arteaga a21db86a78 SCH Codeblock CRC is computed at same time than parity 0 2018-07-17 15:37:57 +02:00
Andre Puschmann 47a8b1343f add rwlock to PDCP 2018-07-17 15:27:04 +02:00
Andre Puschmann 93c11e4416 turn PDCP array into map 2018-07-17 12:50:10 +02:00
Andre Puschmann b257204471 fix public PDCP interface 2018-07-17 12:17:55 +02:00
Andre Puschmann 31ba175b37 add public PDCP entity interface 2018-07-17 12:17:55 +02:00
Pedro Alvarez 3663d59920 Starting to add s1ap_interface_gtpc and s1ap_interface_nas. Adapting send initial context setup request accordingly. 2018-07-16 13:50:12 +01:00
Andre Puschmann be3b2fbc08
Merge pull request #239 from softwareradiosystems/epc_stacktrace 
Epc stacktrace
 2018-07-13 14:28:13 +02:00
Pedro Alvarez 84e7925f69 Fixed up a comment. 2018-07-13 12:06:27 +01:00
Pedro Alvarez 8017b792cf Changing SRSLTE_PHY_DEBUG back to SRSLTE_DEBUG. 2018-07-13 11:59:03 +01:00
Pedro Alvarez 597cf18b9d Changing common/debug.h to crash_handler.h 2018-07-13 11:57:15 +01:00
Andre Puschmann 291d80119c fix conflicts after merging 2018-07-13 12:42:54 +02:00
Ismael Gomez 3f38165827 Add log to pool deallocate 2018-07-12 18:41:25 +02:00
Ismael Gomez 2d5cdc4f35 Add log to pool deallocate 2018-07-12 18:13:27 +02:00
Ismael Gomez 5474f6d55f Add log to pool deallocate 2018-07-12 18:13:19 +02:00
Ismael Gomez 3cb9f51460 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-07-12 18:12:32 +02:00
Andre Puschmann 936001aaf5 add blocking allocation to buffer_pool 2018-07-12 17:52:53 +02:00
Pedro Alvarez c3ef88e112 Fixing conflicts with next. 2018-07-12 15:43:27 +01:00
Andre Puschmann a9b023258c refactor RLC UM to have separate tx/rx objects 2018-07-12 16:13:03 +02:00
Andre Puschmann 4c59f52f9a
Merge pull request #237 from softwareradiosystems/epc_pcap 
Epc pcap
 2018-07-12 16:00:31 +02:00
Ismael Gomez 3122d8e959 RLC reestablish to re-enable tx_enabled 2018-07-12 11:18:14 +02:00
Ismael Gomez 75e8df2e9f Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-07-11 15:33:22 +02:00
Andre Puschmann 55b3b61ec1 Merge branch 'master' into next 2018-07-11 13:00:47 +02:00
Ismael Gomez bd5c1fd83a deallocate dedicatedInfoNAS in rrc 2018-07-11 12:56:14 +02:00
Ismael Gomez 074db8478c deallocate dedicatedInfoNAS in rrc 2018-07-10 19:52:46 +02:00
Pedro Alvarez bd43b6e937 Cleanup comment. 2018-07-10 15:56:57 +01:00
Andre Puschmann 9b894799f0 add support for ciphered authentication response 2018-07-10 12:34:25 +02:00
Pedro Alvarez ff49e56871 Starting to add s1ap_pcap class. 2018-07-09 18:25:43 +01:00
Pedro Alvarez 7aaa9a1789 Moved srslte_debug_handle_crash to common/debug.c 2018-07-09 14:33:50 +01:00
Pedro Alvarez 96786e96da Splitting the lib debug into phy and common debug. 2018-07-09 13:15:35 +01:00
Ismael Gomez 005fe87ae9 RLC reestablish to re-enable tx_enabled 2018-07-09 00:26:58 +02:00
Ismael Gomez 493706eab1 Incorrect default value in buffer pool 2018-07-06 16:20:15 +02:00
Ismael Gomez 2da9787907 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-07-06 15:31:29 +02:00
Ismael Gomez a2615628aa Increase buffer pool size for enb 2018-07-06 15:30:51 +02:00
Pedro Alvarez b460ece601 Merge branch 'mbms_tun' into next 2018-07-06 13:01:14 +01:00
Andre Puschmann 355330dab9
Merge pull request #234 from softwareradiosystems/log_fix 
Log fix
 2018-07-06 13:07:55 +02:00
Ismael Gomez 85a7daa09d Move RLC buffer size to common 2018-07-06 09:08:29 +02:00
Ismael Gomez 589e569ce9
Changes on srsENB mutexing logic to fix general race condition and deadlock issues (#229) 
* fixed some issues with the UL scheduling

* Hack to fix UL scheduler

* minor fix

* Cleaned up code and fixed issue with the update_allocation function

* fixed the console printing in the enb

* log/console fix

* fixed the log print

* added a normalization factor

* RLC: entity uses dynamic instances. Simplified stop/reset/reestablish procedure. Added non-blocking interface

* Limit decimals in metrics stdout

* Changed mutexes to rwlock in RLC/RRC/MAC/PDCP to fix race conditions when removing users

* Fix deadlock bug for MIMO

* Remove headers

* Fix missing unlock causing overflows

* Do not decrease CQI when PUCCH (this is a temporal fix, requires to reduce the maximum MCS)

* Fix mutex unlock in worker

* Configurable RLC tx buffer. Default to 512 for enodeb

* Check NULL SDU in write_sdu()

* Protect RLC objects and tx_queue from being destroyed while using it

* Remove superfluous code

* Disable SIB logging

* Fix block_queue for enb
 2018-07-05 11:00:19 +02:00
Pedro Alvarez 0e135adc6f Starting to change gtpu_read_header and gtpu_write_header to lib. 2018-07-03 14:30:20 +01:00
Andre Puschmann 87fd218c72 remove unused cond variable in logger 2018-07-03 13:17:48 +02:00
Andre Puschmann 4deb251071 remove duplicate run-state variable in logger_file 2018-07-03 13:09:43 +02:00
jctallon 50589108c6 Mbms fixes (#225) 
* fixing the threading structure for mbms in the gtpu

fixing some leaks in pmch tests

fixing stack overflow caused by radio objext

* adding sib.conf.mbsfn.example

* creating a different thread_mch object for the gtpu

* Make mch_thread an isolated class

* excluding mbsfn subframes from noise estimation and cfo estimation

* fixing pdsch ue plotting to only show pmch constellation when mbsfn is activated.
 2018-07-02 17:51:09 +02:00
Andre Puschmann 05ede38ea6 remove obsolte config.h 2018-06-29 15:31:34 +02:00
Ismael Gomez 8c92f3fddc
Improvements and fixes on srsENB scheduler (#228) 2018-06-29 11:25:22 +02:00
Andre Puschmann 46436efb3b
Merge pull request #227 from softwareradiosystems/qci_epc 
Qci epc
 2018-06-28 14:30:48 +02:00
Andre Puschmann 1cba6b18ee
Merge pull request #221 from softwareradiosystems/op_vs_opc 
Op vs opc
 2018-06-28 12:44:39 +02:00
Xavier Arteaga f01f7b4945 Added Vector max abs SIMD function 2018-06-28 09:28:17 +02:00
Pedro Alvarez 0a6540d8bf Saving QCI into ESM context. Different QCIs should be working now. 2018-06-27 17:45:19 +01:00
Ismael Gomez e18ba937dc Limit uplink signal normalization to avoid clipping 2018-06-27 16:29:40 +02:00
Pedro Alvarez 66db3deeb4 Starting to add Bearer QoS parameter to create session request. 2018-06-27 15:10:17 +01:00
Pedro Alvarez 1b43c40422 Starting to add Bearer QoS IE to Create Session Request. 2018-06-26 18:53:04 +01:00
Pedro Alvarez f301bb6373 Merging next into op_vs_opc and resolving conflicts. 2018-06-26 11:36:40 +01:00
Andre Puschmann 064d7bd2dc use original UE establishment cause in S1AP initial UE message 2018-06-25 18:19:57 +02:00
Xavier Arteaga 5e4fb48184 Refactored CQI reporting logging in UE. Fixes #199 2018-06-25 14:57:12 +02:00
Andre Puschmann ecfa685dde add ctor to radio_multi, fix tearing down radio when not initialized 2018-06-20 16:40:10 +02:00
Andre Puschmann 01f6395d70 add option to force IMSI attach by not loading NAS ctxt from file 2018-06-19 14:23:47 +02:00
Pedro Alvarez 75c5e476f1 Added OPc option to UE. (needs testing.) 2018-06-18 15:19:04 +01:00
Pedro Alvarez 02bc1c9956 Revert "Starting to add OP/OPc support." 
This reverts commit 1766e11076.
 2018-06-18 11:34:45 +01:00
Pedro Alvarez e3d1cff4a3 Revert "Adding OPc option to security functions." 
This reverts commit 0eeb70bede.
 2018-06-18 11:29:40 +01:00
Pedro Alvarez 0eeb70bede Adding OPc option to security functions. 2018-06-18 11:24:35 +01:00
Pedro Alvarez 1766e11076 Starting to add OP/OPc support. 2018-06-15 13:28:23 +01:00
Ismael Gomez 6120f20290
Changes in RRC and S1AP to make enb more robust on UE add/rem operations. 
* Consolidated functions in S1AP

* Fixed ASAN in some GCC

* Stop quicker the enb

* Minor typo edit

* Fixed mutexing issues in RRC and possibly RLC/PDCP when adding/removing users
 2018-06-12 17:31:07 +02:00
Xavier Arteaga 301415a00a Fixed AGC out of bounds gain 2018-06-11 13:14:47 +02:00
Xavier Arteaga d9db80d17c Merge branch 'next' into pdsch-coworkers 2018-06-06 17:35:09 +02:00
Xavier Arteaga 6ab69b1d4c Added PDSCH coworkers 2018-06-06 16:59:00 +02:00
yagoda 4569247458 setting tx and rx mod in rlc um for mch to 1 2018-06-06 06:42:30 +02:00
Ismael Gomez 67e90d5a9b Code style: Use { } even in 1-line if 2018-06-04 18:38:18 +02:00
Ismael Gomez 863fe4fcd0 Revert "check in SRSLTE_CONFIG_DIR for configs by default" 
This reverts commit fb77cb87ca.
 2018-06-04 17:36:59 +02:00
Andre Puschmann fb77cb87ca check in SRSLTE_CONFIG_DIR for configs by default 2018-06-04 15:01:16 +02:00
Andre Puschmann 36c650399b rework app startup to search for config files in user's home directory 2018-06-01 15:33:15 +02:00
Ismael Gomez 0a2e9d7b8b Do not reset metrics in the hub 2018-05-31 15:32:01 +02:00
Xavier Arteaga 681b98ae50 Added vector CFO 2018-05-25 16:06:32 +02:00
Andre Puschmann cb15dee3d4 Merge branch 'embms_merge_final' into next 2018-05-23 21:25:37 +02:00
yagoda 54bdfd83ec adding support for mbsfn subframe configuration to pdsch examples 2018-05-22 16:03:25 +02:00
Ismael Gomez 4662b83fe9 Use bzero instead of {} for initializing structs 2018-05-22 15:14:03 +02:00
Andre Puschmann 61d525ea80 Merge branch 'next' into embms_merge_final 2018-05-22 10:39:05 +02:00
Andre Puschmann 234ec178b2 cleanup pdu.h 2018-05-22 10:28:50 +02:00
Ismael Gomez bad007cdd9 Increase/decrease nbytes counter inside mutexed queue 2018-05-21 23:24:55 +02:00
Ismael Gomez 467ba4e326 Average sampling offset estimate before adjusting timing to be more robust against EVA and ETU fading 2018-05-21 23:00:57 +02:00
yagoda 65f2747a8e removing mch handler in rlc, fixing embms autostart 2018-05-20 19:24:44 +02:00
yagoda d0cb214725 fixing sheduling issues and merge errors 2018-05-17 20:23:18 +02:00
yagoda 0ae22e0822 fixing scheduling issues for mbms 2018-05-17 20:20:20 +02:00
Andre Puschmann 9ca2b89282 fixing compile warnings 2018-05-17 17:27:44 +02:00
Andre Puschmann 9ce3be974a Merge branch 'next' into embms_merge_final 2018-05-15 22:32:56 +02:00
Andre Puschmann 2fb0dc62a0 refactor config for multicast RLC bearers 2018-05-15 22:23:21 +02:00
yagoda e4c3f0bc30 adding mbms-gw and mch generation tables 2018-05-15 17:27:10 +02:00
yagoda 49c3578f64 introducing embms support in common upper layer functions 2018-05-15 16:57:23 +02:00
yagoda ec918eab76 adding support for embms in common functions and interfaces 2018-05-15 16:50:57 +02:00
yagoda 9d7d6c9415 adding adaptations to the phy layer for mbms 2018-05-15 16:13:03 +02:00
Andre Puschmann a30ad8952c fix indent and simplify auth request packing 2018-05-15 12:40:29 +02:00
Andre Puschmann d0457211ad adding support for CHAP auth 2018-05-15 12:40:29 +02:00
Andre Puschmann 4dc2951d59 perform initial attach with ESM info transfer 2018-05-15 12:40:29 +02:00
Andre Puschmann 455d4491c5 make RES length variable when packing auth response 2018-05-15 12:40:29 +02:00
Andre Puschmann 3fe6dad323 adding hard SIM card support using PCSC 2018-05-15 12:40:29 +02:00
Andre Puschmann 51e093e611 Merge branch 'next' into rlc_updates 2018-05-11 15:55:03 +02:00
Ismael Gomez 040c33497d merged PR#189 and added check for non-empty queue in get size tail 2018-05-10 21:32:32 -05:00
Ismael Gomez 4515dd94ea Use blocking queue for RRC measurement fixes #193 2018-05-10 13:41:21 -05:00
Ismael Gomez 04609cd07d Check msg_queue size_tail_bytes existence of buffer 2018-05-10 13:41:17 -05:00
Ismael Gomez ba40a4de84 Add checks for when RLC TM queue is corrupted and reset it 2018-05-10 13:39:34 -05:00
Ismael Gomez f3f4528a2f Testing commit to force a Reestablishment 1s after CONNECT 2018-05-10 13:28:55 -05:00
Andre Puschmann 85028d2aed use pretty function name in buffer_pool debug 
- this avoids ambiguity between names, for example
  in reassemble_rx_sdus() for rlc_am an rlc_um
 2018-05-10 16:41:37 +02:00
Andre Puschmann 718a15608c dealloc SCH pdu in MAC instead of pdu_queue 
- this is basically e9fcb10c9e
  but with the counterpart in the eNB's MAC
 2018-05-10 16:36:55 +02:00
Andre Puschmann 595ed70cae Revert "Deallocate SCH pdu on demux instead of pdu_queue" 
This reverts commit e9fcb10c9e.
 2018-05-08 21:41:33 +02:00
Andre Puschmann 05696a5ca7 Merge branch 'next' into rlc_updates 2018-05-04 14:13:50 +02:00
Ismael Gomez e9fcb10c9e Deallocate SCH pdu on demux instead of pdu_queue 2018-05-02 12:15:23 +02:00
Ismael Gomez aa1724b8f3 Add missing-field-initializers flag and properly initialize structs 2018-04-29 17:55:19 +02:00
Joseph Giovatto ab1d9e98f3 Format and typelimit warnings (#169) 
* merge with origin 4fc7dbc3 8daa8346

* fixed whitespace diff

* added .gitignore

* added format warning flags to C_FLAGS
added typelimit check to C_FLAGS and CXX_CLAGS

* Revert "added format warning flags to C_FLAGS"

Apply to branch format_and_typelimt branch

This reverts commit bf7467e82ec7b056ad06dc50cc964fcce18be99b.

* check for format warnings to top level C_FLAGS
added typelimit warnings to top level C_FLAGS and CXX_FLAGS
beset effort attempt to remedy warnings
removed unused param names in hex_log baseclass methods due to multitude of unused-warnings
 2018-04-29 17:26:35 +02:00
Andre Puschmann 8fde56c582 unify rlc_am_stress test to allow also UM tests 2018-04-27 15:40:05 +02:00
Andre Puschmann a2f6166365 Merge branch 'next' into rlc_updates 2018-04-27 15:03:17 +02:00
Ismael Gomez 3ab74fb552 Exposed continuous TX mode to ue.conf 2018-04-27 10:23:38 +02:00
Ismael Gomez 3bf9ca6195 Send end of burst on idle 2018-04-26 17:33:21 +02:00
Ismael Gomez 785298e4c5 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-04-26 14:03:49 +02:00
Andre Puschmann d8bfd2713c initialize byte_buffer content in ctors 2018-04-26 13:20:34 +02:00
Ismael Gomez 62787bdd41 Remove unused include 2018-04-26 12:46:17 +02:00
Ismael Gomez b237d6063e Align header buffer to 8-byte boundary as expected by S1AP pack/unpack functions 2018-04-26 11:46:22 +02:00
Ismael Gomez 208871b251 Changed liblte structs to simple structs and initialized nas/rrc uses. 2018-04-25 18:01:37 +02:00
Ismael Gomez ab78eb6d58 Process BCCH from pdu_process thread. Process PCCH from new thread in RRC 2018-04-25 13:44:58 +02:00
Xavier Arteaga 0bc3be7abb Added DL CSI decoding to TM2 and TM3 2018-04-20 11:27:39 +02:00
Ismael Gomez 384e0f8649 Fixed UL interleaver (missing SIMD deinterleaver) 2018-04-17 19:16:55 +02:00
Ismael Gomez ffb8337be7 Merge branch 'next' into sync_states 2018-04-12 18:30:19 +02:00
Xavier Arteaga 15173c5c30 Added gaussian filter configuration options in srsue.conf 2018-04-10 13:25:26 +02:00
Xavier Arteaga d0d5893a1c New DL channel noise estimator based on RS 2018-04-10 13:25:26 +02:00
Ismael Gomez edd9cbf4dc Merge branch 'next' into sync_states 2018-04-10 09:35:21 +02:00
Andre Puschmann 27165b4fe2 Merge branch 'next' into rlc_updates 2018-04-05 12:39:31 +02:00
Andre Puschmann e7a268d79b fix SIMD compile issue on NEON 2018-04-04 12:20:32 +02:00
Andre Puschmann b298d3d3f9 add missing const keyword to log_filter's members 2018-04-04 11:19:52 +02:00
Andre Puschmann e76fe75c22 add missing const keyword to log_filter's members 2018-04-03 12:18:07 +02:00
Andre Puschmann 61a24cbd4a Merge branch 'next' into rlc_updates 2018-04-03 11:28:12 +02:00
Andre Puschmann dd76f85313 Merge branch 'master' into next 2018-04-03 11:07:17 +02:00
Joseph Giovatto 802f8b716f set msg and hex buf to const * 2018-04-03 10:50:48 +02:00
Joseph Giovatto 4e05266ea8 added printf format check for hex logs 2018-04-03 10:50:32 +02:00
Andre Puschmann 2dcd6695bc remove obsolete config.h 2018-04-03 10:49:49 +02:00
David Rupprecht 06d4559294 Change include path absolut to project dir 2018-04-01 18:08:24 +02:00
David Rupprecht 9d71bec7b6 Unified include guards 2018-03-31 19:04:04 +02:00
Andre Puschmann 4ea5fe6509 Merge branch 'next' into rlc_updates 2018-03-29 20:59:08 +02:00
Joseph Giovatto 49da57c8a1 Changed log methods to take string literal vs string object 
to allow for format checking and save on object copy.
Fixed log format specifier warnings.
 2018-03-29 16:59:19 +02:00
Andre Puschmann 4b90852170 add RLC AM FI field helpers 2018-03-28 17:07:10 +02:00
Andre Puschmann c93ea1dd10 Merge branch 'next' into rlc_updates 2018-03-28 17:00:17 +02:00
Andre Puschmann fffda82f1e increase size of bytebuffer to compensate header, add helper to get remaining size 2018-03-28 16:50:11 +02:00
Andre Puschmann e7c74fa0f7 add simple RLC PCAP writer 2018-03-28 10:45:59 +02:00
Andre Puschmann 7993385742 increase size of bytebuffer to compensate header, add helper to get remaining size 2018-03-28 10:45:59 +02:00
Pedro Alvarez 6e4720771f Merge branch 'next' into epc 2018-03-26 11:26:40 +01:00
Ismael Gomez b3be54b274 Attach and paging ok. Reselection on IDLE not working 2018-03-21 10:46:24 +01:00
Pedro Alvarez c8dafa5410 Merging next into guti attach branch 2018-03-20 17:33:59 +00:00
Ismael Gomez 28e12dbf7d Merge branch 'next' into sync_states 2018-03-20 14:36:31 +01:00
Andre Puschmann c5b423ffee fix subheader parsing 2018-03-19 14:38:27 +01:00
Ismael Gomez f88f465c97 Refactored NAS/RRC/PHY cell_search/selection procedures 2018-03-19 14:14:51 +01:00
Andre Puschmann 37e06d78ea fix build_mode printing in RelWithDebInfo mode 2018-03-19 13:22:50 +01:00
Ismael Gomez ef7b52045e Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-03-18 13:24:20 +01:00
Ismael Gomez 682ed433b2 Possible fix to #167 2018-03-18 13:24:09 +01:00
Ismael Gomez 321a750f56 Added features to ringbuffer 2018-03-16 11:23:37 +01:00
Ismael Gomez 86d4ce52e0 Make intra-frequency measurement period/length a parameter 2018-03-15 12:27:55 +01:00
Ismael Gomez 64cc34adb0 previous commit not working 2018-03-15 11:31:09 +01:00
Ismael Gomez d873eaca5c Assign same timer id after release (was not really a bug) 2018-03-15 11:14:22 +01:00
Ismael Gomez f9d770e50e Added option for Doppler frequency correction 2018-03-14 17:30:55 +01:00
Ismael Gomez 809c550ca2 Use RS power estimation for serving cell RSRP/SNR measurements. Use correlation of RS sequences for neighbour cell verification of Cell ID 2018-03-13 19:07:15 +01:00
Ismael Gomez c2098ad626 Removed unused sample offset correction 2018-03-13 18:52:21 +01:00
Andre Puschmann 5335f046ff dealloc mutex and cond in msg_queue 2018-03-08 22:04:58 +01:00
Andre Puschmann 43811e1886 deallocate used buffers in buffer_pool dtor 2018-03-08 22:04:58 +01:00
Andre Puschmann 9553784e2f change phy_log in UE to log_filter 2018-03-08 22:04:58 +01:00
Pedro Alvarez 2cc4959667 Adding release access bearers request. 2018-03-08 12:50:07 +00:00
Andre Puschmann 57e0c01fc4 check max buffer length in hex print 2018-03-07 21:23:57 +01:00
Pedro Alvarez e499fffe01 Starting to save GTP-C context in a map, to keep the GTP-C connection even when the NAS connection is released. 2018-03-07 14:58:08 +00:00
Ismael Gomez 3adc6b5cbc
Merge pull request #158 from softwareradiosystems/csi 
Csi
 2018-03-07 14:40:57 +01:00
Ismael Gomez be7dc37e7c Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-03-06 22:20:46 +01:00
Ismael Gomez 13efa740e8 Changed logic in RRC/NAS/PHY for cell/plmn search to avoid stucking in IDLE 2018-03-06 22:20:38 +01:00
Pedro Alvarez 5488609096 Resolving conflicts from merging next. Adding the functionality of echoing the attach type. 2018-03-06 16:54:32 +00:00
Andre Puschmann 853f774607 add threaded timeout test 2018-03-06 14:04:17 +01:00
Pedro Alvarez 406a1d01b6 Merge branch 'next' into guti_attach 2018-03-06 12:39:57 +00:00
Paul Sutton 57505725e0
Merge pull request #157 from softwareradiosystems/issue_154fix 
Issue 154fix
 2018-03-06 12:51:02 +01:00
Ismael Gomez dc65061dbb Print buffer pool status every 10s (Debugging commit) 2018-03-06 12:37:45 +01:00
Ismael Gomez 206e41a244 Disable buffer pool timestamps 2018-03-06 12:37:08 +01:00
Ismael Gomez 73602a8558 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-03-05 13:07:34 +01:00
Ismael Gomez 90553e830d Fixed cell search for non-home PLMN 2018-03-05 13:07:24 +01:00
Andre Puschmann 067d76a5c8 enable buffer pool log 2018-03-05 11:22:02 +01:00
Andre Puschmann c198547728 add new RF RX error type and make the UHD driver issue that if anything unexpected happens 2018-03-04 21:53:06 +01:00
Andre Puschmann a85288566b print summary about allocated buffers when buffer pool is full 2018-03-04 21:53:06 +01:00
Ismael Gomez 91664ef2be Do sell reselection on IDLE by phch_recv thread instead of worker 2018-03-04 11:55:58 +01:00
Ismael Gomez fd0c8168f0 Set to Continuous RX and TX 2018-03-02 20:59:17 +01:00
Xavier Arteaga ec901373d4 Correction ofo simd.h for AVX512 2018-03-01 14:01:36 +01:00
Xavier Arteaga 2a69211f32 SCH does not terminate all codeblocks if one fail. Also, SCH does not decode blocks with CRC=OK 2018-03-01 14:01:36 +01:00
Xavier Arteaga 8cabfa82cf Added CSI report enable option in SRS UE 2018-02-28 12:30:34 +01:00
Xavier Arteaga 6fc9c96c58 Added CSI softbits weightening for Single antenna transmission 2018-02-28 12:07:31 +01:00
Pedro Alvarez 669ef9816f Added packing of TMSI to mobile station identity IE. 2018-02-26 10:39:40 +00:00
Ismael Gomez cfaa5e9b28 Fix previous commit could not HO more than once due to not refreshing serving cell after 1st HO 2018-02-25 19:13:12 +01:00
Xavier Arteaga ff5ac85c7d Added int16 to float SIMD vector function 2018-02-21 14:51:09 +01:00
Ismael Gomez 9b1c8aa608 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-02-21 11:52:11 +01:00
Ismael Gomez 56df710d1f Add rx_gain_offset interface for RSRP calibration 2018-02-21 11:51:55 +01:00
Andre Puschmann 8b9bc15ffc Merge branch 'next' into rlc_fixes 2018-02-20 11:46:53 +01:00
Ismael Gomez f8303acba7 Fixed memory leak in logger_stdout 2018-02-17 21:37:48 +01:00
Andre Puschmann 1be93d4682 add RLC UM destructor 2018-02-16 21:32:21 +01:00
Andre Puschmann c5ffdfe8c7 set byte_buffer ptr to null after deallocating from pool 2018-02-16 21:31:11 +01:00
Andre Puschmann 75f42ac829 add RLC AM destructor 2018-02-16 12:40:07 +01:00
Andre Puschmann b2ce6ec9a9
Merge pull request #139 from mrlnc/apn_cfg 
Add APN to config and PDN connectivity request
 2018-02-16 09:43:20 +01:00
Ismael Gomez 2cf6f96f24 Fixes #6 AGC 2018-02-13 15:06:22 +01:00
Ismael Gomez 86818ad65f Fix compilations warnings and remove printf debugs 2018-02-09 17:36:44 +01:00
Pedro Alvarez cc9845ef07 Merging HSS resynch functionality from David Rupprecht. Resolving conflict in user_db.csv. 2018-02-09 15:04:22 +00:00
Andre Puschmann b3beb58edf Merge branch 'next' into rlc_am_ul_bug 2018-02-09 11:49:06 +01:00
Andre Puschmann ddfd114865 rlc_am: disable debug prints 2018-02-09 11:36:55 +01:00
Andre Puschmann bf26934e13 rlc_am: print error but don't exit on buffer allocation errors 2018-02-08 17:50:19 +01:00
Paul Sutton d1d6cea737 Adding debug helpers 2018-02-07 23:13:59 +00:00
Paul Sutton 60b059f3cc Adding RLC AM stress test 2018-02-07 21:59:50 +00:00
Xavier Arteaga 0c2f0ac038 Fixed srsue freq_offset compensation for UL 2018-02-07 18:36:06 +01:00
Andre Puschmann 705acec6b9 fix uninitialized variables in logger 2018-02-07 14:45:44 +01:00
Andre Puschmann 6142b66632 only print print buffer pool when it's empty 2018-02-05 15:10:05 +01:00
Ismael Gomez a279ab47f0 Improved neighbour cell accuracy. Changed RRC to avoid segfault when neighbour cell addition 2018-02-02 19:31:22 +01:00
Ismael Gomez 2347fe0e6f Fixed incorrect DCI location bug. Make all calls to regs/pdcch atomic w.r.t. the CFI 2018-02-02 16:27:11 +01:00
Andre Puschmann 8258c28a4c Revert "fix coverity issue in macro returning negative nof symbols per subframe" 
This reverts commit ed46abbad0.
 2018-02-01 15:53:09 +01:00
Andre Puschmann 32bc0e0ac2 disable buffer pool logging 2018-02-01 13:27:54 +01:00
Xavier Arteaga 99ef760b6f More Coverity fixes 2018-01-31 16:49:14 +01:00
Andre Puschmann dbe0fa6f4e calculate actual period for metrics logging 2018-01-31 13:28:45 +01:00
Andre Puschmann ed46abbad0 fix coverity issue in macro returning negative nof symbols per subframe 2018-01-31 12:17:05 +01:00
Xavier Arteaga c4247c7aca Fix coverity for complex 16bit 2018-01-31 10:44:52 +01:00
Xavier Arteaga 0299e9aae1 Fixed Aperiodic reporting RM31 for TM4 (Amarisoft proof) 2018-01-31 10:18:48 +01:00
Ismael Gomez 9b6e18d84f Lower srsENB priorities below UHD threads 2018-01-30 13:27:03 +01:00
Ismael Gomez 71a2ad8ea8 Catches RA PDCCH order in Format1A 2018-01-29 16:33:28 +01:00
David Rupprecht 5db5399b2f Added HSS sync support (not tested) 2018-01-29 16:12:36 +01:00
David Rupprecht 3ead643c64 Introducing epc interfaces for hss and srsepc namespace 2018-01-29 16:12:36 +01:00
Andre Puschmann bf45ba32bf inform all listeners about stop in metrics hub 2018-01-26 14:17:12 +01:00
Ismael Gomez 754566b28f Changed priorities to below UHD in srsUE 2018-01-25 15:02:11 +01:00
Ismael Gomez c0bbf6c5ae Removed PDCP thread 2018-01-25 15:01:57 +01:00
Merlin Chlosta fcedeb0278 Add APN to config and PDN connectivity request 2018-01-22 19:12:02 +01:00
Xavier Arteaga 0ba58d8d24 Fixed PUSCH retransmissions for non-RRC configured rnti 2018-01-19 16:31:32 +01:00
Pedro Alvarez 4b62c9cb06 Merge branch 'next' into epc. 2018-01-18 13:40:46 +00:00
Andre Puschmann 892ff2c36a add configuration for GW 2018-01-17 16:45:07 +01:00
Ismael Gomez 76969932dc
Merge pull request #134 from softwareradiosystems/enbmimo 
Enbmimo
 2018-01-17 11:03:34 +01:00
Ismael Gomez 0750ff3091 Option to not wrap when reading signal from file 2018-01-16 19:33:51 +01:00
Ismael Gomez 3be48c40c8 Added rotating log to srsUE and srsENB 2018-01-16 12:44:22 +01:00
Andre Puschmann 40a3290e36 initialize metrics object 2018-01-15 17:45:54 +01:00
Xavier Arteaga 57d443ace2 Merge branch 'next' into enbmimo 2018-01-15 13:56:50 +01:00
Pedro Alvarez be7cde7639 Merge branch 'next' into epc, to include RLC AM fix. 2018-01-12 15:44:53 +00:00
Andre Puschmann 74138071db move radio bearer definition to RRC 2018-01-12 14:57:38 +01:00
Xavier Arteaga 9ffdb1e62d Refactored PMI/CQI/RI reporting 2018-01-11 14:37:01 +01:00
Ismael Gomez c521739b51 Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2018-01-10 17:14:18 +01:00
Xavier Arteaga de654cd344 Merge branch 'next' into enbmimo 2018-01-10 16:30:36 +01:00
Ismael Gomez e16839d7a7 Merge branch 'next' into 16bit_avx_viterbi 2018-01-10 16:06:49 +01:00
Andre Puschmann 97448c0a1f fix uninitlized variable in logger and remove delegating ctor 2018-01-10 12:35:26 +01:00
yagoda d749ee66f4 introducing 16 bit viterbi support 2018-01-08 17:05:23 +00:00
Pedro Alvarez 042552491b Merging next into epc branch. 2018-01-08 14:45:13 +00:00
Xavier Arteaga a01c5ea08f Fixes #119: channel estimation subframe averaging 2018-01-08 12:05:31 +01:00
Ismael Gomez e4696fec38 Added ue location calculation for a particular L 2018-01-03 18:07:23 +01:00
Ismael Gomez be880e16f4 Do not include srslte.h in debug 2017-12-29 00:25:31 +01:00
Ismael Gomez a08c662028 Per-antenna SNR 2017-12-29 00:23:53 +01:00
Pedro Alvarez 8c9704ef3c Adding delete session request. 2017-12-21 18:48:31 +00:00
Ismael Gomez a799098784 Merge branch 'next' into merge_patch 2017-12-21 11:28:18 +01:00
Ismael Gomez c6ab02f3f4 Minor changes to logging 2017-12-21 11:26:05 +01:00
yagoda 318afbd8b4 minor fixes to phy logging 2017-12-20 15:15:27 +00:00
yagoda 23afd44a7d modifications to enable phy lib logging 2017-12-20 14:57:22 +00:00
Ismael Gomez 968a503d93 Fixed segfault in metrics hub 2017-12-20 14:12:20 +01:00
Ismael Gomez 33c35d575d Save last PHICH correlation 2017-12-20 13:47:49 +01:00
Ismael Gomez 821d5595c5 Fixed AVX compilation 2017-12-20 12:35:28 +01:00
Ismael Gomez ba7d4ca3a4 Added API to access port/ant chest values 2017-12-20 10:37:36 +01:00
Ismael Gomez dfda8edc04 Minor changes to log 2017-12-20 10:01:57 +01:00
Ismael Gomez 37ee5505e9 Removed unused log_line() functions. Added DCI info string 2017-12-19 21:25:55 +01:00
yagoda 1b1301101c adding support for phy(C level) logging to file 2017-12-18 19:04:47 +00:00
Ismael Gomez c54cb02efd Increased REF BW CFO loop 2017-12-18 16:35:21 +01:00
Ismael Gomez 6711387ad7 Disabled AGC for initial cell search. Copy CFO from search and disable CP based CFO after search to reduce overhead 2017-12-17 23:05:28 +01:00
Pedro Alvarez a4e1707835 Fixed bug in packing ESM information request. 2017-12-17 16:05:52 +00:00
Ismael Gomez 845fc87945 Added option to log_filter to customize time source 2017-12-17 11:01:50 +01:00
Ismael Gomez 9355cd5732 Improved CFO loop. Fixed issue with sinusoid tolerance 2017-12-16 12:46:29 +01:00
Xavier Arteaga ec254a9971 Merge branch 'next' of https://github.com/softwareradiosystems/srsLTE into enbmimo 2017-12-15 10:01:38 +01:00
Ismael Gomez 142ee30029 Merge branch 'next_novolk' into next 2017-12-13 10:28:08 +01:00
Pedro Alvarez c838758db2 Added downlink IP tunnel. Downlink user plane packets reach the UE. 2017-12-07 17:09:31 +00:00
Xavier Arteaga 4fec7799e2 Fixed Aperiodic RI reporting for TM1-2 2017-12-07 09:41:47 +01:00
Pedro Alvarez 04d67509cf Getting all information necessary at the SP-GW to setup the user tunnels from the modify bearer response. 2017-12-06 18:34:37 +00:00
Pedro Alvarez d972549124 Starting to create structure for modify bearer response 2017-12-06 12:50:25 +00:00
Xavier Arteaga f71240d845 Merge branch 'next' into enbmimo 2017-12-06 10:55:59 +01:00
Pedro Alvarez 9f994dba04 Starting to generate modify bearer request. Fixed bug in unpacking activate default bearer accept. 2017-12-05 17:21:46 +00:00
Ismael Gomez b0a2fa3b0b Merge branch 'enbmimo' into mob_crypto_mimo 2017-12-04 12:10:46 -06:00
Ismael Gomez e720568e82 Revert "Added UE Mode 3-1 aperiodic reporting" 
This reverts commit 0bd683b3c4.
 2017-12-04 12:08:02 -06:00
Ismael Gomez eefbdbc913 Revert "Added Aperiodic mode 3-1 in enb and some more optimizations" 
This reverts commit 8ab196901f.
 2017-12-04 12:07:49 -06:00
Xavier Arteaga 8ab196901f Added Aperiodic mode 3-1 in enb and some more optimizations 2017-12-04 12:01:05 -06:00
Xavier Arteaga 0bd683b3c4 Added UE Mode 3-1 aperiodic reporting 2017-12-04 11:58:23 -06:00
Ismael Gomez 48dfc08fa3 Fixed SIC for PSS using channel estimates, added option to disable it (not usable on synchronous same-site cells). Use PSS CE in SSS decoding 2017-12-03 22:13:07 -06:00
Ismael Gomez 5c31800ccb Fixed HO with ciphering 2017-12-02 22:43:35 +01:00
Ismael Gomez 9a255b477a Merge branch 'crypto' into mobility_crypto 2017-12-02 12:23:05 +01:00
Paul Sutton 1a323770c9 Added support for AS ciphering 2017-12-01 19:19:38 +00:00
Ismael Gomez c0e79477b5 Fixed cell reselection when radio-link failure 2017-12-01 14:05:54 +01:00
Ismael Gomez f1c6bcd252 Merge branch 'next' into mobility 2017-11-30 20:13:06 +01:00
Ismael Gomez dd8bacf466 Calibrated CFO loop default values 2017-11-30 20:01:35 +01:00
Paul Sutton 84724d2ab1 NAS-plane encryption working (thanks to David Rupprecht) 2017-11-30 17:09:12 +00:00
Pedro Alvarez f71c87d895 Starting to add attach accept and activate default bearer request NAS messages. 2017-11-30 17:06:56 +00:00
Ismael Gomez 46f15c19e6 Added subframe averaging option in chest_dl. Optional in pdsch_ue 2017-11-29 20:28:04 +01:00
Ismael Gomez a3a1d268b7 Improved CFO estimation/correction by filtering central 6 PRB. Cleaned ue_sync/sync/pss objects. Used const attr in vector and other objects 2017-11-29 18:30:21 +01:00
Pedro Alvarez 13595ccb2d Added logging to MME GTP-C. Fixed weird comment bug. 2017-11-29 16:34:14 +00:00
Ismael Gomez 2772471e41 Added filtering function to PSS 2017-11-29 12:00:10 +01:00
Ismael Gomez 2fd2f15157 Cell RS based CFO estimation 2017-11-29 12:00:05 +01:00
Ismael Gomez 15a1304395 Revert "Add noise reduction in PSS before estimating CFO" 
This reverts commit 0d7af88822.
 2017-11-28 16:20:40 +01:00
Ismael Gomez 0d7af88822 Add noise reduction in PSS before estimating CFO 2017-11-28 15:52:10 +01:00
Xavier Arteaga 854a77455d
Merge pull request #113 from softwareradiosystems/next_new_features 
adding simd xor functionality
 2017-11-28 11:24:15 +01:00
Pedro Alvarez 6cd055e80e Continuing to work on initial context setup request. 2017-11-27 19:13:34 +00:00
Ismael Gomez aacd9e1e5b Revert "Use CP-based CFO estimation only for DL and UL. Estimate every subframe. Calibrated EMA to 0.3 highest valid for low SNR" 
This reverts commit 6196c096af.
 2017-11-27 18:27:48 +01:00
Pedro Alvarez fd6baaf15c Changed S1AP to singleton. Continuing to work on the intial context setup request. Added a TEID to MME_UE_S1AP_ID map. 2017-11-27 15:38:10 +00:00
Ismael Gomez 3a0ab02264 S1/X2 handover tested and working 2017-11-27 13:57:05 +01:00
yagoda 38903de07c adding simd xor functionality 2017-11-27 11:10:50 +00:00
Ismael Gomez cfbea7a6c1 Restored non-guru DFT interface. Removed input buffer from ue_dl interface 2017-11-26 00:38:23 +01:00
Ismael Gomez 8447c965e3 Fixing RSRP measurements 2017-11-25 10:40:53 +01:00
Pedro Alvarez ee21a277e5 Added PAA information in the create session response. 2017-11-24 12:14:36 +00:00
Pedro Alvarez d76daf3db5 Added GTP-C cause value enum. 2017-11-24 11:36:49 +00:00
Ismael Gomez d428760b20 Merge branch 'next' into mobility 2017-11-24 12:02:41 +01:00
Ismael Gomez 408545dab8 X2 (constant NCC) working 2017-11-23 19:46:34 +01:00
Paul Sutton 4877c7ab07 Adding support for GUTI attach 2017-11-23 18:42:48 +00:00
Paul Sutton d9b9ae9454 Fix for GUTI pack bug, add support for integrity with attach req 2017-11-23 18:42:08 +00:00
Pedro Alvarez 2172662388 Added initial create session response structure. Compiling now. 2017-11-23 14:57:21 +00:00
Pedro Alvarez ff32f31c9b Added structures to create session request. Starting to add create session response structure 2017-11-23 12:45:30 +00:00
Andre Puschmann dc65e4243c print build info to log and on stdout 2017-11-23 13:25:40 +01:00
Ismael Gomez 053f5a619d Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next 2017-11-23 12:38:48 +01:00
Ismael Gomez 6196c096af Use CP-based CFO estimation only for DL and UL. Estimate every subframe. Calibrated EMA to 0.3 highest valid for low SNR 2017-11-23 12:36:16 +01:00
Pedro Alvarez e754c6cbf5 Fixed more compilation bugs. Bearer context IE still needs to be added. 2017-11-23 11:23:40 +00:00
Xavier Arteaga f377b12f91 Merge branch 'next' of https://github.com/softwareradiosystems/srsLTE into enbmimo 2017-11-22 18:17:48 +01:00
Xavier Arteaga dbf10cff17 Solved PDSCH Power Allocation p_b on eNB side 2017-11-22 18:01:13 +01:00
Xavier Arteaga 176dae270c Fixes #105. Added backtrace print in 'srsLTE.backtrace.crash' 2017-11-22 16:00:07 +01:00
Pedro Alvarez ccbeb9e1c5 Fixed a bunch of compilation errors. 2017-11-22 14:41:59 +00:00
Pedro Alvarez a8a370ec21 Starting to add Create Session Request function 2017-11-22 11:52:37 +00:00