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

Replaced MNCC by OSMO-CC

Browse Source
This commit is contained in:
Andreas Eversberg
2020-08-09 14:27:56 +02:00
parent d0d14e2acf
commit 2cb2d5f3ac
65 changed files with 740 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fuvst/Makefile.am
View File

@@ -17,6 +17,7 @@ fuvst_LDADD = \
$(top_builddir)/src/liboptions/liboptions.a \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libosmocc/libosmocc.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
@@ -29,7 +30,6 @@ fuvst_LDADD = \
$(top_builddir)/src/libmtp/libmtp.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsample/libsample.a \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libg711/libg711.a \
@@ -43,6 +43,7 @@ fuvst_sniffer_LDADD = \
$(top_builddir)/src/liboptions/liboptions.a \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libosmocc/libosmocc.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
@@ -55,7 +56,6 @@ fuvst_sniffer_LDADD = \
$(top_builddir)/src/libmtp/libmtp.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsample/libsample.a \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libg711/libg711.a \

20
src/fuvst/fuvst.c
View File

@@ -37,8 +37,9 @@
#include "../libsample/sample.h"
#include "../libdebug/debug.h"
#include "../libmobile/call.h"
#include "../libmncc/cause.h"
#include "../libmobile/cause.h"
#include "../libtimer/timer.h"
#include "../libosmocc/message.h"
#include "fuvst.h"
/* digital loopback test */
@@ -367,10 +368,6 @@ static void add_db(uint8_t futln_nat, uint8_t futln_fuvst, uint16_t futln_rest,
* transactions
*/
/* Call reference for calls from mobile station to network
This offset of 0x400000000 is required for MNCC interface. */
static int new_callref = 0x40000000;
/* Release timeout */
#define RELEASE_TO 3.0
@@ -982,19 +979,8 @@ outgoing:
message_send(ident, opcode, data, len);
/* no callref == outgoing call */
if (!trans->callref) {
int rc;
PDEBUG(DCNETZ, DEBUG_INFO, "Setup call to network. (Ident = %d, FuTln=%s, number=%s)\n", ident, transaction2rufnummer(trans), trans->number);
trans->callref = trans->old_callref = ++new_callref;
rc = call_up_setup(trans->callref, transaction2rufnummer(trans), trans->number);
/* rejected by network, release towards BS */
if (rc < 0) {
len = encode_aau(&opcode, &data, Q, 0, cnetz_cause2futln(-rc));
message_send(ident, opcode, data, len);
trans->callref = 0;
PDEBUG(DCNETZ, DEBUG_NOTICE, "Call rejected (cause %d), releasing.\n", -rc);
destroy_transaction(trans);
break;
}
trans->callref = trans->old_callref = call_up_setup(transaction2rufnummer(trans), trans->number, OSMO_CC_NETWORK_CNETZ_NONE, "");
} else {
PDEBUG(DCNETZ, DEBUG_NOTICE, "Call to mobile is alerting.\n");
new_call_state(trans, STATE_MT_ALERTING);

2
src/fuvst/main.c
View File

@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
printf("Using Speech Channel: SPK-%s\n", kanal[i]);
}
main_mobile(&quit, latency, interval, NULL, station_id, 7);
main_mobile("fuvst", &quit, latency, interval, NULL, station_id, 7);
fail:
/* destroy transceiver instance */

2
src/fuvst/sniffer.c
View File

@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
goto fail;
}
main_mobile(&quit, latency, interval, NULL, NULL, 0);
main_mobile(NULL, &quit, latency, interval, NULL, NULL, 0);
fail:
/* destroy transceiver instance */