sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:master: db_flatstore: use PROC_MIN to compute process uid

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4727a534f767e6f2422dc58bb22bbf266408874c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4727a53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:39:58 2011 +0100 db_flatstore: use PROC_MIN to compute process uid - PROC_TCP_MAIN is no longer the lowerest and can produce overlappings --- modules/db_flatstore/km_flatstore_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index a97e9ef..5f377a0 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -136,7 +136,7 @@ int km_child_init(int rank) if (rank <= 0) { km_flat_pid = - rank; } else { - km_flat_pid = rank - PROC_TCP_MAIN; + km_flat_pid = rank - PROC_MIN; } return 0; }

13 years, 10 months

git:master: db_flatstore: skip child init for proc init rank

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ef2906d5036dd48320702285f6390e9e688a292a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef2906d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:43:08 2011 +0100 db_flatstore: skip child init for proc init rank --- modules/db_flatstore/flatstore_mod.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index b008f20..efbe6e1 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -192,6 +192,9 @@ static int child_init(int rank) char* tmp; unsigned int v; + if(rank==PROC_INIT) + return 0; + km_child_init(rank); if (rank <= 0) {

13 years, 10 months

git:master: matrix: don't do db init for rank==proc_init and tcp main

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 24731c59cd9dcb0d1c567821ffdfb1860d4def9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24731c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 4 00:25:20 2011 +0100 matrix: don't do db init for rank==proc_init and tcp main --- modules/matrix/matrix.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 3c921c3..67d117e 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -597,6 +597,8 @@ static int mod_init(void) static int child_init(int rank) { + if(rank==PROC_INIT || rank==PROC_TCP_MAIN) + return 0; if (matrix_db_open() != 0) return -1; return 0; }

13 years, 10 months

git:master: doc: add small note about SCTP compile time deps to INSTALL file, reported from Juha

by Henning Westerholt

Module: sip-router Branch: master Commit: d4d6d3c0270a5892fae87650adc7600a40e25c0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4d6d3c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 3 12:41:20 2011 +0100 doc: add small note about SCTP compile time deps to INSTALL file, reported from Juha --- INSTALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 85b568f..e631567 100644 --- a/INSTALL +++ b/INSTALL @@ -126,6 +126,7 @@ Requirements: module - libpcre libs and devel headers - if you want to compile the lcr and dialplan modules +- libsctp devel headers - if you want to compile the SCTP transport in the core OS Notes:

13 years, 10 months

git:master: mtree: skip db init for special ranks

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 517df28fc695b047d1f7f3cd4376a5f9240b7906 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=517df28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:39:11 2011 +0100 mtree: skip db init for special ranks --- modules/mtree/mtree_mod.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index aeb98ad..29ea12a 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -104,8 +104,8 @@ static int w_mt_match(struct sip_msg* msg, char* str1, char* str2, static int mod_init(void); static void mod_destroy(void); -static int child_init(void); -static int mod_child_init(int r); +static int child_init(int rank); +static int mi_child_init(void); static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, gparam_t *mode); @@ -142,7 +142,7 @@ static param_export_t params[]={ }; static mi_export_t mi_cmds[] = { - { "mt_reload", mt_mi_reload, 0, 0, child_init }, + { "mt_reload", mt_mi_reload, 0, 0, mi_child_init }, { "mt_list", mt_mi_list, 0, 0, 0 }, { "mt_summary", mt_mi_summary, 0, 0, 0 }, { 0, 0, 0, 0, 0} @@ -161,7 +161,7 @@ struct module_exports exports = { mod_init, /* module initialization function */ 0, /* response function */ mod_destroy, /* destroy function */ - mod_child_init /* per child init function */ + child_init /* per child init function */ }; @@ -322,8 +322,10 @@ error1: return -1; } - -static int child_init(void) +/** + * mi and worker process initialization + */ +static int mi_child_init(void) { if(db_con!=NULL) return 0; @@ -339,12 +341,16 @@ static int child_init(void) /* each child get a new connection to the database */ -static int mod_child_init(int r) +static int child_init(int rank) { - if ( child_init()!=0 ) + /* skip child init for non-worker process ranks */ + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) + return 0; + + if ( mi_child_init()!=0 ) return -1; - LM_DBG("#%d: database connection opened successfully\n",r); + LM_DBG("#%d: database connection opened successfully\n", rank); return 0; }

13 years, 10 months

git:master: pdt(k): mi child init function name updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8cd8d0e18a8ead373229ce413ad7cd7f827a98e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cd8d0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:44:18 2011 +0100 pdt(k): mi child init function name updated - child_init => mi_child_init - mod_child_init => child_init --- modules_k/pdt/pdt.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index 9428307..a5eeed4 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -95,8 +95,8 @@ static int w_prefix2domain_1(struct sip_msg* msg, char* mode, char* str2); static int w_prefix2domain_2(struct sip_msg* msg, char* mode, char* sd_en); static int mod_init(void); static void mod_destroy(void); -static int child_init(void); -static int mod_child_init(int r); +static int child_init(int rank); +static int mi_child_init(void); static int prefix2domain(struct sip_msg*, int mode, int sd_en); static struct mi_root* pdt_mi_reload(struct mi_root*, void* param); @@ -131,7 +131,7 @@ static param_export_t params[]={ }; static mi_export_t mi_cmds[] = { - { "pdt_add", pdt_mi_add, 0, 0, child_init }, + { "pdt_add", pdt_mi_add, 0, 0, mi_child_init }, { "pdt_reload", pdt_mi_reload, 0, 0, 0 }, { "pdt_delete", pdt_mi_delete, 0, 0, 0 }, { "pdt_list", pdt_mi_list, 0, 0, 0 }, @@ -151,7 +151,7 @@ struct module_exports exports = { mod_init, /* module initialization function */ 0, /* response function */ mod_destroy, /* destroy function */ - mod_child_init /* per child init function */ + child_init /* per child init function */ }; @@ -270,7 +270,10 @@ error1: } -static int child_init(void) +/** + * mi and worker process init + */ +static int mi_child_init(void) { /* check if db handler is initialized */ if(db_con!=NULL) @@ -293,15 +296,15 @@ static int child_init(void) /* each child get a new connection to the database */ -static int mod_child_init(int r) +static int child_init(int rank) { - if (r==PROC_INIT || r==PROC_MAIN || r==PROC_TCP_MAIN) + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ - if ( child_init()!=0 ) + if ( mi_child_init()!=0 ) return -1; - LM_DBG("#%d: database connection opened successfully\n",r); + LM_DBG("#%d: database connection opened successfully\n", rank); return 0; }

13 years, 10 months

git:master: dialog(k): open db connection for main process in db delayed mode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7c530f69da7368f87e78d7a3ad1f3439005402a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c530f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 19:56:40 2011 +0100 dialog(k): open db connection for main process in db delayed mode - used at shutdown to write to db --- modules_k/dialog/dialog.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 8a0963c..9d875b7 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -612,9 +612,10 @@ static int child_init(int rank) if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && - (rank>0 || rank==PROC_TIMER)) || - (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) + && (rank>0 || rank==PROC_TIMER || rank==PROC_MAIN)) + || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) + { if ( dlg_connect_db(&db_url) ) { LM_ERR("failed to connect to database (rank=%d)\n",rank); return -1;

13 years, 10 months

git:3.1: srdb1: keep PID per DB connection

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: d173cc2dab95dba6ededdaa352bf1e2bde1faa0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d173cc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 1 23:30:34 2010 +0100 srdb1: keep PID per DB connection - print warning when PID mismatches - it is cross-process shared DB connection - initial patch by Robert Verspuy (cherry picked from commit f138cce2c0968872f26538983e06a128a1b41344) --- lib/srdb1/db_id.c | 6 ++++++ lib/srdb1/db_id.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index d55c586..c8db30f 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -30,6 +30,7 @@ #include "db_id.h" #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../pt.h" #include "../../ut.h" #include <stdlib.h> #include <string.h> @@ -241,6 +242,7 @@ struct db_id* new_db_id(const str* url) LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); goto err; } + ptr->pid = my_pid(); return ptr; @@ -274,6 +276,10 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2) } if (strcasecmp(id1->host, id2->host)) return 0; if (strcmp(id1->database, id2->database)) return 0; + if(id1->pid!=id2->pid) { + LM_WARN("identical DB URLs, but different DB connection pid\n"); + return 0; + } return 1; } diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index 025855f..20ab846 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -40,6 +40,7 @@ struct db_id { char* host; /**< Host or IP, case insensitive */ unsigned short port; /**< Port number */ char* database; /**< Database, case sensitive */ + int pid; /**< Process ID (detect cross connections) */ };

13 years, 10 months

[tracker] Task closed: segfault on loading dialplan module 3.1.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#109 - segfault on loading dialplan module 3.1.1 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Fixed with commit GIT#12aebbf1056 More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=109 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.

13 years, 10 months

git:kamailio_3.0: dialplan: fix matching string comparison op

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5392eb7f167d42734de1641d8f7e9f95e6fabc72 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5392eb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 2 16:10:40 2011 +0100 dialplan: fix matching string comparison op - the return code was tested as for match of regexp, which led to mismatches for str comparison - credits to Jordan Levy (cherry picked from commit 88f03cb2cf50ee0b09fda8b3c4c4651553ddd176) --- modules/dialplan/dp_repl.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 21dbd26..e9b875d 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -304,21 +304,23 @@ search_rule: case EQUAL_OP: LM_DBG("equal operator testing\n"); - if(rulep->match_exp.len != input.len) + if(rulep->match_exp.len != input.len) { rez = -1; - else + } else { rez = strncmp(rulep->match_exp.s,input.s,input.len); - break; + rez = (rez==0)?0:-1; + } + break; default: - LM_ERR("bogus match operator code %i\n", rulep->matchop); + LM_ERR("bogus match operator code %i\n", rulep->matchop); return -1; } if(rez >= 0) - goto repl; + goto repl; } - /*test the rules with len 0*/ - if(indexp->len){ + /*test the rules with len 0*/ + if(indexp->len){ for(indexp = indexp->next; indexp!=NULL; indexp = indexp->next) if(!indexp->len) break;

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011