sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
396 discussions

git:master:4deb5141: core: tcp - log details of the exiting tcp connection on insert failure
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 4deb51419ab66931459709fe44acd3e7a0acc18d URL: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T12:45:05+02:00 core: tcp - log details of the exiting tcp connection on insert failure --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Patch: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8147951b21..db6e8b923a 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1720,7 +1720,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * idx - index in the fd_array (or -1 if not known) * return: -1 on error, or when we are not interested any more on reads * from this fd (e.g.: we are closing it ) - * 0 on EAGAIN or when by some other way it is known that no more + * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). * Usefull to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. @@ -1728,7 +1728,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * queued -- the receive buffer might still be non-empty) */ inline static int handle_io(struct fd_map* fm, short events, int idx) -{ +{ int ret; int n; int read_flags; @@ -1736,10 +1736,11 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) int s; long resp; ticks_t t; - + fd_map_t *ee = NULL; + /* update the local config */ cfg_update(); - + switch(fm->type){ case F_TCPMAIN: again: @@ -1803,7 +1804,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) if (unlikely(read_flags & RD_CONN_REPEAT_READ)) goto repeat_1st_read; #endif /* USE_TLS */ - + /* must be before io_watch_add, io_watch_add might catch some * already existing events => might call handle_io and * handle_io might decide to del. the new connection => @@ -1816,13 +1817,25 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) local_timer_reinit(&con->timer); local_timer_add(&tcp_reader_ltimer, &con->timer, S_TO_TICKS(TCP_CHILD_TIMEOUT), t); - if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)){ + if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)) { LM_CRIT("io_watch_add failed for %p id %d fd %d, state %d, flags %x," " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt), ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); + ee = get_fd_map(&io_w, s); + if(ee!=0 && ee->type==F_TCPCONN) { + tcp_connection_t *ec; + ec = (tcp_connection_t*)ee->data; + LM_CRIT("existing tcp con %p id %d fd %d, state %d, flags %x," + " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", + ec, ec->id, ec->fd, ec->state, ec->flags, + ec->s, atomic_get(&ec->refcnt), + ip_addr2a(&ec->rcv.src_ip), ec->rcv.src_port, + ip_addr2a(&ec->rcv.dst_ip), ec->rcv.dst_port); + + } tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); local_timer_del(&tcp_reader_ltimer, &con->timer); goto con_error;

1 0

git:master:50af00c7: core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 50af00c7ef7037b6e55a3d3254a38935532bb0fa URL: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:55:57+02:00 core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Patch: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 3112085a14..9177ae2aaf 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -109,12 +109,12 @@ typedef int fd_type; /* maps a fd to some other structure; used in almost all cases * except epoll and maybe kqueue or /dev/poll */ -struct fd_map{ +typedef struct fd_map { int fd; /* fd no */ fd_type type; /* "data" type */ void* data; /* pointer to the corresponding structure */ short events; /* events we are interested int */ -}; +} fd_map_t; #ifdef HAVE_KQUEUE @@ -132,7 +132,7 @@ struct fd_map{ /* handler structure */ -struct io_wait_handler{ +typedef struct io_wait_handler { enum poll_types poll_method; int flags; struct fd_map* fd_hash; @@ -172,13 +172,12 @@ struct io_wait_handler{ fd_set master_wset; /* write set */ int max_fd_select; /* maximum select used fd */ #endif -}; - -typedef struct io_wait_handler io_wait_h; +} io_wait_h; /* get the corresponding fd_map structure pointer */ #define get_fd_map(h, fd) (&(h)->fd_hash[(fd)]) + /* remove a fd_map structure from the hash; the pointer must be returned * by get_fd_map or hash_fd_map*/ #define unhash_fd_map(pfm) \ @@ -321,7 +320,7 @@ inline static int io_watch_add( io_wait_h* h, h->fd_array[h->fd_no].events=(ev); /* useless for select */ \ h->fd_array[h->fd_no].revents=0; /* useless for select */ \ }while(0) - + #define set_fd_flags(f) \ do{ \ flags=fcntl(fd, F_GETFL); \ @@ -336,8 +335,7 @@ inline static int io_watch_add( io_wait_h* h, goto error; \ } \ }while(0) - - + struct fd_map* e; int flags; #ifdef HAVE_EPOLL @@ -353,7 +351,7 @@ inline static int io_watch_add( io_wait_h* h, int idx; int check_io; struct pollfd pf; - + check_io=0; /* set to 1 if we need to check for pre-existing queued io/data on the fd */ idx=-1; @@ -378,13 +376,13 @@ inline static int io_watch_add( io_wait_h* h, /* hash sanity check */ e=get_fd_map(h, fd); if (unlikely(e && (e->type!=0 /*F_NONE*/))){ - LM_ERR("trying to overwrite entry %d" - " watched for %x in the hash(%d, %d, %p) with (%d, %d, %p)\n", - fd, events, e->fd, e->type, e->data, fd, type, data); + LM_ERR("trying to overwrite entry %d watched for %x" + " in the hash %p (fd:%d, type:%d, data:%p) with (%d, %d, %p)\n", + fd, events, h, e->fd, e->type, e->data, fd, type, data); e=0; goto error; } - + if (unlikely((e=hash_fd_map(h, fd, events, type, data))==0)){ LM_ERR("failed to hash the fd %d\n", fd); goto error;

1 0

git:master:b6abc761: erlang: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: b6abc7618af7b8b3470e76aae7a0fd5ba0869949 URL: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:36:07+02:00 erlang: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Patch: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5…

1 0

git:master:19b3deb8: ctl: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 19b3deb88afe5d787ca366885c660e66f17c3409 URL: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:33:01+02:00 ctl: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Patch: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6…

1 0

git:master:2d58abdc: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 2d58abdc01372898f61d2c09190fdce2681eb738 URL: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-02T11:16:27+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Patch: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce…

1 0

git:master:97ba02b0: crypto: docs for netio params, functions and event route
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 97ba02b003f8f4545376fffbf17cdf600abd6b60 URL: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:49+02:00 crypto: docs for netio params, functions and event route --- Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Patch: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6…

1 0

git:master:d65e15a4: crypto: coherent naming for functions on netio event handling
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: d65e15a461197a9302d1cccc6fe3069d9432e268 URL: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:26+02:00 crypto: coherent naming for functions on netio event handling --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Patch: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index c2ae77fb6b..c2f7fe61e4 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -74,13 +74,13 @@ static cmd_export_t cmds[]={ fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, - {"crypto_nio_in", (cmd_function)w_crypto_nio_in, 0, + {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_out", (cmd_function)w_crypto_nio_out, 0, + {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, + {"crypto_netio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, + {"crypto_netio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, 0, 0, ANY_ROUTE}, {"load_crypto", (cmd_function)load_crypto, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}

1 0

git:master:6f7b04d6: crypto: aes encrypt/decrypt based on event_route[crypto:netio]
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 6f7b04d62e555dbbfb6360623c4c2ab84a36e2e7 URL: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T10:35:18+02:00 crypto: aes encrypt/decrypt based on event_route[crypto:netio] --- Modified: src/modules/crypto/crypto_aes.c Modified: src/modules/crypto/crypto_aes.h Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Patch: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab…

1 0

git:master:40d92899: crypto: saved functions in crypto_aes.c
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 40d9289977b97becc4d4bd948bcde57ea320cf0e URL: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T07:57:34+02:00 crypto: saved functions in crypto_aes.c --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Patch: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 9573c7264d..777d43502b 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -19,3 +19,122 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * Create an 256 bit key and IV using the supplied key_data and salt. + * Fills in the encryption and decryption ctx objects and returns 0 on success + */ +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) +{ + int i, nrounds = 5; + int x; + unsigned char key[32], iv[32]; + + /* + * Gen key & IV for AES 256 CBC mode. A SHA1 digest is used to hash + * the supplied key material. + * nrounds is the number of times the we hash the material. More rounds + * are more secure but slower. + */ + i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha1(), salt, + key_data, key_data_len, nrounds, key, iv); + if (i != 32) { + LM_ERR("key size is %d bits - should be 256 bits\n", i); + return -1; + } + + for(x = 0; x<32; ++x) + LM_DBG("key: %x iv: %x \n", key[x], iv[x]); + + for(x = 0; x<8; ++x) + LM_DBG("salt: %x\n", salt[x]); + + if(e_ctx) { + EVP_CIPHER_CTX_init(e_ctx); + EVP_EncryptInit_ex(e_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + if(d_ctx) { + EVP_CIPHER_CTX_init(d_ctx); + EVP_DecryptInit_ex(d_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + + return 0; +} + +/* + * Encrypt *len bytes of data + * All data going in & out is considered binary (unsigned char[]) + */ +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len) +{ + /* max ciphertext len for a n bytes of plaintext is + * n + AES_BLOCK_SIZE -1 bytes */ + int c_len = *len + AES_BLOCK_SIZE - 1, f_len = 0; + unsigned char *ciphertext = (unsigned char *)malloc(c_len); + + if(ciphertext == NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + /* allows reusing of 'e' for multiple encryption cycles */ + if(!EVP_EncryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_EncryptInit_ex \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext, c_len is filled with the length of ciphertext + * generated, *len is the size of plaintext in bytes */ + if(!EVP_EncryptUpdate(e, ciphertext, &c_len, plaintext, *len)){ + LM_ERR("failure in EVP_EncryptUpdate \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext with the final remaining bytes */ + if(!EVP_EncryptFinal_ex(e, ciphertext+c_len, &f_len)){ + LM_ERR("failure in EVP_EncryptFinal_ex \n"); + free(ciphertext); + return NULL; + } + + *len = c_len + f_len; + return ciphertext; +} + +/* + * Decrypt *len bytes of ciphertext + */ +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len) +{ + /* plaintext will always be equal to or lesser than length of ciphertext*/ + int p_len = *len, f_len = 0; + unsigned char *plaintext = (unsigned char *)malloc(p_len); + + if(plaintext==NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + if(!EVP_DecryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_DecryptInit_ex \n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptUpdate(e, plaintext, &p_len, ciphertext, *len)){ + LM_ERR("failure in EVP_DecryptUpdate\n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptFinal_ex(e, plaintext+p_len, &f_len)){ + LM_ERR("failure in EVP_DecryptFinal_ex\n"); + free(plaintext); + return NULL; + } + + *len = p_len + f_len; + return plaintext; +} \ No newline at end of file

1 0

[kamailio/kamailio] Play media when Kamailio+rtpengine are as an end point(not proxy) (#2315)
by bshirazi 02 Jun '20

02 Jun '20

### Description  With rtpengine module play_media function it is possible to play media to one of the endpoints(Kamailio is normal proxy) but I like to use Kamailio+rtpengine as an end point playing music for caller(simple media server). ### Expected behavior Possible to use Kamailio+rtpengine as an end point playing media. ### Possible Solutions I see some efforts in mailing list trying to build/generate a 183 response inside script to simulate a dummy end point and then use rtpengine_play_media function.  Regards. Babak -- 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/2315

3 4

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