sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:a5484f40: geoip2: removed unneeded lib kmi from Makefile
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Module: kamailio Branch: master Commit: a5484f40c9fb27d7570906b96b8c951476cc12d7 URL: https://github.com/kamailio/kamailio/commit/a5484f40c9fb27d7570906b96b8c951… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-02T09:10:57+01:00 geoip2: removed unneeded lib kmi from Makefile - bits of formatting and removed svn ids --- Modified: src/modules/geoip2/Makefile Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/a5484f40c9fb27d7570906b96b8c951… Patch: https://github.com/kamailio/kamailio/commit/a5484f40c9fb27d7570906b96b8c951… --- diff --git a/src/modules/geoip2/Makefile b/src/modules/geoip2/Makefile index f4b26a4..beb6d44 100644 --- a/src/modules/geoip2/Makefile +++ b/src/modules/geoip2/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# geoip2 module # # WARNING: do not run this directly, it should be run by the master Makefile @@ -9,7 +9,4 @@ LIBS= -lmaxminddb DEFS+=-DKAMAILIO_MOD_INTERFACE -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi - include ../../Makefile.modules diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 114e724..382a540 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -1,5 +1,4 @@ /** - * $Id$ * * This file is part of Kamailio, a free SIP server. * @@ -115,7 +114,7 @@ static int geoip2_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname) { str tomatch; str pvclass; - + if(msg==NULL) { LM_ERR("received null msg\n"); diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index a6464c4..cb5f6ea 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -1,5 +1,4 @@ /** - * $Id$ * * This file is part of Kamailio, a free SIP server. * @@ -178,14 +177,14 @@ int pv_parse_geoip2_name(pv_spec_p sp, str *in) switch(pvs.len) { - case 2: + case 2: if(strncmp(pvs.s, "cc", 2)==0) gpv->type = 0; else if(strncmp(pvs.s, "tz", 2)==0) gpv->type = 1; else goto error; break; - case 3: + case 3: if(strncmp(pvs.s, "zip", 3)==0) gpv->type = 2; else if(strncmp(pvs.s, "lat", 3)==0) @@ -194,7 +193,7 @@ int pv_parse_geoip2_name(pv_spec_p sp, str *in) gpv->type = 4; else goto error; break; - case 4: + case 4: if(strncmp(pvs.s, "city", 4)==0) gpv->type = 8; else if(strncmp(pvs.s, "regc", 4)==0) @@ -203,7 +202,7 @@ int pv_parse_geoip2_name(pv_spec_p sp, str *in) gpv->type = 11; else goto error; break; - case 5: + case 5: if(strncmp(pvs.s, "metro", 5)==0) gpv->type = 12; else if(strncmp(pvs.s, "nmask", 5)==0) @@ -433,7 +432,7 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, int geoip2_init_pv(char *path) { int status = MMDB_open(path, MMDB_MODE_MMAP, &_handle_GeoIP); - + if(MMDB_SUCCESS != status) { LM_ERR("cannot open GeoIP database file at: %s\n", path); @@ -454,7 +453,7 @@ void geoip2_destroy_pv(void) void geoip2_pv_reset(str *name) { sr_geoip2_record_t *gr = NULL; - + gr = sr_geoip2_get_record(name); if(gr==NULL) @@ -466,13 +465,13 @@ int geoip2_update_pv(str *tomatch, str *name) { sr_geoip2_record_t *gr = NULL; int gai_error, mmdb_error; - + if(tomatch->len>255) { LM_DBG("target too long (max 255): %s\n", tomatch->s); return -3; } - + gr = sr_geoip2_get_record(name); if(gr==NULL) { diff --git a/src/modules/geoip2/geoip2_pv.h b/src/modules/geoip2/geoip2_pv.h index ae42ff8..2878746 100644 --- a/src/modules/geoip2/geoip2_pv.h +++ b/src/modules/geoip2/geoip2_pv.h @@ -1,5 +1,4 @@ /** - * $Id$ * * This file is part of Kamailio, a free SIP server. *

1 0

git:master:63942ce6: geoip: removed unneeded lib kmi from Makefile
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Module: kamailio Branch: master Commit: 63942ce68faee014dbfb06dddce860be1c16474f URL: https://github.com/kamailio/kamailio/commit/63942ce68faee014dbfb06dddce860b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-02T09:10:57+01:00 geoip: removed unneeded lib kmi from Makefile - bits of formatting and removed snv ids --- Modified: src/modules/geoip/Makefile Modified: src/modules/geoip/geoip_mod.c Modified: src/modules/geoip/geoip_pv.c Modified: src/modules/geoip/geoip_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/63942ce68faee014dbfb06dddce860b… Patch: https://github.com/kamailio/kamailio/commit/63942ce68faee014dbfb06dddce860b… --- diff --git a/src/modules/geoip/Makefile b/src/modules/geoip/Makefile index a315246..d0f016d 100644 --- a/src/modules/geoip/Makefile +++ b/src/modules/geoip/Makefile @@ -8,7 +8,4 @@ LIBS= -lGeoIP DEFS+=-DKAMAILIO_MOD_INTERFACE -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi - include ../../Makefile.modules diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index 61cf03b..1962172 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) * @@ -117,7 +116,7 @@ static int geoip_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname) { str tomatch; str pvclass; - + if(msg==NULL) { LM_ERR("received null msg\n"); diff --git a/src/modules/geoip/geoip_pv.c b/src/modules/geoip/geoip_pv.c index 12fe68f..1821c9b 100644 --- a/src/modules/geoip/geoip_pv.c +++ b/src/modules/geoip/geoip_pv.c @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) * @@ -174,14 +173,14 @@ int pv_parse_geoip_name(pv_spec_p sp, str *in) switch(pvs.len) { - case 2: + case 2: if(strncmp(pvs.s, "cc", 2)==0) gpv->type = 0; else if(strncmp(pvs.s, "tz", 2)==0) gpv->type = 1; else goto error; break; - case 3: + case 3: if(strncmp(pvs.s, "zip", 3)==0) gpv->type = 2; else if(strncmp(pvs.s, "lat", 3)==0) @@ -196,7 +195,7 @@ int pv_parse_geoip_name(pv_spec_p sp, str *in) gpv->type = 7; else goto error; break; - case 4: + case 4: if(strncmp(pvs.s, "city", 4)==0) gpv->type = 8; else if(strncmp(pvs.s, "area", 4)==0) @@ -207,7 +206,7 @@ int pv_parse_geoip_name(pv_spec_p sp, str *in) gpv->type = 11; else goto error; break; - case 5: + case 5: if(strncmp(pvs.s, "metro", 5)==0) gpv->type = 12; else if(strncmp(pvs.s, "contc", 5)==0) @@ -367,7 +366,7 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, int geoip_init_pv(char *path) { _handle_GeoIP = GeoIP_open(path, GEOIP_MMAP_CACHE); - + if(_handle_GeoIP==NULL) { LM_ERR("cannot open GeoIP database file at: %s\n", path); @@ -392,7 +391,7 @@ void geoip_destroy_pv(void) void geoip_pv_reset(str *name) { sr_geoip_record_t *gr = NULL; - + gr = sr_geoip_get_record(name); if(gr==NULL) @@ -407,13 +406,13 @@ void geoip_pv_reset(str *name) int geoip_update_pv(str *tomatch, str *name) { sr_geoip_record_t *gr = NULL; - + if(tomatch->len>255) { LM_DBG("target too long (max 255): %s\n", tomatch->s); return -3; } - + gr = sr_geoip_get_record(name); if(gr==NULL) { diff --git a/src/modules/geoip/geoip_pv.h b/src/modules/geoip/geoip_pv.h index 8be5209..51c3312 100644 --- a/src/modules/geoip/geoip_pv.h +++ b/src/modules/geoip/geoip_pv.h @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) *

1 0

git:master:5460eea6: regex: added rpc commands, removed mi commands
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Module: kamailio Branch: master Commit: 5460eea67fb30c99ba4f7290e893132ae47520ee URL: https://github.com/kamailio/kamailio/commit/5460eea67fb30c99ba4f7290e893132… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-02T09:10:57+01:00 regex: added rpc commands, removed mi commands --- Modified: src/modules/regex/Makefile Modified: src/modules/regex/doc/regex_admin.xml Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5460eea67fb30c99ba4f7290e893132… Patch: https://github.com/kamailio/kamailio/commit/5460eea67fb30c99ba4f7290e893132…

1 0

git:master:82262107: smsops: removed unused internal libs from makefile
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Module: kamailio Branch: master Commit: 82262107a1f3c14df1dd7430fb9611f4584df67e URL: https://github.com/kamailio/kamailio/commit/82262107a1f3c14df1dd7430fb9611f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-02T09:10:57+01:00 smsops: removed unused internal libs from makefile - bits of whitespacing formating --- Modified: src/modules/smsops/Makefile Modified: src/modules/smsops/smsops.c Modified: src/modules/smsops/smsops_impl.c Modified: src/modules/smsops/smsops_impl.h --- Diff: https://github.com/kamailio/kamailio/commit/82262107a1f3c14df1dd7430fb9611f… Patch: https://github.com/kamailio/kamailio/commit/82262107a1f3c14df1dd7430fb9611f… --- diff --git a/src/modules/smsops/Makefile b/src/modules/smsops/Makefile index 72e4703..633c5da 100644 --- a/src/modules/smsops/Makefile +++ b/src/modules/smsops/Makefile @@ -11,7 +11,4 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi -SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/src/modules/smsops/smsops.c b/src/modules/smsops/smsops.c index f69a9a1..9af52b2 100644 --- a/src/modules/smsops/smsops.c +++ b/src/modules/smsops/smsops.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b797864..6840530 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -52,7 +52,7 @@ typedef enum _rp_message_type { RP_ACK_NETWORK_TO_MS = 0x03, } rp_message_type_t; -enum SMS_DATA { +enum SMS_DATA { SMS_ALL, SMS_RPDATA_TYPE, SMS_RPDATA_REFERENCE, @@ -103,7 +103,7 @@ typedef struct _sms_rp_data { str originator; str destination; int pdu_len; - sms_pdu_t pdu; + sms_pdu_t pdu; } sms_rp_data_t; // Pointer to current parsed rp_data/tpdu diff --git a/src/modules/smsops/smsops_impl.h b/src/modules/smsops/smsops_impl.h index 380b52d..be233c1 100644 --- a/src/modules/smsops/smsops_impl.h +++ b/src/modules/smsops/smsops_impl.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */

1 0

git:master:6e254004: debugger: removed mi commands
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Module: kamailio Branch: master Commit: 6e254004e4c153b95f4bbdc35f8032a99fde8742 URL: https://github.com/kamailio/kamailio/commit/6e254004e4c153b95f4bbdc35f8032a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-02T09:10:57+01:00 debugger: removed mi commands --- Modified: src/modules/debugger/Makefile Modified: src/modules/debugger/debugger_mod.c Modified: src/modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e254004e4c153b95f4bbdc35f8032a… Patch: https://github.com/kamailio/kamailio/commit/6e254004e4c153b95f4bbdc35f8032a…

1 0

Freezing for release v5.0.0
by Daniel-Constantin Mierla 02 Jan '17

02 Jan '17

Hello, I propose to freeze the development of v5.0.0 on January 4, 2017. Hopefully it is just in time for getting the frozen version in next Debian stable. Meanwhile, I hope we can get rid of mi code to have a proper fresh start with cleaned up code in 5.0.0. The big code tree restructuring was already done, config files in embedded languages is there as well (it needs more exports, but that's only about available time to fill some structures, not new feature development). If anyone wants to make other proposals, reply to mailing lists and let's discuss. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

3 5

pua_mi
by Olle E. Johansson 02 Jan '17

02 Jan '17

Hi! http://kamailio.org/docs/modules/devel/modules/pua_mi.html#idp35056788 This module has a lot of mi and needs to be rewritten. I looked at implementing the pua_publish as RPC a long time ago and remembers that doing this back then seemed impossible to me using the RPC interface. If we’re looking into removing mi for 5.0.0 which is a good thing, then we need to handle this module. Just wanted to start the conversation :-) /O

2 2

Happy 2017!
by Daniel-Constantin Mierla 01 Jan '17

01 Jan '17

A fresh year ahead, let it be a great one for all Kamailio friends! Wishing a prosperous and safe 2017 everywhere! Happy New Year! -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017