sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:d78289c3: core: define function name for base64-url encoding as its declaration in .h file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d78289c34e4e5fb97fe1670e2c6773cf9ae5710f URL: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T23:55:59+01:00 core: define function name for base64-url encoding as its declaration in .h file --- Modified: src/core/basex.c --- Diff: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… Patch: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… --- diff --git a/src/core/basex.c b/src/core/basex.c index ce5f7543a1..45abcac028 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -427,7 +427,7 @@ static const int _ksr_b64url_decmap[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; -int base64url_encode(char *in, int ilen, char *out, int osize) +int base64url_enc(char *in, int ilen, char *out, int osize) { int left; int idx;

4 years, 9 months

[kamailio/kamailio] Write Buffer too small (#2240)

by Natzy

### Description  We're trying to connect the same subscriber with Kamailio for load testing. Sometimes it registers successfully but sometimes it throws the following error. ### Troubleshooting >From my understanding by checking the source code, TLS_WR_MBUF_SZ is set as 65536 by default. This is the reason for "write buffer too small". Can someone help me with how to change that? #### Reproduction  I don't exactly know how to reproduce as some the clients pass and some fail. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  BUG: tls [tls_server.c:849]: tls_encode_f(): write buffer too small (65536/65536 bytes) ERROR: websocket [ws_frame.c:300]: encode_and_send_ws_frame(): sending WebSocket frame ERROR: websocket [ws_frame.c:800]: ws_frame_transmit(): sending message NOTICE: <script>: WebSocket connection from a.b.c.d:1234 has closed ERROR: registrar [reply.c:745]: reg_send_reply(): failed to send 200 OK ERROR: <core> [core/tcp_main.c:3502]: handle_ser_child(): received CON_ERROR for 0x7f9472eec990 (id 100), refcnt 4, flags 0x4018 NOTICE: <script>: Error in saving location data WARNING: sl [../../core/forward.h:173]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found ERROR: sl [sl_funcs.c:362]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) WARNING: <core> [core/tcp_read.c:1716]: handle_io(): F_TCPCONN connection marked as bad: 0x7f9472eec990 id 100 refcnt 1 #### SIP Traffic  ### Possible Solutions  Need to increase the default tls write buffer size from 65536. I think it is set as "#define TLS_WR_MBUF_SZ 65536" ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.0.8 (x86_64/linux) c35e69 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c35e69 compiled on 05:04:45 Nov 25 2019 with gcc 4.8.5 * **Operating System**:  Linux 3.10.0-957.21.3.el7.x86_64 #1 SMP Tue Jun 18 16:35:19 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux CentOS Linux release 7.7.1908 (Core) -- 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/2240

4 years, 9 months

git:master:1dd8c578: pv: transformations for base64-url encode/decode variants

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1dd8c5784aa58bd48a713661a1f3e4ed7db58c88 URL: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T17:46:49+01:00 pv: transformations for base64-url encode/decode variants --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e… Patch: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e…

4 years, 9 months

git:master:57d131bc: core: functions to encode/decode base64-url

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57d131bc26523d4a87d60b9e3fa96079030efa88 URL: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T17:45:43+01:00 core: functions to encode/decode base64-url --- Modified: src/core/basex.c Modified: src/core/basex.h --- Diff: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… Patch: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… --- diff --git a/src/core/basex.c b/src/core/basex.c index 592ea0cd96..ce5f7543a1 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -387,3 +387,124 @@ char* b58_encode(char *b58, int *b58sz, char *data, int binsz) return b58; } + +/* base64-url encoding table (RFC 4648 document) */ +static const char _ksr_b64url_encmap[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + +/* base64-url decoding table */ +static const int _ksr_b64url_decmap[] = { + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 0x3E, -1, -1, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, -1, -1, -1, -1, -1, -1, + -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, + 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 0x17, 0x18, 0x19, -1, -1, -1, -1, 0x3F, + -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1 +}; + +int base64url_encode(char *in, int ilen, char *out, int osize) +{ + int left; + int idx; + int i; + int r; + char *p; + int block; + int olen; + + olen = (((ilen+2)/3)<<2); + if (olen >= osize) { + LM_ERR("not enough output buffer size %d - need %d\n", osize, olen+1); + return -1; + } + memset(out, 0, (olen+1)*sizeof(char)); + + p = out; + for(idx=0; idx<ilen; idx+=3) { + left = ilen - idx - 1 ; + left = (left>1)?2:left; + + block = 0; + for(i=0, r=16; i<=left; i++, r-=8) + block += ((unsigned char)in[idx+i]) << r; + + *(p++) = _ksr_b64url_encmap[(block >> 18) & 0x3f]; + *(p++) = _ksr_b64url_encmap[(block >> 12) & 0x3f]; + *(p++) = (left>0)?_ksr_b64url_encmap[(block >> 6) & 0x3f]:'='; + *(p++) = (left>1)?_ksr_b64url_encmap[block & 0x3f]:'='; + } + + return olen; +} + +int base64url_dec(char *in, int ilen, char *out, int osize) +{ + int n; + int block; + int idx; + int i; + int j; + int end; + char c; + int olen; + + for(n=0,i=ilen-1; in[i]=='='; i--) + n++; + + olen = ((ilen * 6) >> 3) - n; + + if (olen<=0) { + LM_ERR("invalid olen parameter calculated, can't continue %d\n", olen); + return -1; + } + + if(olen >= osize) { + LM_ERR("not enough output buffer size %d - need %d\n", osize, olen+1); + return -1; + } + memset(out, 0, (olen+1)*sizeof(char)); + + end = ilen - n; + for(i=0, idx=0; i<end; idx+=3) { + block = 0; + for(j=0; j<4 && i<end ; j++) { + c = _ksr_b64url_decmap[(int)in[i++]]; + if(c<0) { + LM_ERR("invalid input string\"%.*s\"\n", ilen, in); + return -1; + } + block += c << (18 - 6*j); + } + + for(j=0, n=16; j<3 && idx+j<olen; j++, n-=8) + out[idx+j] = (char)((block >> n) & 0xff); + } + + return olen; +} + diff --git a/src/core/basex.h b/src/core/basex.h index 1c5af1c780..8181e6f512 100644 --- a/src/core/basex.h +++ b/src/core/basex.h @@ -864,4 +864,7 @@ int init_basex(void); char* b58_encode(char *b58, int *b58sz, char *data, int binsz); char* b58_decode(char *outb, int *outbszp, char *b58, int b58sz); +int base64url_enc(char *in, int ilen, char *out, int osize); +int base64url_dec(char *in, int ilen, char *out, int osize); + #endif /* _basex_h */

4 years, 9 months

git:master:19263243: ims_diameter_server: extern declaration of global vars in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 19263243127c40d0418ff04e56048d31e9dd9d0c URL: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T16:28:51+01:00 ims_diameter_server: extern declaration of global vars in header file --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c Modified: src/modules/ims_diameter_server/ims_diameter_server.h --- Diff: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… Patch: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index f3e6fe040e..c7fe941b00 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -31,6 +31,13 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ +struct cdp_binds cdpb; +cdp_avp_bind_t *cdp_avp; + +AAAMessage *request; +str responsejson; +str requestjson; + struct cdp_binds cdpb; cdp_avp_bind_t *cdp_avp; diff --git a/src/modules/ims_diameter_server/ims_diameter_server.h b/src/modules/ims_diameter_server/ims_diameter_server.h index 26848d5ebb..76775bd00c 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.h +++ b/src/modules/ims_diameter_server/ims_diameter_server.h @@ -26,14 +26,14 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage; -AAAMessage *request; -str responsejson; -str requestjson; +extern AAAMessage *request; +extern str responsejson; +extern str requestjson; AAAMessage* callback_cdp_request(AAAMessage *request, void *param);

4 years, 9 months

dev question related to generate_avps()

by Stefan Mititelu

Hi, I want to ask you if it would make sense for kamailio upstream code to generate_avps() (got from the database) also when the user failed to register? Please have a look in src/modules/auth_db/authorize.c line 303. If it makes sense, I'll do a pull request for it. Thank you, Stefan

4 years, 9 months

Re: [sr-dev] Regarding MIPS Compilation

by Henning Westerholt

Hello, please keep the list in CC. it looks that it still tries to compile the x86 code, and not the MIPS one. What do you get when you execute “make cfg” on your system – this is what I get on 64 Linux: henning@static:~/repositories/kamailio/src$ make cfg target architecture <x86_64>, host architecture <x86_64> If you have the possibility to test a native compilation on the platform, maybe this is easier to do as well. It will take some time to compile, but still not too much. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: subhra giri <subhraprakash79(a)gmail.com> Sent: Friday, March 6, 2020 12:20 PM To: Henning Westerholt <hw(a)skalatan.de> Subject: Re: [sr-dev] Regarding MIPS Compilation Dear Henning Thank you very much from my heart. I was trying to cross compile it for mips64-octeon-linux. I followed the below steps.export CC=/home/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc 1) downloaded and untrar kamailio-5.3.2. 2)From kamailio-5.3.2 directory, i used below commands export CC=/home/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc make then i am getting below errors ------------------------- core/parser/../mem/../atomic/atomic_x86.h: In function 'atomic_dec_and_test_int': core/parser/../mem/../atomic/atomic_x86.h:222:1: error: impossible constraint in 'asm' make: *** [main.o] Error 1 Please help me if i have used right steps for cross compilation. Thanks and Regards Subhra Prakash Giri On Fri, Mar 6, 2020 at 3:05 PM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello, do you get some problems during compilation? Please provide more details what you have tried, and which steps don’t work etc.. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of subhra giri Sent: Thursday, March 5, 2020 3:01 PM To: sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> Subject: [sr-dev] Regarding MIPS Compilation Hi Can any body help me how to compile kamailio for mips Thanks and Regards Subhra Prakash Giri

4 years, 9 months

Regarding MIPS Compilation

by subhra giri

Hi Can any body help me how to compile kamailio for mips Thanks and Regards Subhra Prakash Giri

4 years, 9 months

git:master:51d95e0e: modukles/tm: added t_clean() script function

by Juha Heinanen

Module: kamailio Branch: master Commit: 51d95e0e7cce0483c517e2bcfc5000b60a7e35be URL: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2020-03-06T09:08:12+02:00 modukles/tm: added t_clean() script function --- Modified: src/modules/tm/README Modified: src/modules/tm/doc/functions.xml Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b… Patch: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b…

4 years, 9 months

git:master:eb4f66de: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: eb4f66de483f17c7736a02dfc9eebfc49b491b01 URL: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-06T07:31:09+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… Patch: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 10fb829f23..7889496941 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -40,7 +40,7 @@ Daniel-Constantin Mierla List of Examples 1.1. Set expire parameter - 1.2. Set expire parameter + 1.2. Set timeout parameter 1.3. secsipid_check_identity usage 1.4. secsipid_add_identity usage 1.5. Libsecsipid usage @@ -115,9 +115,9 @@ modparam("secsipid", "expire", 600) Default value is 5. - Example 1.2. Set expire parameter + Example 1.2. Set timeout parameter ... -modparam("secsipid", "expire", 600) +modparam("secsipid", "timeout", 2) ... 4. Functions

4 years, 9 months

← Newer
1
...
36
37
38
39
40
41
42
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020