sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
222 discussions

git:master:d5135ade: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d5135adec7297caa4dca0021dcf33ea1a1897aac URL: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-14T08:16:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea… Patch: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea…

4 months, 1 week

git:master:e5e0412f: siputils: docs for is_http() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e5e0412f61096e82fdaf61b38fe6a219312709d4 URL: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: docs for is_http() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… Patch: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index dbbba7a6db6..cf08771326c 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1152,6 +1152,27 @@ if (is_sip()) { ... } ... +</programlisting> + </example> + </section> + <section id="siputils.f.is_http"> + <title> + <function moreinfo="none">is_http()</function> + </title> + <para> + Return true if it is a HTTP message. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_http</function> usage</title> + <programlisting format="linespecific"> +... +if (is_http()) { + ... +} +... </programlisting> </example> </section>

4 months, 1 week

git:master:9789b423: siputils: added is_http() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9789b423da91ecf0d2fad30c90f6ad717884cde7 URL: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: added is_http() function --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… Patch: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 19250567479..fa4332ec756 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -131,6 +131,36 @@ int ki_is_sip(sip_msg_t *msg) return -1; } +/** + * return 1 (true) if it is a HTTP message + */ +int w_is_http(sip_msg_t *msg, char *foo, char *bar) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_HTTP) { + return 1; + } + + return -1; +} + +/** + * return 1 (true) if it is a HTTP message + */ +int ki_is_http(sip_msg_t *msg) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_HTTP) { + return 1; + } + + return -1; +} + /* * Checks if From includes a To-tag -- good to identify * if a request creates a new dialog diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 7ce632b6116..8dd0a22b81d 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -122,6 +122,11 @@ int is_reply(struct sip_msg *msg); int w_is_sip(struct sip_msg *msg, char *foo, char *bar); int ki_is_sip(struct sip_msg *msg); +/* + * Return true (1) if it is a HTTP message, otherwise false (-1) + */ +int w_is_http(sip_msg_t *msg, char *foo, char *bar); +int ki_is_http(sip_msg_t *msg); /* * Find if Request URI has a given parameter with matching value diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index f22f0c8f485..372da25b041 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -175,6 +175,7 @@ static cmd_export_t cmds[] = { {"is_request", (cmd_function)w_is_request, 0, 0, 0, ANY_ROUTE}, {"is_reply", (cmd_function)w_is_reply, 0, 0, 0, ANY_ROUTE}, {"is_sip", (cmd_function)w_is_sip, 0, 0, 0, ANY_ROUTE}, + {"is_http", (cmd_function)w_is_http, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_supported", (cmd_function)w_is_supported, 1, fixup_option, 0, @@ -629,6 +630,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_http"), + SR_KEMIP_INT, ki_is_http, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_first_hop"), SR_KEMIP_INT, is_first_hop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 months, 1 week

git:master:856ecb09: siputils: rename internal kemi function for is_sip()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 856ecb09711773c6f24831a1a1d8724733541a7e URL: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: rename internal kemi function for is_sip() --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… Patch: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 7caeb809b2f..19250567479 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -119,7 +119,7 @@ int w_is_sip(sip_msg_t *msg, char *foo, char *bar) /** * return 1 (true) if it is a SIP message */ -int is_sip(sip_msg_t *msg) +int ki_is_sip(sip_msg_t *msg) { if(msg == NULL) return -1; diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index fa914ecc0da..7ce632b6116 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -120,7 +120,7 @@ int is_reply(struct sip_msg *msg); * Return true (1) if it is a SIP message, otherwise false (-1) */ int w_is_sip(struct sip_msg *msg, char *foo, char *bar); -int is_sip(struct sip_msg *msg); +int ki_is_sip(struct sip_msg *msg); /* diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 0912c6b132b..f22f0c8f485 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -625,7 +625,7 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("is_sip"), - SR_KEMIP_INT, is_sip, + SR_KEMIP_INT, ki_is_sip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

4 months, 1 week

[kamailio/kamailio] tls: remove confusing error message when trying to print socket for <default> server (PR #3875)

by Victor Seva

#### 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 - [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 #### Description On start: ``` CRITICAL: <core> [core/ip_addr.c:232]: ip_addr2sbuf(): unknown address family 0 NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... ``` Now it will print: ``` NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [0.0.0.0:0], server_name='<default>' ... ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3875 -- Commit Summary -- * tls: remove confusing error message when trying to print socket for <default> server -- File Changes -- M src/modules/tls/tls_domain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3875.patch https://github.com/kamailio/kamailio/pull/3875.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3875 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3875(a)github.com>

4 months, 1 week

git:master:87c8290a: tls: remove confusing error message when trying to print socket for <default> server

by Victor Seva

Module: kamailio Branch: master Commit: 87c8290ab934fd27f8baebabaf66d1fb4168ba72 URL: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-14T07:44:33+02:00 tls: remove confusing error message when trying to print socket for <default> server > CRITICAL: <core> [core/ip_addr.c:232]: ip_addr2sbuf(): unknown address family 0 > NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… Patch: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index e056a70b504..810a7e9589a 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1155,14 +1155,14 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) d->ctx[i], tls_server_name_cb)) { LM_ERR("register server_name callback handler for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>", i); return -1; } if(!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { LM_ERR("register server_name callback handler data for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>", i); return -1; } @@ -1175,7 +1175,7 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) && (d->server_name.len > 0 || (d->type & TLS_DOMAIN_DEF))) { LM_NOTICE("registered server_name callback handler for socket " "[%s:%d], server_name='%s' ...\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>"); } #endif

4 months, 1 week

[kamailio/kamailio] Siptrace: setting send_sock_name/send_sock_address is ineffective for tcp based transports (PR #3837)

by Dennis

For tcp based transports it is need to set SND_F_FORCE_SOCKET flag before msg_send_buffer call, or duplicate will send from wrong addr/port.   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3837 -- Commit Summary -- * siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used -- File Changes -- M src/modules/siptrace/siptrace_send.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3837.patch https://github.com/kamailio/kamailio/pull/3837.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3837 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3837(a)github.com>

4 months, 1 week

git:master:1b97a027: siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1b97a0271b27794263b3eff61f4acfa81e66069f URL: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T07:09:17+02:00 siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used - send_sock_name/send_sock_address is ineffective for tcp based transports if SND_F_FORCE_SOCKET flag is not set --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… Patch: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index d8a5f974bb3..4f9726de254 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -357,6 +357,8 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) pdst->to.s.sa_family, pdst->proto); goto error; } + } else { + pdst->send_flags.f |= SND_F_FORCE_SOCKET; } if(msg_send_buffer(pdst, buf, len, 1) < 0) {

4 months, 1 week

git:5.8:bdb3f329: pkg/kamailio/deb: refresh fix for tls_wolfssl

by Victor Seva

Module: kamailio Branch: 5.8 Commit: bdb3f32991f756b852d4bc695dc44e634e5ffc6c URL: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:47+02:00 pkg/kamailio/deb: refresh fix for tls_wolfssl --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6… Patch: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6…

4 months, 1 week

git:5.8:65873cd2: pkg/kamailio/deb: fix tls_wolfssl packaging

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 65873cd2cdd390ce10ec99888fb35b0095a90c65 URL: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:27+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl (cherry picked from commit 1d82805ef084d90e5ea14e4894f3e5076e29e2f3) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Patch: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \

4 months, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024