sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
162 discussions

git:master:d6b0beb5: core: parser/contact - add limit for max number of contacts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96 URL: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-03T14:36:29+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Patch: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index dd522a6cd3c..322a22e9590 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -221,6 +221,8 @@ static inline void contact_append(contact_t **head, contact_t *node) ptr->next = node; } +#define KSR_MAX_CONTACTS 256 + /* * Parse contacts in a Contact HF */ @@ -229,9 +231,11 @@ int parse_contacts(str *_s, contact_t **_c) contact_t *c; param_hooks_t hooks; str sv; + int n; sv = *_s; + n = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -273,7 +277,6 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } - if(_s->len == 0) goto ok; @@ -312,7 +315,12 @@ int parse_contacts(str *_s, contact_t **_c) contact_append(_c, c); c = NULL; + n++; + if(n > KSR_MAX_CONTACTS) { + LM_ERR("too many contacts: %d\n", n); + return -1; + } if(_s->len == 0) { LM_ERR("text after comma missing\n"); goto error;

4 months, 2 weeks

git:master:f1baf7dd: nghttp2: set the data field for event route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f1baf7dd48c4ccb8d2d0ab0b24547f2793bb8588 URL: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T10:15:48+02:00 nghttp2: set the data field for event route - reset ctx fields when nothing was set from session/stream --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Patch: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d8c23220a13..6f5faf02ad6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -518,11 +518,25 @@ static int on_request_recv(nghttp2_session *session, if(stream_data->request_method) { _ksr_nghttp2_ctx.method.s = stream_data->request_method; _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } else { + _ksr_nghttp2_ctx.method.s = NULL; + _ksr_nghttp2_ctx.method.len = 0; } if(session_data->client_addr) { _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } else { + _ksr_nghttp2_ctx.srcip.s = NULL; + _ksr_nghttp2_ctx.srcip.len = 0; + } + + if(stream_data->request_data.len > 0) { + _ksr_nghttp2_ctx.data.s = stream_data->request_data.s; + _ksr_nghttp2_ctx.data.len = stream_data->request_data.len; + } else { + _ksr_nghttp2_ctx.data.s = NULL; + _ksr_nghttp2_ctx.data.len = 0; } ksr_event_route(); @@ -567,16 +581,26 @@ static int on_frame_recv_callback( static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, int32_t stream_id, const uint8_t *data, size_t len, void *user_data) { - struct Request *req; + http2_stream_data *stream_data; (void)flags; - (void)user_data; - req = nghttp2_session_get_stream_user_data(session, stream_id); - if(req) { + stream_data = nghttp2_session_get_stream_user_data(session, stream_id); + + if(stream_data) { LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", (unsigned long int)len); LM_DBG("[[%.*s]]", (int)len, (char *)data); - LM_DBG("----------------------------\n"); + LM_DBG("\n----------------------------\n"); + stream_data->request_data.s = realloc(stream_data->request_data.s, + len + stream_data->request_data.len + 1); + if(stream_data->request_data.s == NULL) { + LM_ERR("failed to allocate system memory\n"); + return 0; + } + memcpy(stream_data->request_data.s + stream_data->request_data.len, + data, len); + stream_data->request_data.len += len; + stream_data->request_data.s[stream_data->request_data.len] = '\0'; } return 0; } diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index ac69a147313..63650db53af 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -80,6 +80,7 @@ typedef struct http2_stream_data char *request_pathfull; char *request_method; http2_msghdr_t *hdrlist; + str request_data; int32_t stream_id; int fd; } http2_stream_data;

4 months, 2 weeks

git:master:53e1a29c: pua: check if local requests are dropped and free the param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 53e1a29c265df1489c9bd91deddc0719f8ca2092 URL: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T09:27:41+02:00 pua: check if local requests are dropped and free the param --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Patch: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index ef542e2d627..e57183427f3 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -700,6 +700,11 @@ int update_pua(ua_pres_t *p) ret_code = -1; goto done; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + ret_code = 0; + goto done; + } } else { str met = {"SUBSCRIBE", 9}; ua_pres_t *cb_param = NULL; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 48e92e9728b..53644265633 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -624,6 +624,9 @@ int send_publish(publ_info_t *publ) LM_ERR("in t_request tm module function\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + } done: ret = 0;

4 months, 2 weeks

git:master:00aac8d4: uac: check if local requests are dropped and free the param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 00aac8d48370fac356eecff535835d918c631cc5 URL: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T07:00:58+02:00 uac: check if local requests are dropped and free the param --- Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Patch: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 4885f4d4023..bbe592ba04c 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -974,6 +974,10 @@ void uac_reg_tm_callback(struct cell *t, int type, struct tmcb_params *ps) ri->l_uuid.len, ri->l_uuid.s); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + *ps->param = NULL; + } ri->flags |= UAC_REG_AUTHSENT; lock_release(ri->lock); @@ -1130,6 +1134,9 @@ int uac_reg_send(reg_uac_t *reg, time_t tn) reg->flags &= ~UAC_REG_ONGOING; return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + } return 0; } diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c29e9b4b90e..f91a0c75b4f 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -794,6 +794,11 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) LM_ERR("failed to send request with authentication\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(tp); + *ps->param = NULL; + tp = NULL; + } if(tp->evroute != 0) { return; @@ -871,6 +876,10 @@ int uac_req_send(void) shm_free(tp); return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + if(tp != NULL) + shm_free(tp); + } return 1; }

4 months, 2 weeks

git:master:d12fc310: presence: check if the local notify was dropped in event route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d12fc31056cb37aac347ec05f9ada7bafa5f52de URL: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:20:43+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Patch: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 4c9dece1a39..9a8af778c04 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1736,6 +1736,10 @@ int send_notify_request( shm_free(cb_param); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + goto done; + } LM_GEN2(pres_local_log_facility, pres_local_log_level, "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", @@ -1744,6 +1748,7 @@ int send_notify_request( subs->event->name.len, subs->event->name.s, subs->callid.len, subs->callid.s); +done: ps_free_tm_dlg(td); if(str_hdr.s)

4 months, 2 weeks

git:master:68624c2d: pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 68624c2da093ab789d4e8d35df65ef1bce024bca URL: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:08:28+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Patch: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index c6196a1f5f6..c6ffe70753a 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -479,6 +479,8 @@ static inline char *tm_type_to_string(int type) return "TMCB_ON_BRANCH_FAILURE"; case TMCB_ON_BRANCH_FAILURE_RO: return "TMCB_ON_BRANCH_FAILURE_RO"; + case TMCB_LOCAL_REQUEST_DROP: + return "TMCB_LOCAL_REQUEST_DROP"; case TMCB_MAX: return "TMCB_MAX"; }

4 months, 2 weeks

git:master:ebd1c6c7: tm: cb_flags made unsigned for uac_req

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ebd1c6c75a1b832ce85d576aad134b99d47b5738 URL: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:07:26+02:00 tm: cb_flags made unsigned for uac_req --- Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Patch: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… --- diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 59fa7f4e9ea..6fad3380cd8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -47,7 +47,7 @@ typedef struct uac_req str *ssock; str *ssockname; dlg_t *dialog; - int cb_flags; + unsigned int cb_flags; transaction_cb *cb; void *cbp; str *callid;

4 months, 2 weeks

git:master:f5da773c: tm: cb flag to mark local uac on request drop

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5da773c5fa29edbf9d0e65a83a62f495928ddec URL: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:57:46+02:00 tm: cb flag to mark local uac on request drop --- Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Patch: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… --- diff --git a/src/modules/tm/t_hooks.h b/src/modules/tm/t_hooks.h index aa566cb35d1..cdb657bad64 100644 --- a/src/modules/tm/t_hooks.h +++ b/src/modules/tm/t_hooks.h @@ -59,7 +59,8 @@ struct cell; #define TMCB_RESPONSE_SENT_N 23 #define TMCB_ON_BRANCH_FAILURE_RO_N 24 #define TMCB_ON_BRANCH_FAILURE_N 25 -#define TMCB_MAX_N 25 +#define TMCB_LOCAL_REQUEST_DROP_N 26 +#define TMCB_MAX_N 26 #define TMCB_REQUEST_IN (1 << TMCB_REQUEST_IN_N) @@ -88,6 +89,7 @@ struct cell; #define TMCB_RESPONSE_SENT (1 << TMCB_RESPONSE_SENT_N) #define TMCB_ON_BRANCH_FAILURE (1 << TMCB_ON_BRANCH_FAILURE_N) #define TMCB_ON_BRANCH_FAILURE_RO (1 << TMCB_ON_BRANCH_FAILURE_RO_N) +#define TMCB_LOCAL_REQUEST_DROP (1 << TMCB_LOCAL_REQUEST_DROP_N) #define TMCB_MAX ((1 << (TMCB_MAX_N + 1)) - 1) diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5559533e5fb..5384d826dd8 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -680,6 +680,7 @@ int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) ret = t_uac_prepare(uac_r, dst_req, 0); if(unlikely(ret < 0 && ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } @@ -775,6 +776,7 @@ int t_uac_with_ids( if(ret < 0) { if(unlikely(ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } return ret;

4 months, 2 weeks

git:master:ee06666c: tm: free new buffer on drop for local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee06666c43d96029315dae7618e10d381265a85a URL: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:28:18+02:00 tm: free new buffer on drop for local requests - GH #3403 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Patch: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 206f69ef59d..5559533e5fb 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -559,6 +559,7 @@ static inline int t_uac_prepare( refresh_shortcuts = t_run_local_req(&buf, &buf_len, uac_r, new_cell, request); if(unlikely(refresh_shortcuts == E_DROP)) { + shm_free(buf); ret = E_DROP; goto error1; }

4 months, 2 weeks

Enquiry about N5 interface implementation

by Viabhav Bansal

Hey there! I hope the Kamailio team is physically as well as mentally healthy and thriving towards progressive development. I am a part of a team which deals in development of converged 4G and 5G networks. We have been diving deep into Open5GS 5G core and use Kamailio as our SIP server. However, we are trying to successfully implement VoNR UE registration as well as calling, and facing challenges in that area. I recently saw the VoNR as well as SMSoNR demonstration which the Kamailio team performed and was massively impressed by it! I would like to know when will the N5 SBI update will be rolling out to the public so that we can conduct our testing as well. Hoping for a timely response and update, Thanks and regards, Vaibhav.

4 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024