pespin submitted this change.

View Change



3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified
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(-)

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 54f0e6d..e7caed2 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 change 32431. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ic8540c73b1b13134e11f254beb6a16f7e4452317
Gerrit-Change-Number: 32431
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged