sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:95572016: topos: use headers to pass dlg id between receive and send of dlg requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95572016c2d6764f75775230d5e6cf5d180c6e06 URL: https://github.com/kamailio/kamailio/commit/95572016c2d6764f75775230d5e6cf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T13:30:07+02:00 topos: use headers to pass dlg id between receive and send of dlg requests - it is no longer in the context to be used directly --- Modified: modules/topos/tps_msg.c Modified: modules/topos/tps_storage.c Modified: modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/95572016c2d6764f75775230d5e6cf5… Patch: https://github.com/kamailio/kamailio/commit/95572016c2d6764f75775230d5e6cf5…

8 years, 8 months

git:master:2cb59f17: topos: restore stripped headers when receiving a dlg request

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2cb59f1716931e58b00ba7c0c177b0609c796b17 URL: https://github.com/kamailio/kamailio/commit/2cb59f1716931e58b00ba7c0c177b06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T13:30:07+02:00 topos: restore stripped headers when receiving a dlg request --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/2cb59f1716931e58b00ba7c0c177b06… Patch: https://github.com/kamailio/kamailio/commit/2cb59f1716931e58b00ba7c0c177b06… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index f35eeaf..7b3805a 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -33,6 +33,7 @@ #include "../../data_lump.h" #include "../../forward.h" #include "../../trim.h" +#include "../../dset.h" #include "../../msg_translator.h" #include "../../parser/parse_rr.h" #include "../../parser/parse_uri.h" @@ -258,6 +259,33 @@ int tps_skip_msg(sip_msg_t *msg) /** * */ +int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd) +{ + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse r-uri\n"); + return -1; + } + if(msg->parsed_uri.user.len<10) { + LM_DBG("not an expected user format\n"); + return 1; + } + if(memcmp(msg->parsed_uri.user.s, "atpsh-", 6)==0) { + ptsd->a_uuid = msg->parsed_uri.user; + return 0; + } + if(memcmp(msg->parsed_uri.user.s, "btpsh-", 6)==0) { + ptsd->a_uuid = msg->parsed_uri.user; + ptsd->b_uuid = msg->parsed_uri.user; + return 0; + } + LM_DBG("not an expected user prefix\n"); + + return 1; +} + +/** + * + */ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) { hdr_field_t *hdr; @@ -537,13 +565,110 @@ int tps_reappend_rr(sip_msg_t *msg, tps_data_t *ptsd, str *hbody) /** * */ +int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) +{ + str hname = str_init("Route"); + + if(tps_add_headers(msg, &hname, hbody, 0)<0) { + return -1; + } + + return 0; +} + +/** + * + */ int tps_request_received(sip_msg_t *msg, int dialog) { + tps_data_t mtsd; + tps_data_t stsd; + str lkey; + str ftag; + str nuri; + uint32_t direction = TPS_DIR_DOWNSTREAM; + int ret; + if(dialog==0) { /* nothing to do for initial request */ return 0; } + + memset(&mtsd, 0, sizeof(tps_data_t)); + memset(&stsd, 0, sizeof(tps_data_t)); + + if(tps_pack_message(msg, &mtsd)<0) { + LM_ERR("failed to extract and pack the headers\n"); + return -1; + } + + ret = tps_dlg_message_update(msg, &mtsd); + if(ret<0) { + LM_ERR("failed to update on dlg message\n"); + return -1; + } + + lkey = msg->callid->body; + + tps_storage_lock_get(&lkey); + + if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { + goto error; + } + + /* detect direction - get from-tag */ + if(parse_from_header(msg)<0 || msg->from==NULL) { + LM_ERR("failed getting 'from' header!\n"); + goto error; + } + ftag = get_from(msg)->tag_value; + + if(stsd.a_tag.len!=ftag.len) { + direction = TPS_DIR_UPSTREAM; + } else { + if(memcpy(stsd.a_tag.s, ftag.s, ftag.len)==0) { + direction = TPS_DIR_DOWNSTREAM; + } else { + direction = TPS_DIR_UPSTREAM; + } + } + mtsd.direction = direction; + + tps_storage_lock_release(&lkey); + + if(direction == TPS_DIR_UPSTREAM) { + nuri = stsd.a_contact; + } else { + nuri = stsd.b_contact; + } + if(nuri.len>0) { + if(rewrite_uri(msg, &nuri)<0) { + LM_ERR("failed to update r-uri\n"); + return -1; + } + } + + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction==TPS_DIR_UPSTREAM)?0:1)<0) { + LM_ERR("failed to reappend s-route\n"); + return -1; + } + if(direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 0)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } + } return 0; + +error: + tps_storage_lock_release(&lkey); + return -1; } /**

8 years, 8 months

Radius auth

by Olle E. Johansson

Hello! The README in auth_radius points to an old IETF draft that was turned into RFC 4590. This RFC was later replaced with RFC 5090. Is anyone aware of the changes from draft-01 to RFC 4590 and to RFC 5090 and which level our module complies with? Should we keep the reference to draft-01 or can we safely assume we’re RFC 5090 compliant? /O

8 years, 8 months

git:4.4:14d9a00b: auth_radius Update documentation to be more clear about the different libraries supported

by Olle E. Johansson

Module: kamailio Branch: 4.4 Commit: 14d9a00bd61b3f0248b39e0306445efe8a215fc7 URL: https://github.com/kamailio/kamailio/commit/14d9a00bd61b3f0248b39e0306445ef… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T11:13:06+02:00 auth_radius Update documentation to be more clear about the different libraries supported (cherry picked from commit 057abc8d5588139059c37de232c2dcfa4c0e04cd) --- Modified: modules/auth_radius/README Modified: modules/auth_radius/doc/auth_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14d9a00bd61b3f0248b39e0306445ef… Patch: https://github.com/kamailio/kamailio/commit/14d9a00bd61b3f0248b39e0306445ef…

8 years, 8 months

git:master:057abc8d: auth_radius Update documentation to be more clear about the different libraries supported

by Olle E. Johansson

Module: kamailio Branch: master Commit: 057abc8d5588139059c37de232c2dcfa4c0e04cd URL: https://github.com/kamailio/kamailio/commit/057abc8d5588139059c37de232c2dcf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T11:12:20+02:00 auth_radius Update documentation to be more clear about the different libraries supported --- Modified: modules/auth_radius/README Modified: modules/auth_radius/doc/auth_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/057abc8d5588139059c37de232c2dcf… Patch: https://github.com/kamailio/kamailio/commit/057abc8d5588139059c37de232c2dcf…

8 years, 8 months

Releasing Kamailio v4.4.0

by Daniel-Constantin Mierla

Hello, with no major issues reported lately, I think we are on a good track for releasing stable v4.4.0. Next week a lot of people prepare for Easter, therefore I propose to do the release on Wednesday, March 30, 2016. If new things pop up, the exact date can be adjusted a bit before or after the current proposal. Any new discovered issue should be reported to bug trucker: * https://github.com/kamailio/kamailio/issues Help to complete the upgrade guide would be very appreciated: * https://www.kamailio.org/wiki/install/upgrade/stable-to-devel A draft list of what is new in 4.4 is already available at: * https://www.kamailio.org/wiki/features/new-in-4.4.x Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, Berlin, May 18-20, 2016 - http://www.kamailioworld.com

8 years, 8 months

[kamailio] module http_client - support for preemptive authentication (#515)

by filiplx

It would be nice if it was possible to configure the module to use preemptive authentication. I forked the module to add it myself in a primitive way since I needed it only for Basic Authentication, but it would be better to have it configurable. In functions.h // Before: res |= curl_easy_setopt(curl, CURLOPT_HTTPAUTH, (CURLAUTH_DIGEST|CURLAUTH_BASIC)); // After: res |= curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); From: https://curl.haxx.se/libcurl/c/CURLOPT_HTTPAUTH.html "If more than one bit is set, libcurl will first query the site to see which authentication methods it supports and then pick the best one you allow it to use. For some methods, this will induce an extra network round-trip" <===== this is what I needed to avoid --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/515

8 years, 8 months

[kamailio] dialog module : new rpc function for terminate (#552)

by Yasin CANER

adding new rpc function to terminate a dialog with callid, to tag and from tag You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/552 -- Commit Summary -- * dialog module : new rpc function for terminate -- File Changes -- M modules/dialog/dialog.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/552.patch https://github.com/kamailio/kamailio/pull/552.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/552

8 years, 8 months

git:master:fd51e0f4: http_client Update README with explanation of how an httpcon definition use default settings in the config file

by Olle E. Johansson

Module: kamailio Branch: master Commit: fd51e0f469f6a86926505bb33bdb04fc6dcfa855 URL: https://github.com/kamailio/kamailio/commit/fd51e0f469f6a86926505bb33bdb04f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T09:21:14+02:00 http_client Update README with explanation of how an httpcon definition use default settings in the config file Based on feedback from filipix in issue #541 --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fd51e0f469f6a86926505bb33bdb04f… Patch: https://github.com/kamailio/kamailio/commit/fd51e0f469f6a86926505bb33bdb04f… --- diff --git a/modules/http_client/README b/modules/http_client/README index 9384f35..48445cb 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -442,6 +442,13 @@ modparam("http_client", "authmetod", 3) call. The address given in the function call will be appended to the base URL in the connection definition. + The HTTP connection will be defined using default values in modparam's + above the definition of the httpcon in the configuration file. Also + note that connections can be defined in a separate text file if you + have many parameters per connection, or want to use a per-connection + setting that can be set in that file but not in the httpcon modparam, + like authmethod. + By default, no connections are defined. Parameters diff --git a/modules/http_client/doc/http_client_admin.xml b/modules/http_client/doc/http_client_admin.xml index 924830f..b39e36e 100644 --- a/modules/http_client/doc/http_client_admin.xml +++ b/modules/http_client/doc/http_client_admin.xml @@ -417,6 +417,12 @@ modparam("http_client", "authmetod", 3) address given in the function call will be appended to the base URL in the connection definition. </para> <para> + The HTTP connection will be defined using default values in modparam's above the definition + of the httpcon in the configuration file. Also note that connections can be defined in a + separate text file if you have many parameters per connection, or want to use a per-connection + setting that can be set in that file but not in the httpcon modparam, like authmethod. + </para> + <para> <emphasis> By default, no connections are defined. </emphasis>

8 years, 8 months

git:master:8c037d7c: http_client update TODO based on feedback from filipix in issue #541

by Olle E. Johansson

Module: kamailio Branch: master Commit: 8c037d7c0b10f32de5eacbab46e2f2a38c593aa7 URL: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T09:17:54+02:00 http_client update TODO based on feedback from filipix in issue #541 --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… Patch: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index 34a368c..da2609d 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -48,3 +48,6 @@ The http_client module - todo - Option to try connections at module load with CURLOPT_CONNECT_ONLY just to make sure URLs resolve correctly in DNS and ports are open + +- Make it possible to define modparams in any order. For now, httpcon definitions only use default + values from modparam's defined on lines above in the config file. (issue #541)

8 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016