sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:7cc8eca1: crypto: set flags to encrypt/decrypt on event route functions
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 7cc8eca1d06ada4e4b819e3d061850eddc8a58ed URL: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:40:59+02:00 crypto: set flags to encrypt/decrypt on event route functions --- Modified: src/modules/crypto/crypto_evcb.c --- Diff: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Patch: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… --- diff --git a/src/modules/crypto/crypto_evcb.c b/src/modules/crypto/crypto_evcb.c index dd23d0d0fd..3a79a63523 100644 --- a/src/modules/crypto/crypto_evcb.c +++ b/src/modules/crypto/crypto_evcb.c @@ -31,6 +31,7 @@ #include "../../core/kemi.h" #include "../../core/fmsg.h" #include "../../core/events.h" +#include "../../core/onsend.h" #define CRYPTO_NIO_OUT (1<<0) @@ -92,6 +93,7 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) sip_msg_t *fmsg; sip_msg_t tmsg; sr_kemi_eng_t *keng = NULL; + onsend_info_t onsnd_info = {0}; if(evenv==0) { LM_ERR("crypto env not set\n"); @@ -107,6 +109,16 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) return -1; } fmsg = &tmsg; + + if(evenv->mflags & CRYPTO_NIO_OUT) { + onsnd_info.to = &evenv->evp->dst->to; + onsnd_info.send_sock = evenv->evp->dst->send_sock; + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + p_onsend = &onsnd_info; + } + crypto_set_msg_env(fmsg, evenv); backup_rt = get_route_type(); set_route_type(EVENT_ROUTE); @@ -125,6 +137,10 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) crypto_set_msg_env(fmsg, NULL); /* free the structure -- it is a clone of faked msg */ free_sip_msg(fmsg); + + if(evenv->mflags & CRYPTO_NIO_OUT) { + p_onsend = NULL; + } return 0; } @@ -174,6 +190,13 @@ int crypto_nio_sent(sr_event_param_t *evp) */ int crypto_nio_in(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return -1; + } + return 1; } @@ -182,7 +205,14 @@ int crypto_nio_in(sip_msg_t* msg) */ int crypto_nio_out(sip_msg_t* msg) { - return 1; + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return 1; + } + + return -1; } /** @@ -190,6 +220,12 @@ int crypto_nio_out(sip_msg_t* msg) */ int crypto_nio_encrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_ENCRYPT; + return 1; } @@ -198,5 +234,11 @@ int crypto_nio_encrypt(sip_msg_t* msg) */ int crypto_nio_decrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_DECRYPT; + return 1; } \ No newline at end of file

1 0

git:master:dd15786a: crypto: aes helper functions relocated to dedicated files
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: dd15786aba0b48a83efeef258d689217ac5375a9 URL: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T13:10:29+02:00 crypto: aes helper functions relocated to dedicated files --- Added: src/modules/crypto/crypto_aes.c Added: src/modules/crypto/crypto_aes.h --- Diff: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Patch: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c new file mode 100644 index 0000000000..9573c7264d --- /dev/null +++ b/src/modules/crypto/crypto_aes.c @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + diff --git a/src/modules/crypto/crypto_aes.h b/src/modules/crypto/crypto_aes.h new file mode 100644 index 0000000000..a98a95016e --- /dev/null +++ b/src/modules/crypto/crypto_aes.h @@ -0,0 +1,35 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _CRYPTO_AES_H_ +#define _CRYPTO_AES_H_ + +#include <openssl/evp.h> + +int crypto_aes_init(unsigned char *key_data, int key_data_len, + unsigned char *salt, EVP_CIPHER_CTX *e_ctx, EVP_CIPHER_CTX *d_ctx); + +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len); + +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len); +#endif \ No newline at end of file

1 0

git:master:52f9c668: pv: new var $mts - return msg type as string
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 52f9c668d77746383d8fdae6e90fabd6c7a018fa URL: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:21:25+02:00 pv: new var $mts - return msg type as string - rq - for request - rp - for response --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Patch: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 492344f80e..0308514e70 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -293,6 +293,9 @@ static pv_export_t mod_pvs[] = { {{"mt", (sizeof("mt")-1)}, /* */ PVT_OTHER, pv_get_msgtype, 0, 0, 0, 0, 0}, + {{"mts", (sizeof("mts")-1)}, /* */ + PVT_OTHER, pv_get_msgtypes, 0, + 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5a83a8999b..e53db70c25 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -195,6 +195,23 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, type); } +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + char *types = "xx"; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) { + types = "rq"; + } else if(msg->first_line.type == SIP_REPLY) { + types = "rp"; + } + + return pv_get_strzval(msg, param, res, types); +} + int pv_get_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 919fa3910f..cf87a7e0c9 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -49,6 +49,9 @@ int pv_get_methodid(struct sip_msg *msg, pv_param_t *param, int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:f658a7a8: pv: removed commented code for retcode var - exported from core
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: f658a7a8263efd4b0ed5816959741380a964221d URL: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-31T09:30:13+02:00 pv: removed commented code for retcode var - exported from core --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Patch: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 7f478a9ac5..492344f80e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -338,12 +338,6 @@ static pv_export_t mod_pvs[] = { {{"rb", (sizeof("rb")-1)}, /* */ PVT_MSG_BODY, pv_get_msg_body, 0, 0, 0, 0, 0}, - /* {{"rc", (sizeof("rc")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, - {{"retcode", (sizeof("retcode")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, */ {{"rd", (sizeof("rd")-1)}, /* */ PVT_RURI_DOMAIN, pv_get_ruri_attr, pv_set_ruri_host, 0, 0, pv_init_iname, 2},

1 0

git:master:64adc989: kemi: exported function to get msg type
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 64adc989bd4655b395554023be2aa863f144d81e URL: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-31T09:30:12+02:00 kemi: exported function to get msg type --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… Patch: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index f94ff951d4..fdedda04be 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -872,6 +872,25 @@ static int ki_kx_get_msglen(sip_msg_t *msg) return msg->len; } +/** + * + */ +static int ki_kx_get_msgtype(sip_msg_t *msg) +{ + if(msg==NULL) { + return -1; + } + + if(msg->first_line.type == SIP_REQUEST) { + return 1; + } else if(msg->first_line.type == SIP_REPLY) { + return 2; + } + + return 0; +} + + /** * */ @@ -1122,6 +1141,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_msgtype"), + SR_KEMIP_INT, ki_kx_get_msgtype, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

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 June 2020