sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
163 discussions

git:master:b67bb7a1: tm: docs for header_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: b67bb7a1bc4c710d33e242cea94a192297660c75 URL: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:42:13+02:00 tm: docs for header_mode flag 2 --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Patch: … [View More]

1 0

git:master:f409ffa0: corex: handle return code from core functions for uac forwarding
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f409ffa05fcefc11dbfaef0cfedcc7cee0911b2a URL: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… 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: handle return code from core functions for uac forwarding --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:31c77b2f: core: propagate return code for forward uac helpers
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 31c77b2f81e23666fbd8d6d249d6b8ddce06483a URL: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… 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: propagate return code for forward uac helpers --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… … [View More]

1 0

git:master:efcb697e: corex: export to kemi the forward uac functions
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: efcb697e34f767ccb243c181c9d557d136eada2e URL: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… 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: export to kemi the forward uac functions --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:69b43802: tm: new headers_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]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); [View Less]

1 0

git:master:233dda7b: core: helper function to forward uac style with dst attributes
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]

1 0

git:master:f58c1a0b: corex: updates to forward-uac functions after code relocation
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]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); } /** [View Less]

1 0

git:master:a8162b51: core: relocated function for stateless forwarding uac style
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]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); [View Less]

1 0

git:master:bf9dec59: tm: implement headers_mode option for build_local()
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]

1 0

git:master:aba3c191: corex: backup and restor internal flags for forward uac mode
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

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/… [View More]

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024