cellular-infrastructure
/
osmocom-analog
8
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

common code: Release MNCC call 30 seconds after listening to announcement

This commit is contained in:
Andreas Eversberg 2016-06-19 17:46:56 +02:00
parent b45b0c6bac
commit d851c37eac
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/call.c
View File

@ -24,12 +24,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>
#include "../common/debug.h" #include "debug.h"
#include "../common/sender.h" #include "sender.h"
#include "cause.h" #include "cause.h"
#include "call.h" #include "call.h"
#include "timer.h"
#include "mncc_sock.h" #include "mncc_sock.h"
#define DISC_TIMEOUT 30
extern int use_mncc_sock; extern int use_mncc_sock;
extern int send_patterns; extern int send_patterns;
@ -219,10 +222,14 @@ typedef struct process {
int audio_disconnected; /* if not associated with transceiver anymore */ int audio_disconnected; /* if not associated with transceiver anymore */
enum audio_pattern pattern; enum audio_pattern pattern;
int audio_pos; int audio_pos;
uint8_t cause;
struct timer timer;
} process_t; } process_t;
static process_t *process_head = NULL; static process_t *process_head = NULL;
static void process_timeout(struct timer *timer);
static void create_process(int callref, int state) static void create_process(int callref, int state)
{ {
process_t *process; process_t *process;
@ -232,6 +239,7 @@ static void create_process(int callref, int state)
PDEBUG(DCALL, DEBUG_ERROR, "No memory!\n"); PDEBUG(DCALL, DEBUG_ERROR, "No memory!\n");
abort(); abort();
} }
timer_init(&process->timer, process_timeout, process);
process->next = process_head; process->next = process_head;
process_head = process; process_head = process;
@ -247,6 +255,7 @@ static void destroy_process(int callref)
while (process) { while (process) {
if (process->callref == callref) { if (process->callref == callref) {
*process_p = process->next; *process_p = process->next;
timer_exit(&process->timer);
free(process); free(process);
return; return;
} }
@ -319,6 +328,8 @@ static void disconnect_process(int callref, int cause)
process->pattern = cause2pattern(cause); process->pattern = cause2pattern(cause);
process->audio_disconnected = 1; process->audio_disconnected = 1;
process->audio_pos = 0; process->audio_pos = 0;
process->cause = cause;
timer_start(&process->timer, DISC_TIMEOUT);
return; return;
} }
process = process->next; process = process->next;
@ -378,6 +389,28 @@ static void get_process_patterns(process_t *process, int16_t *samples, int lengt
process->audio_pos = pos; process->audio_pos = pos;
} }
static void process_timeout(struct timer *timer)
{
process_t *process = (process_t *)timer->priv;
{
/* announcement timeout */
uint8_t buf[sizeof(struct gsm_mncc)];
struct gsm_mncc *mncc = (struct gsm_mncc *)buf;
memset(buf, 0, sizeof(buf));
mncc->msg_type = MNCC_REL_IND;
mncc->callref = process->callref;
mncc->fields |= MNCC_F_CAUSE;
mncc->cause.location = 1; /* private local */
mncc->cause.value = process->cause;
destroy_process(process->callref);
PDEBUG(DMNCC, DEBUG_INFO, "Releasing MNCC call towards Network (after timeout)\n");
mncc_write(buf, sizeof(struct gsm_mncc));
}
}
int call_init(const char *station_id, const char *sounddev, int samplerate, int latency, int dial_digits, int loopback) int call_init(const char *station_id, const char *sounddev, int samplerate, int latency, int dial_digits, int loopback)
{ {
int rc = 0; int rc = 0;