sr-dev February 2023

sr-dev@lists.kamailio.org

10 participants
296 discussions

git:master:9b237a31: rr: fixed typos in comments

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b237a311049a2689252b2a177062fe2e3db348c URL: https://github.com/kamailio/kamailio/commit/9b237a311049a2689252b2a177062fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-03T09:39:55+01:00 rr: fixed typos in comments --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/loose.h Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9b237a311049a2689252b2a177062fe… Patch: https://github.com/kamailio/kamailio/commit/9b237a311049a2689252b2a177062fe…

1 year, 10 months

git:master:022fa0cf: rr: doc - fixed typos and use the proper param name add_username instead of enable_username

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 022fa0cfc75d150fde219b8ae4f9a99b3fa2f132 URL: https://github.com/kamailio/kamailio/commit/022fa0cfc75d150fde219b8ae4f9a99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-03T09:38:26+01:00 rr: doc - fixed typos and use the proper param name add_username instead of enable_username --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/doc/rr_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/022fa0cfc75d150fde219b8ae4f9a99… Patch: https://github.com/kamailio/kamailio/commit/022fa0cfc75d150fde219b8ae4f9a99… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 691e3d07df..2456450e4f 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -12,7 +12,7 @@ <section> <title>Overview</title> - <para>The module contains record routing logic</para> + <para>The module contains record routing logic.</para> </section> <section id="RR-dialog-id"> @@ -20,7 +20,7 @@ <para>&kamailio; is basically <emphasis>only</emphasis> a transaction stateful proxy, without any dialog support build in. There are many - features/services which actually requires a dialog awareness, like storing + features/services which actually require a dialog awareness, like storing the information in the dialog creation stage, information which will be used during the whole dialog existence.</para> @@ -246,7 +246,7 @@ modparam("rr", "enable_socket_mismatch_warning", 0) <section id="rr.p.custom_user_avp"> <title><varname>custom_user_avp</varname> (avp string)</title> - <para>When enable_username is enabled, a call to record_route will add + <para>When add_username is enabled, a call to record_route will add the username of the RequestURI to the Record-Route URI. This parameter allows you to setup an AVP with which you can customise the username to be added in the Record-Route URI.</para> @@ -664,7 +664,7 @@ add_rr_param(";nat=yes"); <para>The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular - expression. It must be call after loose_route() (see <xref + expression. It must be called after loose_route() (see <xref linkend="rr.f.loose_route"/>).</para> <para>Meaning of the parameters is as follows:</para> diff --git a/src/modules/rr/doc/rr_devel.xml b/src/modules/rr/doc/rr_devel.xml index 516eb5a3aa..aa6f9c4b69 100644 --- a/src/modules/rr/doc/rr_devel.xml +++ b/src/modules/rr/doc/rr_devel.xml @@ -128,7 +128,7 @@ record_route_advertised_address("1.2.3.4:5090"); The function checks for the request <quote>msg</quote> if the URI parameters of the local Route header (corresponding to the local server) matches the given regular expression <quote>re</quote>. - It must be call after the loose_route was done. + It must be called after the loose_route was done. </para> <para> The function returns 0 on success. Otherwise, -1 is returned. @@ -157,7 +157,7 @@ record_route_advertised_address("1.2.3.4:5090"); <quote>msg</quote>. As for checking it's used the <quote>ftag</quote> Route header parameter, the append_fromtag (see <xref linkend="append-fromtag-id"/> module parameter - must be enables. Also this must be call only after the loose_route is + must be enables. Also this must be called only after the loose_route is done. </para> <para> @@ -185,9 +185,9 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">get_route_param(msg, name, val)</function> </title> <para> - The function search in to the <quote>msg</quote>'s Route header + The function searches in the <quote>msg</quote>'s Route header parameters the parameter called <quote>name</quote> and returns its - value into <quote>val</quote>. It must be call only after the + value into <quote>val</quote>. It must be called only after the loose_route is done. </para> <para> @@ -220,7 +220,7 @@ record_route_advertised_address("1.2.3.4:5090"); <function moreinfo="none">register_rrcb(callback, param)</function> </title> <para> - The function register a new callback (along with its parameter). The + The function registers a new callback (along with its parameter). The callback will be called when a loose route will be performed for the local address. </para>

1 year, 10 months

[kamailio/kamailio] core: msg_translator.c put new line after «parsing failed» error message (PR #3348)

by Дилян Палаузов

I use Kamailio with `log_stderror=yes`. When Kamailio receives confirmation from the Websocket reverse proxy, it logs on stderr ``` 23(24) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 22) 23(24) ERROR: <core> [core/parser/msg_parser.c:749]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 101 Switching Protocols Sia: SIP/2.0/TCP 111.11.111.11:47418 Sec-WebSocket-Protocol: sip Upgrade: websocket Connection: upgrade Sec-WebSocket-Accept: Ak3/c/aw3iyHnFkDDHabw1iXcqY= Content-Length: 0 > 23(24) ERROR: <core> [core/msg_translator.c:3256]: build_sip_msg_from_buf(): parsing failed ``` Without the included `\n` here the subsequent messages are logged on the same line as `parsing failed`. For the record, I use this NGINX configuration: ``` location /sip { proxy_http_version 1.1; proxy_set_header "Accept-Encoding" ""; # delete header before sending it to Kamailio proxy_set_header "Pragma" ""; proxy_set_header "Cache-control" ""; proxy_set_header "User-Agent" ""; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; proxy_pass http://123.12.123.12:5060; proxy_read_timeout 86400; } ``` and it leads to that unparsable message above. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3348 -- Commit Summary -- * core: msg_translator.c put new line after «parsing failed» error message -- File Changes -- M src/core/msg_translator.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3348.patch https://github.com/kamailio/kamailio/pull/3348.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3348 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3348(a)github.com>

1 year, 10 months

git:master:51fa3da9: core: typos in comments and EoL after log when parse msg fails

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 51fa3da96c1eacd4d679598a3305180c9e818cfb URL: https://github.com/kamailio/kamailio/commit/51fa3da96c1eacd4d679598a3305180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-03T09:28:58+01:00 core: typos in comments and EoL after log when parse msg fails - GH #3348 --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/51fa3da96c1eacd4d679598a3305180… Patch: https://github.com/kamailio/kamailio/commit/51fa3da96c1eacd4d679598a3305180… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc1b9736df..3ab6fae472 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -53,7 +53,7 @@ * lookup is performed on the host part and the reply is sent to the * resulting ip. If a port is present or the host part is an ip address * the dns lookup will be a "normal" one (A or AAAA). - * - if rport is present, it's value will be used as the destination port + * - if rport is present, its value will be used as the destination port * (and this will also disable srv lookups) * - if no port is present the destination port will be taken from the srv * lookup. If the srv lookup fails or is not performed (e.g. ip address @@ -1459,7 +1459,7 @@ void process_lumps( struct sip_msg* msg, /* skip len bytes from orig msg */ s_offset+=t->len; } else if (t->op==LUMP_DEL && flag == FLAG_MSG_LUMPS_ONLY) { - /* copy lump value and indent as necessarely */ + /* copy lump value and indent as necessarily */ memcpy(new_buf+offset, orig + t->u.offset, t->len); offset+=t->len; if (new_buf[offset-1] != '\n') { @@ -1592,7 +1592,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) /* The body has been changed, try to find * existing Content-Length */ - /* no need for Content-Length if it's and UDP packet and + /* no need for Content-Length if it's an UDP packet and * it hasn't Content-Length already */ if (msg->content_length==0){ /* content-length doesn't exist, append it */ @@ -1938,7 +1938,7 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) /** builds a request in memory from another sip request. * * Side-effects: - it adds lumps to the msg which are _not_ cleaned. - * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENLENGTH_T + * The added lumps are HDR_VIA_T (almost always added), HDR_CONTENTLENGTH_T * and HDR_ROUTE_T (when a Route: header is added as a result of a non-null * msg->path_vec). * - it might change send_info->proto and send_info->send_socket @@ -2109,7 +2109,7 @@ char * build_req_buf_from_sip_req(struct sip_msg* msg, } received_buf = NULL; } - /* if rport needs to be updated, delete it if present and add it's value */ + /* if rport needs to be updated, delete it if present and add its value */ if (rport_buf){ if (msg->via1->rport){ /* rport already present */ via_insert_param=del_lump(msg, @@ -3075,7 +3075,7 @@ char* create_via_hf(unsigned int *len, /* builds a char* buffer from message headers without body * first line is excluded in case of skip_first_line=1 - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_only_headers( struct sip_msg* msg, int skip_first_line, unsigned int *returned_len, @@ -3127,7 +3127,7 @@ char * build_only_headers( struct sip_msg* msg, int skip_first_line, } /* builds a char* buffer from message body - * error is set -1 if the memory allocation failes + * error is set -1 if the memory allocation fails */ char * build_body( struct sip_msg* msg, unsigned int *returned_len, @@ -3253,7 +3253,7 @@ int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, msg->buf = buf; msg->len = len; if (parse_msg(buf, len, msg)!=0) { - LM_ERR("parsing failed"); + LM_ERR("parsing failed\n"); return -1; } msg->set_global_address=default_global_address;

1 year, 10 months

[kamailio/kamailio] doc/tutorials/dns: USE_NAPTR is on by default (PR #3353)

by Дилян Палаузов

My reading of the original text: > USE_NAPTR - if defined the naptr lookup support will be compiled in. > NAPTR support still has to be enabled from Kamailio's config file (it's > off by default). was that USE_NAPTR was by default off (undefined). This change clarifies that by default USE_NAPTR is defined, but naptr support is by default disabled from the cofiguration file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3353 -- Commit Summary -- * doc/tutorials/dns: USE_NAPTR is on by default -- File Changes -- M doc/tutorials/dns.txt (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3353.patch https://github.com/kamailio/kamailio/pull/3353.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3353 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3353(a)github.com>

1 year, 10 months

git:master:8821d9a9: doc/tutorials/dns: USE_NAPTR is on by default

by Henning Westerholt

Module: kamailio Branch: master Commit: 8821d9a91ab3823d5b1d78d84332ab9965a7c6b2 URL: https://github.com/kamailio/kamailio/commit/8821d9a91ab3823d5b1d78d84332ab9… Author: �� <git-dpa(a)aegee.org> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-01T18:06:44+01:00 doc/tutorials/dns: USE_NAPTR is on by default --- Modified: doc/tutorials/dns.txt --- Diff: https://github.com/kamailio/kamailio/commit/8821d9a91ab3823d5b1d78d84332ab9… Patch: https://github.com/kamailio/kamailio/commit/8821d9a91ab3823d5b1d78d84332ab9… --- diff --git a/doc/tutorials/dns.txt b/doc/tutorials/dns.txt index 442f0900f6..0cfebff3f7 100644 --- a/doc/tutorials/dns.txt +++ b/doc/tutorials/dns.txt @@ -143,7 +143,7 @@ DNS Resolver Options If set to yes - the additional part is checked against the search list. The maximum time a DNS request can take (before failing) is: - (dns_retr_time*dns_retr_no) * (search_list_domains) If dns_try_ipv6 is yes, + (dns_retr_time*dns_retr_no) * (search_list_domains). If dns_try_ipv6 is yes, multiply it again by 2. The option combination that produces the "fastest" DNS resolver config @@ -167,8 +167,9 @@ DNS Resolver Compile Options ---------------------------- USE_NAPTR - if defined the naptr lookup support will be compiled in. - NAPTR support still has to be enabled from Kamailio's config file (it's - off by default). + NAPTR support still has to be enabled from Kamailio's config file. + USE_NAPTR is defined by default. NAPTR support is disabled from the + config file by default. DNS Cache and Failover Config Variables @@ -182,7 +183,7 @@ DNS Cache and Failover Config Variables server. Default: on. - use_dns_failover = on |off - if on and sending a request fails (due to not + use_dns_failover = on | off - if on and sending a request fails (due to not being allowed from an onsend_route, send failure, blocklisted destination or, when using tm, invite timeout), and the destination resolves to multiple ip addresses and/or multiple SRV records, the send will be @@ -260,7 +261,7 @@ DNS Cache and Failover Config Variables Default: no dns_cache_init = on | off - if off, the DNS cache is not initialized - at startup and cannot be enabled runtime, that saves some memory. + at startup and cannot be enabled at runtime, that saves some memory. Default: on DNS Cache Compile Options @@ -301,7 +302,7 @@ DNS Cache Compile Options If this option is not defined (experimental), everything in the AR section will be added to the cache. - Note: To remove a compile options, edit Kamailio's Makefile.defs and remove it + Note: To remove a compile options, edit Kamailio's Makefile.defs and remove it from DEFS list. To add a compile options add it to the make command line, e.g.: make proper; make all extra_defs=-DUSE_DNS_FAILOVER or for a permanent solution, edit Makefile.defs and add it to DEFS

1 year, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2023