Hello Harald Welte, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/4603
to look at the new patch set (#2).
change default config filename to osmo-sgsn.cfg, not osmo_sgsn.cfg
All other Osmocom programs I know of have a default config file using a dash.
Comply.
Be backwards compatible: when a legacy osmo_sgsn.cfg exists but no
osmo-sgsn.cfg, use the old config file instead. (Verified to work by manual
tests.)
Change-Id: If804da17a7481e79e000fe40ae0d9c4be9722e61
---
M src/gprs/sgsn_main.c
1 file changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/03/4603/2
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index e48d8d1..8cd68ff 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -85,8 +85,11 @@
"This is free software: you are free to change and redistribute it.\r\n"
"There is NO WARRANTY, to the extent permitted by law.\r\n";
+#define CONFIG_FILE_DEFAULT "osmo-sgsn.cfg"
+#define CONFIG_FILE_LEGACY "osmo_sgsn.cfg"
+
static struct sgsn_instance sgsn_inst = {
- .config_file = "osmo_sgsn.cfg",
+ .config_file = NULL,
.cfg = {
.gtp_statedir = "./",
.auth_policy = SGSN_AUTH_POLICY_CLOSED,
@@ -216,7 +219,7 @@
printf(" -D --daemonize\tFork the process into a background daemon\n");
printf(" -d option --debug\tenable Debugging\n");
printf(" -s --disable-color\n");
- printf(" -c --config-file\tThe config file to use [%s]\n",
sgsn->config_file);
+ printf(" -c --config-file\tThe config file to use [%s]\n",
CONFIG_FILE_DEFAULT);
printf(" -e --log-level number\tSet a global log level\n");
}
@@ -356,6 +359,12 @@
int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum
ranap_iu_event_type type, void *data);
#endif
+static bool file_exists(const char *path)
+{
+ struct stat sb;
+ return stat(path, &sb) ? false : true;
+}
+
int main(int argc, char **argv)
{
struct ctrl_handle *ctrl;
@@ -392,6 +401,21 @@
handle_options(argc, argv);
+ /* Backwards compatibility: for years, the default config file name was
+ * osmo_sgsn.cfg. All other Osmocom programs use osmo-*.cfg with a
+ * dash. To be able to use the new config file name without breaking
+ * previous setups that might rely on the legacy default config file
+ * name, we need to look for the old config file if no -c option was
+ * passed AND no file exists with the new default file name. */
+ if (!sgsn_inst.config_file) {
+ /* No -c option was passed */
+ if (file_exists(CONFIG_FILE_LEGACY)
+ && !file_exists(CONFIG_FILE_DEFAULT))
+ sgsn_inst.config_file = CONFIG_FILE_LEGACY;
+ else
+ sgsn_inst.config_file = CONFIG_FILE_DEFAULT;
+ }
+
rate_ctr_init(tall_bsc_ctx);
gprs_ns_set_log_ss(DNS);
--
To view, visit https://gerrit.osmocom.org/4603
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If804da17a7481e79e000fe40ae0d9c4be9722e61
Gerrit-PatchSet: 2
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
