sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: mi_datagram: incremental rank for datagram listeners
by Daniel-Constantin Mierla 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: b29f52c3f69d71ce1663df309cb421248e2e50d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b29f52c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 18 18:33:59 2009 +0200 mi_datagram: incremental rank for datagram listeners --- modules_k/mi_datagram/mi_datagram.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index 000a0a3..e68a99a 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -282,7 +282,7 @@ static int mi_child_init(int rank) return -1; /* error */ if(pid==0) { /* child */ - datagram_process(1); + datagram_process(i); return 0; } }

1 0

git:master: mi_xmlrpc: start xmlrpc listeners using SR interface
by Daniel-Constantin Mierla 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: a752507c7806c0297aa48b3a8a53825c6ff5b871 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a752507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 18 18:34:48 2009 +0200 mi_xmlrpc: start xmlrpc listeners using SR interface - xmlrpc process started from PROC_MAIN --- modules_k/mi_xmlrpc/mi_xmlrpc.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index 9e5e504..2b0e59d 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -62,6 +62,7 @@ #include "../../sr_module.h" #include "../../str.h" +#include "../../pt.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" @@ -74,6 +75,7 @@ int rpl_opt = 0; /* module functions */ static int mod_init(); static void destroy(void); +static int child_init(int rank); static void xmlrpc_process(int rank); static int port = 8080; @@ -111,7 +113,7 @@ struct module_exports exports = { mod_init, /* module initialization function */ 0, /* response handling function */ destroy, /* destroy function */ - 0 /* per-child init function */ + child_init /* per-child init function */ }; @@ -129,9 +131,26 @@ static int mod_init(void) return -1; } + /* add space for extra processes */ + register_procs(1); + return 0; } +static int child_init(int rank) +{ + int pid; + if (rank==PROC_MAIN) { + pid=fork_process(100, "MI XMLRPC", 1); + if (pid<0) + return -1; /* error */ + if(pid==0){ + /* child */ + xmlrpc_process(1); + } + } + return 0; +} static void xmlrpc_sigchld( int sig ) {

1 0

git:master: mi_datagram: start extra processes using SR mode
by Daniel-Constantin Mierla 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: a3aa242c94be4c37f1589422634925c1b60eab05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3aa242… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 18 18:10:13 2009 +0200 mi_datagram: start extra processes using SR mode - datagram listeners started in PROC_MAIN --- modules_k/mi_datagram/mi_datagram.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index c186d33..000a0a3 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -55,6 +55,7 @@ #include "../../mem/shm_mem.h" #include "../../lib/kmi/mi.h" #include "../../ip_addr.h" +#include "../../pt.h" #include "mi_datagram.h" #include "datagram_fnc.h" #include "mi_datagram_parser.h" @@ -208,7 +209,7 @@ static int mi_mod_init(void) return -1; } mi_socket_domain = host->h_addrtype; - return 0; + goto done; } /* in case of a Unix socket*/ LM_DBG("we have an UNIX socket\n"); @@ -249,18 +250,48 @@ static int mi_mod_init(void) mi_dtgram_addr.unix_addr.sun_family = AF_LOCAL; memcpy( mi_dtgram_addr.unix_addr.sun_path, mi_socket, strlen(mi_socket)); +done: + /* add space for extra processes */ + register_procs(mi_procs[0].no); + return 0; } static int mi_child_init(int rank) { + int i; + int pid; + if (rank==PROC_TIMER || rank>0 ) { if(mi_datagram_writer_init( DATAGRAM_SOCK_BUF_SIZE , mi_reply_indent )!= 0) { LM_CRIT("failed to initiate mi_datagram_writer\n"); return -1; } } + if (rank==PROC_MAIN) { + if(pre_datagram_process()!=0) + { + LM_ERR("pre-fork function failed\n"); + return -1; + } + for(i=0; i<mi_procs[0].no; i++) + { + pid=fork_process(100, "MI DATAGRAM", 1); + if (pid<0) + return -1; /* error */ + if(pid==0) { + /* child */ + datagram_process(1); + return 0; + } + } + if(post_datagram_process()!=0) + { + LM_ERR("post-fork function failed\n"); + return -1; + } + } return 0; }

1 0

sl module
by jh＠tutpro.com 18 Apr '09

18 Apr '09

looks like it would be a high priority thing to merge k and s sl module, because separate sl modules prevent moving all presence modules to common modules directory. -- juha

1 0

git:master: * modules: presence_mwi, presence_xml, pua, pua_mi
by Juha Heinanen 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: 886cf4bfafb0b1d20f9ffadf0350961b07b37a45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=886cf4b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 18 15:53:54 2009 +0300 * modules: presence_mwi, presence_xml, pua, pua_mi Moved back to modules_k presence related modules, because they include stuff from sl module that does not exist in modules yet. --- {modules => modules_k}/presence_mwi/Makefile | 0 {modules => modules_k}/presence_mwi/README | 0 {modules => modules_k}/presence_mwi/add_events.c | 0 {modules => modules_k}/presence_mwi/add_events.h | 0 .../presence_mwi/doc/presence_mwi.xml | 0 .../presence_mwi/doc/presence_mwi_admin.xml | 0 {modules => modules_k}/presence_mwi/presence_mwi.c | 0 {modules => modules_k}/presence_mwi/presence_mwi.h | 0 {modules => modules_k}/presence_xml/Makefile | 0 {modules => modules_k}/presence_xml/README | 0 {modules => modules_k}/presence_xml/add_events.c | 0 {modules => modules_k}/presence_xml/add_events.h | 0 .../presence_xml/doc/presence_xml.xml | 0 .../presence_xml/doc/presence_xml_admin.xml | 0 .../presence_xml/doc/presence_xml_devel.xml | 0 {modules => modules_k}/presence_xml/notify_body.c | 0 {modules => modules_k}/presence_xml/notify_body.h | 0 {modules => modules_k}/presence_xml/pidf.c | 0 {modules => modules_k}/presence_xml/pidf.h | 0 {modules => modules_k}/presence_xml/presence_xml.c | 0 {modules => modules_k}/presence_xml/presence_xml.h | 0 {modules => modules_k}/presence_xml/xcap_auth.c | 0 {modules => modules_k}/presence_xml/xcap_auth.h | 0 {modules => modules_k}/pua/Makefile | 0 {modules => modules_k}/pua/README | 0 {modules => modules_k}/pua/add_events.c | 0 {modules => modules_k}/pua/add_events.h | 0 {modules => modules_k}/pua/doc/pua.xml | 0 {modules => modules_k}/pua/doc/pua_admin.xml | 0 {modules => modules_k}/pua/doc/pua_devel.xml | 0 {modules => modules_k}/pua/event_list.c | 0 {modules => modules_k}/pua/event_list.h | 0 {modules => modules_k}/pua/hash.c | 0 {modules => modules_k}/pua/hash.h | 0 {modules => modules_k}/pua/pidf.c | 0 {modules => modules_k}/pua/pidf.h | 0 {modules => modules_k}/pua/pua.c | 0 {modules => modules_k}/pua/pua.h | 0 {modules => modules_k}/pua/pua_bind.c | 0 {modules => modules_k}/pua/pua_bind.h | 0 {modules => modules_k}/pua/pua_callback.c | 0 {modules => modules_k}/pua/pua_callback.h | 0 {modules => modules_k}/pua/send_publish.c | 0 {modules => modules_k}/pua/send_publish.h | 0 {modules => modules_k}/pua/send_subscribe.c | 0 {modules => modules_k}/pua/send_subscribe.h | 0 {modules => modules_k}/pua_mi/Makefile | 0 {modules => modules_k}/pua_mi/README | 0 {modules => modules_k}/pua_mi/doc/pua_mi.xml | 0 {modules => modules_k}/pua_mi/doc/pua_mi_admin.xml | 0 {modules => modules_k}/pua_mi/mi_func.c | 0 {modules => modules_k}/pua_mi/mi_func.h | 0 {modules => modules_k}/pua_mi/pua_mi.c | 0 {modules => modules_k}/pua_mi/pua_mi.h | 0 54 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/presence_mwi/Makefile b/modules_k/presence_mwi/Makefile similarity index 100% rename from modules/presence_mwi/Makefile rename to modules_k/presence_mwi/Makefile diff --git a/modules/presence_mwi/README b/modules_k/presence_mwi/README similarity index 100% rename from modules/presence_mwi/README rename to modules_k/presence_mwi/README diff --git a/modules/presence_mwi/add_events.c b/modules_k/presence_mwi/add_events.c similarity index 100% rename from modules/presence_mwi/add_events.c rename to modules_k/presence_mwi/add_events.c diff --git a/modules/presence_mwi/add_events.h b/modules_k/presence_mwi/add_events.h similarity index 100% rename from modules/presence_mwi/add_events.h rename to modules_k/presence_mwi/add_events.h diff --git a/modules/presence_mwi/doc/presence_mwi.xml b/modules_k/presence_mwi/doc/presence_mwi.xml similarity index 100% rename from modules/presence_mwi/doc/presence_mwi.xml rename to modules_k/presence_mwi/doc/presence_mwi.xml diff --git a/modules/presence_mwi/doc/presence_mwi_admin.xml b/modules_k/presence_mwi/doc/presence_mwi_admin.xml similarity index 100% rename from modules/presence_mwi/doc/presence_mwi_admin.xml rename to modules_k/presence_mwi/doc/presence_mwi_admin.xml diff --git a/modules/presence_mwi/presence_mwi.c b/modules_k/presence_mwi/presence_mwi.c similarity index 100% rename from modules/presence_mwi/presence_mwi.c rename to modules_k/presence_mwi/presence_mwi.c diff --git a/modules/presence_mwi/presence_mwi.h b/modules_k/presence_mwi/presence_mwi.h similarity index 100% rename from modules/presence_mwi/presence_mwi.h rename to modules_k/presence_mwi/presence_mwi.h diff --git a/modules/presence_xml/Makefile b/modules_k/presence_xml/Makefile similarity index 100% rename from modules/presence_xml/Makefile rename to modules_k/presence_xml/Makefile diff --git a/modules/presence_xml/README b/modules_k/presence_xml/README similarity index 100% rename from modules/presence_xml/README rename to modules_k/presence_xml/README diff --git a/modules/presence_xml/add_events.c b/modules_k/presence_xml/add_events.c similarity index 100% rename from modules/presence_xml/add_events.c rename to modules_k/presence_xml/add_events.c diff --git a/modules/presence_xml/add_events.h b/modules_k/presence_xml/add_events.h similarity index 100% rename from modules/presence_xml/add_events.h rename to modules_k/presence_xml/add_events.h diff --git a/modules/presence_xml/doc/presence_xml.xml b/modules_k/presence_xml/doc/presence_xml.xml similarity index 100% rename from modules/presence_xml/doc/presence_xml.xml rename to modules_k/presence_xml/doc/presence_xml.xml diff --git a/modules/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml similarity index 100% rename from modules/presence_xml/doc/presence_xml_admin.xml rename to modules_k/presence_xml/doc/presence_xml_admin.xml diff --git a/modules/presence_xml/doc/presence_xml_devel.xml b/modules_k/presence_xml/doc/presence_xml_devel.xml similarity index 100% rename from modules/presence_xml/doc/presence_xml_devel.xml rename to modules_k/presence_xml/doc/presence_xml_devel.xml diff --git a/modules/presence_xml/notify_body.c b/modules_k/presence_xml/notify_body.c similarity index 100% rename from modules/presence_xml/notify_body.c rename to modules_k/presence_xml/notify_body.c diff --git a/modules/presence_xml/notify_body.h b/modules_k/presence_xml/notify_body.h similarity index 100% rename from modules/presence_xml/notify_body.h rename to modules_k/presence_xml/notify_body.h diff --git a/modules/presence_xml/pidf.c b/modules_k/presence_xml/pidf.c similarity index 100% rename from modules/presence_xml/pidf.c rename to modules_k/presence_xml/pidf.c diff --git a/modules/presence_xml/pidf.h b/modules_k/presence_xml/pidf.h similarity index 100% rename from modules/presence_xml/pidf.h rename to modules_k/presence_xml/pidf.h diff --git a/modules/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c similarity index 100% rename from modules/presence_xml/presence_xml.c rename to modules_k/presence_xml/presence_xml.c diff --git a/modules/presence_xml/presence_xml.h b/modules_k/presence_xml/presence_xml.h similarity index 100% rename from modules/presence_xml/presence_xml.h rename to modules_k/presence_xml/presence_xml.h diff --git a/modules/presence_xml/xcap_auth.c b/modules_k/presence_xml/xcap_auth.c similarity index 100% rename from modules/presence_xml/xcap_auth.c rename to modules_k/presence_xml/xcap_auth.c diff --git a/modules/presence_xml/xcap_auth.h b/modules_k/presence_xml/xcap_auth.h similarity index 100% rename from modules/presence_xml/xcap_auth.h rename to modules_k/presence_xml/xcap_auth.h diff --git a/modules/pua/Makefile b/modules_k/pua/Makefile similarity index 100% rename from modules/pua/Makefile rename to modules_k/pua/Makefile diff --git a/modules/pua/README b/modules_k/pua/README similarity index 100% rename from modules/pua/README rename to modules_k/pua/README diff --git a/modules/pua/add_events.c b/modules_k/pua/add_events.c similarity index 100% rename from modules/pua/add_events.c rename to modules_k/pua/add_events.c diff --git a/modules/pua/add_events.h b/modules_k/pua/add_events.h similarity index 100% rename from modules/pua/add_events.h rename to modules_k/pua/add_events.h diff --git a/modules/pua/doc/pua.xml b/modules_k/pua/doc/pua.xml similarity index 100% rename from modules/pua/doc/pua.xml rename to modules_k/pua/doc/pua.xml diff --git a/modules/pua/doc/pua_admin.xml b/modules_k/pua/doc/pua_admin.xml similarity index 100% rename from modules/pua/doc/pua_admin.xml rename to modules_k/pua/doc/pua_admin.xml diff --git a/modules/pua/doc/pua_devel.xml b/modules_k/pua/doc/pua_devel.xml similarity index 100% rename from modules/pua/doc/pua_devel.xml rename to modules_k/pua/doc/pua_devel.xml diff --git a/modules/pua/event_list.c b/modules_k/pua/event_list.c similarity index 100% rename from modules/pua/event_list.c rename to modules_k/pua/event_list.c diff --git a/modules/pua/event_list.h b/modules_k/pua/event_list.h similarity index 100% rename from modules/pua/event_list.h rename to modules_k/pua/event_list.h diff --git a/modules/pua/hash.c b/modules_k/pua/hash.c similarity index 100% rename from modules/pua/hash.c rename to modules_k/pua/hash.c diff --git a/modules/pua/hash.h b/modules_k/pua/hash.h similarity index 100% rename from modules/pua/hash.h rename to modules_k/pua/hash.h diff --git a/modules/pua/pidf.c b/modules_k/pua/pidf.c similarity index 100% rename from modules/pua/pidf.c rename to modules_k/pua/pidf.c diff --git a/modules/pua/pidf.h b/modules_k/pua/pidf.h similarity index 100% rename from modules/pua/pidf.h rename to modules_k/pua/pidf.h diff --git a/modules/pua/pua.c b/modules_k/pua/pua.c similarity index 100% rename from modules/pua/pua.c rename to modules_k/pua/pua.c diff --git a/modules/pua/pua.h b/modules_k/pua/pua.h similarity index 100% rename from modules/pua/pua.h rename to modules_k/pua/pua.h diff --git a/modules/pua/pua_bind.c b/modules_k/pua/pua_bind.c similarity index 100% rename from modules/pua/pua_bind.c rename to modules_k/pua/pua_bind.c diff --git a/modules/pua/pua_bind.h b/modules_k/pua/pua_bind.h similarity index 100% rename from modules/pua/pua_bind.h rename to modules_k/pua/pua_bind.h diff --git a/modules/pua/pua_callback.c b/modules_k/pua/pua_callback.c similarity index 100% rename from modules/pua/pua_callback.c rename to modules_k/pua/pua_callback.c diff --git a/modules/pua/pua_callback.h b/modules_k/pua/pua_callback.h similarity index 100% rename from modules/pua/pua_callback.h rename to modules_k/pua/pua_callback.h diff --git a/modules/pua/send_publish.c b/modules_k/pua/send_publish.c similarity index 100% rename from modules/pua/send_publish.c rename to modules_k/pua/send_publish.c diff --git a/modules/pua/send_publish.h b/modules_k/pua/send_publish.h similarity index 100% rename from modules/pua/send_publish.h rename to modules_k/pua/send_publish.h diff --git a/modules/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c similarity index 100% rename from modules/pua/send_subscribe.c rename to modules_k/pua/send_subscribe.c diff --git a/modules/pua/send_subscribe.h b/modules_k/pua/send_subscribe.h similarity index 100% rename from modules/pua/send_subscribe.h rename to modules_k/pua/send_subscribe.h diff --git a/modules/pua_mi/Makefile b/modules_k/pua_mi/Makefile similarity index 100% rename from modules/pua_mi/Makefile rename to modules_k/pua_mi/Makefile diff --git a/modules/pua_mi/README b/modules_k/pua_mi/README similarity index 100% rename from modules/pua_mi/README rename to modules_k/pua_mi/README diff --git a/modules/pua_mi/doc/pua_mi.xml b/modules_k/pua_mi/doc/pua_mi.xml similarity index 100% rename from modules/pua_mi/doc/pua_mi.xml rename to modules_k/pua_mi/doc/pua_mi.xml diff --git a/modules/pua_mi/doc/pua_mi_admin.xml b/modules_k/pua_mi/doc/pua_mi_admin.xml similarity index 100% rename from modules/pua_mi/doc/pua_mi_admin.xml rename to modules_k/pua_mi/doc/pua_mi_admin.xml diff --git a/modules/pua_mi/mi_func.c b/modules_k/pua_mi/mi_func.c similarity index 100% rename from modules/pua_mi/mi_func.c rename to modules_k/pua_mi/mi_func.c diff --git a/modules/pua_mi/mi_func.h b/modules_k/pua_mi/mi_func.h similarity index 100% rename from modules/pua_mi/mi_func.h rename to modules_k/pua_mi/mi_func.h diff --git a/modules/pua_mi/pua_mi.c b/modules_k/pua_mi/pua_mi.c similarity index 100% rename from modules/pua_mi/pua_mi.c rename to modules_k/pua_mi/pua_mi.c diff --git a/modules/pua_mi/pua_mi.h b/modules_k/pua_mi/pua_mi.h similarity index 100% rename from modules/pua_mi/pua_mi.h rename to modules_k/pua_mi/pua_mi.h

1 0

git:master: * Moved back presence module
by Juha Heinanen 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: 6f2663935df7487162d5f46c636d0bba8d04a3c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f26639… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 18 15:50:45 2009 +0300 * Moved back presence module --- {modules => modules_k}/presence/Makefile | 0 {modules => modules_k}/presence/README | 0 {modules => modules_k}/presence/bind_presence.c | 0 {modules => modules_k}/presence/bind_presence.h | 0 {modules => modules_k}/presence/doc/presence.xml | 0 .../presence/doc/presence_admin.xml | 0 .../presence/doc/presence_devel.xml | 0 {modules => modules_k}/presence/event_list.c | 0 {modules => modules_k}/presence/event_list.h | 0 {modules => modules_k}/presence/hash.c | 0 {modules => modules_k}/presence/hash.h | 0 {modules => modules_k}/presence/notify.c | 0 {modules => modules_k}/presence/notify.h | 0 {modules => modules_k}/presence/presence.c | 0 {modules => modules_k}/presence/presence.h | 0 {modules => modules_k}/presence/presentity.c | 0 {modules => modules_k}/presence/presentity.h | 0 {modules => modules_k}/presence/publish.c | 0 {modules => modules_k}/presence/publish.h | 0 {modules => modules_k}/presence/subscribe.c | 0 {modules => modules_k}/presence/subscribe.h | 0 {modules => modules_k}/presence/utils_func.c | 0 {modules => modules_k}/presence/utils_func.h | 0 23 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/presence/Makefile b/modules_k/presence/Makefile similarity index 100% rename from modules/presence/Makefile rename to modules_k/presence/Makefile diff --git a/modules/presence/README b/modules_k/presence/README similarity index 100% rename from modules/presence/README rename to modules_k/presence/README diff --git a/modules/presence/bind_presence.c b/modules_k/presence/bind_presence.c similarity index 100% rename from modules/presence/bind_presence.c rename to modules_k/presence/bind_presence.c diff --git a/modules/presence/bind_presence.h b/modules_k/presence/bind_presence.h similarity index 100% rename from modules/presence/bind_presence.h rename to modules_k/presence/bind_presence.h diff --git a/modules/presence/doc/presence.xml b/modules_k/presence/doc/presence.xml similarity index 100% rename from modules/presence/doc/presence.xml rename to modules_k/presence/doc/presence.xml diff --git a/modules/presence/doc/presence_admin.xml b/modules_k/presence/doc/presence_admin.xml similarity index 100% rename from modules/presence/doc/presence_admin.xml rename to modules_k/presence/doc/presence_admin.xml diff --git a/modules/presence/doc/presence_devel.xml b/modules_k/presence/doc/presence_devel.xml similarity index 100% rename from modules/presence/doc/presence_devel.xml rename to modules_k/presence/doc/presence_devel.xml diff --git a/modules/presence/event_list.c b/modules_k/presence/event_list.c similarity index 100% rename from modules/presence/event_list.c rename to modules_k/presence/event_list.c diff --git a/modules/presence/event_list.h b/modules_k/presence/event_list.h similarity index 100% rename from modules/presence/event_list.h rename to modules_k/presence/event_list.h diff --git a/modules/presence/hash.c b/modules_k/presence/hash.c similarity index 100% rename from modules/presence/hash.c rename to modules_k/presence/hash.c diff --git a/modules/presence/hash.h b/modules_k/presence/hash.h similarity index 100% rename from modules/presence/hash.h rename to modules_k/presence/hash.h diff --git a/modules/presence/notify.c b/modules_k/presence/notify.c similarity index 100% rename from modules/presence/notify.c rename to modules_k/presence/notify.c diff --git a/modules/presence/notify.h b/modules_k/presence/notify.h similarity index 100% rename from modules/presence/notify.h rename to modules_k/presence/notify.h diff --git a/modules/presence/presence.c b/modules_k/presence/presence.c similarity index 100% rename from modules/presence/presence.c rename to modules_k/presence/presence.c diff --git a/modules/presence/presence.h b/modules_k/presence/presence.h similarity index 100% rename from modules/presence/presence.h rename to modules_k/presence/presence.h diff --git a/modules/presence/presentity.c b/modules_k/presence/presentity.c similarity index 100% rename from modules/presence/presentity.c rename to modules_k/presence/presentity.c diff --git a/modules/presence/presentity.h b/modules_k/presence/presentity.h similarity index 100% rename from modules/presence/presentity.h rename to modules_k/presence/presentity.h diff --git a/modules/presence/publish.c b/modules_k/presence/publish.c similarity index 100% rename from modules/presence/publish.c rename to modules_k/presence/publish.c diff --git a/modules/presence/publish.h b/modules_k/presence/publish.h similarity index 100% rename from modules/presence/publish.h rename to modules_k/presence/publish.h diff --git a/modules/presence/subscribe.c b/modules_k/presence/subscribe.c similarity index 100% rename from modules/presence/subscribe.c rename to modules_k/presence/subscribe.c diff --git a/modules/presence/subscribe.h b/modules_k/presence/subscribe.h similarity index 100% rename from modules/presence/subscribe.h rename to modules_k/presence/subscribe.h diff --git a/modules/presence/utils_func.c b/modules_k/presence/utils_func.c similarity index 100% rename from modules/presence/utils_func.c rename to modules_k/presence/utils_func.c diff --git a/modules/presence/utils_func.h b/modules_k/presence/utils_func.h similarity index 100% rename from modules/presence/utils_func.h rename to modules_k/presence/utils_func.h

1 0

git:master: * modules: peering, pua, pua_mi, presence, presence_xml, presence_mwi
by Juha Heinanen 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: 302b623d8b54b11c33dd7ec6ec6716289c160c50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=302b623… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 18 15:29:07 2009 +0300 * modules: peering, pua, pua_mi, presence, presence_xml, presence_mwi Moved some k modules that don't exist in s from modules_k to modules. --- {modules_k => modules}/peering/Makefile | 0 {modules_k => modules}/peering/README | 0 {modules_k => modules}/peering/doc/peering.xml | 0 .../peering/doc/peering_admin.xml | 0 {modules_k => modules}/peering/peering.c | 0 {modules_k => modules}/peering/peering.h | 0 {modules_k => modules}/peering/verify.c | 0 {modules_k => modules}/peering/verify.h | 0 {modules_k => modules}/presence/Makefile | 0 {modules_k => modules}/presence/README | 0 {modules_k => modules}/presence/bind_presence.c | 0 {modules_k => modules}/presence/bind_presence.h | 0 {modules_k => modules}/presence/doc/presence.xml | 0 .../presence/doc/presence_admin.xml | 0 .../presence/doc/presence_devel.xml | 0 {modules_k => modules}/presence/event_list.c | 0 {modules_k => modules}/presence/event_list.h | 0 {modules_k => modules}/presence/hash.c | 0 {modules_k => modules}/presence/hash.h | 0 {modules_k => modules}/presence/notify.c | 0 {modules_k => modules}/presence/notify.h | 0 {modules_k => modules}/presence/presence.c | 0 {modules_k => modules}/presence/presence.h | 0 {modules_k => modules}/presence/presentity.c | 0 {modules_k => modules}/presence/presentity.h | 0 {modules_k => modules}/presence/publish.c | 0 {modules_k => modules}/presence/publish.h | 0 {modules_k => modules}/presence/subscribe.c | 0 {modules_k => modules}/presence/subscribe.h | 0 {modules_k => modules}/presence/utils_func.c | 0 {modules_k => modules}/presence/utils_func.h | 0 {modules_k => modules}/presence_mwi/Makefile | 0 {modules_k => modules}/presence_mwi/README | 0 {modules_k => modules}/presence_mwi/add_events.c | 0 {modules_k => modules}/presence_mwi/add_events.h | 0 .../presence_mwi/doc/presence_mwi.xml | 0 .../presence_mwi/doc/presence_mwi_admin.xml | 0 {modules_k => modules}/presence_mwi/presence_mwi.c | 0 {modules_k => modules}/presence_mwi/presence_mwi.h | 0 {modules_k => modules}/presence_xml/Makefile | 0 {modules_k => modules}/presence_xml/README | 0 {modules_k => modules}/presence_xml/add_events.c | 0 {modules_k => modules}/presence_xml/add_events.h | 0 .../presence_xml/doc/presence_xml.xml | 0 .../presence_xml/doc/presence_xml_admin.xml | 0 .../presence_xml/doc/presence_xml_devel.xml | 0 {modules_k => modules}/presence_xml/notify_body.c | 0 {modules_k => modules}/presence_xml/notify_body.h | 0 {modules_k => modules}/presence_xml/pidf.c | 0 {modules_k => modules}/presence_xml/pidf.h | 0 {modules_k => modules}/presence_xml/presence_xml.c | 0 {modules_k => modules}/presence_xml/presence_xml.h | 0 {modules_k => modules}/presence_xml/xcap_auth.c | 0 {modules_k => modules}/presence_xml/xcap_auth.h | 0 {modules_k => modules}/pua/Makefile | 0 {modules_k => modules}/pua/README | 0 {modules_k => modules}/pua/add_events.c | 0 {modules_k => modules}/pua/add_events.h | 0 {modules_k => modules}/pua/doc/pua.xml | 0 {modules_k => modules}/pua/doc/pua_admin.xml | 0 {modules_k => modules}/pua/doc/pua_devel.xml | 0 {modules_k => modules}/pua/event_list.c | 0 {modules_k => modules}/pua/event_list.h | 0 {modules_k => modules}/pua/hash.c | 0 {modules_k => modules}/pua/hash.h | 0 {modules_k => modules}/pua/pidf.c | 0 {modules_k => modules}/pua/pidf.h | 0 {modules_k => modules}/pua/pua.c | 0 {modules_k => modules}/pua/pua.h | 0 {modules_k => modules}/pua/pua_bind.c | 0 {modules_k => modules}/pua/pua_bind.h | 0 {modules_k => modules}/pua/pua_callback.c | 0 {modules_k => modules}/pua/pua_callback.h | 0 {modules_k => modules}/pua/send_publish.c | 0 {modules_k => modules}/pua/send_publish.h | 0 {modules_k => modules}/pua/send_subscribe.c | 0 {modules_k => modules}/pua/send_subscribe.h | 0 {modules_k => modules}/pua_mi/Makefile | 0 {modules_k => modules}/pua_mi/README | 0 {modules_k => modules}/pua_mi/doc/pua_mi.xml | 0 {modules_k => modules}/pua_mi/doc/pua_mi_admin.xml | 0 {modules_k => modules}/pua_mi/mi_func.c | 0 {modules_k => modules}/pua_mi/mi_func.h | 0 {modules_k => modules}/pua_mi/pua_mi.c | 0 {modules_k => modules}/pua_mi/pua_mi.h | 0 85 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=302…

1 0

git:master: * module: dialplan
by Juha Heinanen 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: 904ed822481e11087275aca036e61b7e46506773 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=904ed82… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 18 15:02:58 2009 +0300 * module: dialplan Moved from modules_k to modules. --- {modules_k => modules}/dialplan/Makefile | 0 {modules_k => modules}/dialplan/README | 0 {modules_k => modules}/dialplan/dialplan.c | 0 {modules_k => modules}/dialplan/dialplan.h | 0 {modules_k => modules}/dialplan/doc/dialplan.xml | 0 .../dialplan/doc/dialplan_admin.xml | 0 .../dialplan/doc/dialplan_devel.xml | 0 {modules_k => modules}/dialplan/dp_db.c | 0 {modules_k => modules}/dialplan/dp_db.h | 0 {modules_k => modules}/dialplan/dp_repl.c | 0 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/dialplan/Makefile b/modules/dialplan/Makefile similarity index 100% rename from modules_k/dialplan/Makefile rename to modules/dialplan/Makefile diff --git a/modules_k/dialplan/README b/modules/dialplan/README similarity index 100% rename from modules_k/dialplan/README rename to modules/dialplan/README diff --git a/modules_k/dialplan/dialplan.c b/modules/dialplan/dialplan.c similarity index 100% rename from modules_k/dialplan/dialplan.c rename to modules/dialplan/dialplan.c diff --git a/modules_k/dialplan/dialplan.h b/modules/dialplan/dialplan.h similarity index 100% rename from modules_k/dialplan/dialplan.h rename to modules/dialplan/dialplan.h diff --git a/modules_k/dialplan/doc/dialplan.xml b/modules/dialplan/doc/dialplan.xml similarity index 100% rename from modules_k/dialplan/doc/dialplan.xml rename to modules/dialplan/doc/dialplan.xml diff --git a/modules_k/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml similarity index 100% rename from modules_k/dialplan/doc/dialplan_admin.xml rename to modules/dialplan/doc/dialplan_admin.xml diff --git a/modules_k/dialplan/doc/dialplan_devel.xml b/modules/dialplan/doc/dialplan_devel.xml similarity index 100% rename from modules_k/dialplan/doc/dialplan_devel.xml rename to modules/dialplan/doc/dialplan_devel.xml diff --git a/modules_k/dialplan/dp_db.c b/modules/dialplan/dp_db.c similarity index 100% rename from modules_k/dialplan/dp_db.c rename to modules/dialplan/dp_db.c diff --git a/modules_k/dialplan/dp_db.h b/modules/dialplan/dp_db.h similarity index 100% rename from modules_k/dialplan/dp_db.h rename to modules/dialplan/dp_db.h diff --git a/modules_k/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c similarity index 100% rename from modules_k/dialplan/dp_repl.c rename to modules/dialplan/dp_repl.c

1 0

git:master: Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router
by Juha Heinanen 17 Apr '09

17 Apr '09

Module: sip-router Branch: master Commit: 2058f9802c7c9f9a53107635c7b181bafdb83c8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2058f98… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 17 12:17:37 2009 +0300 Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router * 'master' of ssh://jh@git.sip-router.org/sip-router: parser: added METHOD_PUBLISH registrar: included missing lib/kcore/km_ut.h textops: added implementation of free_/fixup_regexp_none() core: commented prototype of free_/fixup_regexp_none() kex: added module documentation kex: set dependency on kmi and kcore libs kex: new module - kamailio extensions libkmi: moved mi core commands to kex module mi_fifo: start FIFO listener process using SR interface ---

5 7

git:master: * Any pending string after the last \n token was ignored. Port
by Juha Heinanen 17 Apr '09

17 Apr '09

Module: sip-router Branch: master Commit: 34df941208059d3e09c641672b7d6c55bf740729 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34df941… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 17 10:03:00 2009 +0300 * Any pending string after the last \n token was ignored. Port from Kamailio 1.5 branch. --- modules_k/dialplan/dp_repl.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules_k/dialplan/dp_repl.c b/modules_k/dialplan/dp_repl.c index 740145d..21dbd26 100644 --- a/modules_k/dialplan/dp_repl.c +++ b/modules_k/dialplan/dp_repl.c @@ -250,6 +250,15 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, } repl_nb++; } + /* anything left? */ + if( repl_nb && token.offset+token.size < repl_comp->replacement.len){ + /*copy from the replacing string*/ + memcpy(result->s + result->len, + repl_comp->replacement.s + token.offset+token.size, + repl_comp->replacement.len -(token.offset+token.size) ); + result->len +=repl_comp->replacement.len-(token.offset+token.size); + } + result->s[result->len] = '\0'; return 0;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009