sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

git:kamailio_3.0: core: use NAME to build User-Agent and Server headers
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: e1c36fdfc9b8f30a4271ee6823a2288dcf9c3833 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1c36fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 10:29:06 2009 +0100 core: use NAME to build User-Agent and Server headers --- config.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.h b/config.h index 09ec79a..a2de7bc 100644 --- a/config.h +++ b/config.h @@ -85,12 +85,12 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: SIP Router "\ - "(" VERSION " (" ARCH "/" OS_QUOTED "))" +#define USER_AGENT "User-Agent: " NAME \ + " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: SIP Router "\ - "(" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SERVER_HDR "Server: " NAME \ + " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256

1 0

git:kamailio_3.0: core: fix define of rval_get_int_handle_ret
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: a75b03f72e42740b410815330c895f16368895bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a75b03f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 10:29:50 2009 +0100 core: fix define of rval_get_int_handle_ret --- rvalue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rvalue.c b/rvalue.c index ef50d3b..ef8dda0 100644 --- a/rvalue.c +++ b/rvalue.c @@ -1035,7 +1035,8 @@ error: if (unlikely((ret)<0)) \ RVE_LOG(L_WARN, rve, txt); \ }while(0) -#elif define RVAL_GET_INT_ERR_IGN \ +#elif defined RVAL_GET_INT_ERR_IGN +#define rval_get_int_handle_ret(ret, txt, rve) \ do { \ if (unlikely((ret)<0)) \ (ret)=0; \

1 0

git:kamailio_3.0: rls(s): obsoleted
by Daniel-Constantin Mierla 10 Dec '09

10 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 9788f89cca72f2d569512c618ff845e4814faacd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9788f89… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 9 10:59:28 2009 +0100 rls(s): obsoleted Moved pa to obsolete/ because it does not compile (needs upgrade to the current DB libs) and it does not have a maintainer. (cherry picked from commit 37bf1610f9a2f5e4fd40cbacaf2705f5437e9daf) --- {modules_s => obsolete}/rls/ChangeLog | 0 {modules_s => obsolete}/rls/Makefile | 0 {modules_s => obsolete}/rls/README | 0 {modules_s => obsolete}/rls/db_rls.c | 0 {modules_s => obsolete}/rls/doc/Makefile | 0 {modules_s => obsolete}/rls/doc/functions.xml | 0 {modules_s => obsolete}/rls/doc/params.xml | 0 {modules_s => obsolete}/rls/doc/rls.xml | 0 {modules_s => obsolete}/rls/doc/rls_base.xml | 0 {modules_s => obsolete}/rls/doc/rls_incl.xml | 0 {modules_s => obsolete}/rls/doc/xcap.xml | 0 {modules_s => obsolete}/rls/result_codes.h | 0 {modules_s => obsolete}/rls/rl_subscription.c | 0 {modules_s => obsolete}/rls/rl_subscription.h | 0 {modules_s => obsolete}/rls/rlmi_doc.c | 0 {modules_s => obsolete}/rls/rlmi_doc.h | 0 {modules_s => obsolete}/rls/rls.sql | 0 {modules_s => obsolete}/rls/rls_auth.c | 0 {modules_s => obsolete}/rls/rls_auth.h | 0 {modules_s => obsolete}/rls/rls_data.c | 0 {modules_s => obsolete}/rls/rls_data.h | 0 {modules_s => obsolete}/rls/rls_handler.c | 0 {modules_s => obsolete}/rls/rls_handler.h | 0 {modules_s => obsolete}/rls/rls_mod.c | 0 {modules_s => obsolete}/rls/rls_mod.h | 0 {modules_s => obsolete}/rls/rpc.c | 0 {modules_s => obsolete}/rls/rpc.h | 0 {modules_s => obsolete}/rls/subscription_manager.c | 0 {modules_s => obsolete}/rls/subscription_manager.h | 0 {modules_s => obsolete}/rls/time_event_manager.c | 0 {modules_s => obsolete}/rls/time_event_manager.h | 0 {modules_s => obsolete}/rls/trace.h | 0 {modules_s => obsolete}/rls/uri_ops.c | 0 {modules_s => obsolete}/rls/uri_ops.h | 0 {modules_s => obsolete}/rls/virtual_subscription.c | 0 35 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/rls/ChangeLog b/obsolete/rls/ChangeLog similarity index 100% rename from modules_s/rls/ChangeLog rename to obsolete/rls/ChangeLog diff --git a/modules_s/rls/Makefile b/obsolete/rls/Makefile similarity index 100% rename from modules_s/rls/Makefile rename to obsolete/rls/Makefile diff --git a/modules_s/rls/README b/obsolete/rls/README similarity index 100% rename from modules_s/rls/README rename to obsolete/rls/README diff --git a/modules_s/rls/db_rls.c b/obsolete/rls/db_rls.c similarity index 100% rename from modules_s/rls/db_rls.c rename to obsolete/rls/db_rls.c diff --git a/modules_s/rls/doc/Makefile b/obsolete/rls/doc/Makefile similarity index 100% rename from modules_s/rls/doc/Makefile rename to obsolete/rls/doc/Makefile diff --git a/modules_s/rls/doc/functions.xml b/obsolete/rls/doc/functions.xml similarity index 100% rename from modules_s/rls/doc/functions.xml rename to obsolete/rls/doc/functions.xml diff --git a/modules_s/rls/doc/params.xml b/obsolete/rls/doc/params.xml similarity index 100% rename from modules_s/rls/doc/params.xml rename to obsolete/rls/doc/params.xml diff --git a/modules_s/rls/doc/rls.xml b/obsolete/rls/doc/rls.xml similarity index 100% rename from modules_s/rls/doc/rls.xml rename to obsolete/rls/doc/rls.xml diff --git a/modules_s/rls/doc/rls_base.xml b/obsolete/rls/doc/rls_base.xml similarity index 100% rename from modules_s/rls/doc/rls_base.xml rename to obsolete/rls/doc/rls_base.xml diff --git a/modules_s/rls/doc/rls_incl.xml b/obsolete/rls/doc/rls_incl.xml similarity index 100% rename from modules_s/rls/doc/rls_incl.xml rename to obsolete/rls/doc/rls_incl.xml diff --git a/modules_s/rls/doc/xcap.xml b/obsolete/rls/doc/xcap.xml similarity index 100% rename from modules_s/rls/doc/xcap.xml rename to obsolete/rls/doc/xcap.xml diff --git a/modules_s/rls/result_codes.h b/obsolete/rls/result_codes.h similarity index 100% rename from modules_s/rls/result_codes.h rename to obsolete/rls/result_codes.h diff --git a/modules_s/rls/rl_subscription.c b/obsolete/rls/rl_subscription.c similarity index 100% rename from modules_s/rls/rl_subscription.c rename to obsolete/rls/rl_subscription.c diff --git a/modules_s/rls/rl_subscription.h b/obsolete/rls/rl_subscription.h similarity index 100% rename from modules_s/rls/rl_subscription.h rename to obsolete/rls/rl_subscription.h diff --git a/modules_s/rls/rlmi_doc.c b/obsolete/rls/rlmi_doc.c similarity index 100% rename from modules_s/rls/rlmi_doc.c rename to obsolete/rls/rlmi_doc.c diff --git a/modules_s/rls/rlmi_doc.h b/obsolete/rls/rlmi_doc.h similarity index 100% rename from modules_s/rls/rlmi_doc.h rename to obsolete/rls/rlmi_doc.h diff --git a/modules_s/rls/rls.sql b/obsolete/rls/rls.sql similarity index 100% rename from modules_s/rls/rls.sql rename to obsolete/rls/rls.sql diff --git a/modules_s/rls/rls_auth.c b/obsolete/rls/rls_auth.c similarity index 100% rename from modules_s/rls/rls_auth.c rename to obsolete/rls/rls_auth.c diff --git a/modules_s/rls/rls_auth.h b/obsolete/rls/rls_auth.h similarity index 100% rename from modules_s/rls/rls_auth.h rename to obsolete/rls/rls_auth.h diff --git a/modules_s/rls/rls_data.c b/obsolete/rls/rls_data.c similarity index 100% rename from modules_s/rls/rls_data.c rename to obsolete/rls/rls_data.c diff --git a/modules_s/rls/rls_data.h b/obsolete/rls/rls_data.h similarity index 100% rename from modules_s/rls/rls_data.h rename to obsolete/rls/rls_data.h diff --git a/modules_s/rls/rls_handler.c b/obsolete/rls/rls_handler.c similarity index 100% rename from modules_s/rls/rls_handler.c rename to obsolete/rls/rls_handler.c diff --git a/modules_s/rls/rls_handler.h b/obsolete/rls/rls_handler.h similarity index 100% rename from modules_s/rls/rls_handler.h rename to obsolete/rls/rls_handler.h diff --git a/modules_s/rls/rls_mod.c b/obsolete/rls/rls_mod.c similarity index 100% rename from modules_s/rls/rls_mod.c rename to obsolete/rls/rls_mod.c diff --git a/modules_s/rls/rls_mod.h b/obsolete/rls/rls_mod.h similarity index 100% rename from modules_s/rls/rls_mod.h rename to obsolete/rls/rls_mod.h diff --git a/modules_s/rls/rpc.c b/obsolete/rls/rpc.c similarity index 100% rename from modules_s/rls/rpc.c rename to obsolete/rls/rpc.c diff --git a/modules_s/rls/rpc.h b/obsolete/rls/rpc.h similarity index 100% rename from modules_s/rls/rpc.h rename to obsolete/rls/rpc.h diff --git a/modules_s/rls/subscription_manager.c b/obsolete/rls/subscription_manager.c similarity index 100% rename from modules_s/rls/subscription_manager.c rename to obsolete/rls/subscription_manager.c diff --git a/modules_s/rls/subscription_manager.h b/obsolete/rls/subscription_manager.h similarity index 100% rename from modules_s/rls/subscription_manager.h rename to obsolete/rls/subscription_manager.h diff --git a/modules_s/rls/time_event_manager.c b/obsolete/rls/time_event_manager.c similarity index 100% rename from modules_s/rls/time_event_manager.c rename to obsolete/rls/time_event_manager.c diff --git a/modules_s/rls/time_event_manager.h b/obsolete/rls/time_event_manager.h similarity index 100% rename from modules_s/rls/time_event_manager.h rename to obsolete/rls/time_event_manager.h diff --git a/modules_s/rls/trace.h b/obsolete/rls/trace.h similarity index 100% rename from modules_s/rls/trace.h rename to obsolete/rls/trace.h diff --git a/modules_s/rls/uri_ops.c b/obsolete/rls/uri_ops.c similarity index 100% rename from modules_s/rls/uri_ops.c rename to obsolete/rls/uri_ops.c diff --git a/modules_s/rls/uri_ops.h b/obsolete/rls/uri_ops.h similarity index 100% rename from modules_s/rls/uri_ops.h rename to obsolete/rls/uri_ops.h diff --git a/modules_s/rls/virtual_subscription.c b/obsolete/rls/virtual_subscription.c similarity index 100% rename from modules_s/rls/virtual_subscription.c rename to obsolete/rls/virtual_subscription.c

1 0

git:kamailio_3.0: module groups: add k modules to the presence group
by Daniel-Constantin Mierla 10 Dec '09

10 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: abceaefbf4276d48478681e263da8309df8164d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abceaef… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 9 11:08:18 2009 +0100 module groups: add k modules to the presence group - added kamailio modules to the presence group: presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client. - removed obsoleted ser presence modules: pa rls. (cherry picked from commit 6eccf69de98426c55fdd3952e11357849d4973f2) --- Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index e3ee534..f5f05d4 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,14 @@ module_group_postgres=$(module_group_postgres_driver) $(module_group_db) module_group_radius=acc_radius auth_radius misc_radius peering # For presence -module_group_presence=dialog pa presence_b2b rls xcap +# kamailio modules +module_group_presence=presence presence_dialoginfo presence_mwi presence_xml \ + pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ + rls xcap_client +#ser modules +module_group_presence+=dialog presence_b2b xcap +# obsolete/unmaintained ser modules +#module_group_presence=pa rls # Modules in this group satisfy specific or niche applications, but are # considered stable for production use. They may or may not have dependencies

1 0

git:kamailio_3.0: pa(s): obsoleted
by Daniel-Constantin Mierla 10 Dec '09

10 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 628af85679da9b6d95561fd099e9ad65fcea2c86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=628af85… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 9 10:53:51 2009 +0100 pa(s): obsoleted Moved pa to obsolete/ because it does not compile (needs upgrade to the current DB libs) and it does not have a maintainer. (cherry picked from commit 32aee80a3059df17aeae1970471557e57bdba557) --- {modules_s => obsolete}/pa/ChangeLog | 0 {modules_s => obsolete}/pa/Makefile | 0 {modules_s => obsolete}/pa/README | 0 {modules_s => obsolete}/pa/async_auth.c | 0 {modules_s => obsolete}/pa/async_auth.h | 0 {modules_s => obsolete}/pa/auth.c | 0 {modules_s => obsolete}/pa/auth.h | 0 {modules_s => obsolete}/pa/dlist.c | 0 {modules_s => obsolete}/pa/dlist.h | 0 {modules_s => obsolete}/pa/doc/Makefile | 0 {modules_s => obsolete}/pa/doc/auth.xml | 0 {modules_s => obsolete}/pa/doc/functions.xml | 0 {modules_s => obsolete}/pa/doc/pa.xml | 0 {modules_s => obsolete}/pa/doc/pa_base.xml | 0 {modules_s => obsolete}/pa/doc/pa_db_src.xml | 0 {modules_s => obsolete}/pa/doc/pa_incl.xml | 0 {modules_s => obsolete}/pa/doc/params.xml | 0 {modules_s => obsolete}/pa/doc/xcap.xml | 0 {modules_s => obsolete}/pa/extension_elements.c | 0 {modules_s => obsolete}/pa/extension_elements.h | 0 {modules_s => obsolete}/pa/hslot.c | 0 {modules_s => obsolete}/pa/hslot.h | 0 {modules_s => obsolete}/pa/message.c | 0 {modules_s => obsolete}/pa/message.h | 0 {modules_s => obsolete}/pa/mimetypes.c | 0 {modules_s => obsolete}/pa/mimetypes.h | 0 {modules_s => obsolete}/pa/notify.c | 0 {modules_s => obsolete}/pa/notify.h | 0 {modules_s => obsolete}/pa/offline_winfo.c | 0 {modules_s => obsolete}/pa/offline_winfo.h | 0 {modules_s => obsolete}/pa/pa_mod.c | 0 {modules_s => obsolete}/pa/pa_mod.h | 0 {modules_s => obsolete}/pa/paerrno.c | 0 {modules_s => obsolete}/pa/paerrno.h | 0 {modules_s => obsolete}/pa/pdomain.c | 0 {modules_s => obsolete}/pa/pdomain.h | 0 {modules_s => obsolete}/pa/pres_notes.c | 0 {modules_s => obsolete}/pa/pres_notes.h | 0 {modules_s => obsolete}/pa/pres_timer.c | 0 {modules_s => obsolete}/pa/presentity.c | 0 {modules_s => obsolete}/pa/presentity.h | 0 {modules_s => obsolete}/pa/ptime.c | 0 {modules_s => obsolete}/pa/ptime.h | 0 {modules_s => obsolete}/pa/publish.c | 0 {modules_s => obsolete}/pa/publish.h | 0 {modules_s => obsolete}/pa/qsa_interface.c | 0 {modules_s => obsolete}/pa/qsa_interface.h | 0 {modules_s => obsolete}/pa/reply.c | 0 {modules_s => obsolete}/pa/reply.h | 0 {modules_s => obsolete}/pa/rpc.c | 0 {modules_s => obsolete}/pa/rpc.h | 0 {modules_s => obsolete}/pa/status_query.c | 0 {modules_s => obsolete}/pa/status_query.h | 0 {modules_s => obsolete}/pa/subscribe.c | 0 {modules_s => obsolete}/pa/subscribe.h | 0 {modules_s => obsolete}/pa/trace.h | 0 {modules_s => obsolete}/pa/tuple.c | 0 {modules_s => obsolete}/pa/tuple.h | 0 {modules_s => obsolete}/pa/tuple_extensions.c | 0 {modules_s => obsolete}/pa/tuple_extensions.h | 0 {modules_s => obsolete}/pa/tuple_notes.c | 0 {modules_s => obsolete}/pa/tuple_notes.h | 0 {modules_s => obsolete}/pa/watcher.c | 0 {modules_s => obsolete}/pa/watcher.h | 0 {modules_s => obsolete}/pa/winfo_doc.c | 0 {modules_s => obsolete}/pa/winfo_doc.h | 0 66 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=628…

1 0

git:kamailio_3.0: makefiles: clean-utils and proper-utils fix
by Daniel-Constantin Mierla 10 Dec '09

10 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 7d8c22046b2e9e5bc87b78a00ba7cff7390f317c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d8c220… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 4 18:16:25 2009 +0100 makefiles: clean-utils and proper-utils fix - clean-utils and proper-utils now work both from the main directory (for utils compiled by make utils or installed by make install-utils) and from the modules directories (for utils installed by a module) - make utils now works in module directories (compiles utils that would be installed by the module) (cherry picked from commit b8e67fd6d759b1a3a2f6acd61e0b7f8706a98d73) --- Makefile | 22 ++++++++++++++++++++++ Makefile.modules | 31 +++++++++++++++++++++++++++++++ Makefile.rules | 25 ------------------------- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 9c1f2b3..e3ee534 100644 --- a/Makefile +++ b/Makefile @@ -971,6 +971,28 @@ clean-libs: proper-libs realclean-libs distclean-libs maintainer-clean-libs: $(MAKE) -C lib $(patsubst %-libs,%,$@) +# utils cleaning targets + +.PHONY: clean-utils +clean-utils: + @for r in $(C_COMPILE_UTILS) $(C_INSTALL_UTILS) "" ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" clean ; \ + fi ; \ + done + +.PHONY: proper-utils +.PHONY: distclean-utils +.PHONY: realclean-utils +.PHONY: maintainer-clean-utils +proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ + clean_target=$(patsubst %-utils,%,$@) +proper-utils realclean-utils distclean-utils maintainer-clean-utils: + @for r in $(C_COMPILE_UTILS) $(C_INSTALL_UTILS) "" ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" $(clean_target); \ + fi ; \ + done # clean extra binary names (common "flavour" names) clean: clean-extra-names diff --git a/Makefile.modules b/Makefile.modules index f1f172b..1f226ba 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -139,14 +139,45 @@ install-libs: endif # $(SER_LIBS) +.PHONY: utils +.PHONY: clean-utils +.PHONY: proper-utils +.PHONY: distclean-utils +.PHONY: realclean-utils +.PHONY: maintainer-clean-utils ifneq (,$(MOD_INSTALL_UTILS)) install-utils: @for ut in $(MOD_INSTALL_UTILS) ; do \ $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ done; true +utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + $(call try_err, $(MAKE) -C "$$r" ) ;\ + done; true + +clean-utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" clean ; \ + fi ; \ + done + +proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ + clean_target=$(patsubst %-utils,%,$@) +proper-utils realclean-utils distclean-utils maintainer-clean-utils: + @for r in $(MOD_INSTALL_UTILS) ; do \ + if [ -d "$$r" ]; then \ + $(MAKE) -C "$$r" $(clean_target); \ + fi ; \ + done + else +# ! MOD_INSTALL_UTILS install-utils: +utils: +clean-utils: +proper-utils realclean-utils distclean-utils maintainer-clean-utils: endif # $(MOD_INSTALL_UTILS) diff --git a/Makefile.rules b/Makefile.rules index 512f828..8f254f4 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -218,16 +218,6 @@ clean-modules: fi ; \ done -.PHONY: clean-utils -clean-utils: - @if [ -n "$(cmodules)" ]; then \ - for r in $(utils_compile) "" ; do \ - if [ -d "$$r" ]; then \ - $(MAKE) -C "$$r" clean ; \ - fi ; \ - done \ - fi - # make proper for the local directory .PHONY: proper .PHONY: distclean @@ -253,21 +243,6 @@ proper-modules realclean-modules distclean-modules maintainer-clean-modules: fi ; \ done -.PHONY: proper-utils -.PHONY: distclean-utils -.PHONY: realclean-utils -.PHONY: maintainer-clean-utils -proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ - clean_target=$(patsubst %-utils,%,$@) -proper-utils realclean-utils distclean-utils maintainer-clean-utils: - @if [ -n "$(cmodules)" ]; then \ - for r in $(utils_compile) "" ; do \ - if [ -d "$$r" ]; then \ - $(MAKE) -C "$$r" $(clean_target); \ - fi ; \ - done \ - fi - .PHONY: clean-tmp clean-tmp: -@rm -f TAGS tags *.dbg .*.swp

1 0

git:kamailio_3.0: tm: onreply_route executed under lock to protect the avps
by Daniel-Constantin Mierla 10 Dec '09

10 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 07b90c04d3b92e2558e61b772c7eed4e4f376ca4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07b90c0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 10 18:35:17 2009 +0100 tm: onreply_route executed under lock to protect the avps Quick fix for the onreply_route possible avp corruption: execute the onreply route under lock. --- modules/tm/t_reply.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 1573e4d..5be259c 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -89,7 +89,9 @@ * 2008-03-12 use cancel_b_method on 6xx (andrei) * 2008-05-30 make sure the wait timer is started after we don't need t * anymore to allow safe calls from fr_timer (andrei) - * 2009-06-01 Pre- and post-script callbacks of branch route are executed (Miklos) + * 2009-06-01 Pre- and post-script callbacks of branch route are + * executed (Miklos) + * 2009-12-10 reply route is executed under lock to protect the avps (andrei) * */ @@ -1861,6 +1863,7 @@ int reply_received( struct sip_msg *p_msg ) #ifdef WITH_XAVP sr_xavp_t **backup_xavps; #endif + int replies_locked; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1888,6 +1891,7 @@ int reply_received( struct sip_msg *p_msg ) tm_ctx_set_branch_index(branch); cancel_bitmap=0; msg_status=p_msg->REPLY_STATUS; + replies_locked=0; uac=&t->uac[branch]; DBG("DEBUG: reply_received: org. status uas=%d, " @@ -2015,6 +2019,9 @@ int reply_received( struct sip_msg *p_msg ) /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) */ + /* lock onreply_route, for safe avp usage */ + LOCK_REPLIES( t ); + replies_locked=1; run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { goto done; @@ -2071,15 +2078,22 @@ int reply_received( struct sip_msg *p_msg ) * reply lock is held (the lock won't be held while sending the * message)*/ if (cfg_get(core, core_cfg, use_dns_failover) && (msg_status==503)) { - branch_ret=add_uac_dns_fallback(t, t->uas.request, uac, 1); + branch_ret=add_uac_dns_fallback(t, t->uas.request, + uac, !replies_locked); prev_branch=-1; + /* unlock replies to avoid sending() while holding a lock */ + if (unlikely(replies_locked)) { + UNLOCK_REPLIES( t ); + replies_locked = 0; + } while((branch_ret>=0) &&(branch_ret!=prev_branch)){ prev_branch=branch_ret; branch_ret=t_send_branch(t, branch_ret, t->uas.request , 0, 1); } } #endif - LOCK_REPLIES( t ); + if (unlikely(!replies_locked)) + LOCK_REPLIES( t ); if ( is_local(t) ) { reply_status=local_reply( t, p_msg, branch, msg_status, &cancel_bitmap ); if (reply_status == RPS_COMPLETED) {

1 0

git:sr_3.0: tm: onreply_route executed under lock to protect the avps
by Andrei Pelinescu-Onciul 10 Dec '09

10 Dec '09

Module: sip-router Branch: sr_3.0 Commit: b577291770fbae2d9df294529dd852acd760c4d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b577291… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 10 18:35:17 2009 +0100 tm: onreply_route executed under lock to protect the avps Quick fix for the onreply_route possible avp corruption: execute the onreply route under lock. --- modules/tm/t_reply.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 28e635e..8dbd1d6 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -89,7 +89,9 @@ * 2008-03-12 use cancel_b_method on 6xx (andrei) * 2008-05-30 make sure the wait timer is started after we don't need t * anymore to allow safe calls from fr_timer (andrei) - * 2009-06-01 Pre- and post-script callbacks of branch route are executed (Miklos) + * 2009-06-01 Pre- and post-script callbacks of branch route are + * executed (Miklos) + * 2009-12-10 reply route is executed under lock to protect the avps (andrei) * */ @@ -1834,6 +1836,7 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; + int replies_locked; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1860,6 +1863,7 @@ int reply_received( struct sip_msg *p_msg ) tm_ctx_set_branch_index(branch); cancel_bitmap=0; msg_status=p_msg->REPLY_STATUS; + replies_locked=0; uac=&t->uac[branch]; DBG("DEBUG: reply_received: org. status uas=%d, " @@ -1984,6 +1988,9 @@ int reply_received( struct sip_msg *p_msg ) /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) */ + /* lock onreply_route, for safe avp usage */ + LOCK_REPLIES( t ); + replies_locked=1; if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg, 0)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ @@ -2035,15 +2042,22 @@ int reply_received( struct sip_msg *p_msg ) * reply lock is held (the lock won't be held while sending the * message)*/ if (cfg_get(core, core_cfg, use_dns_failover) && (msg_status==503)) { - branch_ret=add_uac_dns_fallback(t, t->uas.request, uac, 1); + branch_ret=add_uac_dns_fallback(t, t->uas.request, + uac, !replies_locked); prev_branch=-1; + /* unlock replies to avoid sending() while holding a lock */ + if (unlikely(replies_locked)) { + UNLOCK_REPLIES( t ); + replies_locked = 0; + } while((branch_ret>=0) &&(branch_ret!=prev_branch)){ prev_branch=branch_ret; branch_ret=t_send_branch(t, branch_ret, t->uas.request , 0, 1); } } #endif - LOCK_REPLIES( t ); + if (unlikely(!replies_locked)) + LOCK_REPLIES( t ); if ( is_local(t) ) { reply_status=local_reply( t, p_msg, branch, msg_status, &cancel_bitmap ); if (reply_status == RPS_COMPLETED) {

2 1

AVPs in replies?
by Klaus Darilion 10 Dec '09

10 Dec '09

Hi! K's tm module can be configured to have transaction AVPs or message AVPs: http://kamailio.org/docs/modules/1.5.x/tm#id2530480 What is the behaviour of ser's tm module? I need AVPs in reply route - is it supported? regards klaus

5 32

deleting tcp contacts upon restart?
by jh＠tutpro.com 10 Dec '09

10 Dec '09

when sr is restarted, would it make sense to delete all tcp contacts from location table? -- juha

1 1

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009