sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:5d0494f9: sl: new pv $ltt(key) - return local generated to tag
by Daniel-Constantin Mierla 10 Oct '18

10 Oct '18

Module: kamailio Branch: master Commit: 5d0494f9444b73a639a90c4ff2da933fb2d11d5d URL: https://github.com/kamailio/kamailio/commit/5d0494f9444b73a639a90c4ff2da933… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-09T22:17:13+02:00 sl: new pv $ltt(key) - return local generated to tag - the to-tag used when kamailio sends a reply - $ltt(s) - the to-tag used in stateless replies - $ltt(t) - the to-tag used in transaction stateful replies (transaction has to be created at that time, eg., by t_newtran() or in a branch/failure route, otherwise it returns $null) - $ltt(x) - $ltt(t) if the transaction was created already, otherwise $ltt(s) --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/5d0494f9444b73a639a90c4ff2da933… Patch: https://github.com/kamailio/kamailio/commit/5d0494f9444b73a639a90c4ff2da933… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 96c3fdfdf5..36c8a8eec7 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -78,6 +78,17 @@ static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void** param, int param_no); +static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_ltt_name(pv_spec_p sp, str *in); + + +static pv_export_t mod_pvs[] = { + { {"ltt", (sizeof("ltt")-1)}, PVT_OTHER, pv_get_ltt, 0, + pv_parse_ltt_name, 0, 0, 0 }, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static cmd_export_t cmds[]={ {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, @@ -120,7 +131,7 @@ struct module_exports exports= { cmds, /* cmd (cfg function) exports */ params, /* param exports */ sl_rpc, /* RPC method exports */ - 0, /* pv exports */ + mod_pvs, /* pv exports */ 0, /* response handling function */ mod_init, /* module init function */ child_init, /* per-child init function */ @@ -485,6 +496,83 @@ static int w_sl_forward_reply2(sip_msg_t* msg, char* str1, char* str2) return w_sl_forward_reply(msg, &code, &reason); } +/** + * + */ +static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str ttag = STR_NULL; + tm_cell_t *t = NULL; + + if(msg==NULL) + return pv_get_null(msg, param, res); + + if(param==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) { + case 0: /* mixed */ + if(get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + case 1: /* stateless */ + if(sl_get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + case 2: /* transaction stateful */ + if(sl_bind_tm==0 || tmb.t_gett==0) { + return pv_get_null(msg, param, res); + } + + t = tmb.t_gett(); + if(t== NULL || t==T_UNDEFINED) { + return pv_get_null(msg, param, res); + } + if(tmb.t_get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_ltt_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 1: + if(strncmp(in->s, "x", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncmp(in->s, "s", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "t", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { + goto error; + } + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV ltt key: %.*s\n", in->len, in->s); + return -1; +} + + /** * @brief bind functions to SL API structure */

3 3

git:master:cbaeb436: Revert "sl: new pv $ltt(key) - return local generated to tag"
by Daniel-Constantin Mierla 10 Oct '18

10 Oct '18

Module: kamailio Branch: master Commit: cbaeb4361b512a3bb8525bb3f628894dbea495f5 URL: https://github.com/kamailio/kamailio/commit/cbaeb4361b512a3bb8525bb3f628894… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-10T12:01:22+02:00 Revert "sl: new pv $ltt(key) - return local generated to tag" This reverts commit 5d0494f9444b73a639a90c4ff2da933fb2d11d5d. - mistakenly pushed in master, not personal branch --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/cbaeb4361b512a3bb8525bb3f628894… Patch: https://github.com/kamailio/kamailio/commit/cbaeb4361b512a3bb8525bb3f628894… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 36c8a8eec7..96c3fdfdf5 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -78,17 +78,6 @@ static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void** param, int param_no); -static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -static int pv_parse_ltt_name(pv_spec_p sp, str *in); - - -static pv_export_t mod_pvs[] = { - { {"ltt", (sizeof("ltt")-1)}, PVT_OTHER, pv_get_ltt, 0, - pv_parse_ltt_name, 0, 0, 0 }, - - { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } -}; - static cmd_export_t cmds[]={ {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, @@ -131,7 +120,7 @@ struct module_exports exports= { cmds, /* cmd (cfg function) exports */ params, /* param exports */ sl_rpc, /* RPC method exports */ - mod_pvs, /* pv exports */ + 0, /* pv exports */ 0, /* response handling function */ mod_init, /* module init function */ child_init, /* per-child init function */ @@ -496,83 +485,6 @@ static int w_sl_forward_reply2(sip_msg_t* msg, char* str1, char* str2) return w_sl_forward_reply(msg, &code, &reason); } -/** - * - */ -static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - str ttag = STR_NULL; - tm_cell_t *t = NULL; - - if(msg==NULL) - return pv_get_null(msg, param, res); - - if(param==NULL) - return pv_get_null(msg, param, res); - - switch(param->pvn.u.isname.name.n) { - case 0: /* mixed */ - if(get_reply_totag(msg, &ttag)<0) { - return pv_get_null(msg, param, res); - } - return pv_get_strval(msg, param, res, &ttag); - case 1: /* stateless */ - if(sl_get_reply_totag(msg, &ttag)<0) { - return pv_get_null(msg, param, res); - } - return pv_get_strval(msg, param, res, &ttag); - case 2: /* transaction stateful */ - if(sl_bind_tm==0 || tmb.t_gett==0) { - return pv_get_null(msg, param, res); - } - - t = tmb.t_gett(); - if(t== NULL || t==T_UNDEFINED) { - return pv_get_null(msg, param, res); - } - if(tmb.t_get_reply_totag(msg, &ttag)<0) { - return pv_get_null(msg, param, res); - } - return pv_get_strval(msg, param, res, &ttag); - default: - return pv_get_null(msg, param, res); - } -} - -/** - * - */ -static int pv_parse_ltt_name(pv_spec_p sp, str *in) -{ - if(sp==NULL || in==NULL || in->len<=0) - return -1; - - switch(in->len) { - case 1: - if(strncmp(in->s, "x", 1)==0) { - sp->pvp.pvn.u.isname.name.n = 0; - } else if(strncmp(in->s, "s", 1)==0) { - sp->pvp.pvn.u.isname.name.n = 1; - } else if(strncmp(in->s, "t", 1)==0) { - sp->pvp.pvn.u.isname.name.n = 2; - } else { - goto error; - } - break; - default: - goto error; - } - sp->pvp.pvn.type = PV_NAME_INTSTR; - sp->pvp.pvn.u.isname.type = 0; - - return 0; - -error: - LM_ERR("unknown PV ltt key: %.*s\n", in->len, in->s); - return -1; -} - - /** * @brief bind functions to SL API structure */

1 0

[kamailio/kamailio] pkg/kamailio: Fix of ticket 1085 (#1086)
by sergey-safarov 09 Oct '18

09 Oct '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1086 -- Commit Summary -- * pkg/kamailio: Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/deb/debian/kamailio.service (2) M pkg/kamailio/deb/jessie/kamailio.service (2) M pkg/kamailio/deb/sid/kamailio.service (2) M pkg/kamailio/deb/stretch/kamailio.service (2) M pkg/kamailio/deb/xenial/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1086.patch https://github.com/kamailio/kamailio/pull/1086.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/1086

4 15

git:master:158bfa4c: siputils: exported is_user() and uri_param() variants to kemi framework
by Daniel-Constantin Mierla 08 Oct '18

08 Oct '18

Module: kamailio Branch: master Commit: 158bfa4cee2ee12e53a0b8e0bab86964279d653c URL: https://github.com/kamailio/kamailio/commit/158bfa4cee2ee12e53a0b8e0bab8696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-08T11:55:47+02:00 siputils: exported is_user() and uri_param() variants to kemi framework --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/158bfa4cee2ee12e53a0b8e0bab8696… Patch: https://github.com/kamailio/kamailio/commit/158bfa4cee2ee12e53a0b8e0bab8696…

1 0

git:master:f94e6d12: siputils: exported is_uri() to kemi interface
by Daniel-Constantin Mierla 08 Oct '18

08 Oct '18

Module: kamailio Branch: master Commit: f94e6d12c1fb2e3bba5f603b286ef0fe786fd2e1 URL: https://github.com/kamailio/kamailio/commit/f94e6d12c1fb2e3bba5f603b286ef0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-08T09:59:01+02:00 siputils: exported is_uri() to kemi interface --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/f94e6d12c1fb2e3bba5f603b286ef0f… Patch: https://github.com/kamailio/kamailio/commit/f94e6d12c1fb2e3bba5f603b286ef0f… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index bfd90d020a..a234188b9a 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -65,6 +65,7 @@ #include "../../core/error.h" #include "../../core/kemi.h" #include "../../core/parser/parse_option_tags.h" +#include "../../core/parser/parse_uri.h" #include "ring.h" #include "options.h" @@ -457,6 +458,22 @@ static int fixup_option(void** param, int param_no) { return 0; } +/* + * Check if pseudo variable contains a valid uri + */ +static int ki_is_uri(sip_msg_t* msg, str* suri) +{ + sip_uri_t turi; + + if(suri==NULL || suri->s==NULL || suri->len<=0) { + return -1; + } + if(parse_uri(suri->s, suri->len, &turi)!=0) { + return -1; + } + return 1; +} + /** * */ @@ -481,6 +498,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_uri"), + SR_KEMIP_INT, ki_is_uri, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:b9b6f632: pkg/kamailio/deb: version set to 5.2.0~pre0
by Victor Seva 08 Oct '18

08 Oct '18

Module: kamailio Branch: master Commit: b9b6f632f999ead650a763d9da20d1dd1871c304 URL: https://github.com/kamailio/kamailio/commit/b9b6f632f999ead650a763d9da20d1d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-08T09:12:24+02:00 pkg/kamailio/deb: version set to 5.2.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b9b6f632f999ead650a763d9da20d1d… Patch: https://github.com/kamailio/kamailio/commit/b9b6f632f999ead650a763d9da20d1d…

1 0

git:master:cdfd0d46: Makefile.defs: improve and extend comment about compilation mode
by Henning Westerholt 07 Oct '18

07 Oct '18

Module: kamailio Branch: master Commit: cdfd0d460fbfe7a2cd2343b3829d3df88a943cd8 URL: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T22:49:58+02:00 Makefile.defs: improve and extend comment about compilation mode --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df… Patch: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fe4dc4ce2f..da9e95585a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -698,8 +698,8 @@ C_DEFS+= -DSHM_MEM -DSHM_MMAP \ # you may also want to set -DPROFILING # WARNING: do not add mode=debug or mode=release anymore in the Makefile, -# use make mode=debug all instead. Anyway no by default ser is compiled w/ -# debugging symbols in all cases (-g). --andrei +# use make mode=debug all instead. By default Kamailio is compiled with +# debugging symbols in all cases (-g) and without optimization (-O0). # memory managers and related debug mode C_DEFS+= -DMEM_JOIN_FREE

1 0

git:master:58325bb8: core: remove obselete parse_hostport functionality, deactivated since 2003
by Henning Westerholt 07 Oct '18

07 Oct '18

Module: kamailio Branch: master Commit: 58325bb8ae28ff291d594782bc3bfdd8e811d0a9 URL: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T10:29:46+02:00 core: remove obselete parse_hostport functionality, deactivated since 2003 --- Removed: src/core/parser/parse_hostport.c Removed: src/core/parser/parse_hostport.h --- Diff: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd… Patch: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd… --- diff --git a/src/core/parser/parse_hostport.c b/src/core/parser/parse_hostport.c deleted file mode 100644 index 4fbd1a4566..0000000000 --- a/src/core/parser/parse_hostport.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * 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 - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/*! \file - * \brief Parser :: Parse domain/hostname and port argument - * - * \ingroup parser - */ - - -#ifdef _OBSOLETED - -#include "parse_hostport.h" -#include <string.h> /* strlen */ -#include "../dprint.h" -#include "../ut.h" /* str2s */ - -char* parse_hostport(char* buf, str* host, short int* port) -{ - char *tmp; - int err; - - host->s=buf; - for(tmp=buf;(*tmp)&&(*tmp!=':');tmp++); - host->len=tmp-buf; - if (*tmp==0) { - *port=0; - } else { - *tmp=0; - *port=str2s((unsigned char*)(tmp+1), strlen(tmp+1), &err); - if (err ){ - LOG(L_INFO, - "ERROR: hostport: trailing chars in port number: %s\n", - tmp+1); - /* report error? */ - } - } - - return host->s; -} - -#endif diff --git a/src/core/parser/parse_hostport.h b/src/core/parser/parse_hostport.h deleted file mode 100644 index 10f5f0ceed..0000000000 --- a/src/core/parser/parse_hostport.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * 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 - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/*! \file - * \brief Parser :: Parse domain/hostname and port argument - * - * \ingroup parser - */ - - -#ifndef PARSE_HOSTPORT_H -#define PARSE_HOSTPORT_H - -#include "../str.h" - -char* parse_hostport(char* buf, str* host, short int* port); - -#endif /* PARSE_HOSTPORT_H */

1 0

git:master:884ec6ba: enum: remove old and not compiling code block, deactivated with #ifdef since 2006
by Henning Westerholt 07 Oct '18

07 Oct '18

Module: kamailio Branch: master Commit: 884ec6baf85414d2f92681cd6e61a5d611fd0428 URL: https://github.com/kamailio/kamailio/commit/884ec6baf85414d2f92681cd6e61a5d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T10:02:03+02:00 enum: remove old and not compiling code block, deactivated with #ifdef since 2006 --- Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/884ec6baf85414d2f92681cd6e61a5d… Patch: https://github.com/kamailio/kamailio/commit/884ec6baf85414d2f92681cd6e61a5d… --- diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index 55c2245685..7d1d1553fb 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -364,15 +364,6 @@ int is_from_user_enum_helper(sip_msg_t *_msg, str *suffix, str *service) LM_ERR("Parsing of NAPTR regexp failed\n"); return -5; } -#ifdef LATER - if((pattern.len == 4) && (strncmp(pattern.s, "^.*$", 4) == 0)) { - LM_DBG("Resulted in replacement: '%.*s'\n", replacement.len, - ZSW(replacement.s)); - retval = set_uri(_msg, replacement.s, replacement.len); - free_rdata_list(head); /*clean up*/ - return retval; - } -#endif result.s = &(uri[0]); result.len = MAX_URI_SIZE; /* Avoid making copies of pattern and replacement */

1 0

git:master:b64a2587: core: remove old code for BRANCH_IGNORE_3261_VIA and BRANCH_INCLUDE_FROMTO_BODY
by Henning Westerholt 07 Oct '18

07 Oct '18

Module: kamailio Branch: master Commit: b64a25874e376c00ce60570117d33550af568497 URL: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:56:59+02:00 core: remove old code for BRANCH_IGNORE_3261_VIA and BRANCH_INCLUDE_FROMTO_BODY - remove old code for BRANCH_IGNORE_3261_VIA and BRANCH_INCLUDE_FROMTO_BODY - this was used in pre-3.1 version times and deactivated in #ifdef since 2010 --- Modified: src/core/char_msg_val.h --- Diff: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355… Patch: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355… --- diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h index 4d6887d713..79461cd836 100644 --- a/src/core/char_msg_val.h +++ b/src/core/char_msg_val.h @@ -18,14 +18,6 @@ * @file * @ingroup core * \author andrei - * - * Defines: - * BRANCH_INCLUDE_FROMTO_BODY - if defined the old (pre 3.1) mode of - * including the full from & to bodies will be used (instead of only the - * tags). - * BRANCH_IGNORE_3261_VIA - if defined, no check and special/simpler handling - * of messages with 3261 cookies in the via branch will be made (same - * behaviour as in pre 3.1 versions). */ #ifndef __char_msg_val_h @@ -52,20 +44,6 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) memset( cv, '0', MD5_LEN ); return 0; } -#ifndef BRANCH_IGNORE_3261_VIA - if (likely(msg->via1->branch && msg->via1->branch->value.len>MCOOKIE_LEN && - memcmp(msg->via1->branch->value.s, MCOOKIE, MCOOKIE_LEN)==0)){ - /* 3261 branch cookie present => hash only the received branch ID */ - src[0]=msg->via1->branch->value; - MD5StringArray ( cv, src, 1 ); - return 1; /* success */ - } -#endif /* BRANCH_IGNORE_3261_VIA */ -#ifdef BRANCH_INCLUDE_FROMTO_BODY - /* use the from & to full bodies */ - src[0]= msg->from->body; - src[1]= msg->to->body; -#else /* to body is automatically parsed (via check_transactionquadruple / parse_header), but the from body has to be parsed manually */ if (msg->from->parsed==0){ @@ -78,7 +56,6 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) /* use only the from & to tags */ src[0]=get_from(msg)->tag_value; src[1]=get_to(msg)->tag_value; -#endif /* BRANCH_INCLUDE_FROMTO_BODY */ src[2]= msg->callid->body; src[3]= msg->first_line.u.request.uri; src[4]= get_cseq( msg )->number;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018