sr-dev

sr-dev@lists.kamailio.org

4 participants
44157 discussions

git:master: sercmd: include path updated

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0253726f99ac151f748712a5d39d71f42d9defc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0253726… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:38:52 2009 +0200 sercmd: include path updated --- utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1293b63..cd00a2c 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -54,9 +54,9 @@ #include "parse_listen_id.h" #include "license.h" -#include "../../modules/ctl/ctl_defaults.h" /* default socket & port */ -#include "../../modules/ctl/binrpc.h" -#include "../../modules/ctl/binrpc.c" /* ugly hack */ +#include "../../modules_s/ctl/ctl_defaults.h" /* default socket & port */ +#include "../../modules_s/ctl/binrpc.h" +#include "../../modules_s/ctl/binrpc.c" /* ugly hack */ #ifndef NAME

15 years, 8 months

git:master: makefile: excluded modules that do not compile

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b0f6ec8784712e4c1436fc9a4a3b54296e94ba5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0f6ec8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:27:36 2009 +0200 makefile: excluded modules that do not compile - excluded modules that depend on external libs from default compilation - excluded non-essential modules that do not compile yet --- Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5ed6935..89a5e10 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,12 @@ else auth_radius uri_radius avp_radius \ acc_radius dialog pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ - unixsock dbg print_lib auth_identity ldap + unixsock dbg print_lib auth_identity ldap \ + db_berkeley db_mysql db_postgres db_oracle \ + db_unixodbc memcached mi_xmlrpc \ + nat_traversal perlvdb purple seas siptrace \ + snmpstats uac_redirect xmpp \ + carrierroute # excluded because they do not compile (remove them only after they are # fixed) -- andrei exclude_modules+= avpops bdb dbtext iptrtpproxy pa rls

15 years, 8 months

git:master: Merge ser modules into sip-router master branch

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 3cc16e2873a48b89d495f3a2065e4171bfff70ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cc16e2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 21:23:34 2009 +0200 Merge ser modules into sip-router master branch (merge commit 'origin/ser_modules') * commit 'origin/ser_modules': (2777 commits) modules: added missing parse_to.h include xlog: LOG_() api update usrloc: fixed name conflict lcr: updated to the route_mode changes modules: tm register_tcmb api update ser modules ported to sip-router tls: ser_cert.sh portability fixes METHOD_OTHER is replaced with METHOD_OPTIONS, because the OPTIONS request cfg_size macro renamed to cfg_sizeof to avoid a conflict with one of the * logging API updated (see doc/logging-api.txt for details) When building the route set of ACKs for local UACs, only the reply is now Fixed compiler issues warnings over: Some errors are marked as DB API (framework) failures instead of MYSQL API The header file ds_rpc.h statically defines the doc string for some RPC "Route :" prefix (and separator) is used some more time across the permissions: fix build without -DUSE_IPV6 errors nathelper: added support for SDP rtcp attribute (RFC 3605) prefix_route: include atomic_ops.h where atomic_t is used Fix warnings on LP64 plarforms out there (all 64-bit amd64/emt64 unixes Add comma between function names and fix typo. ... ---

15 years, 8 months

git:refs/tags/sr_before_modules_merge: Tag sr_before_modules_merge: sip-router before kamailio and ser modules merge

by Andrei Pelinescu-Onciul

Module: sip-router Branch: refs/tags/sr_before_modules_merge Tag: 07ca4782073e086a766abf6c6ce32814a516b648 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=07ca478207… Tagger: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 21:21:25 2009 +0200 sip-router before kamailio and ser modules merge

15 years, 8 months

git:refs/tags/ported_ser_cvs_modules: Tag ported_ser_cvs_modules: ser modules ported to sip-router

by Andrei Pelinescu-Onciul

Module: sip-router Branch: refs/tags/ported_ser_cvs_modules Tag: baeeba8c41940f0458c9e7e5afb06754690fc110 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=baeeba8c41… Tagger: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 21:08:04 2009 +0200 ser modules ported to sip-router

15 years, 8 months

git:refs/tags/pure_ser_cvs_modules: Tag pure_ser_cvs_modules: ser modules imported from cvs into modules_s/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: refs/tags/pure_ser_cvs_modules Tag: 293f0580aa3b5833deae908b3e35d59249e5b0e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=tag;h=293f0580aa… Tagger: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 21:06:57 2009 +0200 ser modules imported from cvs into modules_s/ ("pure" state, no sip-router changes)

15 years, 8 months

git:ser_modules: ser modules ported to sip-router

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 7a7f1a7b9265f020e734228a391b903541507cc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a7f1a7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 19:16:10 2009 +0200 ser modules ported to sip-router - added -DSER_MOD_INTERFACE to each module Makefile - db: - linked with srdb2 when needed - fixed db includes path (../../lib/srdb2/*.h) - fixed db constants - fixed tm include path (../../modules/tm/*.h) --- modules_s/acc_db/Makefile | 4 ++++ modules_s/acc_db/acc_db.c | 10 +++++----- modules_s/acc_radius/Makefile | 2 ++ modules_s/acc_radius/acc_radius.c | 8 ++++---- modules_s/acc_syslog/Makefile | 2 ++ modules_s/acc_syslog/acc_syslog.c | 8 ++++---- modules_s/auth/Makefile | 2 ++ modules_s/auth_db/Makefile | 4 ++++ modules_s/auth_db/authdb_mod.c | 2 +- modules_s/auth_db/authdb_mod.h | 2 +- modules_s/auth_db/authorize.c | 10 +++++----- modules_s/auth_identity/Makefile | 2 ++ modules_s/auth_identity/auth_hdrs.c | 2 +- modules_s/auth_radius/Makefile | 2 ++ modules_s/avp/Makefile | 2 ++ modules_s/avp_db/Makefile | 4 ++++ modules_s/avp_db/avp_db.c | 4 ++-- modules_s/avp_db/avp_db.h | 2 +- modules_s/avp_db/extra_attrs.c | 2 +- modules_s/avp_db/extra_attrs.h | 2 +- modules_s/avp_radius/Makefile | 2 ++ modules_s/avpops/Makefile | 4 ++++ modules_s/avpops/avpops_db.c | 2 +- modules_s/avpops/avpops_db.h | 2 +- modules_s/bdb/Makefile | 4 ++++ modules_s/bdb/bdb.h | 4 ++-- modules_s/blst/Makefile | 2 ++ modules_s/cfg_db/Makefile | 4 ++++ modules_s/cfg_db/cfg_db.c | 2 +- modules_s/cfg_rpc/Makefile | 2 ++ modules_s/cpl-c/Makefile | 4 ++++ modules_s/cpl-c/cpl.c | 2 +- modules_s/cpl-c/cpl_db.c | 2 +- modules_s/cpl-c/cpl_db.h | 2 +- modules_s/cpl-c/cpl_env.h | 2 +- modules_s/cpl-c/cpl_proxy.h | 2 +- modules_s/cpl-c/cpl_run.c | 2 +- modules_s/cpl-c/cpl_sig.c | 2 +- modules_s/ctl/Makefile | 2 ++ modules_s/db_ops/Makefile | 4 ++++ modules_s/db_ops/db_ops.c | 2 +- modules_s/dbg/Makefile | 2 ++ modules_s/dbtext/Makefile | 4 ++++ modules_s/dbtext/dbt_api.h | 4 ++-- modules_s/dbtext/dbt_res.h | 2 +- modules_s/dbtext/dbtext.h | 4 ++-- modules_s/dialog/Makefile | 3 +++ modules_s/dialog/db_dlg.h | 4 ++-- modules_s/dialog/dlg_mod.c | 2 +- modules_s/dialog/dlg_mod.h | 6 +++--- modules_s/dialog/dlg_mod_internal.h | 2 +- modules_s/dialog/dlg_request.h | 2 +- modules_s/dialog/serialize_dlg.h | 2 +- modules_s/dispatcher/Makefile | 2 ++ modules_s/diversion/Makefile | 2 ++ modules_s/domain/Makefile | 4 ++++ modules_s/domain/domain.c | 8 ++++---- modules_s/domain/domain_mod.c | 2 +- modules_s/domain/domain_mod.h | 2 +- modules_s/domain/domain_rpc.c | 2 +- modules_s/enum/Makefile | 2 ++ modules_s/eval/Makefile | 2 ++ modules_s/exec/Makefile | 2 ++ modules_s/fifo/Makefile | 2 ++ modules_s/flatstore/Makefile | 4 ++++ modules_s/flatstore/flat_cmd.h | 4 ++-- modules_s/flatstore/flat_con.h | 6 +++--- modules_s/flatstore/flat_uri.h | 4 ++-- modules_s/gflags/Makefile | 4 ++++ modules_s/gflags/gflags.c | 6 +++--- modules_s/iptrtpproxy/Makefile | 2 ++ modules_s/jabber/Makefile | 4 ++++ modules_s/jabber/jabber.c | 4 ++-- modules_s/jabber/xjab_worker.c | 2 +- modules_s/jabber/xjab_worker.h | 4 ++-- modules_s/lcr/Makefile | 4 ++++ modules_s/lcr/lcr_mod.c | 2 +- modules_s/ldap/Makefile | 4 ++++ modules_s/ldap/ld_cmd.h | 6 +++--- modules_s/ldap/ld_con.h | 6 +++--- modules_s/ldap/ld_fld.c | 2 +- modules_s/ldap/ld_fld.h | 6 +++--- modules_s/ldap/ld_mod.c | 2 +- modules_s/ldap/ld_res.c | 2 +- modules_s/ldap/ld_res.h | 4 ++-- modules_s/ldap/ld_uri.h | 4 ++-- modules_s/mangler/Makefile | 2 ++ modules_s/mangler/mangler.c | 6 +++--- modules_s/maxfwd/Makefile | 2 ++ modules_s/mediaproxy/Makefile | 2 ++ modules_s/msilo/Makefile | 4 ++++ modules_s/msilo/msilo.c | 4 ++-- modules_s/mysql/Makefile | 4 ++++ modules_s/mysql/my_cmd.c | 2 +- modules_s/mysql/my_cmd.h | 4 ++-- modules_s/mysql/my_con.h | 6 +++--- modules_s/mysql/my_fld.c | 2 +- modules_s/mysql/my_fld.h | 4 ++-- modules_s/mysql/my_res.c | 2 +- modules_s/mysql/my_res.h | 4 ++-- modules_s/mysql/my_uri.c | 2 +- modules_s/mysql/my_uri.h | 4 ++-- modules_s/mysql/mysql_mod.c | 2 +- modules_s/nathelper/Makefile | 2 ++ modules_s/nathelper/natping.c | 2 +- modules_s/options/Makefile | 2 ++ modules_s/oracle/Makefile | 4 ++++ modules_s/oracle/dbase.h | 4 ++-- modules_s/osp/Makefile | 2 ++ modules_s/osp/tm.c | 2 +- modules_s/pa/Makefile | 3 +++ modules_s/pa/notify.h | 2 +- modules_s/pa/pa_mod.c | 2 +- modules_s/pa/pa_mod.h | 4 ++-- modules_s/pa/presentity.c | 2 +- modules_s/pa/presentity.h | 2 +- modules_s/pa/subscribe.c | 14 +++++++------- modules_s/pa/watcher.c | 2 +- modules_s/pa/watcher.h | 4 ++-- modules_s/pdt/Makefile | 4 ++++ modules_s/pdt/domains.c | 2 +- modules_s/pdt/pdt.c | 2 +- modules_s/permissions/Makefile | 4 ++++ modules_s/permissions/im_db.c | 4 ++-- modules_s/permissions/im_db.h | 2 +- modules_s/permissions/im_rpc.c | 2 +- modules_s/permissions/ip_set_rpc.c | 2 +- modules_s/permissions/permissions.h | 2 +- modules_s/permissions/trusted.c | 2 +- modules_s/permissions/trusted_rpc.c | 2 +- modules_s/pike/Makefile | 2 ++ modules_s/postgres/Makefile | 4 ++++ modules_s/postgres/pg_cmd.h | 6 +++--- modules_s/postgres/pg_con.h | 6 +++--- modules_s/postgres/pg_fld.c | 2 +- modules_s/postgres/pg_fld.h | 4 ++-- modules_s/postgres/pg_res.c | 2 +- modules_s/postgres/pg_res.h | 4 ++-- modules_s/postgres/pg_sql.c | 4 ++-- modules_s/postgres/pg_sql.h | 2 +- modules_s/postgres/pg_uri.c | 2 +- modules_s/postgres/pg_uri.h | 4 ++-- modules_s/prefix_route/Makefile | 4 ++++ modules_s/prefix_route/prefix_route.c | 2 +- modules_s/presence_b2b/Makefile | 3 +++ modules_s/presence_b2b/euac_internals.h | 2 +- modules_s/presence_b2b/events_mod.h | 4 ++-- modules_s/print/Makefile | 2 ++ modules_s/print_lib/Makefile | 2 ++ modules_s/ratelimit/Makefile | 2 ++ modules_s/registrar/Makefile | 2 ++ modules_s/rls/Makefile | 3 +++ modules_s/rls/rl_subscription.h | 2 +- modules_s/rls/rls_mod.h | 4 ++-- modules_s/rls/subscription_manager.c | 2 +- modules_s/rls/subscription_manager.h | 2 +- modules_s/rr/Makefile | 2 ++ modules_s/sanity/Makefile | 2 ++ modules_s/sl/Makefile | 2 ++ modules_s/sms/Makefile | 2 ++ modules_s/sms/sms.c | 2 +- modules_s/sms/sms_funcs.c | 4 ++-- modules_s/sms/sms_funcs.h | 2 +- modules_s/speeddial/Makefile | 4 ++++ modules_s/speeddial/sdlookup.c | 2 +- modules_s/speeddial/speeddial.c | 2 +- modules_s/speeddial/speeddial.h | 2 +- modules_s/textops/Makefile | 2 ++ modules_s/timer/Makefile | 2 ++ modules_s/tls/Makefile | 2 ++ modules_s/uac/Makefile | 2 ++ modules_s/uac/auth.c | 2 +- modules_s/uac/from.c | 4 ++-- modules_s/uac/from.h | 2 +- modules_s/uac/uac.c | 4 ++-- modules_s/unixsock/Makefile | 2 ++ modules_s/uri/Makefile | 4 ++++ modules_s/uri/checks.c | 2 +- modules_s/uri/uri_mod.h | 2 +- modules_s/uri_db/Makefile | 4 ++++ modules_s/uri_db/uridb_mod.c | 22 +++++++++++----------- modules_s/uri_db/uridb_mod.h | 2 +- modules_s/uri_radius/Makefile | 2 ++ modules_s/usrloc/Makefile | 4 ++++ modules_s/usrloc/reg_avps.h | 2 +- modules_s/usrloc/ucontact.c | 2 +- modules_s/usrloc/udomain.c | 2 +- modules_s/usrloc/udomain.h | 2 +- modules_s/usrloc/ul_mod.h | 2 +- modules_s/xcap/Makefile | 2 ++ modules_s/xlog/Makefile | 2 ++ modules_s/xmlrpc/Makefile | 2 ++ 192 files changed, 402 insertions(+), 202 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7a7…

15 years, 8 months

git:ser_modules: modules: tm register_tcmb api update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 84f05eea920186865233d218ac58a754975ec69a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84f05ee… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 19:30:36 2009 +0200 modules: tm register_tcmb api update - register_tmcb has now an additional parameter --- modules_s/acc_db/acc_db.c | 14 +++++++++----- modules_s/acc_radius/acc_radius.c | 14 +++++++++----- modules_s/acc_syslog/acc_syslog.c | 14 +++++++++----- modules_s/cpl-c/cpl_proxy.h | 2 +- modules_s/mangler/mangler.c | 2 +- modules_s/osp/tm.c | 4 ++-- modules_s/uac/from.c | 4 ++-- modules_s/uac/uac.c | 2 +- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/modules_s/acc_db/acc_db.c b/modules_s/acc_db/acc_db.c index 5f94187..755b110 100644 --- a/modules_s/acc_db/acc_db.c +++ b/modules_s/acc_db/acc_db.c @@ -917,24 +917,28 @@ static void on_req(struct cell* t, int type, struct tmcb_params *ps) req_time = time(0); if (is_acc_on(ps->req) || is_mc_on(ps->req)) { - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_OUT callback\n"); return; } if (report_ack) { - if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_E2EACK_IN callback\n"); return; } } - if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_ON_FAILURE_RO callback\n"); return; } - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_IN callback\n"); return; } @@ -1019,7 +1023,7 @@ static int mod_init(void) /* register callbacks*/ /* listen for all incoming requests */ - if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0 ) <= 0) { + if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0, 0) <= 0) { LOG(L_ERR,"ERROR:acc:mod_init: cannot register TMCB_REQUEST_IN " "callback\n"); return -1; diff --git a/modules_s/acc_radius/acc_radius.c b/modules_s/acc_radius/acc_radius.c index 6931863..4275268 100644 --- a/modules_s/acc_radius/acc_radius.c +++ b/modules_s/acc_radius/acc_radius.c @@ -959,24 +959,28 @@ void on_req(struct cell* t, int type, struct tmcb_params *ps) req_time = time(0); if (is_acc_on(ps->req) || is_mc_on(ps->req)) { - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_OUT callback\n"); return; } if (report_ack) { - if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_E2EACK_IN callback\n"); return; } } - if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_ON_FAILURE_RO callback\n"); return; } - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_IN callback\n"); return; } @@ -1008,7 +1012,7 @@ static int mod_init(void) /* register callbacks*/ /* listen for all incoming requests */ - if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0 ) <= 0) { + if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0, 0) <= 0) { LOG(L_ERR,"ERROR:acc:mod_init: cannot register TMCB_REQUEST_IN " "callback\n"); return -1; diff --git a/modules_s/acc_syslog/acc_syslog.c b/modules_s/acc_syslog/acc_syslog.c index f0ec8f3..269bd46 100644 --- a/modules_s/acc_syslog/acc_syslog.c +++ b/modules_s/acc_syslog/acc_syslog.c @@ -876,24 +876,28 @@ void on_req(struct cell* t, int type, struct tmcb_params *ps) req_time = time(0); if (is_acc_on(ps->req) || is_mc_on(ps->req)) { - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_OUT, replyout_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_OUT callback\n"); return; } if (report_ack) { - if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_E2EACK_IN, ack_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_E2EACK_IN callback\n"); return; } } - if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_ON_FAILURE_RO, failure_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_ON_FAILURE_RO callback\n"); return; } - if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, (void*)req_time) <= 0) { + if (tmb.register_tmcb(0, t, TMCB_RESPONSE_IN, replyin_handler, + (void*)req_time, 0) <= 0) { LOG(L_ERR, "ERROR:acc:on_req: Error while registering TMCB_RESPONSE_IN callback\n"); return; } @@ -924,7 +928,7 @@ static int mod_init(void) /* register callbacks*/ /* listen for all incoming requests */ - if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0 ) <= 0) { + if (tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, on_req, 0, 0) <= 0) { LOG(L_ERR,"ERROR:acc:mod_init: cannot register TMCB_REQUEST_IN " "callback\n"); return -1; diff --git a/modules_s/cpl-c/cpl_proxy.h b/modules_s/cpl-c/cpl_proxy.h index 538a015..f6daf20 100644 --- a/modules_s/cpl-c/cpl_proxy.h +++ b/modules_s/cpl-c/cpl_proxy.h @@ -487,7 +487,7 @@ static inline char *run_proxy( struct cpl_interpreter *intr ) /* as I am interested in getting the responses back - I need to install * some callback functions for replies */ if (cpl_fct.tmb.register_tmcb(intr->msg,0, - TMCB_ON_FAILURE|TMCB_RESPONSE_OUT,reply_callback,(void*)intr) <= 0 ) { + TMCB_ON_FAILURE|TMCB_RESPONSE_OUT,reply_callback,(void*)intr, 0) <= 0){ LOG(L_ERR, "ERROR:cpl_c:run_proxy: failed to register " "TMCB_RESPONSE_OUT callback\n"); goto runtime_error; diff --git a/modules_s/mangler/mangler.c b/modules_s/mangler/mangler.c index c97e72b..98fb26d 100644 --- a/modules_s/mangler/mangler.c +++ b/modules_s/mangler/mangler.c @@ -185,7 +185,7 @@ prepare () } if (load_tm(&tmb)==-1) return -1; - if (tmb.register_tmcb(TMCB_REQUEST_OUT,func_invite,0) <= 0) return -1; + if (tmb.register_tmcb(TMCB_REQUEST_OUT, func_invite, 0, 0) <= 0) return -1; #endif return 0; } diff --git a/modules_s/osp/tm.c b/modules_s/osp/tm.c index 7fa96ef..e976498 100644 --- a/modules_s/osp/tm.c +++ b/modules_s/osp/tm.c @@ -64,7 +64,7 @@ int ospInitTm(void) } /* Register callbacks, listen for all incoming requests */ - if (osp_tmb.register_tmcb(0, 0, TMCB_REQUEST_IN, ospOnReq, 0) <= 0) { + if (osp_tmb.register_tmcb(0, 0, TMCB_REQUEST_IN, ospOnReq, 0, 0) <= 0) { LOG(L_ERR, "osp: ERROR: failed to register TMCB_REQUEST_IN callback\n"); LOG(L_ERR, "osp: ERROR: TM callbacks are required for reporting call set up usage\n"); return -1; @@ -104,7 +104,7 @@ static void ospOnReq( // TMCB_RESPONSE_IN | 0; - if (osp_tmb.register_tmcb(0, t, tmcb_types, ospTmcbFunc, 0) <= 0) { + if (osp_tmb.register_tmcb(0, t, tmcb_types, ospTmcbFunc, 0, 0) <= 0) { LOG(L_ERR, "osp: ERROR: failed to register TM callbacks\n"); LOG(L_ERR, "osp: ERROR: TM callbacks are required for reporting call setup usage\n"); return; diff --git a/modules_s/uac/from.c b/modules_s/uac/from.c index 8b68a51..e9e3243 100644 --- a/modules_s/uac/from.c +++ b/modules_s/uac/from.c @@ -420,7 +420,7 @@ void tr_checker(struct cell* t, int type, struct tmcb_params *param) * by replace_from() function */ DBG("*************** marker **************\n"); if ( uac_tmb.register_tmcb( 0, t, TMCB_RESPONSE_IN, - correct_reply, (void*)&rst_from )!=1 ) + correct_reply, (void*)&rst_from, 0)!=1 ) { LOG(L_ERR,"ERROR:uac:tr_checker: failed to install " "TM callback\n"); @@ -434,7 +434,7 @@ void tr_checker(struct cell* t, int type, struct tmcb_params *param) * by restore_from() function */ /* restore in req performed -> replace in reply */ if ( uac_tmb.register_tmcb( 0, t, TMCB_RESPONSE_IN, - correct_reply, (void*)&rst_to)!=1 ) + correct_reply, (void*)&rst_to, 0)!=1 ) { LOG(L_ERR,"ERROR:uac:tr_checker: failed to install " "TM callback\n"); diff --git a/modules_s/uac/uac.c b/modules_s/uac/uac.c index 503f9e6..edcf73c 100644 --- a/modules_s/uac/uac.c +++ b/modules_s/uac/uac.c @@ -138,7 +138,7 @@ static int mod_init(void) if (from_restore_mode==FROM_AUTO_RESTORE) { /* get all transactions */ - if (uac_tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, tr_checker, 0)!=1) + if (uac_tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, tr_checker, 0, 0)!=1) { LOG(L_ERR,"ERROR:uac:mod_init: failed to install TM callback\n"); goto error;

15 years, 8 months

git:ser_modules: lcr: updated to the route_mode changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: d8d1ecf7f7700dd1a53805557d639532940ff701 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8d1ecf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 19:39:36 2009 +0200 lcr: updated to the route_mode changes - instead of the obsoleted tm route_mode use core's route.h is_route_type(REQUEST_ROUTE). --- modules_s/lcr/lcr_mod.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_s/lcr/lcr_mod.c b/modules_s/lcr/lcr_mod.c index 861c940..9a1ddae 100644 --- a/modules_s/lcr/lcr_mod.c +++ b/modules_s/lcr/lcr_mod.c @@ -55,6 +55,7 @@ #include "../../dset.h" #include "../../ip_addr.h" #include "../../config.h" +#include "../../route.h" #include "lcr_rpc.h" #include "lcr_mod.h" @@ -737,7 +738,7 @@ int next_gw(struct sip_msg* _m, char* _s1, char* _s2) memset(&act, 0, sizeof(act)); init_run_actions_ctx(&ra_ctx); - if (*(tmb.route_mode) == MODE_REQUEST) { + if (is_route_type(REQUEST_ROUTE)) { act.type = SET_URI_T; act.val[0].type = STRING_ST; @@ -1001,7 +1002,7 @@ int next_contacts(struct sip_msg* msg, char* key, char* value) int rval; struct run_act_ctx ra_ctx; - if (*(tmb.route_mode) == MODE_REQUEST) { + if (is_route_type(REQUEST_ROUTE)) { /* Find first lcr_contact_avp value */ avp = search_first_avp(contact_avp_name_str, contact_name, &val, &st);

15 years, 8 months

git:ser_modules: usrloc: fixed name conflict

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 7cb4bf65bd1de0fff7f892c148cf23c3ba34f4ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cb4bf6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 20:09:24 2009 +0200 usrloc: fixed name conflict - destroy_avps() renamed to reg_destroy_avps() to avoid conflicts with the usr_avp.h version. --- modules_s/usrloc/reg_avps.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_s/usrloc/reg_avps.c b/modules_s/usrloc/reg_avps.c index 673b7f2..b37ef82 100644 --- a/modules_s/usrloc/reg_avps.c +++ b/modules_s/usrloc/reg_avps.c @@ -54,7 +54,7 @@ static inline avp_t *avp_dup(avp_t *avp) return NULL; } -static void destroy_avps(avp_t *avp) +static void reg_destroy_avps(avp_t *avp) { avp_t *n; @@ -104,7 +104,7 @@ static int save_reg_avps_impl(struct ucontact *c) /* destroy old AVPs */ /* if (c->avps) db_delete_reg_avps(c); */ - destroy_avps(c->avps); + reg_destroy_avps(c->avps); last = NULL; first = NULL; @@ -177,7 +177,7 @@ static int restore_reg_avps(struct ucontact *info) static int delete_reg_avps_impl(struct ucontact *info) { /* db_delete_reg_avps(info); */ - if (info->avps) destroy_avps(info->avps); + if (info->avps) reg_destroy_avps(info->avps); info->avps = NULL; return 0; } @@ -315,7 +315,7 @@ int dup_reg_avps(struct ucontact *dst, struct ucontact *src) /* destroy old AVPs */ /* if (dst->avps) db_delete_reg_avps(dst); */ - destroy_avps(dst->avps); + reg_destroy_avps(dst->avps); last = NULL; first = NULL;

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev