diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-20 02:57:56 +0100 |
|---|---|---|
| committer | gsmevent admin <admin@gsmevent.box> | 2018-12-24 15:45:51 +0100 |
| commit | 37944691dedf82c3efe79d8a7aa813db67a4896c (patch) | |
| tree | 155c306d0ecdd6702763a91a46bfd06a4db27555 /tests | |
| parent | c1c4a1320602ce121246e09a399122529c6d9ebc (diff) | |
remove code dup: add msc_mgcp_try_call_assignment()
Various places in the code check a flag whether assignment was started and
launch it. To fix incoming-call-during-ongoing-call, I will tweak that logic.
To be able to do that only in one place, remove code dup.
Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and
I0ba216b737909e92080a722db26e3577726c63cb/
Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore: LOGPFSMSL)
Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/msc_vlr/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/msc_vlr/msc_vlr_tests.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index bdb8f44a8..8a5e719f6 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -32,7 +32,7 @@ AM_LDFLAGS = \ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=osmo_get_rand_id \ -Wl,--wrap=msc_mgcp_call_release \ - -Wl,--wrap=msc_mgcp_call_assignment \ + -Wl,--wrap=msc_mgcp_try_call_assignment \ -Wl,--wrap=a_iface_tx_cipher_mode \ -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ -Wl,--wrap=osmo_sccp_tx_data_msg \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 8ae559e83..de7600c52 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -652,9 +652,9 @@ int __wrap_a_iface_tx_clear_cmd(struct ran_conn *conn) return 0; } -/* override, requires '-Wl,--wrap=msc_mgcp_call_assignment' */ -int __real_msc_mgcp_call_assignment(struct gsm_trans *trans); -int __wrap_msc_mgcp_call_assignment(struct gsm_trans *trans) +/* override, requires '-Wl,--wrap=msc_mgcp_try_call_assignment' */ +int __real_msc_mgcp_try_call_assignment(struct gsm_trans *trans); +int __wrap_msc_mgcp_try_call_assignment(struct gsm_trans *trans) { log("MS <--Call Assignment-- MSC: subscr=%s callref=0x%x", vlr_subscr_name(trans->vsub), trans->callref); |