June 2020 - sr-dev - kamailio.org

[kamailio/kamailio] cnxcc: minor changes (#2343)
by Victor Seva 04 Jun '20

04 Jun '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual … [View More]

2 4

git:master:e98457fa: cnxcc: minor changes
by Victor Seva 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: e98457faf2098ca2f16a831a4a68d2a26e301b0a URL: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:09:17+02:00 cnxcc: minor changes * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build * use localtime_r() for a … [View More]

1 0

git:master:be57be33: pdb: use memcpy() for PDB_BUFTOSHORT macro
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: be57be33d0e48d412ddab9801ee4d6d906329d70 URL: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T21:46:20+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]be57be33d0e48d412ddab9801ee4d6d… Patch: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } [View Less]

1 0

missing SAR messages
by Georgi Rosenov Stefanov 03 Jun '20

03 Jun '20

Hi All, I am experimenting with Kamailio 5.3.3 as an IMS and I am trying to do load tests I am using SIPp to generate SIP.REGISTER and MariaDB and a DIAMETER tool ( seagull) For now I achieved registrations with "speed" 200 per/sec. When I send SIP.REGISTER faster(let's say 500 per/sec) I see some SARs missing, not sent at all. I start debugging and found that cxdx_send_sar is responsible to creating SAR message. I put my debug message in it. The strange thing: there is a mismatch of my debug … [View More]

2 2

[kamailio/kamailio] warning cleanup (#2298)
by sergey-safarov 03 Jun '20

03 Jun '20

**ld_fld.c:273** implicit-function-declaration ``` CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o ld_fld.c: In function 'ldap_gentime2db_datetime': ld_fld.c:273:10: warning: implicit declaration of function 'timelocal' [-Wimplicit-function-declaration] 273 | *dst = timelocal(&time); | ^~~~~~~~~ CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o … [View More]make[3]: 'libsrdb2.so.1.0' is up to date. ``` **redis_table.c:586** maybe-uninitialized ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o redis_table.c: In function 'db_redis_parse_keys': redis_table.c:586:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 586 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so ``` **app_python** strict-aliasing ``` CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:83, from apy_kemi.c:25: apy_kemi.c: In function 'sr_kemi_apy_return_true': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:121:2: note: in expansion of macro 'Py_INCREF' 121 | Py_INCREF(Py_True); | ^~~~~~~~~ apy_kemi.c: In function 'sr_kemi_apy_return_false': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:130:2: note: in expansion of macro 'Py_INCREF' 130 | Py_INCREF(Py_False); | ^~~~~~~~~ CC (gcc) [M app_python.so] apy_kemi_export.o CC (gcc) [M app_python.so] mod_Core.o ``` **pdb.c:348** address-of-packed-member] ``` LD (gcc) [M p_usrloc.so] p_usrloc.so CC (gcc) [M path.so] path.o CC (gcc) [M path.so] path_mod.o LD (gcc) [M path.so] path.so CC (gcc) [M pdb.so] pdb.o pdb.c: In function 'pdb_query': pdb.c:348:60: warning: taking address of packed member of 'struct pdb_msg' may result in an unaligned pointer value [-Waddress-of-packed-member] 348 | _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ | ^~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M pdb.so] pdb.so CC (gcc) [M pdt.so] pdt.o CC (gcc) [M pdt.so] pdtree.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2298 [View Less]

3 5

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/… [View More]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; [View Less]

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/… [View More]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; [View Less]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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…… [View More] 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 [View Less]

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

<!-- Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for feature requests. If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev … [View More]

3 4

git:master:70fc8569: crypto: set flags to encrypt/decrypt and functions for direction
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 70fc8569559abd80336ad1ddcd5a0676f9665d11 URL: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T20:21:09+02:00 crypto: set flags to encrypt/decrypt and functions for direction --- Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://… [View More]

1 0

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/… [View More]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 [View Less]

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/… [View More]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 [View Less]

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/… [View More]

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/… [View More]

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… … [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020