sr-dev December 2015

sr-dev@lists.kamailio.org

30 participants
230 discussions

git:master:31933ccc: cfgt: fixed a few typos in documentation

by Giacomo Vacca

Module: kamailio Branch: master Commit: 31933ccc40f9af36caa9f0a45e0a57aebe0b91d4 URL: https://github.com/kamailio/kamailio/commit/31933ccc40f9af36caa9f0a45e0a57a… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-12-17T16:43:53Z cfgt: fixed a few typos in documentation --- Modified: modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/31933ccc40f9af36caa9f0a45e0a57a… Patch: https://github.com/kamailio/kamailio/commit/31933ccc40f9af36caa9f0a45e0a57a… --- diff --git a/modules/cfgt/doc/cfgt_admin.xml b/modules/cfgt/doc/cfgt_admin.xml index e507456..4282d7d 100644 --- a/modules/cfgt/doc/cfgt_admin.xml +++ b/modules/cfgt/doc/cfgt_admin.xml @@ -22,7 +22,7 @@ SIP scenarios. </para> <para> - In order to identify defferent scenarios a prefix string should be + In order to identify different scenarios a prefix string should be used inside the Call-ID header. </para> </section> @@ -125,7 +125,7 @@ modparam("cfgt", "mask", 12) <section id="cfgt.p.callid_prefix"> <title><varname>callid_prefix</varname> (string)</title> <para> - Prefix used to indentify test scenario messages. Last char of the + Prefix used to identify test scenario messages. Last char of the string will be used as delimiter for the scenario ID. With parameter set to <quote>NGCP%</quote> and Call-ID <quote>NGCP%123%456</quote> the scenario identified will be <quote>123</quote>.

9 years

git:master:b6b7de88: presence_dialoginfo : aux_body should return xmldoc instead of char

by Luis Azedo

Module: kamailio Branch: master Commit: b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35 URL: https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-12-17T21:02:43Z presence_dialoginfo : aux_body should return xmldoc instead of char --- Modified: modules/presence/notify.c Modified: modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b… Patch: https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index efb8a48..f6a0ba9 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1535,8 +1535,7 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, { aux_body = subs->event->aux_body_processing(subs, notify_body); if(aux_body) { - xmlFree(notify_body->s); - pkg_free(notify_body); + free_notify_body(notify_body, subs->event); notify_body = aux_body; } } diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index e6dc050..710fe91 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -595,5 +595,18 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { memcpy(version_start, version, version_len); memset(version_start + version_len, ' ', 12 - version_len); + xmlDocPtr doc = xmlReadMemory(aux_body->s, aux_body->len, "noname.xml", NULL, 0); + if (doc == NULL) { + LM_ERR("error allocation xmldoc\n"); + pkg_free(aux_body->s); + pkg_free(aux_body); + return NULL; + } + pkg_free(aux_body->s); + xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)&aux_body->s, &aux_body->len, 1); + + xmlCleanupParser(); + xmlMemoryDump(); + return aux_body; }

9 years

git:master:2b960415: Makefile.defs: version set to 4.4.0-dev8

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2b96041540d7b9bf050dbacb78b71085bbc7c03f URL: https://github.com/kamailio/kamailio/commit/2b96041540d7b9bf050dbacb78b7108… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T23:29:52+01:00 Makefile.defs: version set to 4.4.0-dev8 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2b96041540d7b9bf050dbacb78b7108… Patch: https://github.com/kamailio/kamailio/commit/2b96041540d7b9bf050dbacb78b7108… --- diff --git a/Makefile.defs b/Makefile.defs index 2b2078b..2e9f081 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory manager switcher # 0 - f_malloc (fast malloc)

9 years

git:master:412f155e: presence_dialog : fix compilation

by lazedo

Module: kamailio Branch: master Commit: 412f155ede8587c1d439503cd7d0e783bc3c0d6b URL: https://github.com/kamailio/kamailio/commit/412f155ede8587c1d439503cd7d0e78… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-12-17T18:54:45Z presence_dialog : fix compilation --- Modified: modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/412f155ede8587c1d439503cd7d0e78… Patch: https://github.com/kamailio/kamailio/commit/412f155ede8587c1d439503cd7d0e78… --- diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 9ad377c..e6dc050 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -571,7 +571,7 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { aux_body= (str*)pkg_malloc(sizeof(str)); if(aux_body== NULL) { - ERR_MEM(PKG_MEM_STR); + LM_ERR("error allocating memory for aux body str\n"); return NULL; } memset(aux_body, 0, sizeof(str)); @@ -579,7 +579,7 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { if(aux_body->s== NULL) { pkg_free(aux_body); - ERR_MEM(PKG_MEM_STR); + LM_ERR("error allocating memory for aux body buffer\n"); return NULL; } memcpy(aux_body->s, body->s, body->len);

9 years

[kamailio] presence : fix notify version when subs_mode <> 3 (#448)

by lazedo

when subs_mode <> 3 the notify version is always the same (first watcher) for all watchers You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/448 -- Commit Summary -- * presence : fix notify version when subs_node <> 3 -- File Changes -- M modules/presence/notify.c (8) M modules/presence_dialoginfo/add_events.c (1) M modules/presence_dialoginfo/notify_body.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/448.patch https://github.com/kamailio/kamailio/pull/448.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/448

9 years

git:master:6dd06562: Merge pull request #448 from kamailio/lazedo/fix_blf

by lazedo

Module: kamailio Branch: master Commit: 6dd065629604a32081d5e7b63bbbd292f56aaf23 URL: https://github.com/kamailio/kamailio/commit/6dd065629604a32081d5e7b63bbbd29… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-12-17T17:49:37Z Merge pull request #448 from kamailio/lazedo/fix_blf presence : fix notify version when subs_mode <> 3 --- Modified: modules/presence/notify.c Modified: modules/presence_dialoginfo/add_events.c Modified: modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/6dd065629604a32081d5e7b63bbbd29… Patch: https://github.com/kamailio/kamailio/commit/6dd065629604a32081d5e7b63bbbd29… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 6466fc1..efb8a48 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1470,6 +1470,7 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, c_back_param *cb_param= NULL; str* final_body= NULL; uac_req_t uac_r; + str* aux_body = NULL; LM_DBG("dialog info:\n"); printf_subs(subs); @@ -1532,7 +1533,12 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, /* call aux_body_processing if exists */ if(subs->event->aux_body_processing) { - subs->event->aux_body_processing(subs, notify_body); + aux_body = subs->event->aux_body_processing(subs, notify_body); + if(aux_body) { + xmlFree(notify_body->s); + pkg_free(notify_body); + notify_body = aux_body; + } } /* apply authorization rules if exists */ diff --git a/modules/presence_dialoginfo/add_events.c b/modules/presence_dialoginfo/add_events.c index fe1e416..8382fc7 100644 --- a/modules/presence_dialoginfo/add_events.c +++ b/modules/presence_dialoginfo/add_events.c @@ -57,6 +57,7 @@ int dlginfo_add_events(void) /* modify XML body for each watcher to set the correct "version" */ event.aux_body_processing = dlginfo_body_setversion; + event.aux_free_body = free_xml_body; if (pres_add_event(&event) < 0) { diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 5db2a98..9ad377c 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -538,6 +538,7 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { char *version_start=0; char version[MAX_INT_LEN + 2]; /* +2 becasue of trailing " and \0 */ int version_len; + str* aux_body = NULL; if (!body) { return NULL; @@ -564,9 +565,29 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { version_len = snprintf(version, MAX_INT_LEN + 2,"%d\"", subs->version); if (version_len >= MAX_INT_LEN + 2) { LM_ERR("failed to convert 'version' to string\n"); - memcpy(version_start, "00000000000\"", 12); return NULL; } + + aux_body= (str*)pkg_malloc(sizeof(str)); + if(aux_body== NULL) + { + ERR_MEM(PKG_MEM_STR); + return NULL; + } + memset(aux_body, 0, sizeof(str)); + aux_body->s= (char*)pkg_malloc( body->len * sizeof(char)); + if(aux_body->s== NULL) + { + pkg_free(aux_body); + ERR_MEM(PKG_MEM_STR); + return NULL; + } + memcpy(aux_body->s, body->s, body->len); + aux_body->len= body->len; + + /* again but on the copied str, no checks needed */ + version_start = strstr(aux_body->s + 34, "version="); + version_start += 9; /* Replace the placeholder 00000000000 with the version. * Put the padding behind the "" */ @@ -574,5 +595,5 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { memcpy(version_start, version, version_len); memset(version_start + version_len, ' ', 12 - version_len); - return NULL; + return aux_body; }

9 years

git:master:1682896e: presence : fix notify version when subs_node <> 3

by Luis Azedo

Module: kamailio Branch: master Commit: 1682896e2971508e454448d2a89ba5ab10811a84 URL: https://github.com/kamailio/kamailio/commit/1682896e2971508e454448d2a89ba5a… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-12-16T20:50:41Z presence : fix notify version when subs_node <> 3 when submode <> 3 the notify version is always the same (first watcher) for all watchers --- Modified: modules/presence/notify.c Modified: modules/presence_dialoginfo/add_events.c Modified: modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/1682896e2971508e454448d2a89ba5a… Patch: https://github.com/kamailio/kamailio/commit/1682896e2971508e454448d2a89ba5a… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 6466fc1..efb8a48 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1470,6 +1470,7 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, c_back_param *cb_param= NULL; str* final_body= NULL; uac_req_t uac_r; + str* aux_body = NULL; LM_DBG("dialog info:\n"); printf_subs(subs); @@ -1532,7 +1533,12 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, /* call aux_body_processing if exists */ if(subs->event->aux_body_processing) { - subs->event->aux_body_processing(subs, notify_body); + aux_body = subs->event->aux_body_processing(subs, notify_body); + if(aux_body) { + xmlFree(notify_body->s); + pkg_free(notify_body); + notify_body = aux_body; + } } /* apply authorization rules if exists */ diff --git a/modules/presence_dialoginfo/add_events.c b/modules/presence_dialoginfo/add_events.c index fe1e416..8382fc7 100644 --- a/modules/presence_dialoginfo/add_events.c +++ b/modules/presence_dialoginfo/add_events.c @@ -57,6 +57,7 @@ int dlginfo_add_events(void) /* modify XML body for each watcher to set the correct "version" */ event.aux_body_processing = dlginfo_body_setversion; + event.aux_free_body = free_xml_body; if (pres_add_event(&event) < 0) { diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 5db2a98..9ad377c 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -538,6 +538,7 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { char *version_start=0; char version[MAX_INT_LEN + 2]; /* +2 becasue of trailing " and \0 */ int version_len; + str* aux_body = NULL; if (!body) { return NULL; @@ -564,9 +565,29 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { version_len = snprintf(version, MAX_INT_LEN + 2,"%d\"", subs->version); if (version_len >= MAX_INT_LEN + 2) { LM_ERR("failed to convert 'version' to string\n"); - memcpy(version_start, "00000000000\"", 12); return NULL; } + + aux_body= (str*)pkg_malloc(sizeof(str)); + if(aux_body== NULL) + { + ERR_MEM(PKG_MEM_STR); + return NULL; + } + memset(aux_body, 0, sizeof(str)); + aux_body->s= (char*)pkg_malloc( body->len * sizeof(char)); + if(aux_body->s== NULL) + { + pkg_free(aux_body); + ERR_MEM(PKG_MEM_STR); + return NULL; + } + memcpy(aux_body->s, body->s, body->len); + aux_body->len= body->len; + + /* again but on the copied str, no checks needed */ + version_start = strstr(aux_body->s + 34, "version="); + version_start += 9; /* Replace the placeholder 00000000000 with the version. * Put the padding behind the "" */ @@ -574,5 +595,5 @@ str *dlginfo_body_setversion(subs_t *subs, str *body) { memcpy(version_start, version, version_len); memset(version_start + version_len, ' ', 12 - version_len); - return NULL; + return aux_body; }

9 years

Kamailio v4.2.7 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.2.7 stable release is out. This is a maintenance release of the previous stable branch, 4.2, that includes fixes since release of v4.2.6. There is no change to database schema or configuration language structure that you have to do on installations of v4.2.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.2.7 (or to 4.3.x series). For more details about version 4.2.7 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2015/12/kamailio-v4-2-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 4.3, at this moment with its latest release v4.3.4. See more details about it at: * http://www.kamailio.org/w/kamailio-v4-3-0-release-notes/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/miconda - http://www.linkedin.com/in/miconda

9 years

git:4.2:6b904757: ChangeLog: content updated for v4.2.7

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 6b904757798283125f391d27c14ee6ae75bca79c URL: https://github.com/kamailio/kamailio/commit/6b904757798283125f391d27c14ee6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T12:37:53+01:00 ChangeLog: content updated for v4.2.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6b904757798283125f391d27c14ee6a… Patch: https://github.com/kamailio/kamailio/commit/6b904757798283125f391d27c14ee6a…

9 years

git:4.2:dadc0aad: Makefile.defs: version set to 4.2.7

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: dadc0aad61273e77df2bf7fd3da58f4946930028 URL: https://github.com/kamailio/kamailio/commit/dadc0aad61273e77df2bf7fd3da58f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T12:35:51+01:00 Makefile.defs: version set to 4.2.7 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/dadc0aad61273e77df2bf7fd3da58f4… Patch: https://github.com/kamailio/kamailio/commit/dadc0aad61273e77df2bf7fd3da58f4… --- diff --git a/Makefile.defs b/Makefile.defs index dc4db8b..df73e69 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 2 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

9 years

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2015