pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42221?usp=email )
Change subject: tcap: Use osmo_asn1_tcap_set_talloc_ctx() to set app talloc ctx ......................................................................
tcap: Use osmo_asn1_tcap_set_talloc_ctx() to set app talloc ctx
Change-Id: I9c1abc040fdeb58cb97e9b99a2382f336146bc40 --- M TODO-RELEASE M src/ss7_vty.c M src/tcap_as_loadshare_vty.c M src/tcap_as_loadshare_vty.h 4 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/21/42221/1
diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..43bef24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-asn1-tcap >0.2.1 osmo_asn1_tcap_set_talloc_ctx() diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 56633f3..63c0dce 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -1564,7 +1564,7 @@ vty_init_shared(ctx);
#ifdef WITH_TCAP_LOADSHARING - tcap_as_vty_init(); + tcap_as_vty_init(ctx); #endif /* WITH_TCAP_LOADSHARING */ install_node(&rtable_node, NULL); install_lib_element(L_CS7_NODE, &cs7_route_table_cmd); diff --git a/src/tcap_as_loadshare_vty.c b/src/tcap_as_loadshare_vty.c index e6506e8..2ac69d0 100644 --- a/src/tcap_as_loadshare_vty.c +++ b/src/tcap_as_loadshare_vty.c @@ -27,7 +27,7 @@
#include <osmocom/core/hashtable.h>
-#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/tcap/tcap.h>
#include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> @@ -35,6 +35,7 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/misc.h>
+#include <osmocom/sigtran/osmo_ss7.h> #include "ss7_as.h" #include "ss7_asp.h" #include "ss7_vty.h" @@ -125,8 +126,10 @@ return CMD_SUCCESS; }
-void tcap_as_vty_init(void) +void tcap_as_vty_init(void *ctx) { + osmo_asn1_tcap_set_talloc_ctx(ctx); + install_lib_element_ve(&show_cs7_as_name_tcapranges_cmd); install_lib_element_ve(&show_cs7_as_name_tcapranges_tid_cmd); } diff --git a/src/tcap_as_loadshare_vty.h b/src/tcap_as_loadshare_vty.h index cecd26f..dfb2d65 100644 --- a/src/tcap_as_loadshare_vty.h +++ b/src/tcap_as_loadshare_vty.h @@ -4,4 +4,4 @@ struct osmo_ss7_instance;
/* Register tcap vty commands */ -void tcap_as_vty_init(void); +void tcap_as_vty_init(void *ctx);