sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:1984d4a0: core: parser - helper function to return URI format for local rcv socket
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 1984d4a063a175803b2852c14dcadd8839b4ad83 URL: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:49+02:00 core: parser - helper function to return URI format for local rcv socket --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Patch: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 2a4f2bb593..84a7ba6ff5 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1102,6 +1102,91 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) return 0; } +/** + * get received-on-socket ip, port and protocol in SIP URI format + * - tmode - 0: short format (transport=udp is not added, being default) + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +{ + static char buf[MAX_URI_SIZE]; + char* p; + str ip, port; + int len; + str proto; + + if (!uri || !m || !m->rcv.bind_address) { + ERR("invalid parameter value\n"); + return -1; + } + + if(tmode==0) { + switch(m->rcv.proto) { + case PROTO_NONE: + case PROTO_UDP: + proto.s = 0; /* Do not add transport parameter, UDP is default */ + proto.len = 0; + break; + default: + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + } else { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + + len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; + if (proto.s) { + len += TRANSPORT_PARAM_LEN; + len += proto.len; + } + + if (len > MAX_URI_SIZE) { + ERR("buffer too small\n"); + return -1; + } + + p = buf; + memcpy(p, "sip:", 4); + p += 4; + + if (m->rcv.src_ip.af==AF_INET6) + *p++ = '['; + memcpy(p, ip.s, ip.len); + p += ip.len; + if (m->rcv.src_ip.af==AF_INET6) + *p++ = ']'; + + *p++ = ':'; + + memcpy(p, port.s, port.len); + p += port.len; + + if (proto.s) { + memcpy(p, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + p += TRANSPORT_PARAM_LEN; + + memcpy(p, proto.s, proto.len); + p += proto.len; + } + + uri->s = buf; + uri->len = len; + + return 0; +} + + /*! \brief returns a pointer to the begining of the msg's body */ char* get_body(sip_msg_t* const msg) diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 13a30d1570..dd5f498a12 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -498,4 +498,9 @@ void msg_ldata_reset(sip_msg_t*); */ int get_src_uri(sip_msg_t *m, int tmode, str *uri); +/** + * get received-on-socket ip, port and protocol in SIP URI format + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); + #endif

1 0

git:master:a6d405b1: path: fix for second path insert pointer
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a6d405b16ba745497ba9890c60541ffdb6cadeab URL: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:20+02:00 path: fix for second path insert pointer --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Patch: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index ecfff280eb..274e6cfc7c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, if (!l) goto out1; dp = path_strzdup(suffix, cp - suffix); if(dp==NULL) goto out1; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp - suffix, 0); if (!l) goto out1; }

1 0

git:master:8f242cfb: path: documentation for enable_r2 and received_format parameters
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 8f242cfb151bbe4fdf4101f4bde59083307e6f8a URL: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:52:54+02:00 path: documentation for enable_r2 and received_format parameters --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Patch: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 31b8a572d9..4712a09716 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -143,6 +143,63 @@ modparam("path", "use_received", 1) </programlisting> </example> </section> + <section id="path.p.received_format"> + <title><varname>received_format</varname> (int)</title> + <para> + If set to 0, the <quote>received</quote> parameter value will be + in the escaped SIP URI format. + </para> + <para> + If set to 1, the <quote>received</quote> parameter value will be + in the same format as the <quote>alias</quote> parameter added by + set_contact_alias() from <quote>nathelper</quote> module (i.e., + <quote>ip~port~protid</quote>). This is a solution with some + SIP applications that incorrectly match the transport from + received parameter instead of the one from the SIP URI. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>received_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "received_format", 1) +... +</programlisting> + </example> + </section> + <section id="path.p.enable_r2"> + <title><varname>enable_r2</varname> (int)</title> + <para> + If set to 1, the module will add two Path headers, similar to the + double Record-Route done by rr module. One Path headers corresponds + to incoming network socket and the other to outgoing network socket. + The URIs in the Path headers will have the 'r2=on' parameter as well. + </para> + <para> + Note: if enabled, the module adds the two Path headers even when the + incoming socket is the same as outgoing socket. Improvements to skip + the second Path header in this case may be introduced in the future, + meanwhile, if you need to enable this parameter but also deal with + same socket routing, use 'insert_hf("Path: <$Ru>\r\n")'. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>use_received</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "use_received", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:e518e5e7: rr: small formatting adjustments to doc examples
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e518e5e7a50be3510c896bd5f8a4cc38146631cc URL: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:09:18+02:00 rr: small formatting adjustments to doc examples --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Patch: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 3e7138ce05..b64930a665 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -60,7 +60,7 @@ <title>Dialog support in RR module</title> <programlisting format="linespecific"> - +... UAC &kamailio; PROXY UAS ---- INVITE ------> record_route() ----- INVITE ----> @@ -74,7 +74,7 @@ UAC &kamailio; PROXY UAS <------ BYE ------- loose_route() <----- BYE ------- check_route_param(";foo=true") - +... </programlisting> </example> </section> @@ -264,7 +264,6 @@ modparam("rr", "custom_user_avp", "$avp(RR_CUSTOMER_USER_AVP)") #usage in cfg file $avp(RR_CUSTOM_USER_AVP)="mo"; record_route(); - ... </programlisting> </example>

1 0

git:master:2c62b317: path: option to add two path headers and use alias like received value
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 2c62b317065f36606cfb22822e65c00f129b4739 URL: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:04:31+02:00 path: option to add two path headers and use alias like received value - enable_r2 - add two path headers, one for incoming socket and one for outgoing socket - received_format - parameter to control if received value should be in sip uri (as so far) or in contact-alias param format --- Modified: src/modules/path/path.c Modified: src/modules/path/path.h Modified: src/modules/path/path_mod.c Modified: src/modules/path/path_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Patch: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00…

1 0

git:master:9c9da879: core: remove inline from implementation of functions declared without it
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 9c9da87943ad86fd4ca3ba8b007cebfcb7d9bc61 URL: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:02:30+02:00 core: remove inline from implementation of functions declared without it --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Patch: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 71d56f55c9..0661ce4bfa 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1305,7 +1305,7 @@ static inline int _parse_ruri(str *uri, if (*status) return 1; if (parse_uri(uri->s, uri->len, parsed_uri)<0) { - LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", + LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", uri->len, ZSW(uri->s)); *status=0; return -1; @@ -1347,7 +1347,8 @@ int parse_orig_ruri(struct sip_msg* msg) return ret; } -inline int normalize_tel_user(char* res, str* src) { +int normalize_tel_user(char* res, str* src) +{ int i, l; l=0; for (i=0; i<src->len; i++) { @@ -1360,7 +1361,7 @@ inline int normalize_tel_user(char* res, str* src) { default: res[l++]=src->s[i]; } - } + } return l; } @@ -1372,7 +1373,7 @@ str s_tels = STR_STATIC_INIT("tels"); str s_urn = STR_STATIC_INIT("urn"); static str s_null = STR_STATIC_INIT(""); -inline void uri_type_to_str(uri_type type, str *s) { +void uri_type_to_str(uri_type type, str *s) { switch (type) { case SIP_URI_T: *s = s_sip; @@ -1400,7 +1401,7 @@ static str s_tls = STR_STATIC_INIT("tls"); static str s_sctp = STR_STATIC_INIT("sctp"); static str s_ws = STR_STATIC_INIT("ws"); -inline void proto_type_to_str(unsigned short type, str *s) { +void proto_type_to_str(unsigned short type, str *s) { switch (type) { case PROTO_UDP: *s = s_udp; diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index 1638e264f5..a3c8c7142c 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -13,8 +13,8 @@ * 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 + * 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 */ @@ -39,7 +39,7 @@ extern str s_sip, s_sips, s_tel, s_tels, s_urn; /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri - * returns: fills uri & returns <0 on error or 0 if ok + * returns: fills uri & returns <0 on error or 0 if ok */ int parse_uri(char *buf, int len, struct sip_uri* uri); int parse_sip_msg_uri(struct sip_msg* msg);

1 0

git:master:a69a5135: core: mem/fm - replaced old log macros
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a69a5135cd70919c2207a0a747b1d850fd48d35c URL: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T09:50:00+02:00 core: mem/fm - replaced old log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Patch: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85…

1 0

git:5.0:d49131e0: presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

Module: kamailio Branch: 5.0 Commit: d49131e05033a78585bebea1bce503e97274a24e URL: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-06-26T18:06:39+03:00 presence: subsription double delete fix - if timeout_rm_subs parameter set to "1" and NOTIFY timeout about expired subsription (cherry picked from commit 8e185ddf8e81af8d6283a87ec95116965235752a) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Patch: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

1 0

presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

How about backporting this fix to 5.0? https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… -- Juha

2 1

[kamailio/kamailio] htable race condition on expired keys (#1152)
by lazedo 26 Jun '17

26 Jun '17

related to https://github.com/kamailio/kamailio/commit/be46742ebe162a2c48ee5ce27e09497… the below patch solves it, but i'm not sure of the implications why not let the expire routine do its job instead of checking expiration when adding a value ? also moved the `ht_handle_expired_record` after the record is removed ``` diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1bbd079..92a9421 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -674,29 +674,29 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(now>0 && it->expire!=0 && it->expire<now) { - /* entry has expired */ - ht_handle_expired_record(ht, it); - - if(ht->flags==PV_VAL_INT) { - /* initval is integer, use it to create a fresh entry */ - it->flags &= ~AVP_VAL_STR; - it->value.n = ht->initval.n; - /* increment will be done below */ - } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } - } +// if(now>0 && it->expire!=0 && it->expire<now) { +// /* entry has expired */ +// ht_handle_expired_record(ht, it); +// +// if(ht->flags==PV_VAL_INT) { +// /* initval is integer, use it to create a fresh entry */ +// it->flags &= ~AVP_VAL_STR; +// it->value.n = ht->initval.n; +// /* increment will be done below */ +// } else { +// /* delete expired entry */ +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// if(mode) ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } +// } /* update value */ if(it->flags&AVP_VAL_STR) { @@ -803,21 +803,21 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } +// if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { +// /* entry has expired, delete it and return NULL */ +// ht_handle_expired_record(ht, it); +// +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } if(old!=NULL) { if(old->msize>=it->msize) @@ -1056,7 +1056,6 @@ if(it->expire!=0 && it->expire<now) { /* expired */ - ht_handle_expired_record(ht, it); if(it->prev==NULL) ht->entries[i].first = it->next; else @@ -1064,6 +1063,7 @@ if(it->next) it->next->prev = it->prev; ht->entries[i].esize--; + ht_handle_expired_record(ht, it); ht_cell_free(it); } it = it0; ``` -- 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/issues/1152

2 10

← Newer
1
...
9
10
11
12
13
14
15
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017