Change in osmo-msc[master]: transaction: accept trans_type enum in trans_log_subsys()

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun May 26 09:27:23 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13974 )

Change subject: transaction: accept trans_type enum in trans_log_subsys()
......................................................................

transaction: accept trans_type enum in trans_log_subsys()

Change-Id: I3c373d20ebd6e96ebd57f84b74dc15a6b69c03ac
---
M include/osmocom/msc/transaction.h
M src/libmsc/transaction.c
2 files changed, 6 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h
index ba609ea..69cd652 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -159,11 +159,9 @@
 struct gsm_trans *trans_has_conn(const struct msc_a *msc_a);
 void trans_conn_closed(const struct msc_a *msc_a);
 
-static inline int trans_log_subsys(const struct gsm_trans *trans)
+static inline int trans_log_subsys(enum trans_type type)
 {
-	if (!trans)
-		return DMSC;
-	switch (trans->type) {
+	switch (type) {
 	case TRANS_CC:
 	case TRANS_SILENT_CALL:
 		return DCC;
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index d6f8c3b..ebdaced 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -127,11 +127,12 @@
 			      enum trans_type type, uint8_t trans_id,
 			      uint32_t callref)
 {
-	struct gsm_trans *trans = NULL; /* (NULL for LOG_TRANS() before allocation) */
+	int subsys = trans_log_subsys(type);
+	struct gsm_trans *trans;
 
 	/* a valid subscriber is indispensable */
 	if (vsub == NULL) {
-		LOG_TRANS(trans, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n");
+		LOGP(subsys, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n");
 		return NULL;
 	}
 
@@ -142,11 +143,11 @@
 	*trans = (struct gsm_trans){
 		.vsub = vsub,
 		.type = type,
+		.log_subsys = subsys,
 		.transaction_id = trans_id,
 		.callref = callref,
 		.net = net,
 	};
-	trans->log_subsys = trans_log_subsys(trans);
 	vlr_subscr_get(vsub, trans_vsub_use(type));
 	llist_add_tail(&trans->entry, &net->trans_list);
 

-- 
To view, visit https://gerrit.osmocom.org/13974
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c373d20ebd6e96ebd57f84b74dc15a6b69c03ac
Gerrit-Change-Number: 13974
Gerrit-PatchSet: 6
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Assignee: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190526/3696ad73/attachment.html>


More information about the gerrit-log mailing list