summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-03-13 02:05:56 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2019-04-12 06:28:34 +0200
commitd3b84a24c568769b7da7b1ce5e434d81dd9c2882 (patch)
tree5ba164c7ec78b6dc9fa2513b16145459b33b2f24
parent21ff9ae4264de159784a59ce4421365007bde08d (diff)
Revert "skip simple-client default as/asp when saving VTY config"neels/conn_id
This reverts commit b59ebe9f220fed9655059a72832e51f1b04dcbe1.
-rw-r--r--include/osmocom/sigtran/osmo_ss7.h6
-rw-r--r--src/osmo_ss7_vty.c7
-rw-r--r--src/sccp_user.c2
3 files changed, 4 insertions, 11 deletions
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index f448ce7..1858ea0 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -301,9 +301,6 @@ struct osmo_ss7_as {
/*! Were we dynamically allocated by RKM? */
bool rkm_dyn_allocated;
- /*! Were we allocated by "simple client" support? */
- bool simple_client_allocated;
-
struct {
char *name;
char *description;
@@ -386,9 +383,6 @@ struct osmo_ss7_asp {
/*! Were we dynamically allocated */
bool dyn_allocated;
- /*! Were we allocated by "simple client" support? */
- bool simple_client_allocated;
-
/*! Pending message for non-blocking IPA read */
struct msgb *pending_msg;
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index cc53b05..af10ddf 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -679,8 +679,9 @@ DEFUN(show_cs7_asp, show_cs7_asp_cmd,
static void write_one_asp(struct vty *vty, struct osmo_ss7_asp *asp)
{
- /* skip any dynamically created ASPs (e.g. auto-created at connect time) */
- if (asp->dyn_allocated || asp->simple_client_allocated)
+ /* skip any dynamically created ASPs (auto-created at connect
+ * time) */
+ if (asp->dyn_allocated)
return;
vty_out(vty, " asp %s %u %u %s%s",
@@ -938,7 +939,7 @@ static void write_one_as(struct vty *vty, struct osmo_ss7_as *as)
unsigned int i;
/* skip any dynamically allocated AS definitions */
- if (as->rkm_dyn_allocated || as->simple_client_allocated)
+ if (as->rkm_dyn_allocated)
return;
vty_out(vty, " as %s %s%s", as->cfg.name,
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 63eba2a..079057c 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -527,7 +527,6 @@ osmo_sccp_simple_client_on_ss7_id(void *ctx, uint32_t ss7_id, const char *name,
goto out_ss7;
as_created = true;
as->cfg.routing_key.pc = ss7->cfg.primary_pc;
- as->simple_client_allocated = true;
}
LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name,
as->cfg.name);
@@ -576,7 +575,6 @@ osmo_sccp_simple_client_on_ss7_id(void *ctx, uint32_t ss7_id, const char *name,
asp->cfg.remote.host =
talloc_strdup(asp, default_remote_ip);
}
- asp->simple_client_allocated = true;
} else
talloc_free(asp_name);