sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

[kamailio/kamailio] nathelper : added new function set_alias_to_avp (#2124)
by Yasin CANER 25 Nov '19

25 Nov '19

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  new function that read alias from Contact header then write to given avp as sip uri You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2124 -- Commit Summary -- * parse_uri : added new function proto type int to str * nathelper : added new function set_alias_to_avp * nathelper : added description of set_alias_to_avp function -- File Changes -- M src/core/parser/parse_uri.c (23) M src/core/parser/parse_uri.h (2) M src/modules/nathelper/nathelper.c (176) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2124.patch https://github.com/kamailio/kamailio/pull/2124.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/2124

3 16

git:master:28cfa397: nathelper : set_alias_to_avp is renamed to set_alias_to_pv
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 28cfa3978684838442fbd3b4861765023252e963 URL: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : set_alias_to_avp is renamed to set_alias_to_pv set_alias_to_avp renamed to set_alias_to_pv --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… Patch: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d983e99aa4..8c3245c5b8 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -823,9 +823,9 @@ if(is_rfc1918("$rd")) { </programlisting> </example> </section> - <section id="nathelper.set_alias_to_avp"> + <section id="nathelper.set_alias_to_pv"> <title> - <function moreinfo="none">set_alias_to_avp(target_avp)</function> + <function moreinfo="none">set_alias_to_pv(target_avp)</function> </title> <para> Reads <quote>;alias=ip~port~transport</quote> from Contact header then @@ -836,10 +836,10 @@ if(is_rfc1918("$rd")) { REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and FAILURE_ROUTE. </para> <example> - <title><function>set_alias_to_avp</function> usage</title> + <title><function>set_alias_to_pv</function> usage</title> <programlisting format="linespecific"> ... - set_alias_to_avp("$avp(aliasuri)"); + set_alias_to_pv("$avp(aliasuri)"); ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3f820fb02c..afc38f727b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -125,8 +125,8 @@ static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); static int test_sdp_cline(struct sip_msg *msg); -static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow); -static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp); +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow); +static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp); static int alias_to_uri(str *contact_header, str *alias_uri); static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp); @@ -228,7 +228,7 @@ static cmd_export_t cmds[] = { {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, fixup_spve_null, 0, ANY_ROUTE }, - {"set_alias_to_avp", (cmd_function)w_set_alias_to_avp, 1, + {"set_alias_to_pv", (cmd_function)w_set_alias_to_pv, 1, 0, 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -2453,14 +2453,14 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) return 0; } /*! -* @function w_set_alias_to_avp +* @function w_set_alias_to_pv * @abstract wrapper of set_alias_to_avp_f * @param msg sip message * @param uri_avp given avp name * * @result 1 successful , -1 fail */ -static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ str dest_avp={0,0}; if(!uri_avp) @@ -2469,11 +2469,11 @@ static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ dest_avp.s=uri_avp; dest_avp.len=strlen(dest_avp.s); - return ki_set_alias_to_avp(msg,&dest_avp); + return ki_set_alias_to_pv(msg,&dest_avp); } /*! -* @function ki_set_alias_to_avp +* @function ki_set_alias_to_pv * @abstract reads from msg then write to given avp uri_avp as sip uri * * @param msg sip message @@ -2481,7 +2481,7 @@ static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ * * @result 1 successful , -1 fail */ -static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp){ +static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ str contact; str alias_uri={0,0}; @@ -2701,7 +2701,7 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("nathelper"), str_init("set_alias_to_avp"), - SR_KEMIP_INT, ki_set_alias_to_avp, + SR_KEMIP_INT, ki_set_alias_to_pv, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:46b713d3: nathelper : added doc for set_alias_to_avp
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 46b713d35ebb99ccb60768d939d71f675bd016f5 URL: https://github.com/kamailio/kamailio/commit/46b713d35ebb99ccb60768d939d71f6… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : added doc for set_alias_to_avp added documents for set_alias_to_avp function --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/46b713d35ebb99ccb60768d939d71f6… Patch: https://github.com/kamailio/kamailio/commit/46b713d35ebb99ccb60768d939d71f6… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index b5a5b08167..d983e99aa4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -823,6 +823,27 @@ if(is_rfc1918("$rd")) { </programlisting> </example> </section> + <section id="nathelper.set_alias_to_avp"> + <title> + <function moreinfo="none">set_alias_to_avp(target_avp)</function> + </title> + <para> + Reads <quote>;alias=ip~port~transport</quote> from Contact header then + writes to target avp as a sip uri. + </para> + <para> + This function can be used from + REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and FAILURE_ROUTE. + </para> + <example> + <title><function>set_alias_to_avp</function> usage</title> + <programlisting format="linespecific"> +... + set_alias_to_avp("$avp(aliasuri)"); +... + </programlisting> + </example> + </section> </section>

1 0

git:master:72efa93c: nathelper : new function set_alias_to_avp_f is renamed
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 72efa93cbf5926402f008180c026d0afbd2c0f9f URL: https://github.com/kamailio/kamailio/commit/72efa93cbf5926402f008180c026d0a… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : new function set_alias_to_avp_f is renamed function set_alias_to_avp_f is renamed to w_set_alias_to_avp added kemi interface --- Modified: src/core/parser/parse_uri.h Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/72efa93cbf5926402f008180c026d0a… Patch: https://github.com/kamailio/kamailio/commit/72efa93cbf5926402f008180c026d0a… --- diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index 7def5becf3..a3c8c7142c 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -47,4 +47,5 @@ int parse_orig_ruri(struct sip_msg* msg); int normalize_tel_user(char* res, str* src); void uri_type_to_str(uri_type type, str *s); void proto_type_to_str(unsigned short type, str *s); + #endif /* PARSE_URI_H */ diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 681606bb5b..3f820fb02c 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -125,8 +125,8 @@ static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); static int test_sdp_cline(struct sip_msg *msg); -static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp); -static int set_alias_to_avp_f(struct sip_msg *msg, str *uri_avp); +static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow); +static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp); static int alias_to_uri(str *contact_header, str *alias_uri); static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp); @@ -228,7 +228,7 @@ static cmd_export_t cmds[] = { {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, fixup_spve_null, 0, ANY_ROUTE }, - {"set_alias_to_avp", (cmd_function)ki_set_alias_to_avp, 1, + {"set_alias_to_avp", (cmd_function)w_set_alias_to_avp, 1, 0, 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -2453,14 +2453,14 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) return 0; } /*! -* @function ki_set_alias_to_avp +* @function w_set_alias_to_avp * @abstract wrapper of set_alias_to_avp_f * @param msg sip message * @param uri_avp given avp name * * @result 1 successful , -1 fail */ -static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp){ +static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ str dest_avp={0,0}; if(!uri_avp) @@ -2469,11 +2469,11 @@ static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp){ dest_avp.s=uri_avp; dest_avp.len=strlen(dest_avp.s); - return set_alias_to_avp_f(msg,&dest_avp); - + return ki_set_alias_to_avp(msg,&dest_avp); } + /*! -* @function set_alias_to_avp_f +* @function ki_set_alias_to_avp * @abstract reads from msg then write to given avp uri_avp as sip uri * * @param msg sip message @@ -2481,7 +2481,7 @@ static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp){ * * @result 1 successful , -1 fail */ -static int set_alias_to_avp_f(struct sip_msg *msg, str *uri_avp){ +static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp){ str contact; str alias_uri={0,0}; @@ -2700,6 +2700,11 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("nathelper"), str_init("set_alias_to_avp"), + SR_KEMIP_INT, ki_set_alias_to_avp, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:138c9df9: nathelper : fixed memory-leak for set_alias_to_avp
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 138c9df907f04003bafe80bad3cb98e031a6ef50 URL: https://github.com/kamailio/kamailio/commit/138c9df907f04003bafe80bad3cb98e… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : fixed memory-leak for set_alias_to_avp fixed memory-leak for new function set_alias_to_avp fixed some spelling added return for functions write_to_avp and alias_to_uri --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/138c9df907f04003bafe80bad3cb98e… Patch: https://github.com/kamailio/kamailio/commit/138c9df907f04003bafe80bad3cb98e…

1 0

git:master:0fbc7a10: nathelper : added description of set_alias_to_avp function
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 0fbc7a1026e6dc9dda34b75aef7a26e41ccf3b80 URL: https://github.com/kamailio/kamailio/commit/0fbc7a1026e6dc9dda34b75aef7a26e… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : added description of set_alias_to_avp function added description of set_alias_to_avp function --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/0fbc7a1026e6dc9dda34b75aef7a26e… Patch: https://github.com/kamailio/kamailio/commit/0fbc7a1026e6dc9dda34b75aef7a26e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 45c3425c5f..259d4d8997 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2452,6 +2452,9 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) return 0; } +/** +* wrapper of set_alias_to_avp_f +*/ static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp){ str dest_avp={0,0}; @@ -2464,6 +2467,13 @@ static int ki_set_alias_to_avp(struct sip_msg *msg, char *uri_avp){ return set_alias_to_avp_f(msg,&dest_avp); } +/** +* function reads from @param msg then write to given avp @param uri_avp +* as sip uri +* @result 1 succes , -1 fail +* @param msg sip message +* @param uri_avp given avp name +*/ static int set_alias_to_avp_f(struct sip_msg *msg, str *uri_avp){ str contact; str alias_uri={0,0}; @@ -2495,7 +2505,11 @@ static int set_alias_to_avp_f(struct sip_msg *msg, str *uri_avp){ return 1; } - +/** +* write_to_avp function writes data to given avp +* @param data source data +* @param uri_avp destination avp name +*/ void write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ pv_spec_t *pvresult = NULL; pv_value_t valx; @@ -2525,6 +2539,12 @@ void write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ pvresult->setf(msg, &pvresult->pvp, (int)EQ_T, &valx); } +/** +* function alias_to_uri select alias paramter from @param contact_header +* then writes to @param alias_uri +* @param contact_header Source contact header +* @param alias_uri destination string +*/ void alias_to_uri(str *contact_header, str *alias_uri){ int i=0; // index str host={0,0};

1 0

git:master:6b725120: nathelper : added new function set_alias_to_avp
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 6b725120bec491197c29bd059c11d8efea58255e URL: https://github.com/kamailio/kamailio/commit/6b725120bec491197c29bd059c11d8e… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : added new function set_alias_to_avp new function that read alias then write to given avp as sip uri --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6b725120bec491197c29bd059c11d8e… Patch: https://github.com/kamailio/kamailio/commit/6b725120bec491197c29bd059c11d8e…

1 0

git:master:29a81852: parse_uri : added new function proto type int to str
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 29a818525572e19510cafb7aef9ed62eab98a369 URL: https://github.com/kamailio/kamailio/commit/29a818525572e19510cafb7aef9ed62… Author: root <root(a)localhost.localdomain> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 parse_uri : added new function proto type int to str added new function proto type int to str --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/29a818525572e19510cafb7aef9ed62… Patch: https://github.com/kamailio/kamailio/commit/29a818525572e19510cafb7aef9ed62… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index ec39ea7cf2..283443dacd 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1439,3 +1439,26 @@ void proto_type_to_str(unsigned short type, str *s) { *s = s_null; } } + +void proto_type_int_to_str(int type, str *s) { + switch (type) { + case PROTO_UDP: + *s = s_udp; + break; + case PROTO_TCP: + *s = s_tcp; + break; + case PROTO_TLS: + *s = s_tls; + break; + case PROTO_SCTP: + *s = s_sctp; + break; + case PROTO_WS: + case PROTO_WSS: + *s = s_ws; + break; + default: + *s = s_null; + } +} diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index a3c8c7142c..8a8dfac258 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -47,5 +47,5 @@ int parse_orig_ruri(struct sip_msg* msg); int normalize_tel_user(char* res, str* src); void uri_type_to_str(uri_type type, str *s); void proto_type_to_str(unsigned short type, str *s); - +void proto_type_int_to_str(int type, str *s); #endif /* PARSE_URI_H */

1 0

git:master:7fad9c51: app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 7fad9c51f71854e0649fe76e273190e4b4f82438 URL: https://github.com/kamailio/kamailio/commit/7fad9c51f71854e0649fe76e273190e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-23T18:53:17+01:00 app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function --- Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp --- Diff: https://github.com/kamailio/kamailio/commit/7fad9c51f71854e0649fe76e273190e… Patch: https://github.com/kamailio/kamailio/commit/7fad9c51f71854e0649fe76e273190e… --- diff --git a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp index f3b8103185..fb6545f921 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp +++ b/src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp @@ -625,7 +625,7 @@ static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) { SQObject &closure = stack_get(v, 2); v->Push(closure); - SQInteger nArgs; + SQInteger nArgs = 0; if(sq_type(closure) == OT_CLOSURE) { nArgs = _closure(closure)->_function->_nparameters; }

2 2

removing xprint module
by Henning Westerholt 25 Nov '19

25 Nov '19

Hello, >From the xprint module README: The xprint module is the former xlog module from SIP Express Router (SER), kept because it is used by other modules via API to get the value for strings with specifiers. If you want to print log messages from configuration file, use the real module named 'xlog'. I just checked, there seems to be no module using it anymore. Therefore, I would like to propose to remove it in git master. /repositories/kamailio$ grep -R xl_api * | egrep -v "modules/xprint" /repositories/kamailio$ Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/> Kamailio Merchandising - https://skalatan.de/merchandising

2 2

← Newer
1
...
15
16
17
18
19
20
21
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019