williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AMPS/C-Netz: Correctly release pending transaction when creating a new one

Browse Source 
If transactions is created, look on all channels for pending transaction
with same subscriber.

1. Remove that transaction.

2. Make channel return to IDLE.

3. Release call, if callref exists.
This commit is contained in:
Andreas Eversberg
2017-05-26 07:27:30 +02:00
parent 6adfcf7466
commit 57d4d1739e
6 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cnetz/transaction.c
View File

@@ -23,6 +23,8 @@
#include "../common/sample.h"
#include "../common/debug.h"
#include "../common/timer.h"
#include "../common/call.h"
#include "../common/cause.h"
#include "cnetz.h"
#include "telegramm.h"
#include "database.h"
@@ -39,14 +41,28 @@ const char *transaction2rufnummer(transaction_t *trans)
/* create transaction */
transaction_t *create_transaction(cnetz_t *cnetz, uint32_t state, uint8_t futln_nat, uint8_t futln_fuvst, uint16_t futln_rest, int extended)
{
transaction_t *trans;
sender_t *sender;
transaction_t *trans = NULL;
cnetz_t *search_cnetz;
/* search transaction for this subsriber */
trans = search_transaction_number(cnetz, futln_nat, futln_fuvst, futln_rest);
for (sender = sender_head; sender; sender = sender->next) {
search_cnetz = (cnetz_t *) sender;
/* search transaction for this callref */
trans = search_transaction_number(search_cnetz, futln_nat, futln_fuvst, futln_rest);
if (trans)
break;
}
if (trans) {
const char *rufnummer = transaction2rufnummer(trans);
int old_callref = trans->callref;
cnetz_t *old_cnetz = trans->cnetz;
PDEBUG(DTRANS, DEBUG_NOTICE, "Found alredy pending transaction for subscriber '%s', deleting!\n", rufnummer);
destroy_transaction(trans);
if (old_cnetz) /* should be... */
cnetz_go_idle(old_cnetz);
if (old_callref)
call_in_release(old_callref, CAUSE_NORMAL);
}
trans = calloc(1, sizeof(*trans));