sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:4.3:6306a8fe: uac: uac.reg_dump returns an array rpc result

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 6306a8fe46fc7ebf2c8b8b52177d38f9178ba659 URL: https://github.com/kamailio/kamailio/commit/6306a8fe46fc7ebf2c8b8b52177d38f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-11T14:40:39+02:00 uac: uac.reg_dump returns an array rpc result (cherry picked from commit b4120c53a1ba2ae2bad8b9c04963b4becc0a9700) --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/6306a8fe46fc7ebf2c8b8b52177d38f… Patch: https://github.com/kamailio/kamailio/commit/6306a8fe46fc7ebf2c8b8b52177d38f… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 7b7d2de..39499b6 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1747,7 +1747,7 @@ static void rpc_uac_reg_refresh(rpc_t* rpc, void* ctx) } rpc_export_t uac_reg_rpc[] = { - {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, 0}, + {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, RET_ARRAY}, {"uac.reg_info", rpc_uac_reg_info, rpc_uac_reg_info_doc, 0}, {"uac.reg_enable", rpc_uac_reg_enable, rpc_uac_reg_enable_doc, 0}, {"uac.reg_disable", rpc_uac_reg_disable, rpc_uac_reg_disable_doc, 0},

8 years, 9 months

git:master:b4120c53: uac: uac.reg_dump returns an array rpc result

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b4120c53a1ba2ae2bad8b9c04963b4becc0a9700 URL: https://github.com/kamailio/kamailio/commit/b4120c53a1ba2ae2bad8b9c04963b4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-11T14:35:46+02:00 uac: uac.reg_dump returns an array rpc result --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/b4120c53a1ba2ae2bad8b9c04963b4b… Patch: https://github.com/kamailio/kamailio/commit/b4120c53a1ba2ae2bad8b9c04963b4b… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 7b7d2de..39499b6 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1747,7 +1747,7 @@ static void rpc_uac_reg_refresh(rpc_t* rpc, void* ctx) } rpc_export_t uac_reg_rpc[] = { - {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, 0}, + {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, RET_ARRAY}, {"uac.reg_info", rpc_uac_reg_info, rpc_uac_reg_info_doc, 0}, {"uac.reg_enable", rpc_uac_reg_enable, rpc_uac_reg_enable_doc, 0}, {"uac.reg_disable", rpc_uac_reg_disable, rpc_uac_reg_disable_doc, 0},

8 years, 9 months

git:4.3:e827ccf9: textops: fix leak when subst_hf() with flag f is used

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: e827ccf957a341b7026b06f17686da7fcc426fc2 URL: https://github.com/kamailio/kamailio/commit/e827ccf957a341b7026b06f17686da7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-11T03:39:58+02:00 textops: fix leak when subst_hf() with flag f is used - substituion list was not freed (cherry picked from commit 321a6140cdc7d6fd3f18f911af9825bb62575ace) --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e827ccf957a341b7026b06f17686da7… Patch: https://github.com/kamailio/kamailio/commit/e827ccf957a341b7026b06f17686da7… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 9aaada6..198332b 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -2844,6 +2844,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag begin=body.s; off=begin-msg->buf; + if (lst) replace_lst_free(lst); lst=subst_run(se, begin, msg, &nmatches); body.s[body.len] = c; if(lst==0 && flags!=NULL && *flags=='f') @@ -2880,7 +2881,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag } /* if flags set for first header, then all done */ if(flags!=NULL && *flags=='f') - return ret; + goto done; } if(hfl!=NULL) { @@ -2892,6 +2893,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag begin=body.s; off=begin-msg->buf; + if (lst) replace_lst_free(lst); lst=subst_run(se, begin, msg, &nmatches); body.s[body.len] = c; if(lst==0) @@ -2924,10 +2926,11 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag } } error: - LM_DBG("lst was %p\n", lst); - if (lst) replace_lst_free(lst); if (nmatches<0) LM_ERR("%s subst_run failed\n", exports.name); + LM_DBG("lst was %p\n", lst); +done: + if (lst) replace_lst_free(lst); return ret; }

8 years, 9 months

git:master:321a6140: textops: fix leak when subst_hf() with flag f is used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 321a6140cdc7d6fd3f18f911af9825bb62575ace URL: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-11T03:38:24+02:00 textops: fix leak when subst_hf() with flag f is used - substituion list was not freed --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825b… Patch: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825b… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 9aaada6..198332b 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -2844,6 +2844,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag begin=body.s; off=begin-msg->buf; + if (lst) replace_lst_free(lst); lst=subst_run(se, begin, msg, &nmatches); body.s[body.len] = c; if(lst==0 && flags!=NULL && *flags=='f') @@ -2880,7 +2881,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag } /* if flags set for first header, then all done */ if(flags!=NULL && *flags=='f') - return ret; + goto done; } if(hfl!=NULL) { @@ -2892,6 +2893,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag begin=body.s; off=begin-msg->buf; + if (lst) replace_lst_free(lst); lst=subst_run(se, begin, msg, &nmatches); body.s[body.len] = c; if(lst==0) @@ -2924,10 +2926,11 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag } } error: - LM_DBG("lst was %p\n", lst); - if (lst) replace_lst_free(lst); if (nmatches<0) LM_ERR("%s subst_run failed\n", exports.name); + LM_DBG("lst was %p\n", lst); +done: + if (lst) replace_lst_free(lst); return ret; }

8 years, 9 months

[kamailio] about accounting modules (#367)

by Yasin

Hello; i realized that a call and acc module don't have any joint. even if acc is failed ,call continues. So that a accounting leak. i wonder that when accounting failed , can be trigger a event to log or something else. Maybe, we can stop the call dialog module. what do you think about it? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/367

8 years, 9 months

git:master:6173ef7b: Merge pull request #365 from kamailio/lazedo-patch-1

by lazedo

Module: kamailio Branch: master Commit: 6173ef7ba8a9d8eb566f1a192e5915ef74cfc159 URL: https://github.com/kamailio/kamailio/commit/6173ef7ba8a9d8eb566f1a192e5915e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-10-08T09:54:32-07:00 Merge pull request #365 from kamailio/lazedo-patch-1 presence: use advertised ip for local contact --- Modified: modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/6173ef7ba8a9d8eb566f1a192e5915e… Patch: https://github.com/kamailio/kamailio/commit/6173ef7ba8a9d8eb566f1a192e5915e… --- diff --git a/modules/presence/utils_func.h b/modules/presence/utils_func.h index 866df1b..6592375 100644 --- a/modules/presence/utils_func.h +++ b/modules/presence/utils_func.h @@ -124,15 +124,18 @@ static inline int ps_fill_local_contact(struct sip_msg* msg, str *contact) goto error; } - ip.s= ip_addr2a(&msg->rcv.dst_ip); - if(ip.s== NULL) - { - LM_ERR("transforming ip_addr to ascii\n"); - goto error; + if(msg->rcv.bind_address->useinfo.name.len>0) { + ip = msg->rcv.bind_address->useinfo.name; + } else { + ip = msg->rcv.bind_address->address_str; } - ip.len= strlen(ip.s); - port = msg->rcv.dst_port; + if(msg->rcv.bind_address->useinfo.port_no>0) { + port = msg->rcv.bind_address->useinfo.port_no; + } else { + port = msg->rcv.bind_address->port_no; + } + if(strncmp(ip.s, "sip:", 4)!=0) { strncpy(contact->s, "sip:", 4);

8 years, 9 months

git:master:6a498f71: presence: use advertised ip for local contact

by lazedo

Module: kamailio Branch: master Commit: 6a498f713a2522e18bed96dc4d1f361008a95502 URL: https://github.com/kamailio/kamailio/commit/6a498f713a2522e18bed96dc4d1f361… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-10-07T11:39:37-07:00 presence: use advertised ip for local contact --- Modified: modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/6a498f713a2522e18bed96dc4d1f361… Patch: https://github.com/kamailio/kamailio/commit/6a498f713a2522e18bed96dc4d1f361… --- diff --git a/modules/presence/utils_func.h b/modules/presence/utils_func.h index 866df1b..6592375 100644 --- a/modules/presence/utils_func.h +++ b/modules/presence/utils_func.h @@ -124,15 +124,18 @@ static inline int ps_fill_local_contact(struct sip_msg* msg, str *contact) goto error; } - ip.s= ip_addr2a(&msg->rcv.dst_ip); - if(ip.s== NULL) - { - LM_ERR("transforming ip_addr to ascii\n"); - goto error; + if(msg->rcv.bind_address->useinfo.name.len>0) { + ip = msg->rcv.bind_address->useinfo.name; + } else { + ip = msg->rcv.bind_address->address_str; } - ip.len= strlen(ip.s); - port = msg->rcv.dst_port; + if(msg->rcv.bind_address->useinfo.port_no>0) { + port = msg->rcv.bind_address->useinfo.port_no; + } else { + port = msg->rcv.bind_address->port_no; + } + if(strncmp(ip.s, "sip:", 4)!=0) { strncpy(contact->s, "sip:", 4);

8 years, 9 months

[kamailio] presence: use advertised ip for local contact (#365)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/365 -- Commit Summary -- * presence: use advertised ip for local contact -- File Changes -- M modules/presence/utils_func.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/365.patch https://github.com/kamailio/kamailio/pull/365.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/365

8 years, 9 months

git:master:493ef6c1: core: cfg lex - clean history and update application name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 493ef6c11b769f1bdf42092005dc6c1c713d38ea URL: https://github.com/kamailio/kamailio/commit/493ef6c11b769f1bdf42092005dc6c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-08T18:45:15+02:00 core: cfg lex - clean history and update application name --- Modified: cfg.lex Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/493ef6c11b769f1bdf42092005dc6c1… Patch: https://github.com/kamailio/kamailio/commit/493ef6c11b769f1bdf42092005dc6c1…

8 years, 9 months

git:master:81feae19: modules/dialog_ng: set init ts for dialog_in

by jaybeepee

Module: kamailio Branch: master Commit: 81feae1940c299455804ddb211252766d50114d8 URL: https://github.com/kamailio/kamailio/commit/81feae1940c299455804ddb21125276… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-10-08T09:50:23+02:00 modules/dialog_ng: set init ts for dialog_in --- Modified: modules/dialog_ng/dlg_handlers.c Modified: modules/dialog_ng/dlg_hash.c Modified: modules/dialog_ng/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/81feae1940c299455804ddb21125276… Patch: https://github.com/kamailio/kamailio/commit/81feae1940c299455804ddb21125276… --- diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index e94be20..323b7c9 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -44,6 +44,7 @@ int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ extern struct tm_binds d_tmb; extern struct dialog_ng_counters_h dialog_ng_cnts_h; +time_t act_time; extern pv_elem_t *ruri_param_model; /*!< pv-string to get r-uri */ @@ -1671,7 +1672,7 @@ int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, goto error; } if (d_tmb.register_tmcb(req, t, - TMCB_RESPONSE_IN | TMCB_RESPONSE_READY | TMCB_RESPONSE_FWDED | TMCB_ON_FAILURE | TMCB_E2ECANCEL_IN | TMCB_REQUEST_OUT, + TMCB_DESTROY | TMCB_RESPONSE_IN | TMCB_RESPONSE_READY | TMCB_RESPONSE_FWDED | TMCB_ON_FAILURE | TMCB_E2ECANCEL_IN | TMCB_REQUEST_OUT, dlg_onreply, (void*) iuid, dlg_iuid_sfree) < 0) { LM_ERR("failed to register TMCB\n"); goto error; @@ -1826,6 +1827,7 @@ void internal_print_all_dlg(struct dlg_cell *dlg) { LM_DBG("----------------------------"); LM_DBG("Dialog h_entry:h_id = [%u : %u]\n", dlg->h_entry, dlg->h_id); + LM_DBG("Dialog age: %ld\n", act_time - dlg->init_ts); LM_DBG("Dialog call-id: %.*s\n", dlg->callid.len, dlg->callid.s); LM_DBG("Dialog state: %d\n", dlg->state); LM_DBG("Dialog ref counter: %d\n", dlg->ref); @@ -1876,6 +1878,7 @@ void print_all_dlgs() { struct dlg_cell *dlg; unsigned int i; + act_time = time(0); LM_DBG("********************"); LM_DBG("printing %i dialogs\n", d_table->size); diff --git a/modules/dialog_ng/dlg_hash.c b/modules/dialog_ng/dlg_hash.c index 725114c..4de3b32 100644 --- a/modules/dialog_ng/dlg_hash.c +++ b/modules/dialog_ng/dlg_hash.c @@ -336,6 +336,7 @@ struct dlg_cell* build_new_dlg(str *callid, str *from_uri, str *from_tag, str *r } dlg->state = DLG_STATE_UNCONFIRMED; + dlg->init_ts = (unsigned int)time(NULL); dlg->h_entry = core_hash(callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n", dlg->h_entry); @@ -1240,6 +1241,7 @@ void next_state_dlg(struct dlg_cell *dlg, int event, case DLG_EVENT_REQBYE: switch (dlg->state) { case DLG_STATE_CONFIRMED: + case DLG_STATE_CONFIRMED_NA: /* we weight towards tearing the dialog down if we get a bye - perhaps bye can beat ack*/ dlg->dflags |= DLG_FLAG_HASBYE; dlg->state = DLG_STATE_DELETED; *unref = 1; diff --git a/modules/dialog_ng/dlg_hash.h b/modules/dialog_ng/dlg_hash.h index 8d78a51..0988c5a 100644 --- a/modules/dialog_ng/dlg_hash.h +++ b/modules/dialog_ng/dlg_hash.h @@ -125,6 +125,7 @@ typedef struct dlg_cell { str caller_route_set; /*!< route set of caller*/ struct socket_info * caller_bind_addr; /*! binded address of caller*/ unsigned int state; /*!< dialog state */ + unsigned int init_ts;/*!< init (creation) time (absolute UNIX ts)*/ unsigned int start_ts; /*!< start time (absolute UNIX ts)*/ unsigned int lifetime; /*!< dialog lifetime */ unsigned int toroute; /*!< index of route that is executed on timeout */

8 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015