sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
240 discussions

[kamailio/kamailio] siptrace: fix pseudo var direction attribute length (PR #3489)

by Mvondo Eric

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3489 -- Commit Summary -- * siptrace: fix pseudo var direction attribute length -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3489.patch https://github.com/kamailio/kamailio/pull/3489.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3489 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3489(a)github.com>

1 year, 4 months

git:master:508886c3: siptrace: fix pseudo var direction attribute length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 508886c3054a8470fe4469e78e63aa37ae93922d URL: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T08:47:33+02:00 siptrace: fix pseudo var direction attribute length --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Patch: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1c129762314..b37d860ca3f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2795,6 +2795,8 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "dst_proto", 9)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "direction", 9)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; case 10: @@ -2802,8 +2804,6 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "dst_hostip", 10)==0) sp->pvp.pvn.u.isname.name.n = 9; - else if(strncmp(in->s, "direction", 10)==0) - sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default:

1 year, 4 months

git:master:675f6c02: core: modparam use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 675f6c0224897544d30f5f863c503499b2e5f2fe URL: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: modparam use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/1836 > https://github.com/kamailio/kamailio/security/code-scanning/1834 --- Modified: src/core/modparam.c Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Patch: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index cf7957a16a9..46ea0169e53 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -72,7 +72,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) { struct sr_module *t; regex_t preg; - int mod_found, len; + int mod_found, len, len_param; char *reg; void *ptr, *val2; modparam_t param_type; @@ -143,15 +143,15 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) } else { switch(PARAM_TYPE_MASK(param_type)) { case PARAM_STRING: - *((char **)ptr) = - pkg_malloc(strlen((char *)val2) + 1); + len_param = strlen((char *)val2); + *((char **)ptr) = pkg_malloc(len_param + 1); if(!*((char **)ptr)) { PKG_MEM_ERROR; regfree(&preg); pkg_free(reg); return -1; } - strcpy(*((char **)ptr), (char *)val2); + strncpy(*((char **)ptr), (char *)val2, len_param); break; case PARAM_STR: diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2c5b4f1852f..1b7ea7332d2 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -503,7 +503,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strcat(path, mod_path); + strncat(path, mod_path, strlen(mod_path)); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 year, 4 months

git:master:7e8a70e9: jsonrcps: use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 7e8a70e9bf3d0b52eae1b7933633095686f234b2 URL: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 jsonrcps: use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/2381 > https://github.com/kamailio/kamailio/security/code-scanning/2380 > https://github.com/kamailio/kamailio/security/code-scanning/1843 > https://github.com/kamailio/kamailio/security/code-scanning/1841 --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Patch: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index f6ff7049890..906deb03334 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -560,10 +560,10 @@ int jsonrpc_fifo_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_fifo); + strncat(p, jsonrpc_fifo, len - strlen(runtime_dir) - sep); jsonrpc_fifo = p; LM_DBG("fifo path is [%s]\n", jsonrpc_fifo); } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4c6eb028a69..c73687a8239 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -205,10 +205,10 @@ int jsonrpc_dgram_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_dgram_socket); + strncat(p, jsonrpc_dgram_socket, len - strlen(runtime_dir) - sep); jsonrpc_dgram_socket = p; LM_DBG("unix socket path is [%s]\n", jsonrpc_dgram_socket); }

1 year, 4 months

git:master:e347d89d: core: socket_info use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: e347d89dba284f2d9635828b10b7ed49ad2244ad URL: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: socket_info use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2586 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Patch: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 56a4ba261eb..04a2e609323 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,10 +329,10 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); if(si->useinfo.name.s == 0) goto error; - strcpy(si->useinfo.name.s, usename); + strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1); if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; @@ -354,7 +354,7 @@ static inline struct socket_info *new_sock_info(char *name, (char *)pkg_malloc(si->useinfo.port_no_str.len + 1); if(si->useinfo.port_no_str.s == NULL) goto error; - strcpy(si->useinfo.port_no_str.s, p); + strncpy(si->useinfo.port_no_str.s, p, si->useinfo.port_no_str.len); si->useinfo.port_no = useport; he = resolvehost(si->useinfo.name.s);

1 year, 4 months

git:master:77ca2e93: permissions: use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 77ca2e93e945fe46783e953d58bc546d9d6d1b81 URL: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 permissions: use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2616 > https://github.com/kamailio/kamailio/security/code-scanning/1845 --- Modified: src/modules/permissions/parse_config.c Modified: src/modules/permissions/rule.c --- Diff: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Patch: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… --- diff --git a/src/modules/permissions/parse_config.c b/src/modules/permissions/parse_config.c index 20fdf8b6c47..7bf0c95a4fc 100644 --- a/src/modules/permissions/parse_config.c +++ b/src/modules/permissions/parse_config.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -137,7 +137,7 @@ static int parse_expression(char *sv, expression **e, expression **e_exceptions) } } else { /* no exception */ - strcpy(str2, sv); + strncpy(str2, sv, LINE_LENGTH); *e_exceptions = NULL; } diff --git a/src/modules/permissions/rule.c b/src/modules/permissions/rule.c index 3140acfe01f..f315d10d749 100644 --- a/src/modules/permissions/rule.c +++ b/src/modules/permissions/rule.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -148,7 +148,7 @@ expression *new_expression(char *sv) return 0; } - strcpy(e->value, sv); + strncpy(e->value, sv, EXPRESSION_LENGTH); e->reg_value = (regex_t *)pkg_malloc(sizeof(regex_t)); if(!e->reg_value) {

1 year, 4 months

git:master:dd04bceb: path: use snprintf() instead of sprintf()

by Victor Seva

Module: kamailio Branch: master Commit: dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 URL: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 path: use snprintf() instead of sprintf() > https://github.com/kamailio/kamailio/security/code-scanning/2612 > https://github.com/kamailio/kamailio/security/code-scanning/2613 > https://github.com/kamailio/kamailio/security/code-scanning/2614 > https://github.com/kamailio/kamailio/security/code-scanning/2615 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Patch: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 23309c33fe9..2431a985553 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -105,7 +105,8 @@ static int prepend_path( sip_msg_t *_m, str *user, path_param_t param, str *add_params) { struct lump *l; - char *prefix, *suffix, *cp, *dp; + char *prefix, *suffix, *dp; + str cp = STR_NULL; const char *proto_str; int prefix_len, suffix_len; struct hdr_field *hf; @@ -115,13 +116,13 @@ static int prepend_path( + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + path_received_name.len + 1; - cp = suffix = pkg_malloc(suffix_len); + cp.s = suffix = pkg_malloc(suffix_len); if(!suffix) { PKG_MEM_ERROR_FMT("for suffix\n"); goto out1; } - cp += sprintf(cp, ";lr"); + cp.len = sprintf(cp.s, ";lr"); if(param & PATH_PARAM_RECEIVED) { if(path_received_format == 0) { @@ -132,21 +133,25 @@ static int prepend_path( proto_str = NULL; } if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=sip:[%s]:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:[%s]:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } else { - cp += sprintf(cp, ";%s=sip:%s:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:%s:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } } else { if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=[%s]~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=[%s]~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } else { - cp += sprintf(cp, ";%s=%s~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=%s~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } @@ -154,17 +159,18 @@ static int prepend_path( } if(param & PATH_PARAM_OB) { - cp += sprintf(cp, ";ob"); + cp.len += sprintf(cp.s + cp.len, ";ob"); } if(add_params && add_params->len) { - cp += sprintf(cp, ";%.*s", add_params->len, add_params->s); + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, ";%.*s", + add_params->len, add_params->s); } if(path_enable_r2 == 0) { - cp += sprintf(cp, ">\r\n"); + cp.len += sprintf(cp.s + cp.len, ">\r\n"); } else { - cp += sprintf(cp, ";r2=on>\r\n"); + cp.len += sprintf(cp.s + cp.len, ";r2=on>\r\n"); } prefix_len = PATH_PREFIX_LEN + (user ? user->len : 0) + 2; @@ -174,7 +180,8 @@ static int prepend_path( goto out2; } if(user && user->len) - prefix_len = sprintf(prefix, PATH_PREFIX "%.*s@", user->len, user->s); + prefix_len = snprintf( + prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else prefix_len = sprintf(prefix, PATH_PREFIX); @@ -201,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); if(!l) goto out2; @@ -216,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp - suffix); + dp = path_strzdup(suffix, cp.s - suffix); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp.s - suffix, 0); if(!l) goto out1; }

1 year, 4 months

git:master:d00ceda2: rtpproxy: use memcpy instead of strcpy for coherence

by Victor Seva

Module: kamailio Branch: master Commit: d00ceda2c0428c6c02f3ed6d4c8c067e3f6ae94b URL: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 rtpproxy: use memcpy instead of strcpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2617 > https://github.com/kamailio/kamailio/security/code-scanning/2618 > https://github.com/kamailio/kamailio/security/code-scanning/2620 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Patch: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 493d8ffdf88..8103fef4edd 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1667,7 +1667,7 @@ static int set_rtp_proxy_set_f(struct sip_msg *msg, char *str1, char *str2) static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) { - char *cp = NULL; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; int method; int nosdp; @@ -1696,8 +1696,9 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(ip == NULL) { - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); } if(msg->msg_flags & FL_SDP_BODY) @@ -1707,13 +1708,13 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(msg->first_line.type == SIP_REQUEST) { if(method == METHOD_ACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 0, (ip != NULL) ? 1 : 0); if(method == METHOD_PRACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_INVITE && nosdp == 0) { msg->msg_flags |= FL_SDP_BODY; @@ -1722,7 +1723,7 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; if(route_type == FAILURE_ROUTE) return unforce_rtp_proxy(msg, flags); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } else if(msg->first_line.type == SIP_REPLY) { @@ -1730,19 +1731,19 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(nosdp == 0) { if(method == METHOD_PRACK) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett == NULL || tmb.t_gett() == NULL || tmb.t_gett() == T_UNDEFINED) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett()->uas.request->msg_flags & FL_SDP_BODY) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } @@ -1823,15 +1824,16 @@ static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; if(msg->first_line.type == SIP_REQUEST) if(msg->first_line.u.request.method_value != METHOD_ACK) return -1; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 year, 4 months

git:master:cbd7810f: sipcapture: use memcpy instead of strncpy for coherence

by Victor Seva

Module: kamailio Branch: master Commit: cbd7810fff3d5145c1ce34c0e362b5590bb92a12 URL: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:46+02:00 sipcapture: use memcpy instead of strncpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2620 > https://github.com/kamailio/kamailio/security/code-scanning/2621 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Patch: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 46f9059d489..de0a15174cc 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1849,6 +1849,7 @@ static int sip_capture( struct timeval tvb; struct timezone tz; char tmp_node[100]; + str ip; LM_DBG("CAPTURE DEBUG...\n"); @@ -2249,9 +2250,11 @@ static int sip_capture( /* IP source and destination */ - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/ @@ -2794,7 +2797,7 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) struct timezone tz; char tmp_node[100]; time_t epoch_time_as_time_t; - str corrtmp = STR_NULL, tmp; + str corrtmp = STR_NULL, tmp, ip; _capture_mode_data_t *c = NULL; @@ -2834,10 +2837,11 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) //EMPTY_STR(sco.msg); /* IP source and destination */ - - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/

1 year, 4 months

[kamailio/kamailio] Rabbitmq amqps (PR #3510)

by joelbax

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3510 -- Commit Summary -- * db_redis: Adding TLS support * ndb_redis: Adding TLS support * db_redis: Fixing format * db_redis: Missing format fixes * ndb_redis: Format fixes * db_redis: Fixing build * db_redis: Fixing Makefile * db_redis: Fixing global variables * ndb_redis: Fixing global variables names * ndb_redis: Missing uprotected redisSSLContext * db_redis: Searching SSL support in gcc search library path * ndb_redis: Searching SSL support in gcc search library path * db_redis: Format fixes * ndb_redis: Fixing format * Merge remote-tracking branch 'upstream/master' * rabbitmq: Adding ampqs support -- File Changes -- M src/modules/rabbitmq/doc/rabbitmq_admin.xml (3) M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3510.patch https://github.com/kamailio/kamailio/pull/3510.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3510 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3510(a)github.com>

1 year, 4 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023