pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39679?usp=email )

Change subject: Drop use of deprecated vty is_config_node() cb ......................................................................

Drop use of deprecated vty is_config_node() cb

This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0).

See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e.

Change-Id: Ib0d0079c76a18b09cde6ef3f22dda618ff5fbc98 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M stp/stp_main.c 3 files changed, 5 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/79/39679/1

diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 51c1cbd..66cbfe6 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -354,4 +354,6 @@ void osmo_ss7_vty_init_asp(void *ctx); void osmo_ss7_vty_init_sg(void *ctx); int osmo_ss7_vty_go_parent(struct vty *vty); -int osmo_ss7_is_config_node(struct vty *vty, int node); +int osmo_ss7_is_config_node(struct vty *vty, int node) + OSMO_DEPRECATED("Implicit parent node tracking has replaced the use of this callback. " + "This callback is no longer called, ever, and can be left NULL."); diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 8365db2..f76a69e 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -3042,6 +3042,8 @@ return 0; }

+/* This is no longer used. The libosmocore callback was deprecated is not ever called since. + * libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). */ int osmo_ss7_is_config_node(struct vty *vty, int node) { switch (node) { diff --git a/stp/stp_main.c b/stp/stp_main.c index d630032..2d31ef0 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -73,7 +73,6 @@ .copyright = stp_copyright, .version = PACKAGE_VERSION, .go_parent_cb = osmo_ss7_vty_go_parent, - .is_config_node = osmo_ss7_is_config_node, };

static struct {