sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:e3ccc859: modules/imsr_usrloc_scscf: small cleanup in lookup

by Jason Penton

Module: kamailio Branch: master Commit: e3ccc85989f5b285850ba64573ad2402f9dc9efa URL: https://github.com/kamailio/kamailio/commit/e3ccc85989f5b285850ba64573ad240… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-01-05T13:50:19+02:00 modules/imsr_usrloc_scscf: small cleanup in lookup --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/e3ccc85989f5b285850ba64573ad240… Patch: https://github.com/kamailio/kamailio/commit/e3ccc85989f5b285850ba64573ad240… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index a3d64c0..9859796 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -641,9 +641,8 @@ static inline struct ucontact* contact_path_match(unsigned int slot, str* _c, st int get_ucontact(impurecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, struct ucontact** _co) { unsigned int sl; ucontact_t* ptr; - int no_callid; + int with_callid = 1; ptr = 0; - no_callid = 0; *_co = 0; sl = core_hash(_c, 0, contact_list->size); @@ -658,11 +657,11 @@ int get_ucontact(impurecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, break; case CONTACT_CALLID: ptr = contact_callid_match(sl, _c, _callid); - no_callid = 1; + with_callid = 1; break; case CONTACT_PATH: ptr = contact_path_match(sl, _c, _path); - break; + break; case CONTACT_PORT_IP_ONLY: ptr = contact_port_ip_match(sl, _c); break; @@ -677,7 +676,7 @@ int get_ucontact(impurecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, if (ptr) { LM_DBG("have partially found a contact\n"); /* found -> check callid and cseq */ - if (no_callid || (ptr->callid.len == _callid->len + if (!with_callid || (ptr->callid.len == _callid->len && memcmp(_callid->s, ptr->callid.s, _callid->len) == 0)) { if (_cseq < ptr->cseq) { LM_DBG("cseq less than expected\n");

9 years, 10 months

Passed: linuxmaniac/kamailio#16 (vseva/dialplan_fix - e84e9d3)

by Travis CI

Build Update for linuxmaniac/kamailio ------------------------------------- Build: #16 Status: Passed Duration: 6 minutes and 53 seconds Commit: e84e9d3 (vseva/dialplan_fix) Author: Victor Seva Message: dialplan: don't check subexpressions on expressions with pvs View the changeset: https://github.com/linuxmaniac/kamailio/compare/c9f26b592c2d^...e84e9d3a7548 View the full build log and details: https://travis-ci.org/linuxmaniac/kamailio/builds/45935080 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 10 months

git:master:78324dcc: topoh: added note about making call-id when dialog module is used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 78324dcc09d0a51fa02a960a40faa7fdadddce66 URL: https://github.com/kamailio/kamailio/commit/78324dcc09d0a51fa02a960a40faa7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-05T00:09:40+01:00 topoh: added note about making call-id when dialog module is used --- Modified: modules/topoh/README Modified: modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/78324dcc09d0a51fa02a960a40faa7f… Patch: https://github.com/kamailio/kamailio/commit/78324dcc09d0a51fa02a960a40faa7f… --- diff --git a/modules/topoh/README b/modules/topoh/README index 6895a33..8812b7b 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -147,6 +147,10 @@ modparam("topoh", "mask_ip", "192.168.0.1") encode Call-id in such cases. Well-known extensions such as call transfer or conference join will be added to work with encoded Call-id. + NOTE: if you are using dialog module to terminate calls and this + parameter is enabled, you must set the dialog module parameter + 'lreq_callee_headers' to include the header: 'TH: dlh\r\n'. + Default value is 0 (do not mask). Example 1.3. Set mask_callid parameter diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index f932b3e..fd588cd 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -118,6 +118,11 @@ modparam("topoh", "mask_ip", "192.168.0.1") Call-id. </para> <para> + NOTE: if you are using dialog module to terminate calls and this + parameter is enabled, you must set the dialog module parameter + 'lreq_callee_headers' to include the header: 'TH: dlh\r\n'. + </para> + <para> <emphasis> Default value is 0 (do not mask). </emphasis>

9 years, 10 months

git:master:cf74b256: dialog: readme built form docbook

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cf74b25690481dc5793eaf8f8d4831f0b30be291 URL: https://github.com/kamailio/kamailio/commit/cf74b25690481dc5793eaf8f8d4831f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-05T00:05:22+01:00 dialog: readme built form docbook --- Modified: modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/cf74b25690481dc5793eaf8f8d4831f… Patch: https://github.com/kamailio/kamailio/commit/cf74b25690481dc5793eaf8f8d4831f…

9 years, 10 months

git:master:fed48b73: dialog: documentation for parameter lreq_callee_headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fed48b73fe11efa680d7950e73667e9d94466307 URL: https://github.com/kamailio/kamailio/commit/fed48b73fe11efa680d7950e73667e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-05T00:05:06+01:00 dialog: documentation for parameter lreq_callee_headers --- Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fed48b73fe11efa680d7950e73667e9… Patch: https://github.com/kamailio/kamailio/commit/fed48b73fe11efa680d7950e73667e9… --- diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 0a27161..49c3122 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1306,6 +1306,28 @@ modparam("dialog", "track_cseq_updates", 1) </example> </section> + <section id="dialog.p.lreq_callee_headers"> + <title><varname>lreq_callee_headers</varname> (string)</title> + <para> + SIP headers to be added when sending local generated requests + (e.g., BYE) to callee. It can be useful when you use topoh module + with call-id masking (see the docs of topoh module). + </para> + <para> + <emphasis> + Default value is <quote>null</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>lreq_callee_headers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "lreq_callee_headers", "TH: dlh\r\n") +... +</programlisting> + </example> + </section> + </section>

9 years, 10 months

git:master:d8c92fd3: dialog: option to add custom headers for local requests to callee

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d8c92fd3dc83a525665cae2b6e4071a66c6c0784 URL: https://github.com/kamailio/kamailio/commit/d8c92fd3dc83a525665cae2b6e4071a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-04T23:57:13+01:00 dialog: option to add custom headers for local requests to callee - new parameter: lreq_callee_headers - make topoh to handle properly dialog local requests (e.g., bye): lreq_callee_headers set to: 'TH: dlh\r\n' - reported by Alex Balashov --- Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_req_within.c Modified: modules/dialog/dlg_req_within.h --- Diff: https://github.com/kamailio/kamailio/commit/d8c92fd3dc83a525665cae2b6e4071a… Patch: https://github.com/kamailio/kamailio/commit/d8c92fd3dc83a525665cae2b6e4071a…

9 years, 10 months

git:master:b60b337e: tm: safety check for CRLF at end of custom headers for local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b60b337e04f41d4b5262cb068f1bef6f827dba27 URL: https://github.com/kamailio/kamailio/commit/b60b337e04f41d4b5262cb068f1bef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-04T23:55:18+01:00 tm: safety check for CRLF at end of custom headers for local requests - if hdrs value is not ending in '\n', add '\r\n' --- Modified: modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/b60b337e04f41d4b5262cb068f1bef6… Patch: https://github.com/kamailio/kamailio/commit/b60b337e04f41d4b5262cb068f1bef6… --- diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index f705b90..ded1b47 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1553,7 +1553,13 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra *len += CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN; /* Content-Length */ *len += ((server_signature && user_agent_hdr.len>0) ? (user_agent_hdr.len + CRLF_LEN) : 0); /* Signature */ - *len += (headers ? headers->len : 0); /* Additional headers */ + if(headers && headers->len>2) { + /* Additional headers */ + *len += headers->len; + /* End of header if missing */ + if(headers->s[headers->len - 1] != '\n') + *len += CRLF_LEN; + } *len += (body ? body->len : 0); /* Message body */ *len += CRLF_LEN; /* End of Header */ @@ -1586,7 +1592,11 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra memapp(w, user_agent_hdr.s, user_agent_hdr.len); memapp(w, CRLF, CRLF_LEN); } - if (headers) memapp(w, headers->s, headers->len); + if(headers && headers->len>2) { + memapp(w, headers->s, headers->len); + if(headers->s[headers->len - 1] != '\n') + memapp(w, CRLF, CRLF_LEN); + } memapp(w, CRLF, CRLF_LEN); if (body) memapp(w, body->s, body->len);

9 years, 10 months

git:master:0219d5a9: topoh: discover local request direction from th cookie

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0219d5a9090366292671eedc5e25f6c8434989c8 URL: https://github.com/kamailio/kamailio/commit/0219d5a9090366292671eedc5e25f6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-04T23:54:23+01:00 topoh: discover local request direction from th cookie - l can be used to mark local requests for topoh handling --- Modified: modules/topoh/th_msg.c Modified: modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0219d5a9090366292671eedc5e25f6c… Patch: https://github.com/kamailio/kamailio/commit/0219d5a9090366292671eedc5e25f6c… --- diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 3a68f3f..098510e 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1002,6 +1002,15 @@ int th_del_cookie(sip_msg_t *msg) } +/** + * return the special topoh cookie + * - TH header of TH Via parame + * - value is 3 chars + * [0] - direction: d - downstream; u - upstream + * [1] - request type: i - initial; c - in-dialog; l - local in-dialog + * [2] - location: h - header; v - via param + * - if not found, returns 'xxx' + */ char* th_get_cookie(sip_msg_t *msg, int *clen) { hdr_field_t *hf; diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index ff64b6c..a8d9b63 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -401,13 +401,24 @@ int th_msg_sent(void *data) { direction = (th_cookie_value.s[0]=='u')?1:0; /* upstream/downstram */ dialog = (get_to(&msg)->tag_value.len>0)?1:0; - local = (th_cookie_value.s[0]!='d'&&th_cookie_value.s[0]!='u')?1:0; + + if(msg.via2==0) { + local = 1; + if(direction==0 && th_cookie_value.s[1]=='l') { + /* downstream local request (e.g., dlg bye) */ + local = 2; + } + } else { + /* more than one Via, but no received th cookie */ + local = (th_cookie_value.s[0]!='d' && th_cookie_value.s[0]!='u')?1:0; + } /* local generated requests */ if(local) { /* ACK and CANCEL go downstream */ if(get_cseq(&msg)->method_id==METHOD_ACK - || get_cseq(&msg)->method_id==METHOD_CANCEL) + || get_cseq(&msg)->method_id==METHOD_CANCEL + || local==2) { th_mask_callid(&msg); goto ready;

9 years, 10 months

git:master:0739e263: shm_regex Remove svn id, history

by Olle E. Johansson

Module: kamailio Branch: master Commit: 0739e26397e08604eb7fa08ec36369b665009182 URL: https://github.com/kamailio/kamailio/commit/0739e26397e08604eb7fa08ec36369b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-04T11:18:56+01:00 shm_regex Remove svn id, history --- Modified: lib/shm_regex/README Modified: lib/shm_regex/shm_regex.c Modified: lib/shm_regex/shm_regex.h --- Diff: https://github.com/kamailio/kamailio/commit/0739e26397e08604eb7fa08ec36369b… Patch: https://github.com/kamailio/kamailio/commit/0739e26397e08604eb7fa08ec36369b… --- diff --git a/lib/shm_regex/README b/lib/shm_regex/README index bfec807..ce4cde4 100644 --- a/lib/shm_regex/README +++ b/lib/shm_regex/README @@ -1,5 +1,3 @@ -$Id$ - Wrapper functions for regcomp, regexec, regfree, and regerror using shared memory allocators instead of libc malloc/realloc/free. The original functions are prefixed with "shm_". diff --git a/lib/shm_regex/shm_regex.c b/lib/shm_regex/shm_regex.c index 58df667..3d5d40b 100644 --- a/lib/shm_regex/shm_regex.c +++ b/lib/shm_regex/shm_regex.c @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2009 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -24,11 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History - * ------- - * 2009-04-03 Initial version (Miklos) - * 2010-04-25 Use own struct with locking to work-around libc locking failure - * on multi-core hw (skeller) */ #include <malloc.h> /* hook prototypes */ diff --git a/lib/shm_regex/shm_regex.h b/lib/shm_regex/shm_regex.h index 4430f7b..0136446 100644 --- a/lib/shm_regex/shm_regex.h +++ b/lib/shm_regex/shm_regex.h @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2009 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -24,11 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History - * ------- - * 2009-04-03 Initial version (Miklos) - * 2010-04-25 Use own struct with locking to work-around libc locking failure - * on multi-core hw (skeller) */ #ifndef _SHM_REGEX_H

9 years, 10 months

git:master:a5acd43d: binrpc remove svn ID, remove history

by Olle E. Johansson

Module: kamailio Branch: master Commit: a5acd43d0e422692e0fc5114e6857a3959a7a7b4 URL: https://github.com/kamailio/kamailio/commit/a5acd43d0e422692e0fc5114e6857a3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-04T11:17:07+01:00 binrpc remove svn ID, remove history --- Modified: lib/binrpc/README Modified: lib/binrpc/binrpc_api.c Modified: lib/binrpc/binrpc_api.h --- Diff: https://github.com/kamailio/kamailio/commit/a5acd43d0e422692e0fc5114e6857a3… Patch: https://github.com/kamailio/kamailio/commit/a5acd43d0e422692e0fc5114e6857a3… --- diff --git a/lib/binrpc/README b/lib/binrpc/README index c58ee9f..8704682 100644 --- a/lib/binrpc/README +++ b/lib/binrpc/README @@ -1,4 +1,4 @@ -binrcp library +binrpc library -------------- prepared by Vladimir Marek @@ -7,7 +7,7 @@ inspirated by sercmd from Andrei Pelinescu-Onciul Description: ------------ -This library using binrpc implementation from CTL module of SER and encapsulets +This library using binrpc implementation from CTL module of Kamailio and encapsulates it for socket communication. It offers simple functional interface for sending messages over UNIX sockets, TCP or UDP protocol. The messages are encoded into binary RCP format that is much more efficient then standard XMLRPC. @@ -31,4 +31,4 @@ Warning ------- Double check alignment which is used for compilation to avoid nasty problem with -structure size (if using libbinrpc library). This may occur e.g. in binrpc_parse_response!!! \ No newline at end of file +structure size (if using libbinrpc library). This may occur e.g. in binrpc_parse_response!!! diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index fb914cf..1d4c41c 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -25,13 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* +/** * send commands using binrpc * - * History: - * -------- - * 2006-11-09 created by vlada - * 2006-12-20 extended by tma */ #include <sys/types.h> diff --git a/lib/binrpc/binrpc_api.h b/lib/binrpc/binrpc_api.h index 1f9f22e..c04394a 100644 --- a/lib/binrpc/binrpc_api.h +++ b/lib/binrpc/binrpc_api.h @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -25,12 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * -------- - * 2006-11-09 created (vlada) - */ - #ifndef BINRPC_API_H_ #define BINRPC_API_H_

9 years, 10 months

← Newer
1
...
45
46
47
48
49
50
51
52
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015