sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: seas(k): enable cfg framework for module's extra process
by Daniel-Constantin Mierla 10 Apr '11

10 Apr '11

Module: sip-router Branch: master Commit: 4990dea6ab31e9d0aec78ca09af96a481196cd70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4990dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:47:55 2011 +0200 seas(k): enable cfg framework for module's extra process --- modules_k/seas/event_dispatcher.c | 4 ++++ modules_k/seas/seas.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/seas/event_dispatcher.c b/modules_k/seas/event_dispatcher.c index 7702c58..7f8cbb3 100644 --- a/modules_k/seas/event_dispatcher.c +++ b/modules_k/seas/event_dispatcher.c @@ -38,6 +38,7 @@ #include "../../mem/shm_mem.h" /*shm_malloc*/ #include "../../dprint.h" /*LM_**/ #include "../../locking.h" +#include "../../cfg/cfg_struct.h" #include "seas.h" #include "ha.h" @@ -129,6 +130,9 @@ int dispatcher_main_loop(void) spawn_pinger(); while(1){ + /* update the local config framework structures */ + cfg_update(); + if(sig_flag==SIGCHLD){ while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { if (WIFEXITED(chld_status)){ diff --git a/modules_k/seas/seas.c b/modules_k/seas/seas.c index b1adb9d..c68bffa 100644 --- a/modules_k/seas/seas.c +++ b/modules_k/seas/seas.c @@ -37,6 +37,7 @@ #include "../../modules/tm/tm_load.h" /*load_tm_api*/ #include "../../modules/tm/h_table.h" /*cell*/ #include "../../modules/tm/t_lookup.h" /*T_UNDEFINED*/ +#include "../../cfg/cfg_struct.h" #include "encode_msg.h" /*encode_msg*/ @@ -681,6 +682,9 @@ static int seas_init(void) if(0>parse_cluster_cfg()) goto error; register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; error: for(i=0;i<2;i++) @@ -728,6 +732,10 @@ static int seas_child_init(int rank) /*dispatcher child. we leave writing end open so that new childs spawned * by event dispatcher can also write to pipe.. */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + /* close(write_pipe); */ return dispatcher_main_loop(); }

1 0

git:master: snmpstats(k): enable cfg framework for module's extra process
by Daniel-Constantin Mierla 10 Apr '11

10 Apr '11

Module: sip-router Branch: master Commit: 17e94fd7535f541438e09d9536c8b2767e397f13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17e94fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:41:11 2011 +0200 snmpstats(k): enable cfg framework for module's extra process --- modules_k/snmpstats/snmpstats.c | 7 +++++++ modules_k/snmpstats/sub_agent.c | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 1994876..37dc829 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -79,6 +79,7 @@ #include "snmpstats.h" #include "snmpstats_globals.h" #include "../../timer.h" +#include "../../cfg/cfg_struct.h" #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> @@ -340,6 +341,8 @@ static int mod_init(void) /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -363,6 +366,10 @@ static int mod_child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + agentx_child(1); return 0; } diff --git a/modules_k/snmpstats/sub_agent.c b/modules_k/snmpstats/sub_agent.c index 24273ec..d35a3de 100644 --- a/modules_k/snmpstats/sub_agent.c +++ b/modules_k/snmpstats/sub_agent.c @@ -65,6 +65,7 @@ #include "snmpMIBNotifications.h" #include "../../dprint.h" +#include "../../cfg/cfg_struct.h" static int keep_running; @@ -110,6 +111,9 @@ static int initialize_agentx(void) keep_running = 1; while(keep_running) { + /* update the local config framework structures */ + cfg_update(); + agent_check_and_process(1); /* 0 == don't block */ }

1 0

git:master: uac(k): enable cfg framework for module's extra process
by Daniel-Constantin Mierla 10 Apr '11

10 Apr '11

Module: sip-router Branch: master Commit: db0a6250180226ffaa700b67018ba25eb5451caf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db0a625… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:11:07 2011 +0200 uac(k): enable cfg framework for module's extra process --- modules_k/uac/uac.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/uac/uac.c b/modules_k/uac/uac.c index 105172d..81dfe35 100644 --- a/modules_k/uac/uac.c +++ b/modules_k/uac/uac.c @@ -49,6 +49,7 @@ #include "../../mod_fix.h" #include "../../rpc.h" #include "../../rpc_lookup.h" +#include "../../cfg/cfg_struct.h" #include "../rr/api.h" @@ -257,6 +258,8 @@ static int mod_init(void) } uac_reg_init_db(); register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); } init_from_replacer(); @@ -284,9 +287,16 @@ static int child_init(int rank) } if (pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + uac_reg_load_db(); uac_reg_timer(0); for(;;){ + /* update the local config framework structures */ + cfg_update(); + sleep(reg_timer_interval); uac_reg_timer(get_ticks()); }

1 0

git:master: xmpp(k): enable cfg framework for module's extra process
by Daniel-Constantin Mierla 10 Apr '11

10 Apr '11

Module: sip-router Branch: master Commit: cd3d112dcd6b0c5dd6e66fabc8082b70dcb317ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd3d112… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:18:44 2011 +0200 xmpp(k): enable cfg framework for module's extra process --- modules_k/xmpp/xmpp.c | 8 +++++++- modules_k/xmpp/xmpp_component.c | 4 ++++ modules_k/xmpp/xmpp_server.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/modules_k/xmpp/xmpp.c b/modules_k/xmpp/xmpp.c index e7a0093..ad087e4 100644 --- a/modules_k/xmpp/xmpp.c +++ b/modules_k/xmpp/xmpp.c @@ -118,6 +118,7 @@ #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" #include "../../modules/tm/tm_load.h" +#include "../../cfg/cfg_struct.h" #include "xode.h" #include "xmpp.h" @@ -245,7 +246,8 @@ static int mod_init(void) { /* add space for one extra process */ register_procs(1); - + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -263,6 +265,10 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + xmpp_process(1); } } diff --git a/modules_k/xmpp/xmpp_component.c b/modules_k/xmpp/xmpp_component.c index e93b040..123f11a 100644 --- a/modules_k/xmpp/xmpp_component.c +++ b/modules_k/xmpp/xmpp_component.c @@ -49,6 +49,7 @@ #include <string.h> #include "../../sr_module.h" +#include "../../cfg/cfg_struct.h" #include "xmpp.h" #include "xmpp_api.h" @@ -221,6 +222,9 @@ int xmpp_component_child_process(int data_pipe) maxfd = fd > data_pipe ? fd : data_pipe; rv = select(maxfd + 1, &fdset, NULL, NULL, NULL); + /* update the local config framework structures */ + cfg_update(); + if (rv < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); } else if (!rv) { diff --git a/modules_k/xmpp/xmpp_server.c b/modules_k/xmpp/xmpp_server.c index 74b82a3..cc355b4 100644 --- a/modules_k/xmpp/xmpp_server.c +++ b/modules_k/xmpp/xmpp_server.c @@ -91,6 +91,7 @@ #include <string.h> #include "../../sr_module.h" +#include "../../cfg/cfg_struct.h" #include "xmpp.h" #include "xmpp_api.h" @@ -497,6 +498,10 @@ int xmpp_server_child_process(int data_pipe) } rv = select(FD_SETSIZE, &fdset, NULL, NULL, NULL); + + /* update the local config framework structures */ + cfg_update(); + if (rv < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); } else if (!rv) {

1 0

git:master: purple(k): enable cfg framework for module's extra process
by Daniel-Constantin Mierla 10 Apr '11

10 Apr '11

Module: sip-router Branch: master Commit: 11efca600514ba791e456cc809743dd5ec6819c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11efca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:34:53 2011 +0200 purple(k): enable cfg framework for module's extra process --- modules_k/purple/clientpipe.c | 4 ++++ modules_k/purple/purple.c | 6 ++++++ modules_k/purple/purple_sip.c | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/modules_k/purple/clientpipe.c b/modules_k/purple/clientpipe.c index 2e374fb..489ba8a 100644 --- a/modules_k/purple/clientpipe.c +++ b/modules_k/purple/clientpipe.c @@ -23,6 +23,7 @@ #include <errno.h> #include "../../dprint.h" +#include "../../cfg/cfg_struct.h" #include "purple.h" #include "purplepipe.h" @@ -231,6 +232,9 @@ void pipe_reader(gpointer data, gint fd, PurpleInputCondition condition) { return; } + /* update the local config framework structures */ + cfg_update(); + switch (cmd->type) { case PURPLE_MESSAGE_CMD: LM_DBG("received message cmd via pipe from <%s> to <%s>\n", cmd->message.from, cmd->message.to); diff --git a/modules_k/purple/purple.c b/modules_k/purple/purple.c index f85b9d5..7729ffe 100644 --- a/modules_k/purple/purple.c +++ b/modules_k/purple/purple.c @@ -30,6 +30,7 @@ #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" #include "../../modules/tm/tm_load.h" +#include "../../cfg/cfg_struct.h" #include "../pua/pua_bind.h" #include "../pua/pidf.h" @@ -219,6 +220,8 @@ static int init(void) { /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -236,6 +239,9 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; runprocs(1); } } diff --git a/modules_k/purple/purple_sip.c b/modules_k/purple/purple_sip.c index 536f4f8..5b23d89 100644 --- a/modules_k/purple/purple_sip.c +++ b/modules_k/purple/purple_sip.c @@ -23,6 +23,7 @@ #include "../../dprint.h" #include "../../str.h" +#include "../../cfg/cfg_struct.h" #include "../../modules/tm/tm_load.h" #include "../pua/pua_bind.h" #include "../pua/pidf.h" @@ -41,6 +42,9 @@ int purple_send_sip_msg(char *to, char *from, char *msg) { char hdr_buf[512], ruri_buf[512]; uac_req_t uac_r; + /* update the local config framework structures */ + cfg_update(); + ruri.s = ruri_buf; ruri.len = snprintf(ruri_buf, sizeof(ruri_buf), "%s;proto=purple", to); @@ -210,10 +214,13 @@ int purple_send_sip_publish(char *from, char *tupleid, enum purple_publish_basic char pres_buff[512]; publ_info_t publ; + str pres_uri; + + /* update the local config framework structures */ + cfg_update(); memset(&publ, 0, sizeof(publ_info_t)); - str pres_uri; pres_uri.s = pres_buff; pres_uri.len = sprintf(pres_buff, "%s;proto=purple", from);

1 0

git:master: module_k/auth_radius: update due to auth api enhancements
by Juha Heinanen 09 Apr '11

09 Apr '11

Module: sip-router Branch: master Commit: 73815122531ebcc26953c784c3d66624a4154cb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7381512… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 9 19:17:52 2011 +0300 module_k/auth_radius: update due to auth api enhancements - Updated script function negative result codes due to recent auth api enhancements. See README for new and changed codes. --- modules_k/auth_radius/README | 85 ++++++++++++----------- modules_k/auth_radius/authorize.c | 41 +++++++----- modules_k/auth_radius/doc/auth_radius_admin.xml | 85 ++++++++++++----------- 3 files changed, 111 insertions(+), 100 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=738…

1 0

[tracker] Comment added: Kamailio 3.1.3 crash
by sip-router 08 Apr '11

08 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Jasmin Schnatterbeck (jasmin) ---------- Hi Timo, thanks for your message regarding the sip-spirals! Regarding dlg_manage(); it created a new dialog, despite the BYE request was in-dialog. I think that using the event-route for locally generated requests could be the problem, because it's may unusual to call functions of the dialog module in that case. May it would not be even possible without the change Daniel proposed (see above) regarding fork_process. As you mentioned, the availability of $dlg is a bit complex. There is dlg_get(), dlg_manage() and the tracking flag. In my opinion it is important to define when we should be able to decide, whether the dialog module should process the request or not. Before the first route for a request is started (event route and other "special routes") the module could check, if there is a dialog or not. For loose-routed requests that's easy, because of did=, but as there are different ways to trigger a request, it gets more and more complicated. I think besides the existing methods (enable/disable automatic processing of did= ) there should be a way to load a dialog manually. A request can be triggered in different ways through mi or other modules - it seems impossible to write a automatic dialog-detection-routine for every possible case. For example dlg_end_dlg sends hash_entry and hash_id as mi params in a specific order. If these x params are available (maybe $miparams(0-x)) it would be possible to load the dialog with an exported dialog-module function, that can load dialogs based on h_id and h_entry. Of course $dlg working every time without having to load something manually etc. would be perfect, but I think there are some limits for many special cases.... Regarding time machines, there are some disussions again http://arxiv.org/pdf/1103.1373v1 :-) Cheers Jasmin ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment199 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:mariusbucur/dmq: added dmq notification peer changes
by Marius Ovidiu Bucur 08 Apr '11

08 Apr '11

Module: sip-router Branch: mariusbucur/dmq Commit: 04fa5b387dd48f3751671b87e321438119f34d96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04fa5b3… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Apr 8 19:33:11 2011 +0300 added dmq notification peer changes --- modules_k/dmq/dmq.c | 14 ++++++++++++-- modules_k/dmq/dmq.h | 1 + modules_k/dmq/peer.c | 11 +++++++++++ modules_k/dmq/peer.h | 1 + modules_k/dmq/worker.c | 3 ++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c index 90b0ac2..7920361 100644 --- a/modules_k/dmq/dmq.c +++ b/modules_k/dmq/dmq.c @@ -50,6 +50,7 @@ #include "peer.h" #include "bind_dmq.h" #include "worker.h" +#include "notification_peer.h" #include "../../mod_fix.h" static int mod_init(void); @@ -75,6 +76,8 @@ sl_api_t slb; /** module variables */ dmq_worker_t* workers; dmq_peer_list_t* peer_list; +// the dmq module is a peer itself for receiving notifications regarding nodes +dmq_peer_t dmq_notification_peer; /** module functions */ static int mod_init(void); @@ -144,7 +147,7 @@ static int mod_init(void) { /* load peer list - the list containing the module callbacks for dmq */ peer_list = init_peer_list(); - /* register worker processes */ + /* register worker processes - add one because of the ping process */ register_procs(num_workers); /* allocate workers array */ @@ -154,12 +157,14 @@ static int mod_init(void) { return -1; } + /* add first dmq peer - the dmq module itself to receive peer notify messages */ + startup_time = (int) time(NULL); return 0; } /** - * Initialize children + * initialize children */ static int child_init(int rank) { int i, newpid; @@ -179,6 +184,11 @@ static int child_init(int rank) { workers[i].pid = newpid; } } + /** + * add the dmq notification peer. + * the dmq is a peer itself so that it can receive node notifications + */ + add_notification_peer(); return 0; } if(rank == PROC_INIT || rank == PROC_TCP_MAIN) { diff --git a/modules_k/dmq/dmq.h b/modules_k/dmq/dmq.h index 3bd9c84..6d0aac9 100644 --- a/modules_k/dmq/dmq.h +++ b/modules_k/dmq/dmq.h @@ -12,6 +12,7 @@ extern int num_workers; extern dmq_worker_t* workers; +extern dmq_peer_t dmq_notification_peer; static inline int dmq_load_api(dmq_api_t* api) { bind_dmq_f binddmq; diff --git a/modules_k/dmq/peer.c b/modules_k/dmq/peer.c index 1ec177f..4215289 100644 --- a/modules_k/dmq/peer.c +++ b/modules_k/dmq/peer.c @@ -3,6 +3,7 @@ dmq_peer_list_t* init_peer_list() { dmq_peer_list_t* peer_list = shm_malloc(sizeof(dmq_peer_list_t)); memset(peer_list, 0, sizeof(dmq_peer_list_t)); + lock_init(&peer_list->lock); return peer_list; } @@ -15,6 +16,7 @@ dmq_peer_t* search_peer_list(dmq_peer_list_t* peer_list, dmq_peer_t* peer) { if(strncasecmp(cur->peer_id.s, peer->peer_id.s, len) == 0) { return cur; } + cur = cur->next; } return 0; } @@ -22,17 +24,26 @@ dmq_peer_t* search_peer_list(dmq_peer_list_t* peer_list, dmq_peer_t* peer) { void add_peer(dmq_peer_list_t* peer_list, dmq_peer_t* peer) { dmq_peer_t* new_peer = shm_malloc(sizeof(dmq_peer_t)); *new_peer = *peer; + + /* copy the str's */ + new_peer->peer_id.s = shm_malloc(peer->peer_id.len); + memcpy(new_peer->peer_id.s, peer->peer_id.s, peer->peer_id.len); + new_peer->description.s = shm_malloc(peer->description.len); + memcpy(new_peer->peer_id.s, peer->peer_id.s, peer->peer_id.len); + new_peer->next = peer_list->peers; peer_list->peers = new_peer; } int register_dmq_peer(dmq_peer_t* peer) { + lock_get(&peer_list->lock); if(search_peer_list(peer_list, peer)) { LM_ERR("peer already exists: %.*s %.*s\n", peer->peer_id.len, peer->peer_id.s, peer->description.len, peer->description.s); return -1; } add_peer(peer_list, peer); + lock_release(&peer_list->lock); return 0; } diff --git a/modules_k/dmq/peer.h b/modules_k/dmq/peer.h index 72c851f..b9a09ee 100644 --- a/modules_k/dmq/peer.h +++ b/modules_k/dmq/peer.h @@ -18,6 +18,7 @@ typedef struct dmq_peer { } dmq_peer_t; typedef struct dmq_peer_list { + gen_lock_t lock; dmq_peer_t* peers; int count; } dmq_peer_list_t; diff --git a/modules_k/dmq/worker.c b/modules_k/dmq/worker.c index 6eaae21..3a3005c 100644 --- a/modules_k/dmq/worker.c +++ b/modules_k/dmq/worker.c @@ -49,7 +49,8 @@ int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) { } } if(!found_available) { - LM_DBG("no available worker found, passing job to the least busy one\n"); + LM_DBG("no available worker found, passing job to the least busy one [%d %d]\n", + worker->pid, job_queue_size(worker->queue)); } job_queue_push(worker->queue, &new_job); lock_release(&worker->lock);

1 0

git:mariusbucur/dmq: added notification peer to the dmq module
by Marius Ovidiu Bucur 08 Apr '11

08 Apr '11

Module: sip-router Branch: mariusbucur/dmq Commit: 7c81dea1c74b2359770c2e5c62088897fe2f9a42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c81dea… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Apr 8 19:32:50 2011 +0300 added notification peer to the dmq module --- modules_k/dmq/notification_peer.c | 17 +++++++++++++++++ modules_k/dmq/notification_peer.h | 4 ++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/modules_k/dmq/notification_peer.c b/modules_k/dmq/notification_peer.c new file mode 100644 index 0000000..28fba07 --- /dev/null +++ b/modules_k/dmq/notification_peer.c @@ -0,0 +1,17 @@ +#include "notification_peer.h" + +int add_notification_peer() { + int ret; + dmq_notification_peer.callback = dmq_notification_callback; + dmq_notification_peer.description.s = "dmqpeer"; + dmq_notification_peer.description.len = 7; + dmq_notification_peer.peer_id.s = "dmqpeer"; + dmq_notification_peer.peer_id.len = 7; + ret = register_dmq_peer(&dmq_notification_peer); + return ret; +} + +int dmq_notification_callback(struct sip_msg* msg) { + LM_ERR("dmq triggered from dmq_notification_callback\n"); + return 0; +} \ No newline at end of file diff --git a/modules_k/dmq/notification_peer.h b/modules_k/dmq/notification_peer.h new file mode 100644 index 0000000..0e6121a --- /dev/null +++ b/modules_k/dmq/notification_peer.h @@ -0,0 +1,4 @@ +#include "dmq.h" + +int add_notification_peer(); +int dmq_notification_callback(struct sip_msg* msg); \ No newline at end of file

1 0

git:3.1: modules_k:siputils Fixed the fixup for ring_insert_callid
by Marius Zbihlei 08 Apr '11

08 Apr '11

Module: sip-router Branch: 3.1 Commit: 1a33654d739577747fd58d7a661b07e3a1f6fd41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a33654… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 8 16:48:37 2011 +0300 modules_k:siputils Fixed the fixup for ring_insert_callid (cherry picked from commit 8fdc717ab8b28857e23366804f0668b83971f249) --- modules_k/siputils/ring.c | 1 + modules_k/siputils/ring.h | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/siputils/ring.c b/modules_k/siputils/ring.c index ed0d478..1ae54b2 100644 --- a/modules_k/siputils/ring.c +++ b/modules_k/siputils/ring.c @@ -374,6 +374,7 @@ int ring_filter(struct sip_msg *msg, unsigned int flags, void *bar) * \return 0 */ int ring_fixup(void ** param, int param_no) { + int ring_timeout = cfg_get(siputils, siputils_cfg, ring_timeout); if (ring_timeout == 0) { LM_ERR("ring_insert_callid functionality deactivated, you need to set a positive ring_timeout\n"); return -1; diff --git a/modules_k/siputils/ring.h b/modules_k/siputils/ring.h index 74b35a6..2097f8f 100644 --- a/modules_k/siputils/ring.h +++ b/modules_k/siputils/ring.h @@ -38,7 +38,6 @@ extern gen_lock_t *ring_lock; -extern unsigned int ring_timeout; /*!

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
28
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 2011