Skip to content

Commit

Permalink
tm: updated to the new mod interface
Browse files Browse the repository at this point in the history
  • Loading branch information
@miconda @linuxmaniac
miconda authored and linuxmaniac committed Sep 28, 2018
1 parent 00aca06 commit 2833262
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 93 deletions.
3 changes: 1 addition & 2 deletions src/modules/tm/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#
# tm module makefile
#
#
#
# WARNING: do not run this directly, it should be run by the master Makefile

include ../../Makefile.defs
auto_gen=
NAME=tm.so
LIBS=
DEFS+= -DSER_MOD_INTERFACE

ifeq ($(INSTALL_FLAVOUR),kamailio)
DEFS+= -DWITH_EVENT_LOCAL_REQUEST
Expand Down
180 changes: 89 additions & 91 deletions src/modules/tm/tm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,188 +234,188 @@ str tm_event_callback = STR_NULL;
static int fixup_t_check_status(void** param, int param_no);

static cmd_export_t cmds[]={
{"t_newtran", w_t_newtran, 0, 0,
{"t_newtran", w_t_newtran, 0, 0, 0,
REQUEST_ROUTE},
{"t_lookup_request", w_t_check, 0, 0,
{"t_lookup_request", w_t_check, 0, 0, 0,
REQUEST_ROUTE},
{"t_lookup_cancel", w_t_lookup_cancel, 0, 0,
{"t_lookup_cancel", w_t_lookup_cancel, 0, 0, 0,
REQUEST_ROUTE},
{"t_lookup_cancel", w_t_lookup_cancel, 1, fixup_int_1,
{"t_lookup_cancel", w_t_lookup_cancel, 1, fixup_int_1, 0,
REQUEST_ROUTE},
{"t_reply", w_t_reply, 2, fixup_t_reply,
{"t_reply", w_t_reply, 2, fixup_t_reply, 0,
REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE },
{"t_send_reply", w_t_send_reply, 2, fixup_t_reply,
{"t_send_reply", w_t_send_reply, 2, fixup_t_reply, 0,
REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE },
{"t_retransmit_reply", w_t_retransmit_reply, 0, 0,
{"t_retransmit_reply", w_t_retransmit_reply, 0, 0, 0,
REQUEST_ROUTE},
{"t_release", w_t_release, 0, 0,
{"t_release", w_t_release, 0, 0, 0,
REQUEST_ROUTE},
{"t_relay_to_udp", w_t_relay_to_udp, 2, fixup_hostport2proxy,
{"t_relay_to_udp", w_t_relay_to_udp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
{"t_relay_to_udp", w_t_relay_to_udp_uri, 0, 0,
{"t_relay_to_udp", w_t_relay_to_udp_uri, 0, 0, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
#ifdef USE_TCP
{"t_relay_to_tcp", w_t_relay_to_tcp, 2, fixup_hostport2proxy,
{"t_relay_to_tcp", w_t_relay_to_tcp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
{"t_relay_to_tcp", w_t_relay_to_tcp_uri, 0, 0,
{"t_relay_to_tcp", w_t_relay_to_tcp_uri, 0, 0, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
#endif
#ifdef USE_TLS
{"t_relay_to_tls", w_t_relay_to_tls, 2, fixup_hostport2proxy,
{"t_relay_to_tls", w_t_relay_to_tls, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
{"t_relay_to_tls", w_t_relay_to_tls_uri, 0, 0,
{"t_relay_to_tls", w_t_relay_to_tls_uri, 0, 0, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
#endif
#ifdef USE_SCTP
{"t_relay_to_sctp", w_t_relay_to_sctp, 2, fixup_hostport2proxy,
{"t_relay_to_sctp", w_t_relay_to_sctp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
{"t_relay_to_sctp", w_t_relay_to_sctp_uri, 0, 0,
{"t_relay_to_sctp", w_t_relay_to_sctp_uri, 0, 0, 0,
REQUEST_ROUTE|FAILURE_ROUTE},
#endif
{"t_replicate", w_t_replicate_uri, 0, 0,
{"t_replicate", w_t_replicate_uri, 0, 0, 0,
REQUEST_ROUTE},
{"t_replicate", w_t_replicate_uri, 1, fixup_spve_null,
{"t_replicate", w_t_replicate_uri, 1, fixup_spve_null, 0,
REQUEST_ROUTE},
{"t_replicate", w_t_replicate, 2, fixup_hostport2proxy,
{"t_replicate", w_t_replicate, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
{"t_replicate_udp", w_t_replicate_udp, 2, fixup_hostport2proxy,
{"t_replicate_udp", w_t_replicate_udp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#ifdef USE_TCP
{"t_replicate_tcp", w_t_replicate_tcp, 2, fixup_hostport2proxy,
{"t_replicate_tcp", w_t_replicate_tcp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
#ifdef USE_TLS
{"t_replicate_tls", w_t_replicate_tls, 2, fixup_hostport2proxy,
{"t_replicate_tls", w_t_replicate_tls, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
#ifdef USE_SCTP
{"t_replicate_sctp", w_t_replicate_sctp, 2, fixup_hostport2proxy,
{"t_replicate_sctp", w_t_replicate_sctp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
{"t_replicate_to", w_t_replicate_to, 2, fixup_proto_hostport2proxy,
{"t_replicate_to", w_t_replicate_to, 2, fixup_proto_hostport2proxy, 0,
REQUEST_ROUTE},
{"t_relay", w_t_relay, 0, 0,
{"t_relay", w_t_relay, 0, 0, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_relay", w_t_relay2, 2, fixup_hostport2proxy,
{"t_relay", w_t_relay2, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_relay_to_avp", w_t_relay_to_avp, 2, fixup_proto_hostport2proxy,
{"t_relay_to_avp", w_t_relay_to_avp, 2, fixup_proto_hostport2proxy, 0,
REQUEST_ROUTE},
{"t_relay_to", w_t_relay_to, 0, 0,
{"t_relay_to", w_t_relay_to, 0, 0, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_relay_to", w_t_relay_to, 1, fixup_t_relay_to,
{"t_relay_to", w_t_relay_to, 1, fixup_t_relay_to, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_relay_to", w_t_relay_to, 2, fixup_t_relay_to,
{"t_relay_to", w_t_relay_to, 2, fixup_t_relay_to, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_forward_nonack", w_t_forward_nonack, 2, fixup_hostport2proxy,
{"t_forward_nonack", w_t_forward_nonack, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
{"t_forward_nonack_uri", w_t_forward_nonack_uri, 0, 0,
{"t_forward_nonack_uri", w_t_forward_nonack_uri, 0, 0, 0,
REQUEST_ROUTE},
{"t_forward_nonack_udp", w_t_forward_nonack_udp, 2, fixup_hostport2proxy,
{"t_forward_nonack_udp", w_t_forward_nonack_udp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#ifdef USE_TCP
{"t_forward_nonack_tcp", w_t_forward_nonack_tcp, 2, fixup_hostport2proxy,
{"t_forward_nonack_tcp", w_t_forward_nonack_tcp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
#ifdef USE_TLS
{"t_forward_nonack_tls", w_t_forward_nonack_tls, 2, fixup_hostport2proxy,
{"t_forward_nonack_tls", w_t_forward_nonack_tls, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
#ifdef USE_SCTP
{"t_forward_nonack_sctp", w_t_forward_nonack_sctp, 2, fixup_hostport2proxy,
{"t_forward_nonack_sctp", w_t_forward_nonack_sctp, 2, fixup_hostport2proxy, 0,
REQUEST_ROUTE},
#endif
{"t_forward_nonack_to", w_t_forward_nonack_to, 2, fixup_proto_hostport2proxy,
{"t_forward_nonack_to", w_t_forward_nonack_to, 2, fixup_proto_hostport2proxy, 0,
REQUEST_ROUTE},
{"t_relay_cancel", w_t_relay_cancel, 0, 0,
{"t_relay_cancel", w_t_relay_cancel, 0, 0, 0,
REQUEST_ROUTE},
{"t_on_failure", w_t_on_failure, 1, fixup_on_failure,
{"t_on_failure", w_t_on_failure, 1, fixup_on_failure, 0,
REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE },
{"t_on_branch_failure",w_t_on_branch_failure, 1, fixup_on_branch_failure,
{"t_on_branch_failure",w_t_on_branch_failure, 1, fixup_on_branch_failure, 0,
REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE },
{"t_on_reply", w_t_on_reply, 1, fixup_on_reply,
{"t_on_reply", w_t_on_reply, 1, fixup_on_reply, 0,
REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE },
{"t_on_branch", w_t_on_branch, 1, fixup_on_branch,
{"t_on_branch", w_t_on_branch, 1, fixup_on_branch, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_check_status", t_check_status, 1, fixup_t_check_status,
{"t_check_status", t_check_status, 1, fixup_t_check_status, 0,
REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE},
{"t_write_req", t_write_req, 2, fixup_t_write,
{"t_write_req", t_write_req, 2, fixup_t_write, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_write_unix", t_write_unix, 2, fixup_t_write,
{"t_write_unix", t_write_unix, 2, fixup_t_write, 0,
REQUEST_ROUTE | FAILURE_ROUTE },
{"t_set_fr", t_set_fr_inv, 1, fixup_var_int_1,
{"t_set_fr", t_set_fr_inv, 1, fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_set_fr", t_set_fr_all, 2, fixup_var_int_12,
{"t_set_fr", t_set_fr_all, 2, fixup_var_int_12, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_reset_fr", w_t_reset_fr, 0, 0,
{"t_reset_fr", w_t_reset_fr, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_set_retr", w_t_set_retr, 2, fixup_var_int_12,
{"t_set_retr", w_t_set_retr, 2, fixup_var_int_12, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_reset_retr", w_t_reset_retr, 0, 0,
{"t_reset_retr", w_t_reset_retr, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_set_max_lifetime", w_t_set_max_lifetime, 2, fixup_var_int_12,
{"t_set_max_lifetime", w_t_set_max_lifetime, 2, fixup_var_int_12, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_reset_max_lifetime", w_t_reset_max_lifetime, 0, 0,
{"t_reset_max_lifetime", w_t_reset_max_lifetime, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_set_auto_inv_100", w_t_set_auto_inv_100, 1, fixup_var_int_1,
{"t_set_auto_inv_100", w_t_set_auto_inv_100, 1, fixup_var_int_1, 0,
REQUEST_ROUTE},
{"t_set_disable_6xx", w_t_set_disable_6xx, 1, fixup_var_int_1,
{"t_set_disable_6xx", w_t_set_disable_6xx, 1, fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_set_disable_failover", w_t_set_disable_failover, 1, fixup_var_int_1,
{"t_set_disable_failover", w_t_set_disable_failover, 1, fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
#ifdef CANCEL_REASON_SUPPORT
{"t_set_no_e2e_cancel_reason", w_t_set_no_e2e_cancel_reason, 1,
fixup_var_int_1,
fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
/* alias for t_set_no_e2e_cancel_reason */
{"t_disable_e2e_cancel_reason", w_t_set_no_e2e_cancel_reason, 1,
fixup_var_int_1,
fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
#endif /* CANCEL_REASON_SUPPORT */
{"t_set_disable_internal_reply", w_t_set_disable_internal_reply, 1,
fixup_var_int_1,
fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_branch_timeout", w_t_branch_timeout, 0, 0,
{"t_branch_timeout", w_t_branch_timeout, 0, 0, 0,
FAILURE_ROUTE|EVENT_ROUTE},
{"t_branch_replied", w_t_branch_replied, 0, 0,
{"t_branch_replied", w_t_branch_replied, 0, 0, 0,
FAILURE_ROUTE|EVENT_ROUTE},
{"t_any_timeout", w_t_any_timeout, 0, 0,
{"t_any_timeout", w_t_any_timeout, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_any_replied", w_t_any_replied, 0, 0,
{"t_any_replied", w_t_any_replied, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_is_canceled", w_t_is_canceled, 0, 0,
{"t_is_canceled", w_t_is_canceled, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_is_retr_async_reply", w_t_is_retr_async_reply, 0, 0,
{"t_is_retr_async_reply", w_t_is_retr_async_reply, 0, 0, 0,
TM_ONREPLY_ROUTE},
{"t_is_expired", w_t_is_expired, 0, 0,
{"t_is_expired", w_t_is_expired, 0, 0, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_grep_status", w_t_grep_status, 1, fixup_var_int_1,
{"t_grep_status", w_t_grep_status, 1, fixup_var_int_1, 0,
REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE },
{"t_drop_replies", w_t_drop_replies, 0, 0,
{"t_drop_replies", w_t_drop_replies, 0, 0, 0,
FAILURE_ROUTE},
{"t_drop_replies", w_t_drop_replies, 1, 0,
{"t_drop_replies", w_t_drop_replies, 1, 0, 0,
FAILURE_ROUTE},
{"t_save_lumps", w_t_save_lumps, 0, 0,
{"t_save_lumps", w_t_save_lumps, 0, 0, 0,
REQUEST_ROUTE},
{"t_check_trans", w_t_check_trans, 0, 0,
{"t_check_trans", w_t_check_trans, 0, 0, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE },
{"t_is_set", w_t_is_set, 1, fixup_t_is_set,
{"t_is_set", w_t_is_set, 1, fixup_t_is_set, 0,
ANY_ROUTE },
{"t_use_uac_headers", w_t_use_uac_headers, 0, 0,
{"t_use_uac_headers", w_t_use_uac_headers, 0, 0, 0,
ANY_ROUTE },
{"t_uac_send", (cmd_function)w_t_uac_send, 6, fixup_spve_all,
{"t_uac_send", (cmd_function)w_t_uac_send, 6, fixup_spve_all, 0,
ANY_ROUTE },

{"t_load_contacts", t_load_contacts, 0, 0,
{"t_load_contacts", t_load_contacts, 0, 0, 0,
REQUEST_ROUTE | FAILURE_ROUTE},
{"t_next_contacts", t_next_contacts, 0, 0,
{"t_next_contacts", t_next_contacts, 0, 0, 0,
REQUEST_ROUTE | FAILURE_ROUTE},
{"t_next_contact_flow", t_next_contact_flow, 0, 0,
{"t_next_contact_flow", t_next_contact_flow, 0, 0, 0,
REQUEST_ROUTE },

/* not applicable from the script */
{"load_tm", (cmd_function)load_tm, NO_SCRIPT, 0, 0},
{"load_xtm", (cmd_function)load_xtm, NO_SCRIPT, 0, 0},
{0,0,0,0,0}
{"load_tm", (cmd_function)load_tm, NO_SCRIPT, 0, 0, 0},
{"load_xtm", (cmd_function)load_xtm, NO_SCRIPT, 0, 0, 0},
{0,0,0,0,0,0}
};


Expand Down Expand Up @@ -483,18 +483,16 @@ struct module_exports tm_exports = {
#else
struct module_exports exports= {
#endif
"tm",
/* -------- exported functions ----------- */
cmds,
tm_rpc, /* RPC methods */
/* ------------ exported variables ---------- */
params,

mod_init, /* module initialization function */
(response_function) reply_received,
(destroy_function) tm_shutdown,
0, /* w_onbreak, */
child_init /* per-child init function */
"tm", /* module name */
DEFAULT_DLFLAGS, /* dlopen flags */
cmds, /* cmd (cfg function) exports */
params, /* param exports */
tm_rpc, /* RPC method exports */
0, /* pv exports */
reply_received, /* response handling function */
mod_init, /* module init function */
child_init, /* per-child init function */
tm_shutdown /* module destroy function */
};


Expand Down

0 comments on commit 2833262

Please sign in to comment.