sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
157 discussions

git:master:69b43802: tm: new headers_mode flag 2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 69b4380222121321412afc70dfafe39961551f41 URL: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: new headers_mode flag 2 - statelss uac-style forwarding of CANCEL --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Patch: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index cf30afedfa7..9568b6adb1b 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -61,6 +61,7 @@ extern int tm_failure_exec_mode; extern int tm_dns_reuse_rcv_socket; +extern int tm_headers_mode; static int goto_on_branch = 0, branch_route = 0; /* E2E_CANCEL_HOP_BY_HOP - cancel hop by hop */ @@ -1902,7 +1903,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, #endif /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, &host, port, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, &host, port, &dst); + } goto end; } else { init_dest_info(&dst); @@ -1910,7 +1915,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, 0, 0, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, 0, 0, &dst); + } goto end; } } diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 49c801d2e8f..9adc4613421 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -70,7 +70,6 @@ (_d) += (_len); \ } while(0) -#define TM_CANCEL_HEADERS_COPY 1 extern int tm_headers_mode; /* Build a local request based on a previous request; main diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index c06d1e6adf6..f6ad810d377 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,6 +28,9 @@ #include "h_table.h" #include "t_reply.h" +#define TM_CANCEL_HEADERS_COPY (1) +#define TM_CANCEL_FORWARD_UAC (1 << 1) + char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to, sip_msg_t *imsg, struct cancel_reason *reason);

3 weeks, 1 day

git:master:233dda7b: core: helper function to forward uac style with dst attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 233dda7b9a1ca6954c35f2f0b271cb9bc4c813d9 URL: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: helper function to forward uac style with dst attributes --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Patch: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 3d2e743cdbd..97953ee7b85 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -695,6 +695,41 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + int ret; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward request like initial uac sender, with only one via */ diff --git a/src/core/forward.h b/src/core/forward.h index 5b414a7a64b..31086c6512b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,8 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info); int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

3 weeks, 1 day

git:master:f58c1a0b: corex: updates to forward-uac functions after code relocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f58c1a0b74cce2f3abca540d0d6cb826d3d7b637 URL: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: updates to forward-uac functions after code relocation --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Patch: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c6852759114..a5d05dbaea2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,63 +279,7 @@ static void mod_destroy(void) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - int ret; - dest_info_t dst; - sip_uri_t *u; - sip_uri_t next_hop; - sr_lump_t *anchor; - hdr_field_t *hf; - msg_flags_t msg_flags_bk; - - if(msg == NULL) { - LM_WARN("invalid msg parameter\n"); - return -1; - } - - if(parse_headers(msg, HDR_EOH_F, 0) == -1) { - LM_ERR("error while parsing message\n"); - return -1; - } - /* remove incoming Via headers */ - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->type != HDR_VIA_T) { - continue; - } - anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - if(anchor == 0) { - LM_ERR("cannot remove Via header\n"); - return -1; - } - } - - init_dest_info(&dst); - if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; - } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; - } - } else { - ret = parse_uri(vuri->s, vuri->len, &next_hop); - u = &next_hop; - } - if(ret < 0) { - LM_ERR("forward - bad uri dropping packet\n"); - return -1; - } - dst.proto = u->proto; - msg_flags_bk = msg->msg_flags; - msg->msg_flags |= FL_VIA_NORECEIVED; - ret = forward_request_mode( - msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); - msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - - return -1; + return forward_uac_uri(msg, vuri); } /** @@ -343,7 +287,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return ki_forward_uac_uri(msg, NULL); + return forward_uac_uri(msg, NULL); } /** @@ -358,7 +302,7 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return ki_forward_uac_uri(msg, &vuri); + return forward_uac_uri(msg, &vuri); } /**

3 weeks, 1 day

git:master:a8162b51: core: relocated function for stateless forwarding uac style

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8162b513443fd688ab66e470748cc948c811a6a URL: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: relocated function for stateless forwarding uac style --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Patch: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 1d2b1d5d650..3d2e743cdbd 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -40,6 +40,7 @@ #include "hash_func.h" #include "config.h" #include "parser/msg_parser.h" +#include "parser/parse_uri.h" #include "char_msg_val.h" #include "route.h" #include "events.h" @@ -694,6 +695,70 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ +int forward_uac_uri(sip_msg_t *msg, str *vuri) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + } else { + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index a90ce3446ce..5b414a7a64b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

3 weeks, 1 day

git:master:bf9dec59: tm: implement headers_mode option for build_local()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bf9dec59480cb8bed1deaa7670454b57045b8b90 URL: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: implement headers_mode option for build_local() --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Patch: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index c195193d6e6..49c801d2e8f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -187,6 +187,28 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, LM_BUG("unhandled reason cause %d\n", reason->cause); } *len += reason_len; + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + *len += hdr->len; + } + } + } *len += CRLF_LEN; /* end of msg. */ cancel_buf = shm_malloc(*len + 1); @@ -258,6 +280,29 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, } } } + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + append_str(p, hdr->name.s, hdr->len); + } + } + } + append_str(p, CRLF, CRLF_LEN); /* msg. end */ *p = 0;

3 weeks, 1 day

git:master:aba3c191: corex: backup and restor internal flags for forward uac mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aba3c191e4d00666cb4a9e0c646057df4976d133 URL: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: backup and restor internal flags for forward uac mode --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Patch: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 7e121f8bb61..c6852759114 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -285,6 +285,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) sip_uri_t next_hop; sr_lump_t *anchor; hdr_field_t *hf; + msg_flags_t msg_flags_bk; if(msg == NULL) { LM_WARN("invalid msg parameter\n"); @@ -325,9 +326,11 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) return -1; } dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; if(ret >= 0) { return 1; }

3 weeks, 1 day

git:master:a30839fc: modules: readme files regenerated - pua_dialoginfo ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a30839fceabbab3be18e01ec6f39c9e0d542f6b6 URL: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T10:16:10+02:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Patch: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e…

3 weeks, 1 day

[kamailio/kamailio] pua and pua_dialoginfo improvements (PR #3955)

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) - [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 #### Description We are seeing a lot of error messages like: > ERROR: <null> pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) After some investigation I come up with a couple of fixes: * pua: improve the query to support caller|callee with same pres_id (same dialog) * pua_dialoginfo: support uuid to generate pres_id to improve randomness You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3955 -- Commit Summary -- * pua: get_record_puadb() add pres_uri to the query * pua_dialoginfo: use_uuid parameter * pua_dialoginfo: document use_uuid parameter -- File Changes -- M src/modules/pua/pua_db.c (18) M src/modules/pua/pua_db.h (5) M src/modules/pua/send_publish.c (5) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (11) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (25) M src/modules/pua_dialoginfo/pua_dialoginfo.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3955.patch https://github.com/kamailio/kamailio/pull/3955.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3955 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3955(a)github.com>

3 weeks, 1 day

git:master:c06ed186: pua_dialoginfo: document use_uuid parameter

by Victor Seva

Module: kamailio Branch: master Commit: c06ed1864f37e5574345601489427a8623d24e34 URL: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: document use_uuid parameter --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Patch: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index 17ae58a27fa..d1eda128f23 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -50,6 +50,11 @@ <surname>Gaisnon</surname> <email>frederic.gaisnon(a)gmail.com</email> </editor> + <editor> + <firstname>Victor</firstname> + <surname>Seva</surname> + <email>vseva(a)sipwise.com</email> + </editor> </authorgroup> <copyright> <year>2006</year> @@ -63,6 +68,10 @@ <year>2021</year> <holder>MomentTech</holder> </copyright> + <copyright> + <year>2024</year> + <holder>Sipwise</holder> + </copyright> </bookinfo> <toc></toc> @@ -70,5 +79,3 @@ </book> - - diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index cad923058ac..6093c3516b6 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -211,6 +211,11 @@ <emphasis>pua</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>uuid</emphasis> if <varname>use_uuid</varname> is enabled. + </para> + </listitem> </itemizedlist> </para> </section> @@ -233,6 +238,25 @@ <section> <title>Parameters</title> + <section id="pua_dialoginfo.p.use_uuid"> + <title><varname>use_uuid</varname> (int)</title> + <para> + If this parameter is set, the pres_id will be generated using libuuid via uuid module. + uuid module has to be loaded before pua_dialoginfo in this case. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>use_uuid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "use_uuid", 1) +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.include_callid"> <title><varname>include_callid</varname> (int)</title> <para>

3 weeks, 1 day

git:master:6ba2fba3: pua_dialoginfo: use_uuid parameter

by Victor Seva

Module: kamailio Branch: master Commit: 6ba2fba382704b0c693a1ca5745db6203c12f2a0 URL: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: use_uuid parameter generate pres_id using libuuid via uuid module --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Patch: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index d1782380b07..35757128ff7 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -51,6 +51,7 @@ MODULE_VERSION /* Default module parameter values */ +#define DEF_USE_UUID 0 #define DEF_INCLUDE_CALLID 1 #define DEF_INCLUDE_LOCALREMOTE 1 #define DEF_INCLUDE_TAGS 1 @@ -91,6 +92,7 @@ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ +int use_uuid = DEF_USE_UUID; int include_callid = DEF_INCLUDE_CALLID; int include_localremote = DEF_INCLUDE_LOCALREMOTE; int include_tags = DEF_INCLUDE_TAGS; @@ -123,6 +125,7 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { + {"use_uuid", INT_PARAM, &use_uuid}, {"include_callid", INT_PARAM, &include_callid}, {"include_localremote", INT_PARAM, &include_localremote}, {"include_tags", INT_PARAM, &include_tags}, @@ -733,8 +736,16 @@ struct dlginfo_cell *get_dialog_data(struct dlg_cell *dlg, int type, int len; // generate new random uuid - if(sruid_next_safe(&_puadi_sruid) < 0) { - return NULL; + if(use_uuid) { + _puadi_sruid.uid.len = SRUID_SIZE; + if(sruid_uuid_generate(_puadi_sruid.uid.s, &_puadi_sruid.uid.len) < 0) { + LM_ERR("uuid not generated\n"); + return NULL; + } + } else { + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } } LM_DBG("uuid generated: '%.*s'\n", _puadi_sruid.uid.len, _puadi_sruid.uid.s);

3 weeks, 1 day

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024