sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:8f407a91: pkg: create /var/run/kamailio with user permissions in centos 7 spec

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f407a915785a2bd594567399cd52a305ccb274e URL: https://github.com/kamailio/kamailio/commit/8f407a915785a2bd594567399cd52a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-03T15:40:20+02:00 pkg: create /var/run/kamailio with user permissions in centos 7 spec --- Modified: pkg/kamailio/centos/7/kamailio.init Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8f407a915785a2bd594567399cd52a3… Patch: https://github.com/kamailio/kamailio/commit/8f407a915785a2bd594567399cd52a3… --- diff --git a/pkg/kamailio/centos/7/kamailio.init b/pkg/kamailio/centos/7/kamailio.init index 3ee9677..2cdae7a 100644 --- a/pkg/kamailio/centos/7/kamailio.init +++ b/pkg/kamailio/centos/7/kamailio.init @@ -23,7 +23,8 @@ KAM=/usr/sbin/kamailio KAMCFG=/etc/kamailio/kamailio.cfg PROG=kamailio -PID_FILE=/var/run/kamailio.pid +HOMEDIR=/var/run/$PROG +PID_FILE=/var/run/$PROG/kamailio.pid LOCK_FILE=/var/lock/subsys/kamailio RETVAL=0 DEFAULTS=/etc/sysconfig/kamailio @@ -101,6 +102,12 @@ if test "$DUMP_CORE" = "yes" ; then echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern fi +# /var/run can be a tmpfs +if [ ! -d $HOMEDIR ]; then + mkdir -p $HOMEDIR + chown ${USER}:${GROUP} $HOMEDIR +fi + OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index f8207e2..9376953 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -623,6 +623,8 @@ install -m644 pkg/kamailio/centos/%{?centos}/kamailio.sysconfig \ /usr/sbin/groupadd -r kamailio 2> /dev/null || : /usr/sbin/useradd -r -g kamailio -s /bin/false -c "Kamailio daemon" -d \ %{_libdir}/kamailio kamailio 2> /dev/null || : +mkdir -p %{_var}/run/kamailio 2> /dev/null || : +chown kamailio:kamailio %{_var}/run/kamailio 2> /dev/null || :

7 years, 7 months

git:master:24e72969: htable: handle blob/text columns when loading from database

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 24e729698017b5d898a92cdf7acb024e44252b84 URL: https://github.com/kamailio/kamailio/commit/24e729698017b5d898a92cdf7acb024… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-03T14:25:18+02:00 htable: handle blob/text columns when loading from database - reported by Patrick Ginhoux --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/24e729698017b5d898a92cdf7acb024… Patch: https://github.com/kamailio/kamailio/commit/24e729698017b5d898a92cdf7acb024… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 6ce3fc9..83a9f01 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -114,7 +114,8 @@ static char ht_name_buf[HT_NAME_BUF_SIZE]; static int ht_pack_values(ht_t *ht, db1_res_t* db_res, int row, int cols, str *hvalue) { - static char vbuf[4096]; +#define HTABLE_PACK_BUF_SIZE 4096 + static char vbuf[HTABLE_PACK_BUF_SIZE]; int c; int len; char *p; @@ -128,6 +129,8 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, len += strlen(RES_ROWS(db_res)[row].values[c].val.string_val); } else if(RES_ROWS(db_res)[row].values[c].type == DB1_STR) { len += RES_ROWS(db_res)[row].values[c].val.str_val.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_BLOB) { + len += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { len += 12; } else { @@ -135,8 +138,9 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, return -1; } } - if(len + c>=4096) { - LM_ERR("too large values (need %d)\n", len+c); + if(len + c>=HTABLE_PACK_BUF_SIZE) { + LM_ERR("too large values (need %d, have %d)\n", len+c, + HTABLE_PACK_BUF_SIZE); return -1; } p = vbuf; @@ -151,6 +155,10 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, strncpy(p, RES_ROWS(db_res)[row].values[c].val.str_val.s, RES_ROWS(db_res)[row].values[c].val.str_val.len); p += RES_ROWS(db_res)[row].values[c].val.str_val.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_BLOB) { + memcpy(p, RES_ROWS(db_res)[row].values[c].val.blob_val.s, + RES_ROWS(db_res)[row].values[c].val.blob_val.len); + p += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { iv.s = sint2str(RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len); strncpy(p, iv.s, iv.len); @@ -280,6 +288,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); break; + case DB1_BLOB: + kname.s = (RES_ROWS(db_res)[i].values[0].val.blob_val.s); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = (RES_ROWS(db_res)[i].values[0].val.blob_val.len); + break; case DB1_STRING: kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { @@ -392,6 +408,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } str2sint(&kvalue, &val.n); break; + case DB1_BLOB: + kvalue = RES_ROWS(db_res)[i].values[3].val.blob_val; + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } + str2sint(&kvalue, &val.n); + break; case DB1_STRING: kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) { @@ -423,6 +447,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } val.s = kvalue; break; + case DB1_BLOB: + kvalue = RES_ROWS(db_res)[i].values[3].val.blob_val; + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } + val.s = kvalue; + break; case DB1_STRING: kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) {

7 years, 7 months

compiler warnings (latest master)

by Juha Heinanen

CC (gcc) [M pv.so] pv_core.o pv_core.c: In function 'pv_get_hdrc': pv_core.c:1811:9: warning: unused variable 'p_size' [-Wunused-variable] int n, p_size; ^ pv_core.c:1811:6: warning: unused variable 'n' [-Wunused-variable] int n, p_size; ^ pv_core.c:1810:12: warning: unused variable 'p_ini' [-Wunused-variable] char *p, *p_ini; ^ pv_core.c:1810:8: warning: unused variable 'p' [-Wunused-variable] char *p, *p_ini; ^ pv_core.c:1809:20: warning: unused variable 'hf0' [-Wunused-variable] struct hdr_field *hf0; ^ pv_core.c:1806:6: warning: unused variable 'idxf' [-Wunused-variable] int idxf; ^ pv_core.c:1805:6: warning: unused variable 'idx' [-Wunused-variable] int idx; ^

7 years, 7 months

git:master:71fce8d0: pv: remove unused vars in $hdrc(...) implementation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71fce8d061c50e6ad80947f16c1fe6ed8760d634 URL: https://github.com/kamailio/kamailio/commit/71fce8d061c50e6ad80947f16c1fe6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-03T14:02:28+02:00 pv: remove unused vars in $hdrc(...) implementation - reported by Juha Heinanen --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/71fce8d061c50e6ad80947f16c1fe6e… Patch: https://github.com/kamailio/kamailio/commit/71fce8d061c50e6ad80947f16c1fe6e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40a9952..cf0b606 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1802,13 +1802,8 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) */ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - int idx; - int idxf; pv_value_t tv; struct hdr_field *hf; - struct hdr_field *hf0; - char *p, *p_ini; - int n, p_size; int hcount; if(msg==NULL || res==NULL || param==NULL)

7 years, 7 months

git:master:987c8101: ims_icscf: Fix fixup functions

by Carsten Bock

Module: kamailio Branch: master Commit: 987c8101504cc7939c6782df55d7073f492e12c8 URL: https://github.com/kamailio/kamailio/commit/987c8101504cc7939c6782df55d7073… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-03T08:33:18+02:00 ims_icscf: Fix fixup functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/987c8101504cc7939c6782df55d7073… Patch: https://github.com/kamailio/kamailio/commit/987c8101504cc7939c6782df55d7073… --- diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 07eb29c..47813e2 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -270,15 +270,14 @@ static int fixup_uar(void** param, int param_no) { if (strlen((char*) *param) <= 0) { LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; + return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0){ - LM_ERR("fixup spve failed on %d\n", param_no); - return -1; - } - return 0; + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); } return 0; @@ -291,11 +290,12 @@ static int fixup_lir(void** param, int param_no) return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0) - return -1; - return 0; - } + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); + } return 0; }

7 years, 7 months

SIP-T support

by Martin Quevedo

Hello guys! I need to connect a SIP server to a GSM operator MSC so that users can call a short number on their phones and access an IVR. My SIP server does not talk SIP-T (isup embedded on sip) but the MSC requires SIP-T Is it possible to create a kamailio configuration file that translates SIP to SIP-T back and forth so that I can have that SIP-T support? Regards, Martin

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017