sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

by Mojtaba

Hello, I am Mojtaba Esfandiai. I am going to implement new module in Kamailio, In this module i wanna to implement HI2Operations,ver18 for Lawful Interception (ETSI TS 101 671 V3.15.1). My idea is when the request is received by Kamailio was "subject of target", a module's function is executed. In cmd_functions. we should check type of IRIContent and related data. Then we encapsulated all data and encode in in BER file and save in in favourite path. Do you have any idea for this module? Thanks With Regards. -- --Mojtaba Esfandiari.S

6 years, 2 months

git:master:491e19eb: tls: update to default session id value to reflect major version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 491e19eb47384162cba64fd9f043e77574ce5017 URL: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-21T12:51:08+02:00 tls: update to default session id value to reflect major version --- Modified: src/modules/tls/tls_cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… Patch: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… --- diff --git a/src/modules/tls/tls_cfg.c b/src/modules/tls/tls_cfg.c index 7bfa75a685..d133a2da98 100644 --- a/src/modules/tls/tls_cfg.c +++ b/src/modules/tls/tls_cfg.c @@ -47,7 +47,7 @@ struct cfg_group_tls default_tls_cfg = { STR_NULL, /* certificate (default value set in fix_tls_cfg) */ STR_NULL, /* cipher_list (default value set in fix_tls_cfg) */ 0, /* session_cache */ - STR_STATIC_INIT("kamailio-tls-4.x.y"), /* session_id */ + STR_STATIC_INIT("kamailio-tls-5.x.y"), /* session_id */ STR_NULL, /* config_file */ 3, /* log (L_DBG)*/ 3, /* debug (L_DBG) */

6 years, 2 months

git:master:9e13c951: core: use memcpy() instead of strncpy()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9e13c9512b48ab9522f508465c6031e7b4a96086 URL: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:56:04+02:00 core: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul --- Modified: src/core/dset.c Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… Patch: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1a10f2af9a..ff40c192ad 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -877,18 +877,18 @@ int uri_restore_rcv_alias(str *uri, str *nuri, str *suri) nuri->len = p - nuri->s; p = suri->s; - strncpy(p, "sip:", 4); + memcpy(p, "sip:", 4); p += 4; - strncpy(p, ip.s, ip.len); + memcpy(p, ip.s, ip.len); p += ip.len; *p++ = ':'; - strncpy(p, port.s, port.len); + memcpy(p, port.s, port.len); p += port.len; proto_type_to_str((unsigned short)proto, &sproto); if(sproto.len>0 && proto!=PROTO_UDP) { - strncpy(p, ";transport=", 11); + memcpy(p, ";transport=", 11); p += 11; - strncpy(p, sproto.s, sproto.len); + memcpy(p, sproto.s, sproto.len); p += sproto.len; } suri->len = p - suri->s; diff --git a/src/core/select_core.c b/src/core/select_core.c index 112dee489e..c96db61104 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -827,7 +827,7 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) { char* p; int size; - + if (select_uri_p == NULL) { if (parse_uri(res->s, res->len, &uri)<0) return -1; @@ -836,27 +836,27 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) if (!select_uri_p->host.len) return -1; - + if (select_uri_p->port.len) { res->s=select_uri_p->host.s; res->len=select_uri_p->host.len+select_uri_p->port.len+1; return 0; } - + size=select_uri_p->host.len+5; if (!(p = get_static_buffer(size))) return -1; - - strncpy(p, select_uri_p->host.s, select_uri_p->host.len); + + memcpy(p, select_uri_p->host.s, select_uri_p->host.len); switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: - strncpy(p+select_uri_p->host.len, ":5061", 5); + memcpy(p+select_uri_p->host.len, ":5061", 5); break; case SIP_URI_T: case TEL_URI_T: case URN_URI_T: - strncpy(p+select_uri_p->host.len, ":5060", 5); + memcpy(p+select_uri_p->host.len, ":5060", 5); break; case ERROR_URI_T: return -1;

6 years, 2 months

git:master:55575264: core: use parentesis to surround condtion on raw_ipip header size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 55575264332e07611c269873c9ce0b5a63c35454 URL: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:45:48+02:00 core: use parentesis to surround condtion on raw_ipip header size --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… Patch: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index 9dd65d2340..6b9e3f9f90 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -314,13 +314,14 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, if (unlikely(n<0)) goto error; end=*buf+n; - if (unlikely(n<((sizeof(struct ip) * raw_ipip ? 2 : 1)+sizeof(struct udphdr)))) { + if (unlikely(n<((sizeof(struct ip) * (raw_ipip ? 2 : 1))+sizeof(struct udphdr)))) { n=-3; goto error; } - if(raw_ipip) - *buf = *buf + sizeof(struct ip); + if(raw_ipip) { + *buf = *buf + sizeof(struct ip); + } /* FIXME: if initial buffer is aligned, one could skip the memcpy and directly cast ip and udphdr pointer to the memory */

6 years, 2 months

git:master:daad89a5: path: use memcpy() instead of strncpy()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: daad89a516f1f298ef8f71505d7ab93b35fe76db URL: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:37:15+02:00 path: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… Patch: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 5b29a33527..f95d68ab70 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -406,8 +406,8 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) } } else { /* received=ip~port~proto */ - strncpy(dst_uri_buf, "sip:", 4); - strncpy(dst_uri_buf+4, hooks.contact.received->body.s, + memcpy(dst_uri_buf, "sip:", 4); + memcpy(dst_uri_buf+4, hooks.contact.received->body.s, hooks.contact.received->body.len); dst_uri_buf[4+hooks.contact.received->body.len] = '\0'; p = dst_uri_buf + 4; @@ -433,7 +433,7 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) LM_ERR("unknown proto in received param\n"); goto done; } - strncpy(p, "transport=", 10); + memcpy(p, "transport=", 10); p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len;

6 years, 2 months

git:master:4be1c60b: dispatcher: use memcpy() instead of strncpy()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4be1c60bb67d191f8a2715253a7cbcb2ea412d85 URL: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:32:09+02:00 dispatcher: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… Patch: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0422cd6b20..20077f1506 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -330,8 +330,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) /* check uri */ if(parse_uri(uri.s, uri.len, &puri) != 0) { if(iuri.len>4 && strncmp(iuri.s, "sip:", 4)!=0 && iuri.len<500) { - strncpy(ub, "sip:", 4); - strncpy(ub+4, iuri.s, iuri.len); + memcpy(ub, "sip:", 4); + memcpy(ub+4, iuri.s, iuri.len); ub[iuri.len+4] = '\0'; uri.s = ub; uri.len = iuri.len+4;

6 years, 2 months

git:master:c4ce16fc: kamailio.cfg: added via1 sanity check in default config

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c4ce16fce6da24e6dc7e732117419cf3ce788d56 URL: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T13:07:00+02:00 kamailio.cfg: added via1 sanity check in default config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… Patch: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 13bef88de1..d17c719eaf 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -577,7 +577,7 @@ route[REQINIT] { exit; } - if(!sanity_check("1511", "7")) { + if(!sanity_check("17895", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; }

6 years, 2 months

Kamailio On Tap – Social Event In Dusseldorf, Sep 27, 2018

by Daniel-Constantin Mierla

Hello, we are organizing an open social networking event in the evening of Sep 27, 2018, in Dusseldorf, at the end of the first day of Kamailio Developers meeting. Anyone in the area that wants to enjoy beer, pizza and chat about Kamailio, VoIP/RTC is welcome to join us. More details at: * https://www.kamailio.org/w/2018/09/kamailio-on-tap-social-event-in-dusseldo… Note that participation is free, but you have to announce your participation until Sep 26 in order to plan properly the event. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

6 years, 2 months

[kamailio/kamailio] can't generate 487 reply when a final 408 was sent out (#1648)

by Prabhat Kumar

kamailio verison is 4.0 Operating System : Ubuntu 16.04 Everyhting seems fine. Sip user is recieving the call but i am not getting any voice from that side. I dont know whether there is NAT issue or something else. I get this error in my log "tm [t_reply.c:479]: _reply_light(): can't generate 487 reply when a final 408 was sent out" I have used dispatcher and wss connection. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1648

6 years, 2 months

git:master:0d14ce8b: nathelper: exported fix_nated_sdp() variants to KEMI framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0d14ce8bf45ada579f7ec85793d358a5fa32e4b7 URL: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T09:03:10+02:00 nathelper: exported fix_nated_sdp() variants to KEMI framework --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… Patch: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index b9d9d622b3..44badb90fb 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1548,25 +1548,15 @@ static inline int replace_sdp_ip( return count; } -static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) +static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) { str body; - str ip; - int level, rest_len; + int rest_len; char *buf, *m_start, *m_end; struct lump *anchor; int ret; int count = 0; - if(fixup_get_ivalue(msg, (gparam_t *)str1, &level) != 0) { - LM_ERR("failed to get value for first parameter\n"); - return -1; - } - if(str2 && fixup_get_svalue(msg, (gparam_t *)str2, &ip) != 0) { - LM_ERR("failed to get value for second parameter\n"); - return -1; - } - if(extract_body(msg, &body) == -1) { LM_ERR("cannot extract body from msg!\n"); return -1; @@ -1631,7 +1621,7 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", str2 ? &ip : 0); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0); if(ret == -1) return -1; count += ret; @@ -1639,7 +1629,7 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", str2 ? &ip : 0); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0); if(ret == -1) return -1; count += ret; @@ -1648,6 +1638,28 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) return count > 0 ? 1 : 2; } +static int ki_fix_nated_sdp(sip_msg_t *msg, int level) +{ + return ki_fix_nated_sdp_ip(msg, level, NULL); +} + +static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) +{ + int level; + str ip; + + if(fixup_get_ivalue(msg, (gparam_t *)str1, &level) != 0) { + LM_ERR("failed to get value for first parameter\n"); + return -1; + } + if(str2 && fixup_get_svalue(msg, (gparam_t *)str2, &ip) != 0) { + LM_ERR("failed to get value for second parameter\n"); + return -1; + } + + return ki_fix_nated_sdp_ip(msg, level, &ip); +} + static int extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; @@ -2432,6 +2444,16 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("nathelper"), str_init("fix_nated_sdp"), + SR_KEMIP_INT, ki_fix_nated_sdp, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("nathelper"), str_init("fix_nated_sdp_ip"), + SR_KEMIP_INT, ki_fix_nated_sdp_ip, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

6 years, 2 months

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018