[S] Change in osmocom-bb[master]: layer23: Call telnet_exit() during app exit if VTY support is enabled

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32431 ) Change subject: layer23: Call telnet_exit() during app exit if VTY support is enabled ...................................................................... layer23: Call telnet_exit() during app exit if VTY support is enabled Change-Id: Ic8540c73b1b13134e11f254beb6a16f7e4452317 --- M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 3 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/32431/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 567b2e0..a4b9441 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -186,6 +186,9 @@ if (l23_app_exit) rc = l23_app_exit(); + if (l23_app_info.opt_supported & L23_OPT_VTY) + telnet_exit(); + if (rc != -EBUSY) exit (0); } diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index d91425b..119e9e4 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -481,8 +481,6 @@ osmo_gps_close(); - telnet_exit(); - return 0; } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 11ffd95..71a16c1 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -339,7 +339,12 @@ osmo_select_main(0); } - l23_app_exit(); + if (l23_app_exit) + rc = l23_app_exit(); + + if (l23_app_info.opt_supported & L23_OPT_VTY) + telnet_exit(); + log_fini(); talloc_free(config_file); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic8540c73b1b13134e11f254beb6a16f7e4452317 Gerrit-Change-Number: 32431 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange