sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:4d1e4e81: geoip2: added continet conde for new geoip api pv
by Daniel-Constantin Mierla 12 Mar '15

12 Mar '15

Module: kamailio Branch: master Commit: 4d1e4e815d4ba7dbfe913caff42715b2adb74720 URL: https://github.com/kamailio/kamailio/commit/4d1e4e815d4ba7dbfe913caff42715b… Author: Sergey Okhapkin <sos(a)sokhapkin.dyndns.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-12T09:57:44+01:00 geoip2: added continet conde for new geoip api pv --- Modified: modules/geoip2/README Modified: modules/geoip2/doc/geoip2_admin.xml Modified: modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/4d1e4e815d4ba7dbfe913caff42715b… Patch: https://github.com/kamailio/kamailio/commit/4d1e4e815d4ba7dbfe913caff42715b… --- diff --git a/modules/geoip2/README b/modules/geoip2/README index c9cb1ed..fd07cdd 100644 --- a/modules/geoip2/README +++ b/modules/geoip2/README @@ -141,6 +141,7 @@ if(geoip2_match("$si", "src")) + regc - region + regn - region name + metro - metro code + + contc - continent code Exported pseudo-variables are documented at http://www.kamailio.org/wiki/. diff --git a/modules/geoip2/doc/geoip2_admin.xml b/modules/geoip2/doc/geoip2_admin.xml index 244930d..b944bb3 100644 --- a/modules/geoip2/doc/geoip2_admin.xml +++ b/modules/geoip2/doc/geoip2_admin.xml @@ -163,6 +163,9 @@ if(geoip2_match("$si", "src")) <listitem><para> <emphasis>metro</emphasis> - metro code </para></listitem> + <listitem><para> + <emphasis>contc</emphasis> - continent code + </para></listitem> </itemizedlist> </listitem> </itemizedlist> diff --git a/modules/geoip2/geoip2_pv.c b/modules/geoip2/geoip2_pv.c index f9f7dbb..69bd719 100644 --- a/modules/geoip2/geoip2_pv.c +++ b/modules/geoip2/geoip2_pv.c @@ -41,6 +41,7 @@ typedef struct _sr_geoip2_record { str region_code; str region_name; str country; + str cont_code; char latitude[16]; char longitude[16]; char metro[16]; @@ -207,6 +208,8 @@ int pv_parse_geoip2_name(pv_spec_p sp, str *in) gpv->type = 12; else if(strncmp(pvs.s, "nmask", 5)==0) gpv->type = 13; + else if(strncmp(pvs.s, "contc", 5)==0) + gpv->type = 6; else goto error; break; default: @@ -311,6 +314,22 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, } return pv_geoip2_get_strzval(msg, param, res, gpv->item->r.longitude); + case 6: /* contc */ + if(gpv->item->r.cont_code.s==NULL) + { + if(gpv->item->r.flags&16) + return pv_get_null(msg, param, res); + if(MMDB_get_value(&gpv->item->r.record.entry, &entry_data, + "continent","code", NULL + ) != MMDB_SUCCESS) + return pv_get_null(msg, param, res); + if(entry_data.has_data && entry_data.type == MMDB_DATA_TYPE_UTF8_STRING) { + gpv->item->r.cont_code.s = (char *)entry_data.utf8_string; + gpv->item->r.cont_code.len = entry_data.data_size; + } + gpv->item->r.flags |= 16; + } + return pv_get_strval(msg, param, res, &gpv->item->r.cont_code); case 8: /* city */ if(gpv->item->r.city.s==NULL) {

1 0

git:master:0d0bf309: geoip: continent code attribute name changed to contc
by Daniel-Constantin Mierla 12 Mar '15

12 Mar '15

Module: kamailio Branch: master Commit: 0d0bf30963e24cd8218f2edd3f26a16dd6e66ee5 URL: https://github.com/kamailio/kamailio/commit/0d0bf30963e24cd8218f2edd3f26a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-12T09:48:08+01:00 geoip: continent code attribute name changed to contc - similar pattern like for the other attributes --- Modified: modules/geoip/geoip_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0d0bf30963e24cd8218f2edd3f26a16… Patch: https://github.com/kamailio/kamailio/commit/0d0bf30963e24cd8218f2edd3f26a16… --- diff --git a/modules/geoip/geoip_pv.c b/modules/geoip/geoip_pv.c index e52d4da..46c4dff 100644 --- a/modules/geoip/geoip_pv.c +++ b/modules/geoip/geoip_pv.c @@ -210,10 +210,7 @@ int pv_parse_geoip_name(pv_spec_p sp, str *in) case 5: if(strncmp(pvs.s, "metro", 5)==0) gpv->type = 12; - else goto error; - break; - case 6: - if(strncmp(pvs.s, "contid", 6)==0) + else if(strncmp(pvs.s, "contc", 5)==0) gpv->type = 13; else goto error; break; @@ -354,7 +351,7 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); return pv_get_sintval(msg, param, res, gpv->item->r.record->metro_code); - case 13: /* contid */ + case 13: /* contc */ if(gpv->item->r.record==NULL) return pv_get_null(msg, param, res); return pv_geoip_get_strzval(msg, param, res,

1 0

[ser-dev] re.h - subst_str ussage
by Cockhootec Yahrabee 11 Mar '15

11 Mar '15

Hi guys, I am trying to 'search&replace' some patterns in message body but unfortunately with no result (but bunch of errors). First of all I am trying to perform regex substitution as one that can be seen at https://regex101.com/r/vF1kZ7/1 Since I have regular expression I am trying to convert it so it will work with `sub_str` function from re.h Here is my attempt: https://gist.github.com/ivanbarlog/1b552b57e89bf4670872#file-test-c-L12 I had quite lot of errors but last error I am getting is that `subst_parser` cannot find separator https://github.com/kamailio/kamailio/blob/master/re.c#L240 Since the `struct subst_expr` is not parsed right the next error is segfault in `subst_str` function. If someone can explain me how exactly I should use `subst_str` function with my regex I'll be really grateful. Little example code would be also great. Thanks in advance

2 1

git:master:95e02eb1: auth_xkeys: remove unused variable: hbody
by Ovidiu Sas 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: 95e02eb1df87a0fc5733f1063124254a81da5d83 URL: https://github.com/kamailio/kamailio/commit/95e02eb1df87a0fc5733f1063124254… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2015-03-11T12:45:15-04:00 auth_xkeys: remove unused variable: hbody --- Modified: modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/95e02eb1df87a0fc5733f1063124254… Patch: https://github.com/kamailio/kamailio/commit/95e02eb1df87a0fc5733f1063124254… --- diff --git a/modules/auth_xkeys/auth_xkeys.c b/modules/auth_xkeys/auth_xkeys.c index 2dbc083..36002b9 100644 --- a/modules/auth_xkeys/auth_xkeys.c +++ b/modules/auth_xkeys/auth_xkeys.c @@ -197,7 +197,6 @@ int auth_xkeys_add(sip_msg_t* msg, str *hdr, str *key, str *alg, str *data) { str xdata; - str hbody; auth_xkey_t *itc; char xout[SHA512_DIGEST_STRING_LENGTH]; struct lump* anchor;

1 0

[kamailio] xmlrpc: Improve doc (#109)
by Eloy Coto 11 Mar '15

11 Mar '15

Hi, I don't want to commit directly to other modules ;-) - Fix broken links into the xmlrpc doc. - Add xmlrpc_test2.py into the doc. - Add a small comment into the xmlrpc_test2.py. (Easy to understand how xmlrpc works.) Regards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/109 -- Commit Summary -- * xmlrpc: Improve doc -- File Changes -- M modules/xmlrpc/doc/xmlrpc.xml (41) M modules/xmlrpc/examples/xmlrpc_test2.py (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/109.patch https://github.com/kamailio/kamailio/pull/109.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/109

2 4

git:master:7675bae5: Merge pull request #109 from eloycoto/master
by Eloy Coto 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: 7675bae5b99b79d80de13afac9fd7cdf41f531a2 URL: https://github.com/kamailio/kamailio/commit/7675bae5b99b79d80de13afac9fd7cd… Author: Eloy Coto <eloy.coto(a)gmail.com> Committer: Eloy Coto <eloy.coto(a)gmail.com> Date: 2015-03-11T15:38:47Z Merge pull request #109 from eloycoto/master xmlrpc: Improve doc --- Modified: modules/xmlrpc/doc/xmlrpc.xml Modified: modules/xmlrpc/examples/xmlrpc_test2.py --- Diff: https://github.com/kamailio/kamailio/commit/7675bae5b99b79d80de13afac9fd7cd… Patch: https://github.com/kamailio/kamailio/commit/7675bae5b99b79d80de13afac9fd7cd…

1 0

git:master:0dfb6814: xmlrpc: Improve doc
by Eloy Coto 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: 0dfb68143ceeccd613cc76e01dcc9bdce9d22ccb URL: https://github.com/kamailio/kamailio/commit/0dfb68143ceeccd613cc76e01dcc9bd… Author: Eloy Coto <eloy.coto(a)gmail.com> Committer: Eloy Coto <eloy.coto(a)gmail.com> Date: 2015-03-11T15:11:07Z xmlrpc: Improve doc --- Modified: modules/xmlrpc/doc/xmlrpc.xml Modified: modules/xmlrpc/examples/xmlrpc_test2.py --- Diff: https://github.com/kamailio/kamailio/commit/0dfb68143ceeccd613cc76e01dcc9bd… Patch: https://github.com/kamailio/kamailio/commit/0dfb68143ceeccd613cc76e01dcc9bd…

1 0

git:master:db26c5ce: db_mysql: Remove SVN ID's, remove history sections
by Olle E. Johansson 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: db26c5ceb8bb68afdbab9bd2fc93fcaf5b299110 URL: https://github.com/kamailio/kamailio/commit/db26c5ceb8bb68afdbab9bd2fc93fca… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-11T16:26:21+01:00 db_mysql: Remove SVN ID's, remove history sections --- Modified: modules/db_mysql/km_db_mysql.c Modified: modules/db_mysql/km_db_mysql.h Modified: modules/db_mysql/km_dbase.c Modified: modules/db_mysql/km_dbase.h Modified: modules/db_mysql/km_my_con.c Modified: modules/db_mysql/km_my_con.h Modified: modules/db_mysql/km_res.c Modified: modules/db_mysql/km_res.h Modified: modules/db_mysql/km_row.c Modified: modules/db_mysql/km_row.h Modified: modules/db_mysql/km_val.c Modified: modules/db_mysql/km_val.h Modified: modules/db_mysql/my_cmd.c Modified: modules/db_mysql/my_cmd.h Modified: modules/db_mysql/my_con.c Modified: modules/db_mysql/my_con.h Modified: modules/db_mysql/my_fld.c Modified: modules/db_mysql/my_fld.h Modified: modules/db_mysql/my_res.c Modified: modules/db_mysql/my_res.h Modified: modules/db_mysql/my_uri.c Modified: modules/db_mysql/my_uri.h Modified: modules/db_mysql/mysql_mod.c Modified: modules/db_mysql/mysql_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/db26c5ceb8bb68afdbab9bd2fc93fca… Patch: https://github.com/kamailio/kamailio/commit/db26c5ceb8bb68afdbab9bd2fc93fca…

1 0

git:master:a00367f9: presence: Remove svn id, remove history
by Olle E. Johansson 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: a00367f9fdb1fc689f071a419576aa5b5a96b3a1 URL: https://github.com/kamailio/kamailio/commit/a00367f9fdb1fc689f071a419576aa5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-11T15:30:50+01:00 presence: Remove svn id, remove history --- Modified: modules/presence/bind_presence.c Modified: modules/presence/bind_presence.h Modified: modules/presence/event_list.c Modified: modules/presence/event_list.h Modified: modules/presence/hash.c Modified: modules/presence/hash.h Modified: modules/presence/notify.c Modified: modules/presence/notify.h Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/presentity.c Modified: modules/presence/presentity.h Modified: modules/presence/publish.c Modified: modules/presence/publish.h Modified: modules/presence/subscribe.c Modified: modules/presence/subscribe.h Modified: modules/presence/utils_func.c Modified: modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/a00367f9fdb1fc689f071a419576aa5… Patch: https://github.com/kamailio/kamailio/commit/a00367f9fdb1fc689f071a419576aa5…

1 0

git:master:3b5633de: ctl: use uid/gid from the core if not set for the module
by Daniel-Constantin Mierla 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: 3b5633de56c2367d19122f0f3c01698af34a21e9 URL: https://github.com/kamailio/kamailio/commit/3b5633de56c2367d19122f0f3c01698… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-11T09:42:02+01:00 ctl: use uid/gid from the core if not set for the module - otherwise it cannot do clean created files at shut down --- Modified: modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/3b5633de56c2367d19122f0f3c01698… Patch: https://github.com/kamailio/kamailio/commit/3b5633de56c2367d19122f0f3c01698… --- diff --git a/modules/ctl/ctl.c b/modules/ctl/ctl.c index 2a05435..f630f8a 100644 --- a/modules/ctl/ctl.c +++ b/modules/ctl/ctl.c @@ -264,6 +264,9 @@ static int mod_init(void) goto error; } } + /* get the uid/gid from core if not set for the module */ + if(usock_uid==-1 && sock_uid!=-1) usock_uid = sock_uid; + if(usock_gid==-1 && sock_gid!=-1) usock_gid = sock_gid; /* open socket now, before suid */ if (init_ctrl_sockets(&ctrl_sock_lst, listen_lst, DEFAULT_CTL_PORT, usock_mode, usock_uid, usock_gid)<0){

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015