sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:master:6feb2826: tm: handle rpc tm.t_uac_start only with From and To headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6feb28266210a8210d31d7dac49cf3ea3da06164 URL: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T16:00:37+01:00 tm: handle rpc tm.t_uac_start only with From and To headers - reported by GH #1393 --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… Patch: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 2247c043d9..ec81f69450 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -133,8 +133,8 @@ static int rpc_uac_check_msg(rpc_t *rpc, void* c, * @return pkg_malloc'ed header block on success (with *l set to its length), * 0 on error. */ -static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, - struct socket_info* ssock, int* l) +static int get_hfblock(str *uri, struct hdr_field *hf, int proto, + struct socket_info* ssock, str* hout) { struct str_list sl, *last, *i, *foo; int p, frag_len, total_len; @@ -142,6 +142,8 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, str *sock_name, *portname; struct dest_info di; + hout->s = NULL; + hout->len = 0; ret = 0; /* pessimist: assume failure */ total_len = 0; last = &sl; @@ -209,7 +211,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, if(total_len==0) { LM_DBG("empty result for headers block\n"); - goto error; + return 1;; } /* construct a single header block now */ @@ -227,8 +229,9 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, dst += foo->s.len; pkg_free(foo); } - *l = total_len; - return ret; + hout->len = total_len; + hout->s = ret; + return 0; error: i = sl.next; @@ -237,8 +240,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, i = i->next; pkg_free(foo); } - *l = 0; - return 0; + return -1; } @@ -500,10 +502,9 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) if (rpc_uac_check_msg(rpc, c, &faked_msg, &method, &body, &fromtag, &cseq_is, &cseq, &callid)<0) goto error; - hfb.s=get_hfblock(nexthop.len? &nexthop: &ruri, faked_msg.headers, - PROTO_NONE, ssock, &hfb.len); - if (hfb.s==0){ - rpc->fault(c, 500, "out of memory"); + if(get_hfblock(nexthop.len? &nexthop: &ruri, faked_msg.headers, + PROTO_NONE, ssock, &hfb)<0) { + rpc->fault(c, 500, "Failed to build headers block"); goto error; } /* proceed to transaction creation */ @@ -534,7 +535,7 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) memset(&uac_req, 0, sizeof(uac_req)); uac_req.method=&method; - uac_req.headers=&hfb; + if(hfb.s!=NULL && hfb.len>0) uac_req.headers=&hfb; uac_req.body=body.len?&body:0; uac_req.dialog=&dlg; if (reply_wait){ @@ -732,10 +733,9 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, LM_ERR("checking values failed\n"); goto error; } - hfb.s=get_hfblock(nexthop->len? nexthop: ruri, faked_msg.headers, - PROTO_NONE, ssock, &hfb.len); - if (hfb.s==0){ - LM_ERR("out of memory"); + if(get_hfblock(nexthop->len? nexthop: ruri, faked_msg.headers, + PROTO_NONE, ssock, &hfb)<0) { + LM_ERR("failed to get the block of headers"); goto error; } /* proceed to transaction creation */ @@ -766,7 +766,7 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, memset(&uac_req, 0, sizeof(uac_req)); uac_req.method=method; - uac_req.headers=&hfb; + if(hfb.s!=NULL && hfb.len>0) uac_req.headers=&hfb; uac_req.body=body->len?body:0; uac_req.dialog=&dlg;

6 years, 11 months

Question about cdp development

by Alfonso Pinto

Hi all, I've to develop a module that uses cdp to contact an HSS. To understand how to use cdp API I'm looking into other modules that already use it. Of course, I read also the module documentation. Looking into ims-registrar-scscf I found something that triggers my curiosity. My question is about this https://github.com/kamailio/kamailio/blob/master/src/modules/ims_registrar_… The effect of that part is that the callback is going to be added only once. In that case, why bother with the lock and the shared variable when the initialisation could be done in mod_init()? If someone can answer it I would be really grateful. Cheers, Alfonso.

6 years, 11 months

git:master:ce9f6758: topos: print warn message when local address is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ce9f67581f45a00fd879329ffc918b2a7ef9b8d0 URL: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T09:06:36+01:00 topos: print warn message when local address is not set --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… Patch: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 9d56cb945e..95f1097bd6 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -383,6 +383,9 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) if(ret<0) goto error; ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; + if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { + LM_WARN("no local address - do record routing for all initial requests\n"); + } if(dialog==0) { ret = _tps_storage_api.insert_dialog(td); if(ret<0) goto error;

6 years, 11 months

git:master:d1f1b08e: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d1f1b08e757955158b73841f344b993d52b26d29 URL: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-16T09:01:41+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… Patch: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index cf4bce61f6..c921117131 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -84,7 +84,10 @@ Chapter 1. Admin Guide The module is transparent for the configuration writer. It only needs to be loaded (tune the parameters if needed). - It works for SIP MESSAGE requests. + It also works for SIP MESSAGE or other requests that do not create a + call dialog -- record_route() must be used for them as well, the + headers are not going to be in the messages sent to the network, they + are needed to know local addresses used to communicate with each side. 2. Dependencies @@ -95,7 +98,8 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * rr module - server must perform record routing to ensure in-dialog - requests are encoded/decoded. + requests are encoded/decoded (it must be done for all initial + requests). * database module - to store the data for topology stripping and restoring.

6 years, 11 months

git:master:22e4167e: modules: readme files regenerated - tcpops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 22e4167ebca08ee0fca155e9a230fd719e00a6e7 URL: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-15T13:01:30+01:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… Patch: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index b0a0c3b9e1..896eed34a6 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -30,6 +30,7 @@ Olle E. Johansson 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 4. Event routes @@ -47,6 +48,7 @@ Olle E. Johansson 1.5. tcp_keepalive_disable usage 1.6. tcp_set_connection_lifetime usage 1.7. tcp_set_closed_event usage + 1.8. tcp_get_conid usage Chapter 1. Admin Guide @@ -65,6 +67,7 @@ Chapter 1. Admin Guide 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 4. Event routes @@ -114,6 +117,7 @@ modparam("tcpops", "closed_event", 0) 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 3.1. tcp_conid_alive(conid) @@ -292,6 +296,29 @@ event_route[tcp:closed] { xlog("connection $conid was closed"); } +3.7. tcp_get_conid(hostport, pvname) + + Get the connection id based on target host:port. The connection id is + set in the variable named by pvname parameter. + + Meaning of the parameters is as follows: + * hostport - target "host:port" address, the port can be ommited + (default to 5060) and the parameter can contain variables. + * pvname - target variable name. + + Return values: + + 1: connection was found + + -1: connection was not found or an error occured + + Example 1.8. tcp_get_conid usage +... + if(tcp_conid_alive("127.0.0.1:5060", "$var(conid)")) { + xlog("connection id is: $var(conid)\n"); + } +... + 4. Event routes 4.1. tcp:closed

6 years, 11 months

git:5.1:434f66ac: pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 434f66ac4385c8aa1fcf6547041e03fab89bd90e URL: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-01-15T08:25:55-05:00 pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… Patch: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

6 years, 11 months

git:5.1:038b47b4: Merge pull request #1401 from sergey-safarov/docker

by GitHub

Module: kamailio Branch: 5.1 Commit: 038b47b4d5157d61cfbce27acba6cf0ed345f3b9 URL: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-16T08:49:05+01:00 Merge pull request #1401 from sergey-safarov/docker pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… Patch: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

6 years, 11 months

[kamailio/kamailio] pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo (#1401)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1401 -- Commit Summary -- * pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1401.patch https://github.com/kamailio/kamailio/pull/1401.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/1401

6 years, 11 months

git:master:4e659b5f: topos: docs - more explicit info about required use of record_route()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e659b5f3cd9b176e3bf2e20ceebf34d9734707b URL: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T08:46:39+01:00 topos: docs - more explicit info about required use of record_route() --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… Patch: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index bda8ab766d..3320bf3642 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -26,7 +26,10 @@ loaded (tune the parameters if needed). </para> <para> - It works for SIP MESSAGE requests. + It also works for SIP MESSAGE or other requests that do not create + a call dialog -- record_route() must be used for them as well, the + headers are not going to be in the messages sent to the network, they + are needed to know local addresses used to communicate with each side. </para> </section> <section> @@ -39,7 +42,8 @@ <listitem> <para> <emphasis>rr module</emphasis> - server must perform record - routing to ensure in-dialog requests are encoded/decoded. + routing to ensure in-dialog requests are encoded/decoded (it + must be done for all initial requests). </para> </listitem> <listitem>

6 years, 11 months

git:master:97532ca1: topos: set uuid fields before checking contact/rr fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97532ca18f595d89edf9b0b6e6688847aa38dd44 URL: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T06:04:22+01:00 topos: set uuid fields before checking contact/rr fields --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… Patch: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 27231bec38..9d56cb945e 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -214,19 +214,10 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) } else { sv = td->as_contact; } - if(sv.len<=0) { - /* no contact - skip */ - return 0; - } - if(td->cp + 8 + (2*uuid->len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { LM_ERR("insufficient data buffer\n"); return -1; } - if (parse_uri(sv.s, sv.len, &puri) < 0) { - LM_ERR("failed to parse the uri\n"); - return -1; - } if(dir==TPS_DIR_DOWNSTREAM) { td->b_uuid.s = td->cp; *td->cp = 'b'; @@ -234,8 +225,6 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) memcpy(td->cp, uuid->s, uuid->len); td->cp += uuid->len; td->b_uuid.len = td->cp - td->b_uuid.s; - - td->bs_contact.s = td->cp; } else { td->a_uuid.s = td->cp; *td->cp = 'a'; @@ -243,7 +232,20 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) memcpy(td->cp, uuid->s, uuid->len); td->cp += uuid->len; td->a_uuid.len = td->cp - td->a_uuid.s; + } + if(sv.len<=0) { + /* no contact - skip */ + return 0; + } + + if (parse_uri(sv.s, sv.len, &puri) < 0) { + LM_ERR("failed to parse the uri\n"); + return -1; + } + if(dir==TPS_DIR_DOWNSTREAM) { + td->bs_contact.s = td->cp; + } else { td->as_contact.s = td->cp; } *td->cp = '<';

6 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018