<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16074">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix some typos<br><br>Fix typos and common misspellings in code comments and log messages.<br><br>Change-Id: Ie66b89065f2100c1d2125ce5a6c9b1d58df7c8ad<br>---<br>M doc/manuals/chapters/counters_generated.adoc<br>M doc/manuals/chapters/running.adoc<br>M doc/sequence_charts/msc_log_to_ladder.py<br>M include/osmocom/msc/gsm_data.h<br>M include/osmocom/msc/mncc.h<br>M include/osmocom/msc/msc_roles.h<br>M include/osmocom/msc/sgs_server.h<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/mncc_call.c<br>M src/libmsc/mncc_sock.c<br>M src/libmsc/msc_a.c<br>M src/libmsc/msc_vty.c<br>M src/libmsc/ran_msg_a.c<br>M src/libmsc/ran_peer.c<br>M src/libmsc/sgs_iface.c<br>M src/libmsc/smpp_openbsc.c<br>M src/libmsc/sms_queue.c<br>M src/libvlr/vlr.c<br>M src/libvlr/vlr_auth_fsm.c<br>M src/libvlr/vlr_lu_fsm.c<br>M src/libvlr/vlr_sgs.c<br>M src/libvlr/vlr_sgs_fsm.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>27 files changed, 50 insertions(+), 50 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc</span><br><span>index 1b40d8b..e2587e8 100644</span><br><span>--- a/doc/manuals/chapters/counters_generated.adoc</span><br><span>+++ b/doc/manuals/chapters/counters_generated.adoc</span><br><span>@@ -27,7 +27,7 @@</span><br><span> | sms:rp_err_other | <<msc_sms:rp_err_other>> | Other error of MS responses on a sms delive attempt.</span><br><span> | sms:deliver_unknown_error | <<msc_sms:deliver_unknown_error>> | Unknown error occurred during sms delivery.</span><br><span> | call:mo_setup | <<msc_call:mo_setup>> | Received setup requests from a MS to init a MO call.</span><br><span style="color: hsl(0, 100%, 40%);">-| call:mo_connect_ack | <<msc_call:mo_connect_ack>> | Received a connect ack from MS of a MO call. Call is now succesful connected up.</span><br><span style="color: hsl(120, 100%, 40%);">+| call:mo_connect_ack | <<msc_call:mo_connect_ack>> | Received a connect ack from MS of a MO call. Call is now successful connected up.</span><br><span> | call:mt_setup | <<msc_call:mt_setup>> | Sent setup requests to the MS (MT).</span><br><span> | call:mt_connect | <<msc_call:mt_connect>> | Sent a connect to the MS (MT).</span><br><span> | call:active | <<msc_call:active>> | Count total amount of calls that ever reached active state.</span><br><span>diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc</span><br><span>index 9d56f1f..71f336b 100644</span><br><span>--- a/doc/manuals/chapters/running.adoc</span><br><span>+++ b/doc/manuals/chapters/running.adoc</span><br><span>@@ -44,7 +44,7 @@</span><br><span> Same as option -M (deprecated).</span><br><span> *-C, --no-dbcounter*::</span><br><span> Deprecated. DB statistics and counter has been removed.</span><br><span style="color: hsl(0, 100%, 40%);">- This option is only valid for compatiblity and does nothing.</span><br><span style="color: hsl(120, 100%, 40%);">+ This option is only valid for compatibility and does nothing.</span><br><span> </span><br><span> </span><br><span> === Multiple instances</span><br><span>diff --git a/doc/sequence_charts/msc_log_to_ladder.py b/doc/sequence_charts/msc_log_to_ladder.py</span><br><span>index 1ceaeb6..30b6594 100755</span><br><span>--- a/doc/sequence_charts/msc_log_to_ladder.py</span><br><span>+++ b/doc/sequence_charts/msc_log_to_ladder.py</span><br><span>@@ -713,7 +713,7 @@</span><br><span> help='Pick output format: mscgen format or libosmocore/contrib/ladder_to_msc.py format')</span><br><span> parser.add_argument('-m', '--mask-values', dest='mask_values', action='store_true',</span><br><span> help='Do not output specific values like IP address, port, endpoint CI, instead just indicate that a value is'</span><br><span style="color: hsl(0, 100%, 40%);">- ' present. This makes the output reproducable across various logs.')</span><br><span style="color: hsl(120, 100%, 40%);">+ ' present. This makes the output reproducible across various logs.')</span><br><span> parser.add_argument('-s', '--start-with', dest='start_with_re', default=None,</span><br><span> help='Skip until the first message with this label (regex), e.g. -s "CC SETUP"')</span><br><span> </span><br><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 11b6e82..bcee213 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -83,7 +83,7 @@</span><br><span> [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Unknown error occurred during sms delivery."},</span><br><span> /* FIXME: count also sms delivered */</span><br><span> [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now successful connected up."},</span><br><span> [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."},</span><br><span> [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent a connect to the MS (MT)."},</span><br><span> [MSC_CTR_CALL_ACTIVE] = {"call:active", "Count total amount of calls that ever reached active state."},</span><br><span>diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h</span><br><span>index 28ee9b3..4414a8d 100644</span><br><span>--- a/include/osmocom/msc/mncc.h</span><br><span>+++ b/include/osmocom/msc/mncc.h</span><br><span>@@ -53,7 +53,7 @@</span><br><span> #define MNCC_SETUP_CNF 0x0104</span><br><span> #define MNCC_SETUP_COMPL_REQ 0x0105</span><br><span> #define MNCC_SETUP_COMPL_IND 0x0106</span><br><span style="color: hsl(0, 100%, 40%);">-/* MNCC_REJ_* is perfomed via MNCC_REL_* */</span><br><span style="color: hsl(120, 100%, 40%);">+/* MNCC_REJ_* is performed via MNCC_REL_* */</span><br><span> #define MNCC_CALL_CONF_IND 0x0107</span><br><span> #define MNCC_CALL_PROC_REQ 0x0108</span><br><span> #define MNCC_PROGRESS_REQ 0x0109</span><br><span>@@ -132,7 +132,7 @@</span><br><span> /* which fields are present */</span><br><span> uint32_t fields;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* data derived informations (MNCC_F_ based) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* data derived information (MNCC_F_ based) */</span><br><span> struct gsm_mncc_bearer_cap bearer_cap;</span><br><span> struct gsm_mncc_number called;</span><br><span> struct gsm_mncc_number calling;</span><br><span>diff --git a/include/osmocom/msc/msc_roles.h b/include/osmocom/msc/msc_roles.h</span><br><span>index b22bc7b..4957175 100644</span><br><span>--- a/include/osmocom/msc/msc_roles.h</span><br><span>+++ b/include/osmocom/msc/msc_roles.h</span><br><span>@@ -236,7 +236,7 @@</span><br><span> MSC_A_EV_FROM_T_SEND_END_SIGNAL_REQUEST,</span><br><span> </span><br><span> /* gsm_04_08.c has successfully received a valid Complete Layer 3 message, i.e. Location Updating, CM Service</span><br><span style="color: hsl(0, 100%, 40%);">- * Request, Paging Reponse or IMSI Detach. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * Request, Paging Response or IMSI Detach. */</span><br><span> MSC_A_EV_COMPLETE_LAYER_3_OK,</span><br><span> </span><br><span> /* Received a Classmark Update -- during GERAN ciphering, msc_a may have to wait for Classmark information to</span><br><span>diff --git a/include/osmocom/msc/sgs_server.h b/include/osmocom/msc/sgs_server.h</span><br><span>index a89022d..400bd9e 100644</span><br><span>--- a/include/osmocom/msc/sgs_server.h</span><br><span>+++ b/include/osmocom/msc/sgs_server.h</span><br><span>@@ -44,7 +44,7 @@</span><br><span> char vlr_name[SGS_VLR_NAME_MAXLEN];</span><br><span> /* timers on VLR side */</span><br><span> unsigned int timer[_NUM_SGS_STATE_TIMERS];</span><br><span style="color: hsl(0, 100%, 40%);">- /* countrs on VLR side */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* counters on VLR side */</span><br><span> unsigned int counter[_NUM_SGS_STATE_COUNTERS];</span><br><span> } cfg;</span><br><span> };</span><br><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index 52912eb..ee5a234 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> /* VLR subscriber authentication state */</span><br><span> enum vlr_subscr_auth_state {</span><br><span style="color: hsl(0, 100%, 40%);">- /* subscriber needs to be autenticated */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* subscriber needs to be authenticated */</span><br><span> VLR_SUB_AS_NEEDS_AUTH,</span><br><span> /* waiting for AuthInfo from HLR/AUC */</span><br><span> VLR_SUB_AS_NEEDS_AUTH_WAIT_AI,</span><br><span>@@ -66,7 +66,7 @@</span><br><span> VLR_ULA_E_SEND_ID_NACK, /* Result of Send-ID from PVLR */</span><br><span> VLR_ULA_E_AUTH_RES, /* Result of auth procedure */</span><br><span> VLR_ULA_E_CIPH_RES, /* Result of Ciphering Mode Command */</span><br><span style="color: hsl(0, 100%, 40%);">- VLR_ULA_E_ID_IMSI, /* IMSI recieved from MS */</span><br><span style="color: hsl(120, 100%, 40%);">+ VLR_ULA_E_ID_IMSI, /* IMSI received from MS */</span><br><span> VLR_ULA_E_ID_IMEI, /* IMEI received from MS */</span><br><span> VLR_ULA_E_ID_IMEISV, /* IMEISV received from MS */</span><br><span> VLR_ULA_E_HLR_IMEI_ACK, /* Check_IMEI_VLR result from HLR */</span><br><span>@@ -420,7 +420,7 @@</span><br><span> </span><br><span> void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Process Acccess Request FSM */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Process Access Request FSM */</span><br><span> </span><br><span> enum proc_arq_vlr_event {</span><br><span> PR_ARQ_E_START,</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 0bdc4fb..750c766 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -341,7 +341,7 @@</span><br><span> }</span><br><span> </span><br><span> /* TODO: 10.5.1.6 MS Classmark for UMTS / Classmark 2 */</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: 10.5.3.14 Aditional update parameters (CS fallback calls) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: 10.5.3.14 Additional update parameters (CS fallback calls) */</span><br><span> /* TODO: 10.5.7.8 Device properties */</span><br><span> /* TODO: 10.5.1.15 MS network feature support */</span><br><span> </span><br><span>@@ -676,7 +676,7 @@</span><br><span> /*</span><br><span> * Handle CM Service Requests</span><br><span> * a) Verify that the packet is long enough to contain the information</span><br><span style="color: hsl(0, 100%, 40%);">- * we require otherwsie reject with INCORRECT_MESSAGE</span><br><span style="color: hsl(120, 100%, 40%);">+ * we require otherwise reject with INCORRECT_MESSAGE</span><br><span> * b) Try to parse the TMSI. If we do not have one reject</span><br><span> * c) Check that we know the subscriber with the TMSI otherwise reject</span><br><span> * with a HLR cause</span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index 7e2d70b..4e604e5 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -280,7 +280,7 @@</span><br><span> mncc_set_cause(&rel, GSM48_CAUSE_LOC_PRN_S_LU, GSM48_CC_CAUSE_RESOURCE_UNAVAIL);</span><br><span> gsm48_cc_tx_release(trans, &rel);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Ressource unavailable */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Resource unavailable */</span><br><span> if (trans->cc.mncc_initiated)</span><br><span> mncc_release_ind(trans->net, trans, trans->callref,</span><br><span> GSM48_CAUSE_LOC_PRN_S_LU,</span><br><span>@@ -1922,7 +1922,7 @@</span><br><span> if (!trans) {</span><br><span> LOG_TRANS(trans, LOGL_ERROR, "No memory for trans.\n");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Ressource unavailable */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Resource unavailable */</span><br><span> mncc_release_ind(net, NULL, data->callref,</span><br><span> GSM48_CAUSE_LOC_PRN_S_LU,</span><br><span> GSM48_CC_CAUSE_RESOURCE_UNAVAIL);</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index 8a13cda..b696a67 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -265,7 +265,7 @@</span><br><span> </span><br><span> if (trans->msc_a) {</span><br><span> LOG_MSC_A_CAT(msc_a, DPAG, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Handle paging error: transaction already associated with subsciber,"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Handle paging error: transaction already associated with subscriber,"</span><br><span> " apparently it was already handled. Skip.\n");</span><br><span> return;</span><br><span> }</span><br><span>diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c</span><br><span>index 34c7299..e5fc820 100644</span><br><span>--- a/src/libmsc/mncc_call.c</span><br><span>+++ b/src/libmsc/mncc_call.c</span><br><span>@@ -192,7 +192,7 @@</span><br><span> </span><br><span> /* Disassociate the rtp_stream from this MNCC call instance, and clear the remote RTP IP:port info.</span><br><span> * When the MNCC FSM ends for any reason, it will release the RTP stream (which usually triggers complete tear down of</span><br><span style="color: hsl(0, 100%, 40%);">- * the call_leg and CC transaction). If the RTP stream should still remain in use, e.g. during Subseqent inter-MSC</span><br><span style="color: hsl(120, 100%, 40%);">+ * the call_leg and CC transaction). If the RTP stream should still remain in use, e.g. during Subsequent inter-MSC</span><br><span> * Handover where this MNCC was a forwarding to a remote MSC that is no longer needed, this function must be called</span><br><span> * before the MNCC FSM instance terminates. Call this *before* setting a new remote RTP address on the rtp_stream, since</span><br><span> * this clears the rtp_stream->remote ip:port information. */</span><br><span>diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c</span><br><span>index 0a4e99b..670d692 100644</span><br><span>--- a/src/libmsc/mncc_sock.c</span><br><span>+++ b/src/libmsc/mncc_sock.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span> state->listen_bfd.when |= BSC_FD_READ;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* release all exisitng calls */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* release all existing calls */</span><br><span> gsm0408_clear_all_trans(state->net, TRANS_CC);</span><br><span> </span><br><span> /* flush the queue */</span><br><span>diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c</span><br><span>index 3c316ea..0b07fbc 100644</span><br><span>--- a/src/libmsc/msc_a.c</span><br><span>+++ b/src/libmsc/msc_a.c</span><br><span>@@ -1323,7 +1323,7 @@</span><br><span> dst = &vsub->classmark;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MSC_A(msc_a, LOGL_DEBUG, "A5 capabilities recived from Classmark Update: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A(msc_a, LOGL_DEBUG, "A5 capabilities received from Classmark Update: %s\n",</span><br><span> osmo_gsm48_classmark_a5_name(classmark));</span><br><span> osmo_gsm48_classmark_update(dst, classmark);</span><br><span> </span><br><span>@@ -1643,7 +1643,7 @@</span><br><span> MSC_EV_CALL_LEG_RTP_COMPLETE);</span><br><span> OSMO_ASSERT(cl);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* HACK: We put the connection in loopback mode at the beginnig to</span><br><span style="color: hsl(120, 100%, 40%);">+ /* HACK: We put the connection in loopback mode at the beginning to</span><br><span> * trick the hNodeB into doing the IuUP negotiation with itself.</span><br><span> * This is a hack we need because osmo-mgw does not support IuUP yet, see OS#2459. */</span><br><span> if (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU)</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 51504ef..f833585 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -1929,7 +1929,7 @@</span><br><span> {</span><br><span> if (vty->type != VTY_FILE) {</span><br><span> vty_out(vty, "The IPA name cannot be changed at run-time; "</span><br><span style="color: hsl(0, 100%, 40%);">- "It can only be set in the configuraton file.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ "It can only be set in the configuration file.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c</span><br><span>index 59789b0..cb228ef 100644</span><br><span>--- a/src/libmsc/ran_msg_a.c</span><br><span>+++ b/src/libmsc/ran_msg_a.c</span><br><span>@@ -514,7 +514,7 @@</span><br><span> int i;</span><br><span> if (gsm0808_dec_encrypt_info(&encr_info, ie_encryption_information->val, ie_encryption_information->len)</span><br><span> <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Failed to decode Encryption Informaiton IE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Failed to decode Encryption Information IE\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -524,7 +524,7 @@</span><br><span> }</span><br><span> </span><br><span> if (encr_info.key_len > sizeof(geran_encr.key)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Failed to decode Encryption Informaiton IE:"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Failed to decode Encryption Information IE:"</span><br><span> " encryption key is too long: %u\n", geran_encr.key_len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c</span><br><span>index 77740a0..da88873 100644</span><br><span>--- a/src/libmsc/ran_peer.c</span><br><span>+++ b/src/libmsc/ran_peer.c</span><br><span>@@ -650,7 +650,7 @@</span><br><span> </span><br><span> switch (page_where) {</span><br><span> case CELL_IDENT_NO_CELL:</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_SCCP_RAN_CAT(sri, DPAG, LOGL_ERROR, "Asked to page on NO_CELL, wich doesn't make sense.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_SCCP_RAN_CAT(sri, DPAG, LOGL_ERROR, "Asked to page on NO_CELL, which doesn't make sense.\n");</span><br><span> return 0;</span><br><span> </span><br><span> case CELL_IDENT_UTRAN_PLMN_LAC_RNC:</span><br><span>diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c</span><br><span>index 5ccded7..422ce72 100644</span><br><span>--- a/src/libmsc/sgs_iface.c</span><br><span>+++ b/src/libmsc/sgs_iface.c</span><br><span>@@ -336,7 +336,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Comfortable status message generator that also generates some basic</span><br><span style="color: hsl(0, 100%, 40%);">- * context-dependent dependand log output */</span><br><span style="color: hsl(120, 100%, 40%);">+ * context-dependent log output */</span><br><span> static int sgs_tx_status(struct sgs_connection *sgc, const char *imsi, enum sgsap_sgs_cause cause, struct msgb *msg,</span><br><span> int sgsap_iei)</span><br><span> {</span><br><span>@@ -352,7 +352,7 @@</span><br><span> LOGSGC_VSUB(sgc, subscr_info(imsi), LOGL_ERROR, "Rx %s with invalid mandatory %s IEI!\n",</span><br><span> sgsap_msg_type_name(msg->data[0]), sgsap_iei_name(sgsap_iei));</span><br><span> } else if (cause == SGSAP_SGS_CAUSE_COND_IE_ERROR) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSGC_VSUB(sgc, subscr_info(imsi), LOGL_ERROR, "Rx %s with errornous conditional %s IEI!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSGC_VSUB(sgc, subscr_info(imsi), LOGL_ERROR, "Rx %s with erroneous conditional %s IEI!\n",</span><br><span> sgsap_msg_type_name(msg->data[0]), sgsap_iei_name(sgsap_iei));</span><br><span> } else {</span><br><span> LOGSGC_VSUB(sgc, subscr_info(imsi), LOGL_ERROR, "Rx %s failed with cause %s at %s IEI!\n",</span><br><span>@@ -860,7 +860,7 @@</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span> /* If we do not find an existing connection and allocating a new one</span><br><span style="color: hsl(0, 100%, 40%);">- * faild, give up and return status. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * failed, give up and return status. */</span><br><span> if (!msc_a)</span><br><span> return sgs_tx_status(sgc, imsi, SGSAP_SGS_CAUSE_MSG_INCOMP_STATE, msg, 0);</span><br><span> </span><br><span>@@ -1278,7 +1278,7 @@</span><br><span> sgs_tx(mme->conn, msg_sgs);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! initalize SGs new interface</span><br><span style="color: hsl(120, 100%, 40%);">+/*! initialize SGs new interface</span><br><span> * \param[in] ctx talloc context</span><br><span> * \param[in] network associated gsm network</span><br><span> * \returns returns allocated sgs_stae, NULL in case of error. */</span><br><span>diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c</span><br><span>index e4c3891..98b3b53 100644</span><br><span>--- a/src/libmsc/smpp_openbsc.c</span><br><span>+++ b/src/libmsc/smpp_openbsc.c</span><br><span>@@ -319,7 +319,7 @@</span><br><span> </span><br><span> llist_for_each_entry(esme, &smsc->esme_list, list) {</span><br><span> /* we currently send an alert notification to each ESME that is</span><br><span style="color: hsl(0, 100%, 40%);">- * connected, and do not require a (non-existant) delivery</span><br><span style="color: hsl(120, 100%, 40%);">+ * connected, and do not require a (non-existent) delivery</span><br><span> * pending flag to be set before. */</span><br><span> if (!esme->bind_flags) {</span><br><span> LOGP(DSMPP, LOGL_DEBUG,</span><br><span>@@ -367,7 +367,7 @@</span><br><span> * to the ESME */</span><br><span> case S_SMS_UNKNOWN_ERROR:</span><br><span> if (sms->smpp.transaction_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Send back the SUBMIT-SM response with apropriate error */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send back the SUBMIT-SM response with appropriate error */</span><br><span> LOGP(DLSMS, LOGL_INFO, "SMPP SUBMIT-SM: Error\n");</span><br><span> rc = smpp_tx_submit_r(sms->smpp.esme,</span><br><span> sms->smpp.sequence_nr,</span><br><span>diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c</span><br><span>index d60cb4a..c00a8c6 100644</span><br><span>--- a/src/libmsc/sms_queue.c</span><br><span>+++ b/src/libmsc/sms_queue.c</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* SMS queue to continously attempt to deliver SMS */</span><br><span style="color: hsl(120, 100%, 40%);">+/* SMS queue to continuously attempt to deliver SMS */</span><br><span> /*</span><br><span> * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span> * All Rights Reserved</span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index ca6f90d..0f9c991 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -360,7 +360,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Find subscriber by IMSI, or create new subscriber if not found.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] vlr VLR instace.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] vlr VLR instance.</span><br><span> * \param[in] imsi IMSI string.</span><br><span> * \param[out] created if non-NULL, returns whether a new entry was created. */</span><br><span> struct vlr_subscr *_vlr_subscr_find_or_create_by_imsi(struct vlr_instance *vlr,</span><br><span>@@ -390,7 +390,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Find subscriber by TMSI, or create new subscriber if not found.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] vlr VLR instace.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] vlr VLR instance.</span><br><span> * \param[in] tmsi TMSI.</span><br><span> * \param[out] created if non-NULL, returns whether a new entry was created. */</span><br><span> struct vlr_subscr *_vlr_subscr_find_or_create_by_tmsi(struct vlr_instance *vlr,</span><br><span>@@ -730,7 +730,7 @@</span><br><span> </span><br><span> if (key_seq >= ARRAY_SIZE(vsub->auth_tuples)) {</span><br><span> LOGVSUBP(LOGL_NOTICE, vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- "Skipping auth tuple wih invalid cksn %zu\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Skipping auth tuple with invalid cksn %zu\n",</span><br><span> key_seq);</span><br><span> continue;</span><br><span> }</span><br><span>diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c</span><br><span>index 036c3d7..dcdf584 100644</span><br><span>--- a/src/libvlr/vlr_auth_fsm.c</span><br><span>+++ b/src/libvlr/vlr_auth_fsm.c</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Osmocom Visitor Location Register (VLR) Autentication FSM */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Osmocom Visitor Location Register (VLR) Authentication FSM */</span><br><span> </span><br><span> /* (C) 2016 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span>diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c</span><br><span>index 2db5711..e4d40f0 100644</span><br><span>--- a/src/libvlr/vlr_lu_fsm.c</span><br><span>+++ b/src/libvlr/vlr_lu_fsm.c</span><br><span>@@ -688,7 +688,7 @@</span><br><span> static bool lai_in_this_vlr(struct vlr_instance *vlr,</span><br><span> const struct osmo_location_area_id *lai)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: VLR needs to keep a locally configued list of LAIs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: VLR needs to keep a locally configured list of LAIs */</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c</span><br><span>index 452de2c..269dda6 100644</span><br><span>--- a/src/libvlr/vlr_sgs.c</span><br><span>+++ b/src/libvlr/vlr_sgs.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> };</span><br><span> </span><br><span> /* Reset all SGs-Associations back to zero.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] vlr VLR instace. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] vlr VLR instance. */</span><br><span> void vlr_sgs_reset(struct vlr_instance *vlr)</span><br><span> {</span><br><span> struct vlr_subscr *vsub;</span><br><span>@@ -59,11 +59,11 @@</span><br><span> }</span><br><span> </span><br><span> /*! Perform an SGs location update.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] vlr VLR instace.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] vlr VLR instance.</span><br><span> * \param[in] cfg SGs interface configuration parameters.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] response_cb calback function that is called when LU is done.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] paging_cb calback function that is called when LU needs to page.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] mminfo_cb calback function that is called to provide MM info to the UE.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] response_cb callback function that is called when LU is done.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] paging_cb callback function that is called when LU needs to page.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] mminfo_cb callback function that is called to provide MM info to the UE.</span><br><span> * \param[in] mme_name fqdn of the requesting MME (mme-name).</span><br><span> * \param[in] type location update type (normal or IMSI attach).</span><br><span> * \param[in] imsi mobile identity (IMSI).</span><br><span>@@ -299,7 +299,7 @@</span><br><span> {</span><br><span> struct vlr_subscr *vsub = arg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 3GPP TS 29.118 does not specify a specif action that has to happen</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 29.118 does not specify a specific action that has to happen</span><br><span> * in case Ts5 times out. The timeout just indicates that the paging</span><br><span> * failed. Other actions may check the status of Ts5 to see if a paging</span><br><span> * is still ongoing or not. */</span><br><span>@@ -327,7 +327,7 @@</span><br><span> /* Note: 3GPP TS 29.118, chapter 4.2.2 mentions paging in the FSM</span><br><span> * diagram, but paging never causes a state transition except when</span><br><span> * an explicit failure is indicated (MME actively rejects paging).</span><br><span style="color: hsl(0, 100%, 40%);">- * Apparantly it is also possible that an LU happens while the paging</span><br><span style="color: hsl(120, 100%, 40%);">+ * Apparently it is also possible that an LU happens while the paging</span><br><span> * is still ongoing and Ts5 is running. (chapter 5.1.2.3). This means</span><br><span> * that the paging procedure is intended to run in parallel to the</span><br><span> * SGs FSM and given that the benaviour around Ts5 must be implemented</span><br><span>diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c</span><br><span>index 49ad09a..a131b7e 100644</span><br><span>--- a/src/libvlr/vlr_sgs_fsm.c</span><br><span>+++ b/src/libvlr/vlr_sgs_fsm.c</span><br><span>@@ -54,7 +54,7 @@</span><br><span> struct vlr_subscr *vsub = fi->priv;</span><br><span> osmo_fsm_inst_state_chg(fi, SGS_UE_ST_NULL, 0, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Note: This is only relevent for cases where we are in the middle</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note: This is only relevant for cases where we are in the middle</span><br><span> * of an TMSI reallocation procedure. Should a failure of some sort</span><br><span> * put us to NULL state, we have to free the pending TMSI */</span><br><span> vsub->tmsi_new = GSM_RESERVED_TMSI;</span><br><span>@@ -156,7 +156,7 @@</span><br><span> /* Check if we expect a TMSI REALLOCATION COMPLETE message from the MME</span><br><span> * by checking the tmsi_new flag. If this flag is not GSM_RESERVED_TMSI</span><br><span> * we know that we have a TMSI pending and need to wait for the MME</span><br><span style="color: hsl(0, 100%, 40%);">- * to acknowlege first */</span><br><span style="color: hsl(120, 100%, 40%);">+ * to acknowledge first */</span><br><span> if (vsub->tmsi_new != GSM_RESERVED_TMSI) {</span><br><span> osmo_fsm_inst_state_chg(fi, SGS_UE_ST_ASSOCIATED, vsub->sgs.cfg.timer[SGS_STATE_TS6_2],</span><br><span> SGS_STATE_TS6_2);</span><br><span>@@ -355,7 +355,7 @@</span><br><span> .event_names = sgs_ue_fsm_event_names,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Initalize/Register SGs FSM in osmo-fsm subsystem */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Initialize/Register SGs FSM in osmo-fsm subsystem */</span><br><span> void vlr_sgs_fsm_init(void)</span><br><span> {</span><br><span> if (osmo_fsm_find_by_name(sgs_ue_fsm.name) != &sgs_ue_fsm)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>index 155afbe..9026241 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>@@ -1267,7 +1267,7 @@</span><br><span> }</span><br><span> </span><br><span> /* During CM Service Request or Paging Response we already have Classmark 2 that indicates A5/3</span><br><span style="color: hsl(0, 100%, 40%);">- * availablity. Here, in a hacky way remove the knowledge of Classmark 2 to tickle a code path where</span><br><span style="color: hsl(120, 100%, 40%);">+ * availability. Here, in a hacky way remove the knowledge of Classmark 2 to tickle a code path where</span><br><span> * proc_arq_fsm needs a Classmark Update during Ciphering. Shouldn't happen in reality though. */</span><br><span> static void test_cm_service_needs_classmark_update()</span><br><span> {</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>index e3949e9..96a5303 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>@@ -2995,7 +2995,7 @@</span><br><span> lu_result_sent == 0</span><br><span> - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3</span><br><span> DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: RAN decode: CLASSMARK_UPDATE</span><br><span style="color: hsl(0, 100%, 40%);">-DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities recived from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span style="color: hsl(120, 100%, 40%);">+DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities received from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: Received Event MSC_A_EV_CLASSMARK_UPDATE</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: state_chg to MSC_A_ST_AUTH_CIPH</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: CIPHER_MODE_COMMAND on GERAN-A</span><br><span>@@ -3639,7 +3639,7 @@</span><br><span> lu_result_sent == 0</span><br><span> - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3</span><br><span> DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: RAN decode: CLASSMARK_UPDATE</span><br><span style="color: hsl(0, 100%, 40%);">-DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities recived from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span style="color: hsl(120, 100%, 40%);">+DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities received from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: Received Event MSC_A_EV_CLASSMARK_UPDATE</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: state_chg to MSC_A_ST_AUTH_CIPH</span><br><span> DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN encode: CIPHER_MODE_COMMAND on GERAN-A</span><br><span>@@ -3990,7 +3990,7 @@</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: - rx_from_ms: now used by 1 (paging-response)</span><br><span> - BSC sends back a BSSMAP Classmark Update, that triggers the Ciphering Mode Command in A5/3</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: RAN decode: CLASSMARK_UPDATE</span><br><span style="color: hsl(0, 100%, 40%);">-DBSSAP msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities recived from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span style="color: hsl(120, 100%, 40%);">+DBSSAP msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: A5 capabilities received from Classmark Update: no-cm1 no-cm2 no-cm3</span><br><span> DMSC msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: Received Event MSC_A_EV_CLASSMARK_UPDATE</span><br><span> DMSC msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_WAIT_CLASSMARK_UPDATE}: state_chg to MSC_A_ST_AUTH_CIPH</span><br><span> DMSC msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:PAGING_RESP){MSC_A_ST_AUTH_CIPH}: RAN encode: CIPHER_MODE_COMMAND on GERAN-A</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16074">change 16074</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/+/16074"/><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: Ie66b89065f2100c1d2125ce5a6c9b1d58df7c8ad </div>
<div style="display:none"> Gerrit-Change-Number: 16074 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: roox <mardnh@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>