sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:master:eeefe7dc: sanity: fix sanity_reply function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: eeefe7dcc2af90e7def8f1698e8f79d0dd020043 URL: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:25:03+02:00 sanity: fix sanity_reply function name for config exports --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Patch: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 54b66d330b..5dc0cabfb7 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index 3a026f1f93..fab02c0e62 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,6 +36,7 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { + long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:993c036b: cdp: close socket in case of error
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 993c036bb185f6053a3a2f0486be30398918a87c URL: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T14:55:01+02:00 cdp: close socket in case of error --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Patch: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0bff4131d3..692cc363ae 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,7 +844,7 @@ int receive_loop(peer *original_peer) */ int peer_connect(peer *p) { - int sock; + int sock = -1; int tmp = 0; unsigned int option = 1; @@ -922,17 +922,20 @@ int peer_connect(peer *p) if (valopt) { LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); close(sock); + sock = -1; continue; } }else{ LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } } }else{ LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } @@ -956,7 +959,6 @@ int peer_connect(peer *p) if (!send_fd(p->fd_exchange_pipe,sock,p)){ LM_ERR("peer_connect(): [%.*s] Error sending fd to respective receiver\n",p->fqdn.len,p->fqdn.s); - close(sock); goto error; } @@ -967,6 +969,7 @@ int peer_connect(peer *p) error: if (res) freeaddrinfo(res); if (sainfo) freeaddrinfo(sainfo); + if (sock!=-1) close(sock); return -1; }

1 0

git:master:b1eb0928: ims_ipsec_pcscf: safety check for pcontact search result
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: b1eb0928f8e68a697eccda3e75504eb2263cb95b URL: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T10:02:18+02:00 ims_ipsec_pcscf: safety check for pcontact search result --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Patch: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5013087c02..0651d4226f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -667,7 +667,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -810,7 +810,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 + || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -967,7 +968,7 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; }

1 0

git:master:5cac8b4e: ims_ipsec_pcscf: clean local parsed tm uas request headers
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 5cac8b4e99399ae3db4fb281fc084f73d8e8307f URL: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:57:53+02:00 ims_ipsec_pcscf: clean local parsed tm uas request headers --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Patch: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index f8672a592a..5013087c02 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -140,7 +140,7 @@ static str get_www_auth_param(const char* param_name, str www_auth) return val; } -static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) +static int fill_contact(struct pcontact_info* ci, struct sip_msg* m, tm_cell_t *t) { contact_body_t* cb = NULL; struct via_body* vb = NULL; @@ -244,7 +244,6 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) } } else if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); return -1; @@ -651,9 +650,13 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) pcontact_t* pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } // Find the contact - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -681,7 +684,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) } // Get request from reply - struct cell *t = tmb.t_gett(); + if (!t) t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); goto cleanup; @@ -765,6 +768,9 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) // Do not free str* sec_header! It will be freed in data_lump.c -> free_lump() ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -778,11 +784,12 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) unsigned short dst_port = 0; unsigned short src_port = 0; ip_addr_t via_host; - struct sip_msg* req = NULL; + struct cell *t = NULL; + if(m->first_line.type == SIP_REPLY) { // Get request from reply - struct cell *t = tmb.t_gett(); + t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); return ret; @@ -796,7 +803,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -864,7 +871,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Request sends from P-CSCF client port src_port = s->port_pc; - + // for Request sends to UE server port dst_port = s->port_us; } @@ -934,6 +941,9 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -943,11 +953,14 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) struct pcontact_info ci; pcontact_t* pcontact = NULL; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } - // // Find the contact - // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -978,6 +991,9 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; }

1 0

git:master:8e69474a: presence: rename local variable that conflicts with tm define
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d URL: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:05:03+02:00 presence: rename local variable that conflicts with tm define --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Patch: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index b53528ce80..64c13a5f09 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1303,7 +1303,7 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, str rec_route = {0, 0}; int rt = 0; contact_body_t *b; - struct to_body *pto, TO = {0}, *pfrom = NULL; + struct to_body *pto, tob = {0}, *pfrom = NULL; uint32_t lexpire; str rtag_value; struct sip_uri uri; @@ -1352,12 +1352,12 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, LM_DBG("'To' header ALREADY PARSED: <%.*s>\n", pto->uri.len, pto->uri.s); } else { - parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &TO); - if(TO.uri.len <= 0) { + parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &tob); + if(tob.uri.len <= 0) { LM_DBG("'To' header NOT parsed\n"); goto error; } - pto = &TO; + pto = &tob; } if(pto->parsed_uri.user.s && pto->parsed_uri.host.s @@ -1509,11 +1509,11 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, } getbflagsval(0, &subs->flags); - free_to_params(&TO); + free_to_params(&tob); return 0; error: - free_to_params(&TO); + free_to_params(&tob); return -1; }

1 0

git:master:27b6c641: tm: relocated defines not useful in the header file
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 27b6c641b5d941503f974fea05af506972ac2ab5 URL: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:00:55+02:00 tm: relocated defines not useful in the header file --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Patch: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ad9c8ae903..08e50a8ea9 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -46,6 +46,22 @@ #endif +#define CSEQ "CSeq: " +#define CSEQ_LEN (sizeof(CSEQ)-1) +#define TO "To: " +#define TO_LEN (sizeof(TO)-1) +#define CALLID "Call-ID: " +#define CALLID_LEN (sizeof(CALLID)-1) +#define FROM "From: " +#define FROM_LEN (sizeof(FROM)-1) +#define FROMTAG ";tag=" +#define FROMTAG_LEN (sizeof(FROMTAG)-1) +#define TOTAG ";tag=" +#define TOTAG_LEN (sizeof(TOTAG)-1) +#define MAXFWD_VALUE "70" +#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF +#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) + /* convenience macros */ #define memapp(_d,_s,_len) \ do{\ diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index e22bb0e1de..a97c1f9451 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,6 @@ #include "h_table.h" #include "t_reply.h" -#define CSEQ "CSeq: " -#define CSEQ_LEN (sizeof(CSEQ)-1) -#define TO "To: " -#define TO_LEN (sizeof(TO)-1) -#define CALLID "Call-ID: " -#define CALLID_LEN (sizeof(CALLID)-1) -#define FROM "From: " -#define FROM_LEN (sizeof(FROM)-1) -#define FROMTAG ";tag=" -#define FROMTAG_LEN (sizeof(FROMTAG)-1) -#define TOTAG ";tag=" -#define TOTAG_LEN (sizeof(TOTAG)-1) -#define MAXFWD_VALUE "70" -#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF -#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch, ); char *build_uac_request( str msg_type, str dst, str from, - str fromtag, int cseq, str callid, str headers, + str fromtag, int cseq, str callid, str headers, str body, int branch, struct cell *t, unsigned int *len); @@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, * request should be send. The function is used by tm when it generates * local ACK to 200 OK (on behalf of applications using uac */ -char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, +char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, unsigned int branch, str *hdrs, str *body, unsigned int *len, struct dest_info* dst); @@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, /* * Create a request */ -char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, - struct cell *t, int* len, struct dest_info* dst); +char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, + struct cell *t, int* len, struct dest_info* dst); int t_calc_branch(struct cell *t,

1 0

git:master:159224b2: tm: function to clean local parsed headers and body for uas request
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 159224b254d9a67104c60fedab46a1b78cf19a83 URL: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T08:56:14+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Patch: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 27aaef9b5f..ad9c8ae903 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1776,3 +1776,37 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, return NULL; } +/** + * + */ +void t_uas_request_clean_parsed(tm_cell_t *t) +{ + struct hdr_field *hdr; + void *mstart; + void *mend; + + if (!t || !t->uas.request) { + return; + } + + mstart = t->uas.request; + mend = t->uas.end_request; + + /* free header's parsed structures that were added by failure handlers */ + for (hdr=t->uas.request->headers; hdr; hdr=hdr->next ) { + if (hdr->parsed && hdr_allocs_parse(hdr) + && (hdr->parsed<mstart || hdr->parsed>=mend)) { + /* header parsed filed doesn't point inside fake memory + * chunck -> it was added by failure funcs.-> free it as pkg */ + LM_DBG("removing hdr->parsed %d\n", hdr->type); + clean_hdr_field(hdr); + hdr->parsed = 0; + } + } + /* free parsed body added by failure handlers */ + if (t->uas.request->body) { + if(t->uas.request->body->free) + t->uas.request->body->free(&t->uas.request->body); + t->uas.request->body = 0; + } +} diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index 46969e0d69..e22bb0e1de 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,7 +28,6 @@ #include "h_table.h" #include "t_reply.h" - #define CSEQ "CSeq: " #define CSEQ_LEN (sizeof(CSEQ)-1) #define TO "To: " @@ -45,7 +44,6 @@ #define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF #define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -92,4 +90,7 @@ int t_calc_branch(struct cell *t, char* print_callid_mini(char* target, str callid); char* print_cseq_mini(char* target, str* cseq, str* method); +typedef void (*t_uas_request_clean_parsed_f)(tm_cell_t *t); +void t_uas_request_clean_parsed(tm_cell_t *t); + #endif diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 65515a3a28..8635b90eae 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -139,6 +139,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_next_contacts = t_next_contacts; tmb->set_fr = t_set_fr; tmb->t_release_transaction = t_release_transaction; + tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 8190ee977c..4695a8f7e1 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -38,6 +38,7 @@ #include "t_append_branches.h" #include "t_stats.h" #include "t_serial.h" +#include "t_msgbuilder.h" /* export not usable from scripts */ #define NO_SCRIPT -1 @@ -122,6 +123,7 @@ struct tm_binds { cmd_function t_next_contacts; tset_fr_f set_fr; trelease_t t_release_transaction; + t_uas_request_clean_parsed_f t_uas_request_clean_parsed; }; typedef struct tm_binds tm_api_t;

1 0

db_redis shared tcp connection issue
by Andrew Pogrebennyk 04 May '22

04 May '22

Dear community, I've been looking at some weirdness in db_redis behavior when it returns the responses to the queries made by tcp processes in mixed order. Tested this on various kamailio 5.3 and 5.4 (sipwise spce) and they are showing interesting pattern. After restart of kamailio I ran lsof to enumerate all the sockets open in kamailio children. There is a connection to db port 6379 which is held by multiple processes at the same time. > for i in $(ps auxww | grep kamailio.proxy | grep -v grep | awk '{print > $2}'); do echo "print file descriptors of $i" && sudo lsof -p $i | grep > 6379; done > redis_conn.txt ...i see that lsof lists tcp client socket to redis server with same source TCP port and same inode number in several processes: 14199, "TIMER NH", 14200, "ctl handler", 14205, "Dialog Clean Timer", 14206, "JSONRPCS FIFO", 14210, "JSONRPCS DATAGRAM", 14213, "tcp receiver (generic) child=0", 14214, "tcp receiver (generic) child=1", 14215, "tcp receiver (generic) child=2", 14220, "tcp receiver (generic) child=3", 14224, "tcp receiver (generic) child=4", 14225, "tcp main process" The UDP processes are safe (and some timer ones too), because in that lsof they have unique TCP client port. That's giving me a lot of headache because UA registrations received by any of the TCP workers (or IPSec ones for that matter) are randomly failing, because if two processes made same query to DB in parallel it is appearing on the wire with same TCP source port and replies can be mixed up. This can be some bug in usage of hiredis, impacting all users of db_redis module. Is there any relation to the way kamailio is working its TCP workers, where maybe tcp workers are forked from the main attendant processes after having opened the DB connection? P.S. Why I have the above hypothesis: when I log redis queries with redis-cli monitor at startup of kamailio, I see only that srem_key_lua is executed against redis in runtime only once from that source port, but then this connection is shared across multiple processes. Regards, Andrew

3 8

git:master:7f359ca1: lcr: init variable for fixing warning report
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 7f359ca152e87ec72c6dd39fe09885bae630e36f URL: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T20:59:49+02:00 lcr: init variable for fixing warning report --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Patch: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 9647dde044..6f5eafdb22 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -1939,7 +1939,7 @@ static inline int decode_avp_value(char *value, unsigned int *gw_index, struct ip_addr *addr, str *hostname, str *port, str *params, str *transport, unsigned int *flags, unsigned int *rule_id) { - unsigned int u; + unsigned int u = 0; str s; char *sep; struct ip_addr *ip;

1 0

git:master:a0285e6d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 03 May '22

03 May '22

Module: kamailio Branch: master Commit: a0285e6d6f1aec539e89df60cf5aeb78c6a0409b URL: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-03T20:01:15+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Patch: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

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 May 2022