<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/15059">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">doc/sequence_charts: fix naming of mncc_fsm to mncc_call<br><br>mncc_fsm.[hc] were renamed to mncc_call.[hc] during patch review, which failed<br>to carry through to this sequence chart.<br><br>Also fix the MNCC_ST_* to MNCC_CALL_ST_* and MNCC_EV_* to MNCC_CALL_EV_*.<br><br>Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203<br>---<br>M doc/sequence_charts/Makefile.am<br>R doc/sequence_charts/mncc_call_fsm.msc<br>2 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/sequence_charts/Makefile.am b/doc/sequence_charts/Makefile.am</span><br><span>index b667a6f..f1775c8 100644</span><br><span>--- a/doc/sequence_charts/Makefile.am</span><br><span>+++ b/doc/sequence_charts/Makefile.am</span><br><span>@@ -6,17 +6,17 @@</span><br><span> EXTRA_DIST = \</span><br><span> inter_bsc_ho.msc \</span><br><span> inter_msc_ho.msc \</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_fsm.msc \</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_call_fsm.msc \</span><br><span> $(NULL)</span><br><span> </span><br><span> CLEANFILES = \</span><br><span> inter_bsc_ho.png \</span><br><span> inter_msc_ho.png \</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_fsm.png \</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_call_fsm.png \</span><br><span> $(NULL)</span><br><span> </span><br><span> msc: \</span><br><span style="color: hsl(0, 100%, 40%);">- $(builddir)/mncc_fsm.png \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(builddir)/mncc_call_fsm.png \</span><br><span> $(builddir)/inter_bsc_ho.png \</span><br><span> $(builddir)/inter_msc_ho.png \</span><br><span> $(NULL)</span><br><span>diff --git a/doc/sequence_charts/mncc_fsm.msc b/doc/sequence_charts/mncc_call_fsm.msc</span><br><span>similarity index 77%</span><br><span>rename from doc/sequence_charts/mncc_fsm.msc</span><br><span>rename to doc/sequence_charts/mncc_call_fsm.msc</span><br><span>index 45a77ca..4a14ff7 100644</span><br><span>--- a/doc/sequence_charts/mncc_fsm.msc</span><br><span>+++ b/doc/sequence_charts/mncc_call_fsm.msc</span><br><span>@@ -1,15 +1,15 @@</span><br><span> msc {</span><br><span> hscale=3;</span><br><span style="color: hsl(0, 100%, 40%);">- msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_fsm.c)"], msc2[label="osmo-msc"];</span><br><span style="color: hsl(120, 100%, 40%);">+ msc1[label="osmo-msc"], mncc1[label="MNCC FSM\n(osmo-msc mncc_call.c)"], sipcon1[label="osmo-sip-connector"], sip[label="PBX"], sipcon2[label="osmo-sip-connector"], mncc2[label="MNCC FSM\n(osmo-msc mncc_call.c)"], msc2[label="osmo-msc"];</span><br><span> </span><br><span> msc1 note sipcon1 [label="MO call"];</span><br><span> sipcon2 note msc2 [label="MT call"];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mncc1 abox mncc1 [label="MNCC_ST_NOT_STARTED"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc1 abox mncc1 [label="MNCC_CALL_ST_NOT_STARTED"];</span><br><span> msc1 rbox msc1 [label="mncc_outgoing_start()"];</span><br><span style="color: hsl(0, 100%, 40%);">- msc1 -> mncc1 [label="MNCC_EV_OUTGOING_START"];</span><br><span style="color: hsl(120, 100%, 40%);">+ msc1 -> mncc1 [label="MNCC_CALL_EV_OUTGOING_START"];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_PROCEEDING"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_PROCEEDING"];</span><br><span> mncc1 => sipcon1 [label="MNCC_SETUP_IND</span><br><span> \n callref, IMSI, called and calling number, SDP"];</span><br><span> sipcon1 => sip [label="SIP INVITE</span><br><span>@@ -22,7 +22,7 @@</span><br><span> \n callref, RTP IP address and port"];</span><br><span> mncc1 <= sipcon1 [label="MNCC_CALL_PROC_REQ</span><br><span> \n callref, RTP IP address and port"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc1 abox mncc1 [label="MNCC_ST_OUTGOING_WAIT_COMPLETE"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc1 abox mncc1 [label="MNCC_CALL_ST_OUTGOING_WAIT_COMPLETE"];</span><br><span> </span><br><span> sip => sipcon2 [label="SIP INVITE</span><br><span> \n from, to, SDP"];</span><br><span>@@ -30,10 +30,10 @@</span><br><span> msc2 <= sipcon2 [label="MNCC_SETUP_REQ</span><br><span> \n callref, called and calling number</span><br><span> \n SDP"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc2 abox mncc2 [label="MNCC_ST_NOT_STARTED"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc2 abox mncc2 [label="MNCC_CALL_ST_NOT_STARTED"];</span><br><span> msc2 rbox msc2 [label="mncc_incoming_start()"];</span><br><span style="color: hsl(0, 100%, 40%);">- msc2 -> mncc2 [label="MNCC_EV_INCOMING_START"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc2 abox mncc2 [label="MNCC_ST_INCOMING_WAIT_COMPLETE"];</span><br><span style="color: hsl(120, 100%, 40%);">+ msc2 -> mncc2 [label="MNCC_CALL_EV_INCOMING_START"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc2 abox mncc2 [label="MNCC_CALL_ST_INCOMING_WAIT_COMPLETE"];</span><br><span> mncc2 => sipcon2 [label="MNCC_CALL_CONF_IND</span><br><span> \n callref, bearer capabilities, cccap and IMSI, SDP?"];</span><br><span> mncc2 <= sipcon2 [label="MNCC_RTP_CREATE</span><br><span>@@ -67,14 +67,14 @@</span><br><span> mncc2 rbox mncc2 [label="mncc_rx_rtp_connect()"];</span><br><span> mncc2 <= sipcon2 [label="MNCC_SETUP_COMPL_REQ</span><br><span> \n callref"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc2 abox mncc2 [label="MNCC_ST_TALKING"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc2 abox mncc2 [label="MNCC_CALL_ST_TALKING"];</span><br><span> </span><br><span> sipcon1 <= sip [label="SIP 200 OK INVITE"];</span><br><span> mncc1 <= sipcon1 [label="MNCC_SETUP_RSP</span><br><span> \n callref"];</span><br><span> mncc1 => sipcon1 [label="MNCC_SETUP_COMPL_IND</span><br><span> \n callref"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc1 abox mncc1 [label="MNCC_ST_TALKING"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc1 abox mncc1 [label="MNCC_CALL_ST_TALKING"];</span><br><span> sipcon1 => sip [label="SIP ACK"];</span><br><span> </span><br><span> ...;</span><br><span>@@ -84,7 +84,7 @@</span><br><span> mncc1 rbox mncc1 [label="mncc_release()"];</span><br><span> mncc1 => sipcon1 [label="MNCC_DISC_IND</span><br><span> \n callref and cause"];</span><br><span style="color: hsl(0, 100%, 40%);">- mncc1 abox mncc1 [label="MNCC_ST_WAIT_RELEASE_ACK"];</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc1 abox mncc1 [label="MNCC_CALL_ST_WAIT_RELEASE_ACK"];</span><br><span> sipcon1 => sip [label="SIP BYE"];</span><br><span> sipcon1 <= sip [label="SIP 200 OK"];</span><br><span> mncc1 <= sipcon1 [label="MNCC_REL_REQ</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/15059">change 15059</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-msc/+/15059"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I03ee1b43ab95dca3c43fdb9e92dc158aad5a4203 </div>
<div style="display:none"> Gerrit-Change-Number: 15059 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>