sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:master:f6066a02: Merge pull request #1405 from kamailio/vseva/http_async_client_fix
by GitHub 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: f6066a022db81ae4d5f6c5cb5500fdcfdb15e33e URL: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T10:10:51+01:00 Merge pull request #1405 from kamailio/vseva/http_async_client_fix http_async_client: cleanup avps/xavps after exec route on Http worker --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… Patch: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 59106a3bae..87a62ea8f6 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -263,6 +264,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_ERR("error running event route kemi callback\n"); } } + ksr_msg_env_reset(); } done:

1 0

git:master:ad46b115: http_async_client: cleanup avps/xavps after exec route on Http worker
by Victor Seva 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: ad46b115bedec01c52c5a9dcde0756db85ee61ec URL: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-22T09:05:08+01:00 http_async_client: cleanup avps/xavps after exec route on Http worker when suspend_transaction is false --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… Patch: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 59106a3bae..87a62ea8f6 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -263,6 +264,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_ERR("error running event route kemi callback\n"); } } + ksr_msg_env_reset(); } done:

1 0

[kamailio/kamailio] http_async_client: cleanup avps/xavps after exec route on Http worker (#1405)
by Victor Seva 22 Jan '18

22 Jan '18

when suspend_transaction is false As suggested at #1391 to avoid shared memory leak You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1405 -- Commit Summary -- * http_async_client: cleanup avps/xavps after exec route on Http worker -- File Changes -- M src/modules/http_async_client/async_http.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1405.patch https://github.com/kamailio/kamailio/pull/1405.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1405

2 3

git:master:2aebb2bf: rls: removed local variable contact, unused inside rls_handle_subscribe()
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 2aebb2bf1f3d71a0dc7eca847af2aa127ff54453 URL: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-21T13:20:55+01:00 rls: removed local variable contact, unused inside rls_handle_subscribe() --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… Patch: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 9222dc72b8..a96d1674f7 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -479,7 +479,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma pres_ev_t* event = NULL; int err_ret = -1; int ret = to_presence_code; - str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; unsigned int hash_code=0; @@ -802,13 +801,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma ret = 1; stop: forpresence: - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } - if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s); if(subs.record_route.s!=NULL) @@ -829,13 +821,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma error: LM_ERR("occurred in rls_handle_subscribe\n"); - - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s);

1 0

git:master:5e58d48c: rls: rls_get_service_list() - set to NULL the content of rootdoc pointer
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 5e58d48c980f5e413f47271dd342ee0630722bbb URL: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-21T13:17:46+01:00 rls: rls_get_service_list() - set to NULL the content of rootdoc pointer - its a function parameter and expects to be set by the function --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… Patch: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index c895bd1a93..9222dc72b8 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -272,12 +272,10 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - rootdoc = NULL; if(xmldoc!=NULL) xmlFreeDoc(xmldoc); - } - else - { + *rootdoc = NULL; + } else { *rootdoc = xmldoc; } @@ -290,8 +288,6 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, error: if(result!=NULL) rls_xcap_dbf.free_result(rls_xcap_db, result); - if(xmldoc!=NULL) - xmlFreeDoc(xmldoc); if(xcapdoc!=NULL) pkg_free(xcapdoc);

1 0

Planning the release of v5.1.1
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Hello, I am considering to do the first patch release from 5.1 series at the beginning of next week (most likely on Monday or Tuesday), as usual, if there are issues you are aware of and not reported to bug tracker, do it as soon as possible in order to have a chance to be fixed: - https://github.com/kamailio/kamailio/issues Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 1

git:master:4fa92be9: uri_db: ki_check_uri_realm() has three string params for kemi exports
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 4fa92be97bca8da3ce5bf5181ef9262006b4fb9d URL: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:45:51+01:00 uri_db: ki_check_uri_realm() has three string params for kemi exports --- Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… Patch: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… --- diff --git a/src/modules/uri_db/uri_db.c b/src/modules/uri_db/uri_db.c index 583303c9ee..aa8f1ac99a 100644 --- a/src/modules/uri_db/uri_db.c +++ b/src/modules/uri_db/uri_db.c @@ -232,7 +232,7 @@ static sr_kemi_t sr_kemi_uri_db_exports[] = { }, { str_init("uri_db"), str_init("check_uri_realm"), SR_KEMIP_INT, ki_check_uri_realm, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -244,4 +244,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_uri_db_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:23450310: textops: proper parameter types for kemi exports
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 23450310fe6095f612d328871380012f189ac1c3 URL: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:44:59+01:00 textops: proper parameter types for kemi exports --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… Patch: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 1e844f5ed8..6162d023d2 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -334,7 +334,7 @@ static int ki_tcp_conid_state(sip_msg_t* msg, int i_conid) LM_DBG("Connection id %d does not exist.\n", i_conid); ret = -1; goto done; - } + } /* Connection structure exists, now check what Kamailio thinks of it */ if (s_con->state == S_CONN_OK) { /* All is fine, return happily */ @@ -387,7 +387,7 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* conid, char *p2) int ret = w_tcp_conid_state(msg, conid, p2); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -397,7 +397,7 @@ static int ki_tcp_conid_alive(sip_msg_t* msg, int i_conid) int ret = ki_tcp_conid_state(msg, i_conid); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -642,22 +642,22 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { }, { str_init("tcpops"), str_init("tcp_enable_closed_event"), SR_KEMIP_INT, ki_tcpops_enable_closed_event, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_enable_closed_event_cid"), SR_KEMIP_INT, ki_tcpops_enable_closed_event_cid, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_alive"), SR_KEMIP_INT, ki_tcp_conid_alive, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_state"), SR_KEMIP_INT, ki_tcp_conid_state, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -669,4 +669,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_tcpops_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:fb904abd: textops: fixed mixmatching types for exported kemi functions
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: fb904abd968eb44e797ee7bc08c5705e69de2fc7 URL: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:44:31+01:00 textops: fixed mixmatching types for exported kemi functions --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… Patch: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 8bd7d883fe..97f1ecff12 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4096,7 +4096,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { }, { str_init("textops"), str_init("append_body_part_cd"), SR_KEMIP_INT, ki_append_multibody_cd, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("remove_body_part"),

1 0

git:master:4fbbc544: msilo: set parameter names in prototypes
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 4fbbc544c2c860c24ab3e8d4a4eb362f7f626ee8 URL: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:43:13+01:00 msilo: set parameter names in prototypes - used in genrating the index for kemi exports --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… Patch: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 2f261d69bd..19c1beb1fd 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -146,8 +146,8 @@ static int ms_skip_notification_flag = -1; static int mod_init(void); static int child_init(int); -static int m_store(struct sip_msg*, str*); -static int m_dump(struct sip_msg*, str*); +static int m_store(sip_msg_t *masg, str *owner_s); +static int m_dump(sip_msg_t *msg, str *owner_s); static int m_store_2(struct sip_msg*, char*, char*); static int m_dump_2(struct sip_msg*, char*, char*); @@ -544,7 +544,7 @@ static int get_non_mandatory_headers(struct sip_msg *msg, char *buf, int buf_len * = "2" -- look for outgoing URI only at to header */ -static int m_store(struct sip_msg* msg, str *owner_s) +static int m_store(sip_msg_t* msg, str *owner_s) { str body, str_hdr, ctaddr; struct to_body *pto, *pfrom; @@ -935,7 +935,7 @@ static int ki_m_store(sip_msg_t* msg) /** * dump message */ -static int m_dump(struct sip_msg* msg, str* owner_s) +static int m_dump(sip_msg_t* msg, str* owner_s) { struct to_body *pto = NULL; db_key_t db_keys[3]; @@ -1652,4 +1652,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_msilo_exports); return 0; -} \ No newline at end of file +}

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018