PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code style: Use { } even in 1-line if

This commit is contained in:
Ismael Gomez 2018-06-04 18:38:18 +02:00
parent 95690a56ec
commit 67e90d5a9b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srslte/common/timers.h
View File

@ -143,7 +143,7 @@ public:
used_timers[i] = false; used_timers[i] = false;
nof_used_timers--; nof_used_timers--;
} else { } else {
fprintf(stderr, "Error releasing timer: nof_used_timers=%d, nof_timers=%d\n", nof_used_timers, nof_timers); fprintf(stderr, "Error releasing timer id=%d: nof_used_timers=%d, nof_timers=%d\n", i, nof_used_timers, nof_timers);
} }
} }
uint32_t get_unique_id() { uint32_t get_unique_id() {

16
srsenb/src/upper/gtpu.cc
View File

@ -207,8 +207,9 @@ void gtpu::stop()
{ {
if (run_enable) { if (run_enable) {
run_enable = false; run_enable = false;
if(mch_run_enable) if(mch_run_enable) {
mch_run_enable = false; mch_run_enable = false;
}
// Wait thread to exit gracefully otherwise might leave a mutex locked // Wait thread to exit gracefully otherwise might leave a mutex locked
int cnt=0; int cnt=0;
@ -218,8 +219,9 @@ void gtpu::stop()
} }
if (running) { if (running) {
thread_cancel(); thread_cancel();
if(mch_running) if(mch_running) {
pthread_cancel(mch_thread); pthread_cancel(mch_thread);
}
} }
wait_thread_finish(); wait_thread_finish();
pthread_join(mch_thread, NULL); pthread_join(mch_thread, NULL);
@ -255,11 +257,11 @@ void gtpu::write_pdu(uint16_t rnti, uint32_t lcid, srslte::byte_buffer_t* pdu)
} }
pool->deallocate(pdu); pool->deallocate(pdu);
} }
// gtpu_interface_rrc // gtpu_interface_rrc
void gtpu::add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in) void gtpu::add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in)
{ {
// Allocate a TEID for the incoming tunnel // Allocate a TEID for the incoming tunnel
rntilcid_to_teidin(rnti, lcid, teid_in); rntilcid_to_teidin(rnti, lcid, teid_in);
//gtpu_log->info("Adding bearer for rnti: 0x%x, lcid: %d, addr: 0x%x, teid_out: 0x%x, teid_in: 0x%x\n", rnti, lcid, addr, teid_out, *teid_in); //gtpu_log->info("Adding bearer for rnti: 0x%x, lcid: %d, addr: 0x%x, teid_out: 0x%x, teid_in: 0x%x\n", rnti, lcid, addr, teid_out, *teid_in);