sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: cnxcc: added missing files and updated example

by Carlos Ruiz Diaz

Module: sip-router Branch: master Commit: 10a8a26cdb5007a3971f96bbcd69b7a835532d89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10a8a26… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Fri Oct 31 17:26:44 2014 -0600 cnxcc: added missing files and updated example --- modules/cnxcc/cnxcc_redis.c | 544 ++++++++++++++++++++++++++++++ modules/cnxcc/cnxcc_redis.h | 63 ++++ modules/cnxcc/cnxcc_select.c | 17 +- modules/cnxcc/example/kamailio-cnxcc.cfg | 14 +- 4 files changed, 623 insertions(+), 15 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=10a…

9 years, 5 months

git:master: cnxcc: added Redis support for distributed cnxcc nodes

by Carlos Ruiz Diaz

Module: sip-router Branch: master Commit: c587ce0b17a0765934eeb55bba8605aea9c5ce8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c587ce0… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Fri Oct 31 17:20:09 2014 -0600 cnxcc: added Redis support for distributed cnxcc nodes - works for all monitoring functions --- modules/cnxcc/Makefile | 3 +- modules/cnxcc/README | 30 +- modules/cnxcc/cnxcc.c | 8 +- modules/cnxcc/cnxcc.h | 8 +- modules/cnxcc/cnxcc_check.c | 127 ++-- modules/cnxcc/cnxcc_check.h | 2 +- modules/cnxcc/cnxcc_mod.c | 1293 +++++++++++++++++------------------ modules/cnxcc/cnxcc_mod.h | 45 +- modules/cnxcc/cnxcc_rpc.c | 151 ++--- modules/cnxcc/cnxcc_rpc.h | 2 +- modules/cnxcc/cnxcc_select.c | 14 +- modules/cnxcc/cnxcc_select.h | 2 +- modules/cnxcc/cnxcc_sip_msg_faker.c | 13 +- modules/cnxcc/cnxcc_sip_msg_faker.h | 2 +- modules/cnxcc/doc/cnxcc.xml | 9 +- modules/cnxcc/doc/cnxcc_admin.xml | 55 +- 16 files changed, 877 insertions(+), 887 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c58…

9 years, 5 months

Preserve socket info in sip_msg_shm_clone ?

by Alekzander Spiridonov

Hi list, While going through an issue with multiple listen ip's on the same eth I've found that while cloning the message tm doesn't save any info about the socket it was received on. The question is: was it done on purpose or it's a bug? (e.g. for retransmitions timer prrocess is able to pick any(?) socket for sending message) -- Best regards, Alekzander Spiridonov

9 years, 5 months

git:master: dialog: increase local cseq after REFER generated by dlg_bridge

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c76ee9facb771d2eae792214e6d4cef39c94a9eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c76ee9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 31 12:35:56 2014 +0100 dialog: increase local cseq after REFER generated by dlg_bridge - otherwise the next BYE can be rejected --- modules/dialog/dlg_transfer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dlg_transfer.c b/modules/dialog/dlg_transfer.c index b338559..b4d8be8 100644 --- a/modules/dialog/dlg_transfer.c +++ b/modules/dialog/dlg_transfer.c @@ -140,6 +140,9 @@ void dlg_refer_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } + /* after REFER, the CSeq must be increased */ + dialog_info->loc_seq.value++; + set_uac_req(&uac_r, &met, NULL, NULL, dialog_info, 0, NULL, NULL); result = d_tmb.t_request_within(&uac_r);

9 years, 5 months

git:master: tm: update headers shortcuts if buffer rebuilt after event_route[tm: local-requests]

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b6d3dc61a78e549c9a75ddfa2fbb86aa2a1682c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6d3dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 31 12:33:38 2014 +0100 tm: update headers shortcuts if buffer rebuilt after event_route[tm:local-requests] - affecting transactions for local generated requests - bulding local ACK uses the shortcuts and they ended up being broken - reported by Kristian F. Høgh --- modules/tm/uac.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 0398118..10e7a59 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -70,6 +70,7 @@ #include "../../dset.h" #include "../../socket_info.h" #include "../../compiler_opt.h" +#include "../../parser/parse_cseq.h" #include "config.h" #include "ut.h" #include "h_table.h" @@ -185,6 +186,43 @@ static inline unsigned int dlg2hash( dlg_t* dlg ) return hashid; } +/** + * refresh hdr shortcuts inside new buffer + */ +int uac_refresh_hdr_shortcuts(tm_cell_t *tcell, char *buf, int buf_len) +{ + sip_msg_t lreq; + struct cseq_body *cs; + + if(likely(build_sip_msg_from_buf(&lreq, buf, buf_len, inc_msg_no())<0)) { + LM_ERR("failed to parse msg buffer\n"); + return -1; + } + if(parse_headers(&lreq,HDR_CSEQ_F|HDR_CALLID_F|HDR_FROM_F|HDR_TO_F,0)<0) { + LM_ERR("failed to parse headers in new message\n"); + goto error; + } + tcell->from.s = lreq.from->name.s; + tcell->from.len = lreq.from->len; + tcell->to.s = lreq.to->name.s; + tcell->to.len = lreq.to->len; + tcell->callid.s = lreq.callid->name.s; + tcell->callid.len = lreq.callid->len; + + cs = get_cseq(&lreq); + tcell->cseq_n.s = lreq.cseq->name.s; + tcell->cseq_n.len = (int)(cs->number.s + cs->number.len - lreq.cseq->name.s); + + LM_DBG("=========== cseq: [%.*s]\n", tcell->cseq_n.len, tcell->cseq_n.s); + lreq.buf=0; /* covers the obsolete DYN_BUF */ + free_sip_msg(&lreq); + return 0; + +error: + lreq.buf=0; /* covers the obsolete DYN_BUF */ + free_sip_msg(&lreq); + return -1; +} /* WARNING: - dst_cell contains the created cell, but it is un-referenced * (before using it make sure you REF() it first) @@ -221,6 +259,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, snd_flags_t snd_flags; tm_xlinks_t backup_xd; tm_xdata_t local_xd; + int refresh_shortcuts = 0; ret=-1; hi=0; /* make gcc happy */ @@ -428,6 +467,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, buf = buf1; buf_len = buf_len1; /* a possible change of the method is not handled! */ + refresh_shortcuts = 1; } } else { @@ -444,6 +484,7 @@ normal_update: buf = buf1; buf_len = buf_len1; /* a possible change of the method is not handled! */ + refresh_shortcuts = 1; } } } @@ -476,6 +517,12 @@ normal_update: request->buffer = buf; request->buffer_len = buf_len; + if(unlikely(refresh_shortcuts==1)) { + if(uac_refresh_hdr_shortcuts(new_cell, buf, buf_len)<0) { + LM_ERR("failed to refresh header shortcuts\n"); + goto error1; + } + } new_cell->nr_of_outgoings++; /* Register the callbacks after everything is successful and nothing can fail.

9 years, 5 months

[tracker] Comment added: sqlops sql_pvquery() error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#487 - sqlops sql_pvquery() error User who did this - Savolainen Dmitri (snen) ---------- could you push it to current stable 4.2 and add "4.2" option to this tracker "Reported Version" list ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=487#comment1686 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 5 months

git:master: main.c: fix compile warning

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e4f18cb322d54035fb6825df3a2f712ed03a71db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4f18cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 31 11:09:53 2014 +0100 main.c: fix compile warning --- main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 2e9d9fc..0667276 100644 --- a/main.c +++ b/main.c @@ -191,6 +191,7 @@ #include "ppcfg.h" #include "sock_ut.h" #include "async_task.h" +#include "dset.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h>

9 years, 5 months

git:master: rr: dont set msg flag FL_RR_ADDED for record_route() in branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 58ad681ab68a14e8fe2b0f6ebc6cf03bdabeea80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58ad681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 30 20:47:42 2014 +0100 rr: dont set msg flag FL_RR_ADDED for record_route() in branch_route - the operation is specific only for the branch --- modules/rr/rr_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 49133cf..34aa0a6 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -270,7 +270,8 @@ static int w_record_route(struct sip_msg *msg, char *key, char *bar) if ( record_route( msg, key?&s:0 )<0 ) return -1; - msg->msg_flags |= FL_RR_ADDED; + if(get_route_type()!=BRANCH_ROUTE) + msg->msg_flags |= FL_RR_ADDED; return 1; }

9 years, 5 months

git:master: tm: do all the clean local msg structure in one place

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a2252afe90e0acd779e64c47eacc174b4bbdc41c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2252af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 31 00:31:11 2014 +0100 tm: do all the clean local msg structure in one place - uri/dst-uri were clened before the entire local sip message, not being visible while rebuilding the content --- modules/tm/uac.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 9a9cf48..0398118 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -395,19 +395,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, tm_xdata_swap(new_cell, &backup_xd, 1); setsflagsval(sflag_bk); - if (unlikely(lreq.new_uri.s)) - { - pkg_free(lreq.new_uri.s); - lreq.new_uri.s=0; - lreq.new_uri.len=0; - } - if (unlikely(lreq.dst_uri.s)) - { - pkg_free(lreq.dst_uri.s); - lreq.dst_uri.s=0; - lreq.dst_uri.len=0; - } - + /* rebuild the new message content */ if(lreq.force_send_socket != uac_r->dialog->send_sock) { LM_DBG("Send socket updated to: %.*s", lreq.force_send_socket->address_str.len, @@ -459,6 +447,20 @@ normal_update: } } } + + /* clean local msg structure */ + if (unlikely(lreq.new_uri.s)) + { + pkg_free(lreq.new_uri.s); + lreq.new_uri.s=0; + lreq.new_uri.len=0; + } + if (unlikely(lreq.dst_uri.s)) + { + pkg_free(lreq.dst_uri.s); + lreq.dst_uri.s=0; + lreq.dst_uri.len=0; + } lreq.buf=0; /* covers the obsolete DYN_BUF */ free_sip_msg(&lreq); }

9 years, 5 months

git:master: modules/cdp: Changed state machine for process unsuccessful answer when pending

by Richard Good

Module: sip-router Branch: master Commit: ea6d3205d06b8d9f67429ca43ea97a4dcd6a9f1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6d320… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 30 17:23:23 2014 +0200 modules/cdp: Changed state machine for process unsuccessful answer when pending When in state PENDING and receive ANS_UNSUCCESS correct behaviour is to cleanup and move to IDLE --- modules/cdp/authstatemachine.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules/cdp/authstatemachine.c b/modules/cdp/authstatemachine.c index a65bdc6..49a7cd4 100644 --- a/modules/cdp/authstatemachine.c +++ b/modules/cdp/authstatemachine.c @@ -243,10 +243,7 @@ inline int auth_client_statefull_sm_process(cdp_session_t* s, int event, AAAMess //LM_INFO("state machine: i was in pending and i am going to open\n"); break; case AUTH_EV_RECV_ANS_UNSUCCESS: - x->state = AUTH_ST_DISCON; - //LM_INFO("state machine: i was in pending and i am going to discon\n"); - Send_STR(s, msg); - break; + LM_DBG("In state AUTH_ST_PENDING and received AUTH_EV_RECV_ANS_UNSUCCESS - nothing to do but clean up session\n"); case AUTH_EV_SESSION_TIMEOUT: case AUTH_EV_SERVICE_TERMINATED: case AUTH_EV_SESSION_GRACE_TIMEOUT:

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014