sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:deb3f4ab: module/sipcapture: added RPID parser for PPI field

by Alexandr Dubovikov

Module: kamailio Branch: master Commit: deb3f4ab1516d33c3781927149e92c96cf789008 URL: https://github.com/kamailio/kamailio/commit/deb3f4ab1516d33c3781927149e92c9… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2018-09-27T11:59:42+02:00 module/sipcapture: added RPID parser for PPI field --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/deb3f4ab1516d33c3781927149e92c9… Patch: https://github.com/kamailio/kamailio/commit/deb3f4ab1516d33c3781927149e92c9… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 6f0108a055..df46d25fb2 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -67,6 +67,7 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/digest/digest.h" #include "../../core/parser/parse_ppi_pai.h" +#include "../../core/parser//parse_rpid.h" #include "../../core/forward.h" #include "../../core/pvar.h" #include "../../core/str.h" @@ -1921,6 +1922,16 @@ static int sip_capture(sip_msg_t *msg, str *_table, LM_DBG("PARSE PPI: (%.*s)\n", ppi->uri.len, ppi->uri.s); sco.pid_user = ppi->parsed_uri.user; } + } else if((parse_rpid_header(msg) == 0) && (msg->rpid) && (msg->rpid->parsed)) { + to_body_t *rpid = get_rpid(msg); + if((rpid->parsed_uri.user.s == NULL) + && (parse_uri(rpid->uri.s, rpid->uri.len, &rpid->parsed_uri) < 0)) { + LM_DBG("DEBUG: do_action: bad rpid: method:[%.*s] CID: [%.*s]\n", + sco.method.len, sco.method.s, sco.callid.len, sco.callid.s); + } else { + LM_DBG("PARSE RPID: (%.*s)\n",rpid->uri.len, rpid->uri.s); + sco.pid_user = rpid->parsed_uri.user; + } } else { EMPTY_STR(sco.pid_user); }

6 years, 2 months

[kamailio/kamailio] module_sipcapture: added RPID parser for PPI field (#1653)

by Alexandr Dubovikov

#### 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) - [x] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  added RPID header parser to extract URL's user and store to PPI field. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1653 -- Commit Summary -- * module/sipcapture: added RPID parser for PPI field -- File Changes -- M src/modules/sipcapture/sipcapture.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1653.patch https://github.com/kamailio/kamailio/pull/1653.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/1653

6 years, 2 months

[kamailio/kamailio] Makefile.defs: default locks review (#1035)

by Daniel-Constantin Mierla

Apparently the default locks are set to PTHREAD mutex, when the architecture is not handled explicitely. It should be reviewed and eventually switch to standard POSIX, they should work everywhere while PTHREAD are targeting threads and work only in few cases for processes. -- 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/1035

6 years, 2 months

git:master:8bc56bbc: ims_usrloc_scscf: fix compilation warning

by Victor Seva

Module: kamailio Branch: master Commit: 8bc56bbc23ef888ebbfbe54732ffe7f82bd7082d URL: https://github.com/kamailio/kamailio/commit/8bc56bbc23ef888ebbfbe54732ffe7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-27T12:35:58+02:00 ims_usrloc_scscf: fix compilation warning >impurecord.c:1243:16: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] > if ((contact == impucontact->contact)) { > ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ >impurecord.c:1243:16: note: remove extraneous parentheses around the comparison to silence this warning > if ((contact == impucontact->contact)) { --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc56bbc23ef888ebbfbe54732ffe7f… Patch: https://github.com/kamailio/kamailio/commit/8bc56bbc23ef888ebbfbe54732ffe7f… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 20c8a64154..67744bb5db 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1240,7 +1240,7 @@ int unlink_contact_from_impu(impurecord_t* impu, ucontact_t* contact, int write_ impucontact = impu->linked_contacts.head; while (impucontact) { - if ((contact == impucontact->contact)) { + if (contact == impucontact->contact) { remove_impucontact_from_list(impu, impucontact); if (write_to_db && db_mode == WRITE_THROUGH && (db_unlink_contact_from_impu(impu, contact) != 0)) { LM_ERR("Failed to un-link DB contact [%.*s] from IMPU [%.*s]...continuing but db will be out of sync!\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s);

6 years, 2 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: f1f5ec13937ae14aee0c1610dd1dcd2e1100966b URL: https://github.com/kamailio/kamailio/commit/f1f5ec13937ae14aee0c1610dd1dcd2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-27T12:31:37+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/f1f5ec13937ae14aee0c1610dd1dcd2… Patch: https://github.com/kamailio/kamailio/commit/f1f5ec13937ae14aee0c1610dd1dcd2… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 578333ea44..3ea60f8949 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -91,7 +91,7 @@ Olle E. Johansson List of Examples - 1.1. Quick start config + 1.1. Quick Start Basic Config 1.2. Compiling TLS with Debug Messages 1.3. Set tls_method parameter 1.4. Set certificate parameter @@ -223,24 +223,38 @@ Chapter 1. Admin Guide 2. Quick Start - Make sure you have a proper certificate and private key and either use - the certificate and private_key module parameters, or make sure the - certificate and key are in the same PEM file, named cert.pem an placed - in [your-cfg-install-prefix]/etc/kamailio/. Don't forget to load the - tls module and to enable TLS (add enable_tls=yes to your config). + The default kamailio.cfg file has basic tls support included, it has to + be enabled with "#!define WITH_TLS" directive. - Example 1.1. Quick start config + The most important parameters to set the path to the public certificate + and private key files. You can either have them in different file or in + the same file in PEM format. The parameters for them are certificate + and private_key. They can be given as modparam or or provided in the + profiles of tls.cfg file. + + When installing tls module of kamailio, a sample 'tls.cfg' file is + deployed in the same folder with 'kamailio.cfg', along with freshly + generated self signed certificates. + + HINT: be sure you have enable_tls=yes to your kamailio.cfg. + + Example 1.1. Quick Start Basic Config #... -loadmodule "modules/tls/tls.so" +loadmodule "sl.so" +loadmodule "tls.so" -modparam("tls", "private_key", "./andrei-test.pem") -modparam("tls", "certificate", "./andrei-test.pem") +modparam("tls", "private_key", "./server-test.pem") +modparam("tls", "certificate", "./server-test.pem") modparam("tls", "ca_list", "./calist.pem") enable_tls=yes -route{ - # .... +request_route { + if(proto != TLS) { + sl_send_reply("403", "Accepting TLS Only"); + exit; + } + ... } 3. Important Notes @@ -1445,14 +1459,16 @@ modparam("tls", "engine_algorithms", "ALL") 11.1. is_peer_verified() - Returns true if the connection on which the message was received is TLS - , the peer presented an X509 certificate and the certificate chain - verified ok. It can be used only in a request route. + Returns true if the connection on which the message was received is + TLS, the peer presented an X509 certificate and the certificate chain + verified ok. + + It can be used only in a request route. Example 1.45. is_peer_verified usage - if (proto==TLS && !is_peer_verified()){ + if (proto==TLS && !is_peer_verified()) { sl_send_reply("400", "No certificate or verification failed"); - drop; + exit; } 12. RPC Commands

6 years, 2 months

[kamailio] feature request: sample config for federation / peering with repro (#531)

by Daniel Pocock

repro servers peer with each other in a federated manner just like SMTP servers for email, but using TLS mutual authentication to prevent impersonation. Kamailio has TLS support and should be able to talk to such servers and other Kamailio servers in the same way. It would be good to create a recommended sample configuration for this type of service and also add it to the RTC Quick Start Guide: http://rtcquickstart.org/guide/multi/sip-proxy.html --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/531

6 years, 2 months

git:master:b08df6d5: tls: updates to overview section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b08df6d531513ecf472f4642ddf180bffac46f58 URL: https://github.com/kamailio/kamailio/commit/b08df6d531513ecf472f4642ddf180b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-27T12:20:39+02:00 tls: updates to overview section - GH #531 --- Modified: src/modules/tls/doc/functions.xml Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/b08df6d531513ecf472f4642ddf180b… Patch: https://github.com/kamailio/kamailio/commit/b08df6d531513ecf472f4642ddf180b… --- diff --git a/src/modules/tls/doc/functions.xml b/src/modules/tls/doc/functions.xml index 1f3116f26d..2a371de8f1 100644 --- a/src/modules/tls/doc/functions.xml +++ b/src/modules/tls/doc/functions.xml @@ -18,16 +18,18 @@ <title><function>is_peer_verified()</function></title> <para> Returns true if the connection on which the message was received - is TLS , the peer presented an X509 certificate and the + is TLS, the peer presented an X509 certificate and the certificate chain verified ok. + </para> + <para> It can be used only in a request route. </para> <example> <title><function>is_peer_verified</function> usage</title> <programlisting> - if (proto==TLS && !is_peer_verified()){ + if (proto==TLS && !is_peer_verified()) { sl_send_reply("400", "No certificate or verification failed"); - drop; + exit; } </programlisting> </example> diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index f5337baaf9..8147208f70 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -68,27 +68,41 @@ <section id="tls.quick_start"> <title>Quick Start</title> <para> - Make sure you have a proper certificate and private key and either - use the <varname>certificate</varname> and <varname>private_key</varname> - module parameters, or make sure the certificate and key are in the same PEM file, - named <emphasis>cert.pem</emphasis> an placed in [your-cfg-install-prefix]/etc/kamailio/. - Don't forget to load the tls module and to enable TLS - (add <emphasis>enable_tls=yes</emphasis> to your config). + The default kamailio.cfg file has basic tls support included, it has to + be enabled with "#!define WITH_TLS" directive. + </para> + <para> + The most important parameters to set the path to the public certificate and private key + files. You can either have them in different file or in the same file in PEM format. + The parameters for them are <varname>certificate</varname> and <varname>private_key</varname>. + They can be given as modparam or or provided in the profiles of tls.cfg file. + </para> + <para> + When installing tls module of kamailio, a sample 'tls.cfg' file is deployed in the same + folder with 'kamailio.cfg', along with freshly generated self signed certificates. + </para> + <para> + HINT: be sure you have <emphasis>enable_tls=yes</emphasis> to your kamailio.cfg. </para> <example> - <title>Quick start config</title> + <title>Quick Start Basic Config</title> <programlisting> #... -loadmodule "modules/tls/tls.so" +loadmodule "sl.so" +loadmodule "tls.so" -modparam("tls", "private_key", "./andrei-test.pem") -modparam("tls", "certificate", "./andrei-test.pem") +modparam("tls", "private_key", "./server-test.pem") +modparam("tls", "certificate", "./server-test.pem") modparam("tls", "ca_list", "./calist.pem") enable_tls=yes -route{ - # .... +request_route { + if(proto != TLS) { + sl_send_reply("403", "Accepting TLS Only"); + exit; + } + ... } </programlisting> </example>

6 years, 2 months

git:master:65860790: tls: renamed sip-router_cert.sh to tls_cert.sh

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65860790056bc847dc4320ee31424bd458f998fd URL: https://github.com/kamailio/kamailio/commit/65860790056bc847dc4320ee31424bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-27T12:20:39+02:00 tls: renamed sip-router_cert.sh to tls_cert.sh - it is specific to the module, not the flavour of the application --- Added: src/modules/tls/tls_cert.sh Modified: src/modules/tls/Makefile Removed: src/modules/tls/sip-router_cert.sh --- Diff: https://github.com/kamailio/kamailio/commit/65860790056bc847dc4320ee31424bd… Patch: https://github.com/kamailio/kamailio/commit/65860790056bc847dc4320ee31424bd… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index c6969c1228..53d296c529 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -38,7 +38,7 @@ include ../../Makefile.modules install-tls-cert: $(cfg_prefix)/$(cfg_dir) - MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + MAIN_NAME=$(MAIN_NAME) ./tls_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-cfg: @if ! [ -d $(cfg_prefix)/$(cfg_dir) ]; then \ diff --git a/src/modules/tls/sip-router_cert.sh b/src/modules/tls/tls_cert.sh similarity index 100% rename from src/modules/tls/sip-router_cert.sh rename to src/modules/tls/tls_cert.sh

6 years, 2 months

git:master:45f7312f: tls: removed the old very basic sample config

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 45f7312fdb2fc08db627872f01485c50386bf169 URL: https://github.com/kamailio/kamailio/commit/45f7312fdb2fc08db627872f01485c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-27T12:20:39+02:00 tls: removed the old very basic sample config --- Removed: src/modules/tls/sip-router-tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/45f7312fdb2fc08db627872f01485c5… Patch: https://github.com/kamailio/kamailio/commit/45f7312fdb2fc08db627872f01485c5… --- diff --git a/src/modules/tls/sip-router-tls.cfg b/src/modules/tls/sip-router-tls.cfg deleted file mode 100644 index ae860d1a63..0000000000 --- a/src/modules/tls/sip-router-tls.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# -# This is a minimalistic SER configuration file which can -# be used to test the TLS module. -# -debug=4 # debug level (cmd line: -dddddddddd) -fork=yes -log_stderror=yes - -children=1 -enable_tls=1 - -loadpath "./modules" - -loadmodule "sl" -loadmodule "tls" - -modparam("tls", "config", "tls.cfg") - -listen=tls:127.0.0.1:5061 - -route { - sl_reply("200", "OK"); - break; -} -

6 years, 2 months

git:master:9bd04869: modules: readme files regenerated - db_unixodbc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9bd0486982836348539c1767cb4d711f397eb649 URL: https://github.com/kamailio/kamailio/commit/9bd0486982836348539c1767cb4d711… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-27T11:46:41+02:00 modules: readme files regenerated - db_unixodbc ... [skip ci] --- Modified: src/modules/db_unixodbc/README --- Diff: https://github.com/kamailio/kamailio/commit/9bd0486982836348539c1767cb4d711… Patch: https://github.com/kamailio/kamailio/commit/9bd0486982836348539c1767cb4d711… --- diff --git a/src/modules/db_unixodbc/README b/src/modules/db_unixodbc/README index eae1e116f8..1f3faf2e00 100644 --- a/src/modules/db_unixodbc/README +++ b/src/modules/db_unixodbc/README @@ -186,7 +186,7 @@ modparam("db_unixodbc", "quote_char", "`") 5.2. Configuring and Running - In the openser.conf file, add the line: + In the Kamailio.cfg file, add the line: .... loadmodule "/usr/local/lib/kamailio/modules/db_unixodbc.so" .... @@ -204,7 +204,7 @@ modparam("auth_db", "password_column", "password") url adding this line: .... modparam("usrloc|auth_db", "db_url", - "unixodbc://openser:openserrw@localhost/my_dsn") + "unixodbc://kamailio:kamailiorw@localhost/my_dsn") .... replacing my_dsn with the correct value.

6 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018