sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
287 discussions

git:master:2058676d: modules: readme files regenerated - lost ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2058676daacc2feded18b872bd53c0514710d4bb URL: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-03T11:16:14+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… Patch: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 14cf3b36a6..00fa5f2ceb 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -376,8 +376,15 @@ r(pidf)\n"); * pidf-lo - the PIDF-LO returned in the HELD locationRequest response * error - any error code returned in the HELD response - The return value is 200 on success, 400 if an internal error occured, - or 500 if an error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error + occured, or 500 if an error code is returned in the HELD response. + Success codes in detail are as follows: + * 200 - received 200 OK, but neither location-info nor locationURI + element found + * 201 - received 200 OK with locationURI (aka Location-by-Reference) + * 202 - received 200 OK with location-info element (aka + Location-by-Value) + * 203 - received 200 OK with location-info and locationURI element This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE.

3 years, 6 months

[kamailio/kamailio] jwt: token may have a validity period (number of seconds) (#2722)

by Frédéric Gaisnon

#### 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) - [x ] 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  Add a new parameter validity to jwt_generate(prvkey, alg, claims) in order to set a validity period for generated jwt token. I know branch 5.5 is almost released but I think that this functionality is very important for this new module and I hope it can be added to this release. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2722 -- Commit Summary -- * cplc: add a configuration route before redirected call (key: redirect_route) * pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) * Merge branch 'master' of https://github.com/kamailio/kamailio * jwt: token may have a validity period (number of seconds) -- File Changes -- M src/modules/jwt/doc/jwt.xml (9) M src/modules/jwt/doc/jwt_admin.xml (5) M src/modules/jwt/jwt_mod.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2722.patch https://github.com/kamailio/kamailio/pull/2722.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/2722

3 years, 6 months

git:master:ae13686c: lost: lost_held_dereference() documentation added and code comment corrected

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: ae13686c80b03693ee2195d38a8c8eb0ede0d0dc URL: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T11:00:41+02:00 lost: lost_held_dereference() documentation added and code comment corrected --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… Patch: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 7f4597632b..f8065770d9 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -429,9 +429,23 @@ xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va </para></listitem> </itemizedlist> <para> - The return value is 200 on success, 400 if an internal error occured, or 500 if an - error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error occured, or 500 if an + error code is returned in the HELD response. Success codes in detail are as follows: </para> + <itemizedlist> + <listitem><para> + <emphasis>200</emphasis> - received 200 OK, but neither location-info nor locationURI element found + </para></listitem> + <listitem><para> + <emphasis>201</emphasis> - received 200 OK with locationURI (aka Location-by-Reference) + </para></listitem> + <listitem><para> + <emphasis>202</emphasis> - received 200 OK with location-info element (aka Location-by-Value) + </para></listitem> + <listitem><para> + <emphasis>203</emphasis> - received 200 OK with location-info and locationURI element + </para></listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index caa86732ed..cc6d65ad2a 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1006,8 +1006,8 @@ p_lost_fsr_t lost_parse_findServiceResponse(str ret) * lost_check_HeldResponse(node) * does a quick check of HELD dereference response and returns ... * 0: neither location value nor reference found - * 1: location value found - * 2: location reference found + * 1: location reference found + * 2: location value found * 3: location value and reference found * multiple occurences are ignored */

3 years, 6 months

git:5.5:6c6d4cb2: ChangeLog: updated content to prepare for 5.5.x series

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6c6d4cb2823c5d9f1c02bbde695d8769cb87fb6c URL: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T10:21:41+02:00 ChangeLog: updated content to prepare for 5.5.x series --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876… Patch: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876…

3 years, 6 months

git:5.5:b5044dfe: topos_redis: store context field

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b5044dfea4202b10040b42fa478177cbc3b0f2d0 URL: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:45:10+02:00 topos_redis: store context field (cherry picked from commit a1a1b548e9362b2b478e0551042e86e294249ddc) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… Patch: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index c2d43b4c33..0d21cbc2d1 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -78,6 +78,7 @@ str td_key_a_srcaddr = str_init("a_srcaddr"); str td_key_b_srcaddr = str_init("b_srcaddr"); str td_key_s_method = str_init("s_method"); str td_key_s_cseq = str_init("s_cseq"); +str td_key_x_context = str_init("x_context"); str tt_key_rectime = str_init("rectime"); str tt_key_a_callid = str_init("a_callid"); @@ -99,6 +100,7 @@ str tt_key_a_tag = str_init("a_tag"); str tt_key_b_tag = str_init("b_tag"); str tt_key_s_method = str_init("s_method"); str tt_key_s_cseq = str_init("s_cseq"); +str tt_key_x_context = str_init("x_context"); #define TPS_REDIS_SET_ARGSV(sval, argc, argv, argvlen) \ do { \ @@ -242,6 +244,8 @@ int tps_redis_insert_dialog(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->s_method, argc, &td_key_s_method, argv, argvlen); TPS_REDIS_SET_ARGS(&td->s_cseq, argc, &td_key_s_cseq, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &td_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -502,6 +506,8 @@ int tps_redis_insert_branch(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->a_tag, argc, &tt_key_a_tag, argv, argvlen); TPS_REDIS_SET_ARGS(&td->b_tag, argc, &tt_key_b_tag, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &tt_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -929,6 +935,9 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } else if(skey.len==tt_key_b_tag.len && strncmp(skey.s, tt_key_b_tag.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->b_tag); + } else if(skey.len==tt_key_x_context.len + && strncmp(skey.s, tt_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); } @@ -1134,6 +1143,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) } else if(skey.len==td_key_s_cseq.len && strncmp(skey.s, td_key_s_cseq.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->s_cseq); + } else if(skey.len==td_key_x_context.len + && strncmp(skey.s, td_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); }

3 years, 6 months

git:5.5:f7651222: jwt: more details about claims parameter format

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: f76512226f8db95b7ecd8c881475e2f53f2aa900 URL: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:45:02+02:00 jwt: more details about claims parameter format (cherry picked from commit 7d24a7afe02bf1f7c8ddddfcfc9f1c287296c996) --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… Patch: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index dba928b523..36d3d0d0f7 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -109,6 +109,10 @@ modparam("jwt", "key_mode", 1) <para> claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format). + The string values can be enclosed in single or double quotes. If a + value is not eclosed in between quotes, it is added as numeric + value if it is successfully converted to a long value, otherwise is + added as string value. </para> </listitem> </itemizedlist> @@ -120,7 +124,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... </programlisting> </example> @@ -151,7 +155,8 @@ modparam("jwt", "key_mode", 1) <listitem> <para> claims - the list of claims to be checked they are in the JWT, in the format - "name1=value1;name2=value2;..." (same as the SIP parameters format). + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). </para> </listitem> <listitem> @@ -168,7 +173,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -206,7 +211,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ... </programlisting>

3 years, 6 months

git:5.5:d06a4f50: jwt: handle claims that have numeric values

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d06a4f5096a3044c2d46a49adb1ff2ea38d2eba8 URL: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:54+02:00 jwt: handle claims that have numeric values - values in between quotes are string always (cherry picked from commit c0532161f18cce514adaf2b5d784999319445911) --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… Patch: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6426381efb..4a88c9f0dd 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -186,6 +186,7 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) param_t *pit = NULL; int ret = 0; jwt_t *jwt = NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0) { @@ -242,16 +243,30 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) iat = time(NULL); ret = jwt_add_grant_int(jwt, "iat", iat); + if(ret != 0) { + LM_ERR("failed to add iat grant\n"); + goto error; + } for (pit = params_list; pit; pit=pit->next) { if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_add_grant(jwt, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_add_grant_int(jwt, pit->name.s, lval); + } else { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s grant\n", pit->name.s); + goto error; + } } } ret = jwt_set_alg(jwt, valg, (unsigned char*)kdata.s, (size_t)kdata.len); - if (ret < 0) { + if (ret != 0) { LM_ERR("failed to set algorithm and key\n"); goto error; } @@ -324,6 +339,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, jwt_t *jwt = NULL; jwt_valid_t *jwt_valid = NULL; str sparams = STR_NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0 @@ -384,7 +400,17 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_valid_add_grant_int(jwt_valid, pit->name.s, lval); + } else { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s valid grant\n", pit->name.s); + goto error; + } } }

3 years, 6 months

git:5.5:238c9808: core: ut - functions to convert from str to long

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 238c9808d42186282d0983f1efff2f4b60c4fc2c URL: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:45+02:00 core: ut - functions to convert from str to long (cherry picked from commit 80c906d5418ece5e4a3e993cc632a0e6ae3d24be) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… Patch: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… --- diff --git a/src/core/ut.h b/src/core/ut.h index 4ab08024a7..61ff696e13 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,69 +628,88 @@ static inline void strlower(str* _s) } +#define str2unval(_s, _r) do { \ + int i; \ + if (_r == NULL) return -1; \ + *_r = 0; \ + if (_s == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + for(i = 0; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + return 0; \ + } while(0) + /* - * Convert a str into integer + * Convert an str to unsigned long */ -static inline int str2int(str* _s, unsigned int* _r) +static inline int str2ulong(str* _s, unsigned long* _r) { - int i; + str2unval(_s, _r); +} - if (_r == NULL) return -1; - *_r = 0; - if (_s == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; +/* + * Convert an str to unsigned integer + */ +static inline int str2int(str* _s, unsigned int* _r) +{ + str2unval(_s, _r); +} - for(i = 0; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } +#define str2snval(_s, _r) do { \ + int i; \ + int sign; \ + if (_s == NULL) return -1; \ + if (_r == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + *_r = 0; \ + sign = 1; \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } else if (_s->s[0] == '-') { \ + sign = -1; \ + i++; \ + } \ + for(; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + *_r *= sign; \ + return 0; \ + } while(0) - return 0; +/* + * Convert an str to signed long + */ +static inline int str2slong(str* _s, long* _r) +{ + str2snval(_s, _r); } + /* * Convert an str to signed integer */ static inline int str2sint(str* _s, int* _r) { - int i; - int sign; - - if (_s == NULL) return -1; - if (_r == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; - - *_r = 0; - sign = 1; - i = 0; - if (_s->s[0] == '+') { - i++; - } else if (_s->s[0] == '-') { - sign = -1; - i++; - } - for(; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } - *_r *= sign; - - return 0; + str2snval(_s, _r); } /* - * Convert a str into integer + * Convert an strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -713,7 +732,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an str to signed integer + * Convert an strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

3 years, 6 months

git:5.5:3f5c99f1: topos_redis: use initial transaction method for early dialog branch loading

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 3f5c99f1bb3bbfdfb84416e7850f379e7a151e15 URL: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:35+02:00 topos_redis: use initial transaction method for early dialog branch loading (cherry picked from commit 824920d5b159d80ce3c241313bf647b5dbbf6661) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… Patch: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index d63543dc38..c2d43b4c33 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -588,6 +588,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -622,12 +623,17 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat xuuid.len = sd->b_uuid.len - 1; } + if(md->s_method_id & (METHOD_SUBSCRIBE|METHOD_NOTIFY)) { + smethod.s = "SUBSCRIBE"; + smethod.len =9; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, - md->s_method.len, md->s_method.s, + smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, md->b_tag.len, md->b_tag.s, xuuid.len, xuuid.s); @@ -1161,15 +1167,11 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { - if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert INVITE extra branch data\n"); - return -1; - } - } - if(md->s_method.len==9 && strncmp(md->s_method.s, "SUBSCRIBE", 9)==0) { + if(md->s_method_id==METHOD_INVITE + || md->s_method_id==METHOD_SUBSCRIBE) { if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert SUBSCRIBE extra branch data\n"); + LM_ERR("failed to insert %.*s extra initial branch data\n", + md->s_method.len, md->s_method.s); return -1; } }

3 years, 6 months

git:5.5:d4523bab: topos_redis: use uuid for initial transaction indexing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d4523bab0499d1c927e13382ec492d9bc9f00fd7 URL: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:09+02:00 topos_redis: use uuid for initial transaction indexing (cherry picked from commit 5707f9ef7f6a0d9b9bcd00ff85168b977591a30a) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… Patch: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 5f0fda701e..78013993fe 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -314,6 +314,7 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; unsigned long lval = 0; + str xuuid = str_init(""); if(td->x_vbranch1.len<=0) { LM_INFO("no via branch for this message\n"); @@ -331,13 +332,22 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(td->a_uuid.len>1) { + xuuid.s = td->a_uuid.s + 1; + xuuid.len = td->a_uuid.len - 1; + } else if(td->b_uuid.len>1) { + xuuid.s = td->b_uuid.s + 1; + xuuid.len = td->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE-128, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, td->s_method.len, td->s_method.s, td->a_callid.len, td->a_callid.s, - td->b_tag.len, td->b_tag.s); + td->b_tag.len, td->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE-128) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1; @@ -571,6 +581,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat redisReply *rrpl = NULL; str skey = STR_NULL; str sval = STR_NULL; + str xuuid = str_init(""); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -591,14 +602,23 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->a_uuid.len>1) { + xuuid.s = md->a_uuid.s + 1; + xuuid.len = md->a_uuid.len - 1; + } else if(md->b_uuid.len>1) { + xuuid.s = md->b_uuid.s + 1; + xuuid.len = md->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, md->s_method.len, md->s_method.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s); + md->b_tag.len, md->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1;

3 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021