From 6ecdaf6c016be838e45735b9622ee67db0e41d8a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 7 Mar 2020 15:56:08 +0100 Subject: [PATCH] mncc_mt_loadgen: Don't call GsmCallFsm() with rtp_bridge=True rtp_bridge=True triggers the automatic transmission of a MNCC_RTP_CREATE when that call goes into ACTIVE state. We don't want this in the case of mncc_mt_loadgen, as we perform this at a much sooner point in time. Change-Id: I8816ccb8c7dce2958496c81a95f1a91bc33e772b --- gsm_call_fsm.py | 4 ---- mncc_mt_loadgen.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py index c8bcf39..5f846e1 100644 --- a/gsm_call_fsm.py +++ b/gsm_call_fsm.py @@ -228,8 +228,6 @@ class GsmCallFsm(pykka.ThreadingActor): # RTP def _do_mncc_rtp_create_ind(self, mncc_msg): - if self.rtp_bridge == False: - raise Exception('GsmCallFsm', 'rtp_create_ind but not in RTP bridge mode') self.rtp = mncc_msg # notify the call controller about this self.ctrl_ref.tell({'type':'rtp_create_ind', 'called':self.called, 'rtp':self.rtp}) @@ -336,8 +334,6 @@ class GsmCallConnector(pykka.ThreadingActor): def rtp_created(self, msisdn, rtp): log.info('CallConnector:rtp_created(%s) %s' % (msisdn, rtp)) - if self.rtp_bridge == False: - raise Exception('GsmCallConnector', 'rtp_created but not in RTP bridge mode') if msisdn == self.msisdn_a: # A->B leg self.rtp_a = rtp elif msisdn == self.msisdn_b: # B->A leg diff --git a/mncc_mt_loadgen.py b/mncc_mt_loadgen.py index a4c0c85..021d619 100755 --- a/mncc_mt_loadgen.py +++ b/mncc_mt_loadgen.py @@ -103,7 +103,7 @@ class MTCallRtpsource(pykka.ThreadingActor): self.mncc_act = mncc_act self.ctrl_act = ctrl_act self.codecs_permitted = codecs_permitted - self.call = GsmCallFsm.start(self.mncc_act, self.actor_ref, True, self.codecs_permitted) + self.call = GsmCallFsm.start(self.mncc_act, self.actor_ref, False, self.codecs_permitted) self.callref = self.call.ask({'type':'get_callref'}) self.state = 'NULL' self.rtp_msc = None