sr-dev

sr-dev@lists.kamailio.org

22 participants
45189 discussions

git:master:7f03faa0: geoip2: logging library version at startup
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 7f03faa01ee4d832f5079b9344fc895ff425ac6c URL: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: logging library version at startup --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Patch: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1ac03f06d6..17d910399b 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,6 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { + LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:b467ce54: geoip2: also log database path
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b467ce544afa709c28e39d8734b2e9ba6a43b79c URL: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: also log database path --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Patch: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 17d910399b..f24a853c3a 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,7 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); + LM_INFO("using GeoIP database path %s, library version %s\n", geoip2_path, MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:1bde8e0e: core: function to get local socket by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 1bde8e0e6193f0ed63452b3b8d31bfc78121dfb6 URL: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 core: function to get local socket by index --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Patch: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 5622e2634d..c9dd89118d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -912,6 +912,40 @@ socket_info_t* ksr_get_socket_by_advertise(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_index(int idx) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if (idx<0) { + idx += _ksr_sockets_no; + if (idx < 0) { + LM_DBG("negative overall index\n"); + return NULL; + } + } + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(idx==0) { + return si; + } + idx--; + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 3c8deeb244..cbc630b9b8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -106,6 +106,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); +socket_info_t* ksr_get_socket_by_index(int idx); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:2c3cc027: corex: corex: $lsock() variable can match by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 2c3cc027b05317ec61c706180cb9cfea555cbc11 URL: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 corex: corex: $lsock() variable can match by index --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Patch: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 74fcff6e79..9f404d32aa 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -218,6 +218,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'a': si = ksr_get_socket_by_advertise(&lexpr.val); break; + case 'i': + si = ksr_get_socket_by_index(lexpr.valno); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:aa8ec3bf: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: aa8ec3bf19328741b0565d306438a9b396f39eef URL: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T16:01:26+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Patch: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters

1 0

[kamailio/kamailio] Typos docs (PR #3078)
by Bastian Triller 11 Apr '22

11 Apr '22

#### 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:  - [x] PR should be backported to stable branches - [x] 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/3078 -- Commit Summary -- * core: Fix typos, reference to SER * auth: Fix missing dependency in docs -- File Changes -- M src/core/str.h (2) M src/core/ut.c (14) M src/core/ut.h (8) M src/modules/auth/doc/auth.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3078.patch https://github.com/kamailio/kamailio/pull/3078.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3078(a)github.com>

2 3

git:master:dd15436e: auth: Fix missing dependency in docs
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: dd15436e8697f70df6ef9d188da36f70e7116a74 URL: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 auth: Fix missing dependency in docs --- Modified: src/modules/auth/doc/auth.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Patch: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… --- diff --git a/src/modules/auth/doc/auth.xml b/src/modules/auth/doc/auth.xml index 6f20e8c71d..137a5a5f56 100644 --- a/src/modules/auth/doc/auth.xml +++ b/src/modules/auth/doc/auth.xml @@ -66,7 +66,14 @@ <section id="auth.dep"> <title>Dependencies</title> <para> - The module does not depend on any other module. + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>sl</emphasis> - stateless reply. + </para> + </listitem> + </itemizedlist> </para> </section>

1 0

git:master:841681e6: pua_dialoginfo: Fix typo
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 841681e68a8fd913bc6944eed4f4d00c05f92359 URL: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 pua_dialoginfo: Fix typo --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Patch: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 0385ed90dd..7b27e666c5 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -643,7 +643,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } #ifdef PUA_DIALOGINFO_DEBUG - /* dialog callback testing (registered last to be executed frist) */ + /* dialog callback testing (registered last to be executed first) */ if (dlg_api.register_dlgcb(dlg, DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED

1 0

git:master:8bab7115: core: Fix typos, reference to SER
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 8bab711590ac8b4fd73efabbc7c22be3231e6214 URL: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 core: Fix typos, reference to SER --- Modified: src/core/str.h Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Patch: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… --- diff --git a/src/core/str.h b/src/core/str.h index d7977652d9..063a9e9398 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -143,7 +143,7 @@ typedef struct _str str; } while(0) /** - * str with value: not null and not emptu + * str with value: not null and not empty */ #define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) diff --git a/src/core/ut.c b/src/core/ut.c index 8dde51aaff..a581f98e9f 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -97,7 +97,7 @@ int group2gid(int* gid, char* group) /* - * Replacement of timegm (does not exists on all platforms + * Replacement of timegm (does not exists on all platforms) * Taken from * http://lists.samba.org/archive/samba-technical/2002-November/025737.html */ @@ -232,7 +232,7 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) /** transform a relative pathname into an absolute one. * @param base - base file, used to extract the absolute path prefix. - * Might be NULL, in which case the path of the ser.cfg is + * Might be NULL, in which case the path of the kamailio.cfg is * used. * @param file - file path to be transformed. If it's already absolute * (starts with '/') is left alone. If not the result will @@ -301,7 +301,7 @@ char* get_abs_pathname(str* base, str* file) /** - * @brief search for occurence of needle in text + * @brief search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -323,7 +323,7 @@ char *str_search(str *text, str *needle) } /** - * @brief search for occurence of needlez starting from vstart and before vend + * @brief search for occurrence of needlez starting from vstart and before vend * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -346,7 +346,7 @@ char *stre_search_strz(char *vstart, char *vend, char *needlez) } /** - * @brief case insensitive search for occurence of needle in text + * @brief case insensitive search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -393,7 +393,7 @@ char *str_casesearch_strz(str *text, char *needlez) } /** - * @brief search for last occurence of needle in text (reverse search) + * @brief search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -415,7 +415,7 @@ char *str_rsearch(str *text, str *needle) } /** - * @brief case insensitive search for last occurence of needle in text (reverse search) + * @brief case insensitive search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ diff --git a/src/core/ut.h b/src/core/ut.h index 44bd0e75c7..7792a865ef 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -729,7 +729,7 @@ static inline int str2int(str* _s, unsigned int* _r) /* - * Convert an str to signed long + * Convert a str to signed long */ static inline int str2slong(str* _s, long* _r) { @@ -738,7 +738,7 @@ static inline int str2slong(str* _s, long* _r) /* - * Convert an str to signed integer + * Convert a str to signed integer */ static inline int str2sint(str* _s, int* _r) { @@ -747,7 +747,7 @@ static inline int str2sint(str* _s, int* _r) /* - * Convert an strz to integer + * Convert a strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -770,7 +770,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an strz to signed integer + * Convert a strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:master:abd41396: modules: readme files regenerated - pv_headers ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: abd41396a937155a978ff024f309b082459a057e URL: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T15:16:16+02:00 modules: readme files regenerated - pv_headers ... [skip ci] --- Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Patch: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… --- diff --git a/src/modules/pv_headers/README b/src/modules/pv_headers/README index 828c7d1a13..e714d3f666 100644 --- a/src/modules/pv_headers/README +++ b/src/modules/pv_headers/README @@ -12,6 +12,11 @@ Victor Seva Sipwise GmbH <vseva(a)sipwise.com> +Fabricio Santolin da Silva + + Alcatel-Lucent Enterprise + <fabricio.santolin-da-silva(a)al-enterprise.com> + Copyright © 2018 Sipwise GmbH __________________________________________________________________ @@ -44,6 +49,8 @@ Victor Seva 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -86,6 +93,8 @@ Chapter 1. Admin Guide 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -240,8 +249,8 @@ modparam("pv_headers", "auto_msg", 1) 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) - - \ + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 4.1. pvh_collect_headers() @@ -317,6 +326,32 @@ modparam("pv_headers", "auto_msg", 1) This function can be used from ANY_ROUTE but only after pvh_collect_headers() or with “auto_msg” parameter enabled. +4.8. pvh_value_exists(hname, hparameter) + + Checks if the parameter “hparameter” is present in the header “hname” + from XAVP. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + +4.9. pvh_remove_header_param(hname, hparameter) + + Removes an existing parameter “hparameter” in the header “hname” from + the XAVP. + + If there are multiple headers, only the one containing the parameter + will be modified. + + The parameter can be located in any position (begining, middle or end) + of the list of parameters. + + If the parameter is the only one present, the header will be removed. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + 5. Exported Variables * $x_hdr

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev