Change in osmo-bts[master]: fixup: vty: call bts_model_vty_init() from bts_vty_init()

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Mon Nov 2 22:55:23 UTC 2020


fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21027 )

Change subject: fixup: vty: call bts_model_vty_init() from bts_vty_init()
......................................................................

fixup: vty: call bts_model_vty_init() from bts_vty_init()

Now bts_model_vty_init() must be called only once, otherwise the
process would crash when bts_model_init() is called from main().

Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9
Related: SYS#4937, OS#3036
---
M src/osmo-bts-litecell15/main.c
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/main.c
M src/osmo-bts-trx/main.c
M src/osmo-bts-virtual/main.c
6 files changed, 0 insertions(+), 12 deletions(-)

Approvals:
  dexter: Looks good to me, approved; Verified
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c
index e29efd5..985d7db 100644
--- a/src/osmo-bts-litecell15/main.c
+++ b/src/osmo-bts-litecell15/main.c
@@ -112,8 +112,6 @@
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 
diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index 9b0ebec..12c489f 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -113,8 +113,6 @@
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 4dc399e..f69a535 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -781,8 +781,6 @@
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 9befcda..2057a05 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -80,8 +80,6 @@
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index 166af7e..021c3c7 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -147,8 +147,6 @@
 
 	bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index e5b7206..e5e44ed 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -70,8 +70,6 @@
 	osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);
 	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
 
-	bts_model_vty_init(bts);
-
 	return 0;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21027
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9
Gerrit-Change-Number: 21027
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201102/3d1b0bed/attachment.htm>


More information about the gerrit-log mailing list