sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

[kamailio/kamailio] Use NID_userId instead of NID_x500UniqueIdentifier to access the uid field in x509 subjects (#1846)

by Sebastian Denz

#### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #1843 #### Description Just use another x509 attribute. See #1843 for details. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1846 -- Commit Summary -- * dont use url encoding for transport tag in path header * Revert "dont use url encoding for transport tag in path header" * Merge remote-tracking branch 'upstream/master' * change NID_x500UniqueIdentifier to NID_userId to access itu-t.9.2342.19200300.100.1.1 (see #1843) -- File Changes -- M src/modules/tls/tls_select.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1846.patch https://github.com/kamailio/kamailio/pull/1846.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/1846

5 years, 9 months

git:master:6eeb273b: tls: use NID_userId instead of NID_x500UniqueIdentifier access (GH #1846)

by Henning Westerholt

Module: kamailio Branch: master Commit: 6eeb273b9a6ef38c2312deca16d9234687a282bf URL: https://github.com/kamailio/kamailio/commit/6eeb273b9a6ef38c2312deca16d9234… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-11T21:26:10+01:00 tls: use NID_userId instead of NID_x500UniqueIdentifier access (GH #1846) - use NID_userId instead of NID_x500UniqueIdentifier to access the uid field in x509 subjects in tls module - pull request GH #1846 from Sebastian Denz, denzs at gonicus dot de --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/6eeb273b9a6ef38c2312deca16d9234… Patch: https://github.com/kamailio/kamailio/commit/6eeb273b9a6ef38c2312deca16d9234…

5 years, 9 months

git:master:ffc10c8a: core: fix related to e3ecad34bb1 in dst_blacklist.c, small whitespace change in ut.c

by Henning Westerholt

Module: kamailio Branch: master Commit: ffc10c8ac68e1ffd65f0faa8610c7c5f09078aa9 URL: https://github.com/kamailio/kamailio/commit/ffc10c8ac68e1ffd65f0faa8610c7c5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-11T21:15:57+01:00 core: fix related to e3ecad34bb1 in dst_blacklist.c, small whitespace change in ut.c --- Modified: src/core/dst_blacklist.c Modified: src/core/ut.c --- Diff: https://github.com/kamailio/kamailio/commit/ffc10c8ac68e1ffd65f0faa8610c7c5… Patch: https://github.com/kamailio/kamailio/commit/ffc10c8ac68e1ffd65f0faa8610c7c5… --- diff --git a/src/core/dst_blacklist.c b/src/core/dst_blacklist.c index 5259c34b04..da2718c709 100644 --- a/src/core/dst_blacklist.c +++ b/src/core/dst_blacklist.c @@ -164,13 +164,12 @@ static int init_blst_callback_lst(struct blst_callbacks_lst* cb_lst, int max) cb_lst->max_hooks=MAX_BLST_HOOKS; cb_lst->last_idx=0; cb_lst->hooks=pkg_malloc(cb_lst->max_hooks*sizeof(struct blacklist_hook)); - if (cb_lst->hooks==0) - PKG_MEM_ERROR; - goto error; + if (cb_lst->hooks==0) { + PKG_MEM_ERROR; + return -1; + } memset(cb_lst->hooks, 0, cb_lst->max_hooks*sizeof(struct blacklist_hook)); return 0; -error: - return -1; } diff --git a/src/core/ut.c b/src/core/ut.c index 77842c9cfd..5ee8f34db1 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -160,7 +160,7 @@ char* as_asciiz(str* s) r = (char*)pkg_malloc(s->len + 1); if (!r) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; return 0; } memcpy(r, s->s, s->len);

5 years, 9 months

[kamailio/kamailio] src/core/tcp_main.c: Fixed #1836 after regression introduced … (#1847)

by sergey-safarov

… e3ecad34bb13e72b16a4213e7ce785194e88c534 #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1835 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1847 -- Commit Summary -- * src/core/tcp_main.c: Fixed #1836 after regression introduced e3ecad34bb13e72b16a4213e7ce785194e88c534 -- File Changes -- M src/core/tcp_main.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1847.patch https://github.com/kamailio/kamailio/pull/1847.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/1847

5 years, 9 months

git:master:130f5cd0: src/core/tcp_main.c: Fixed #1836 after regression introduced e3ecad34bb13e72b16a4213e7ce785194e88c534

by Sergey Safarov

Module: kamailio Branch: master Commit: 130f5cd0fca0f387bb63d0bdaa773b98089a2168 URL: https://github.com/kamailio/kamailio/commit/130f5cd0fca0f387bb63d0bdaa773b9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-02-11T15:37:15+03:00 src/core/tcp_main.c: Fixed #1836 after regression introduced e3ecad34bb13e72b16a4213e7ce785194e88c534 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/130f5cd0fca0f387bb63d0bdaa773b9… Patch: https://github.com/kamailio/kamailio/commit/130f5cd0fca0f387bb63d0bdaa773b9… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7266c63cea..c412ef7b68 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -642,9 +642,10 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, if (unlikely(q->last==0)){ wb_size=MAX_unsigned(cfg_get(tcp, tcp_cfg, wq_blk_size), size); wb=shm_malloc(sizeof(*wb)+wb_size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=wb_size; wb->next=0; q->last=wb; @@ -664,9 +665,10 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, if (last_free==0){ wb_size=MAX_unsigned(cfg_get(tcp, tcp_cfg, wq_blk_size), size); wb=shm_malloc(sizeof(*wb)+wb_size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=wb_size; wb->next=0; q->last->next=wb; @@ -724,9 +726,10 @@ inline static int _wbufq_insert(struct tcp_connection* c, const char* data, }else{ /* create a size bytes block directly */ wb=shm_malloc(sizeof(*wb)+size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=size; /* insert it */ wb->next=q->first;

5 years, 9 months

git:master:12cf3ba6: Merge pull request #1847 from sergey-safarov/1836

by GitHub

Module: kamailio Branch: master Commit: 12cf3ba6c12c66da8f0c5015a72ed93d83143d78 URL: https://github.com/kamailio/kamailio/commit/12cf3ba6c12c66da8f0c5015a72ed93… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-11T14:37:24+01:00 Merge pull request #1847 from sergey-safarov/1836 src/core/tcp_main.c: Fixed #1836 after regression introduced â¦ --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/12cf3ba6c12c66da8f0c5015a72ed93… Patch: https://github.com/kamailio/kamailio/commit/12cf3ba6c12c66da8f0c5015a72ed93… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7266c63cea..c412ef7b68 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -642,9 +642,10 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, if (unlikely(q->last==0)){ wb_size=MAX_unsigned(cfg_get(tcp, tcp_cfg, wq_blk_size), size); wb=shm_malloc(sizeof(*wb)+wb_size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=wb_size; wb->next=0; q->last=wb; @@ -664,9 +665,10 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, if (last_free==0){ wb_size=MAX_unsigned(cfg_get(tcp, tcp_cfg, wq_blk_size), size); wb=shm_malloc(sizeof(*wb)+wb_size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=wb_size; wb->next=0; q->last->next=wb; @@ -724,9 +726,10 @@ inline static int _wbufq_insert(struct tcp_connection* c, const char* data, }else{ /* create a size bytes block directly */ wb=shm_malloc(sizeof(*wb)+size-1); - if (unlikely(wb==0)) - SHM_MEM_ERROR; + if (unlikely(wb==0)) { + SHM_MEM_ERROR; goto error; + } wb->b_size=size; /* insert it */ wb->next=q->first;

5 years, 9 months

[kamailio/kamailio] Feature request: New event_route on topos (#1573)

by Joonas Keskitalo

As discused on #1569, here is a new feature request. ### What this feature request is all about? Currently there is a feature on topos module, which allows Kamailio to disable topos on requests destined to specific IP address. This event_route however has a drawback since it is only usable if the specified IP address is never sending requests to Kamailio. Consider a following scenario: Asterisk is sending an INVITE to Kamailio, which will reroute it to Provider. Kamailio has event_route 'topos:msg-outgoing' enabled and there is the following statement: ``` event_route[topos:msg-outgoing] { if($sndto(ip)=="89.18.234.47") { xlog("L_INFO","Not going to topos this request\n"); drop; } } ``` In this case 10.20.234.47 is IP address of Asterisk since system admin does not want to hide topology when requests are going to Asterisk. However after this INVITE call is ended from the receiving end, which is causing a BYE message coming from Provider to Asterisk. On this BYE request, topos event_route is triggered and BYE message is dropped out of topos process. Then the originally masked contact uri stays in the message and BYE request does not find its final destination. ### What should be done? Current event_route is designed to only make a decision by destination IP address for speed reasons. To be able to properly investigate each SIP message throughly before making a decision to topos or not, we need to have another event_route. An example of this event_route call could be as follows: ``` event_route[topos:msg-parse] { if($rd=="89.18.234.47" && $rm != "BYE") { xlog("L_INFO","Not going to topos this request <$rm> from <$si> to <$rd>\n"); drop; } } ``` -- 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/1573

5 years, 9 months

git:master:57523088: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 575230886d63091e97782a4c2c44060e471a30f1 URL: https://github.com/kamailio/kamailio/commit/575230886d63091e97782a4c2c44060… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-02-10T17:01:42+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/575230886d63091e97782a4c2c44060… Patch: https://github.com/kamailio/kamailio/commit/575230886d63091e97782a4c2c44060… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 20b08cfa4a..a94c179dac 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -380,10 +380,9 @@ make -C modules/tls extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG" it, especially under heavy traffic. This documentation is incomplete. The provided selects are not - documented. A list with all the ones implemented by the TLS module can - be seen under doc/select_list/select_tls.txt or or - http://sip-router.org/docbook/sip-router/branch/master/select_list/sele - ct_list.html#select_list.tls. + documented in this file. A list with all the ones implemented by the + TLS module can be found in the Cookbook https://www.kamailio.org/wiki/ + in the section Selects for the respective version of Kamailio. 8. Quick Certificate Howto

5 years, 9 months

git:master:7659b9b5: tls: replace old sip-router wiki with current kamailio wiki entity in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: 7659b9b5c93b75f81fd0bcbe9839ab2fb64ec1e3 URL: https://github.com/kamailio/kamailio/commit/7659b9b5c93b75f81fd0bcbe9839ab2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-10T16:56:37+01:00 tls: replace old sip-router wiki with current kamailio wiki entity in docs --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/7659b9b5c93b75f81fd0bcbe9839ab2… Patch: https://github.com/kamailio/kamailio/commit/7659b9b5c93b75f81fd0bcbe9839ab2… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index ba8d4b2ac9..fe10eec08a 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -276,11 +276,10 @@ make -C modules/tls extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG" </para> <para> This documentation is incomplete. - The provided selects are not documented. A list with all the - ones implemented by the TLS module can be seen under - doc/select_list/select_tls.txt or - or <ulink url="http://sip-router.org/docbook/sip-router/branch/master/select_list/select_l…"> - http://sip-router.org/docbook/sip-router/branch/master/select_list/select_l…</ulink>. + The provided selects are not documented in this file. A list with all the + ones implemented by the TLS module can be found in the Cookbook + <ulink url="&kamwiki;">&kamwiki;</ulink> in the section + <emphasis>Selects</emphasis> for the respective version of &kamailio;. </para> </section>

5 years, 9 months

git:master:0374a573: tm: debug message when matching a skip method for transaction lookup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0374a573604dfac337d69f8db38cca0e3ef30300 URL: https://github.com/kamailio/kamailio/commit/0374a573604dfac337d69f8db38cca0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-10T16:17:49+01:00 tm: debug message when matching a skip method for transaction lookup --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/0374a573604dfac337d69f8db38cca0… Patch: https://github.com/kamailio/kamailio/commit/0374a573604dfac337d69f8db38cca0… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 19f7979ee8..63cdbcff89 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -412,7 +412,12 @@ static int matching_3261( struct sip_msg *p_msg, struct cell **trans, /* found an existing cancel for the searched transaction */ *cancel=1; } - if (skip_method & t_msg->REQ_METHOD) continue; + if (skip_method & t_msg->REQ_METHOD) { + LM_DBG("matched skip method - s:0x%x t:0x%x m:0x%x -" + " continue searching\n", + skip_method, t_msg->REQ_METHOD, p_msg->REQ_METHOD); + continue; + } } found: prefetch_w(p_cell); /* great chance of modifiying it */ @@ -433,7 +438,8 @@ static int matching_3261( struct sip_msg *p_msg, struct cell **trans, *trans=e2e_ack_trans; return 2; } - LM_DBG("RFC3261 transaction matching failed\n"); + LM_DBG("RFC3261 transaction matching failed - via branch [%.*s]\n", + via1->branch->value.len, via1->branch->value.s); return 0; }

5 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2019