[PATCH] osmo-bsc[master]: HO: clearly mark conn penalty timer member for hodec2

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/6495

HO: clearly mark conn penalty timer member for hodec2

The conn's penalty timers will be used only for handover decision 2, make it
clear by a sub-struct.

hodec2 will also initialize the penalty timer list on demand only, so no need
to always initialize.

Change-Id: Ie6c2bc2b10dc424dfd94a9e11a9a62f51c48aa10
---
M include/osmocom/bsc/gsm_data.h
M src/libbsc/bsc_api.c
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/6495/1

diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 8bfb859..eedc7ad 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -111,7 +111,10 @@
 	struct llist_head ho_dtap_cache;
 	unsigned int ho_dtap_cache_len;
 
-	struct penalty_timers *ho_penalty_timers;
+	struct {
+		int failures;
+		struct penalty_timers *penalty_timers;
+	} hodec2;
 
 	/* "Codec List (MSC Preferred)" as received by the BSSAP Assignment Request. 3GPP 48.008
 	 * 3.2.2.103 says:
diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c
index 2cb5b10..183c789 100644
--- a/src/libbsc/bsc_api.c
+++ b/src/libbsc/bsc_api.c
@@ -277,7 +277,6 @@
 	conn->lchan = lchan;
 	lchan->conn = conn;
 	INIT_LLIST_HEAD(&conn->ho_dtap_cache);
-	conn->ho_penalty_timers = penalty_timers_init(conn);
 	llist_add_tail(&conn->entry, &net->subscr_conns);
 	return conn;
 }
@@ -351,7 +350,7 @@
 	/* drop pending messages */
 	ho_dtap_cache_flush(conn, 0);
 
-	penalty_timers_free(&conn->ho_penalty_timers);
+	penalty_timers_free(&conn->hodec2.penalty_timers);
 
 	llist_del(&conn->entry);
 	talloc_free(conn);

-- 
To view, visit https://gerrit.osmocom.org/6495
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6c2bc2b10dc424dfd94a9e11a9a62f51c48aa10
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>