sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
186 discussions

git:master:88c25b39: textops: added ends_with(str, suffix) function
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 88c25b39c5bc1c7390a29176f76b8ede5b27802d URL: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-06T15:29:45+01:00 textops: added ends_with(str, suffix) function - exported to kemi --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… Patch: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5f9361f5b2..6f3c6f9b5e 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -136,6 +136,7 @@ static int in_list_prefix_f(struct sip_msg* _msg, char* _subject, char* _list, static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); +static int ends_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); @@ -316,6 +317,9 @@ static cmd_export_t cmds[]={ {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"ends_with", (cmd_function)ends_with_f, 2, + fixup_spve_spve, 0, + ANY_ROUTE}, {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, 0, 0, ANY_ROUTE}, @@ -4220,6 +4224,49 @@ static int ki_starts_with(sip_msg_t *msg, str *s1, str *s2 ) return -2; } +static int ends_with_f(struct sip_msg *msg, char *str1, char *str2 ) +{ + str s1; + str s2; + int ret; + + if(fixup_get_svalue(msg, (gparam_p)str1, &s1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)str2, &s2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + if(s2.len > s1.len) { + return -1; + } + ret = strncmp(s1.s + s1.len - s2.len, s2.s, s2.len); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + +static int ki_ends_with(sip_msg_t *msg, str *vstr, str *vsuffix ) +{ + int ret; + + if(vstr==NULL || vsuffix==NULL) { + return -1; + } + if(vsuffix->len > vstr->len) { + return -1; + } + ret = strncmp(vstr->s + vstr->len - vsuffix->len, vsuffix->s, vsuffix->len); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + static int ki_is_audio_on_hold(sip_msg_t *msg) { int sdp_session_num = 0, sdp_stream_num; @@ -4903,6 +4950,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("ends_with"), + SR_KEMIP_INT, ki_ends_with, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("is_audio_on_hold"), SR_KEMIP_INT, ki_is_audio_on_hold, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] Problems establishing SIP signaling between MsTeams and Kamailio. (#2597)
by wvalles3010 06 Jan '21

06 Jan '21

Hello community, I am having trouble establishing SIP signaling between MsTeams and Kamailio. I currently have this configuration in my tls.cfg file [server: default] method = TLSv1.2 + verify_certificate = yes require_certificate = yes private_key = /etc/kamailio/certificates/private-key.pem certificate = /etc/kamailio/certificates/certificate.pem [client: default] method = TLSv1.2 + verify_certificate = yes require_certificate = yes private_key = /etc/kamailio/certificates/private-key.pem certificate = /etc/kamailio/certificates/certificate.pem My domain was certified with ssl through an authoritative certifier (GoDaddy), however I see these errors in the / var / log / messages of the Kamailio server. Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_mod.c:389]: mod_init(): With ECDH-Support! Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_mod.c:392]: mod_init(): With Diffie Hellman Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_init.c:722]: tls_h_mod_init_f(): compiled with openssl version "OpenSSL 1.0.2k-fips 26 Jan 2017" (0x100020bf), kerberos support: on, compression: on Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_init.c:730]: tls_h_mod_init_f(): installed openssl library version "OpenSSL 1.0.2k-fips 26 Jan 2017" (0x100020bf), kerberos support: on, zlib compression: on#012 compiler: gcc -I. -I.. -I../include -fPIC -DOPENSSL_PIC -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DKRB5_MIT -m64 -DL_ENDIAN -Wall -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -Wa,--noexecstack -DPURIFY -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: WARNING: tls [tls_init.c:787]: tls_h_mod_init_f(): openssl bug #1491 (crash/mem leaks on low memory) workaround enabled (on low memory tls operations will fail preemptively) with free memory thresholds 13107200 and 6553600 bytes Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: <core> [core/cfg/cfg_ctx.c:598]: cfg_set_now(): tls.low_mem_threshold1 has been changed to 13107200 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: <core> [core/cfg/cfg_ctx.c:598]: cfg_set_now(): tls.low_mem_threshold2 has been changed to 6553600 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: <core> [main.c:2834]: main(): processes (at least): 25 - shm size: 67108864 - pkg size: 4194304 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:305]: ksr_tls_fill_missing(): TLSs<default>: tls_method=22 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:317]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/kamailio/certificados/certificate.pem' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:324]: ksr_tls_fill_missing(): TLSs<default>: ca_list='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:331]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:335]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=1 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:342]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:349]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/kamailio/certificados/private-key.pem' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:353]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=1 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:356]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:359]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: NOTICE: tls [tls_domain.c:1107]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:697]: set_verification(): TLSs<default>: Client MUST present valid certificate Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:305]: ksr_tls_fill_missing(): TLSc<default>: tls_method=22 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:317]: ksr_tls_fill_missing(): TLSc<default>: certificate='/etc/kamailio/certificados/certificate.pem' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:324]: ksr_tls_fill_missing(): TLSc<default>: ca_list='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:331]: ksr_tls_fill_missing(): TLSc<default>: crl='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:335]: ksr_tls_fill_missing(): TLSc<default>: require_certificate=1 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:342]: ksr_tls_fill_missing(): TLSc<default>: cipher_list='(null)' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:349]: ksr_tls_fill_missing(): TLSc<default>: private_key='/etc/kamailio/certificados/private-key.pem' Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:353]: ksr_tls_fill_missing(): TLSc<default>: verify_certificate=1 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:356]: ksr_tls_fill_missing(): TLSc<default>: verify_depth=9 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:359]: ksr_tls_fill_missing(): TLSc<default>: verify_client=0 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32409]: INFO: tls [tls_domain.c:697]: set_verification(): TLSc<default>: Server MUST present valid certificate Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32422]: INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/32422 Jan 6 15:13:45 Kamailio-Server /usr/sbin/kamailio[32424]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32425]: ERROR: tls [tls_server.c:1283]: tls_h_read_f(): protocol level error Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32425]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS write:error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32425]: ERROR: tls [tls_server.c:1287]: tls_h_read_f(): source IP: 52.114.75.24 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32425]: ERROR: tls [tls_server.c:1290]: tls_h_read_f(): destination IP: 161.35.44.66 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32425]: ERROR: <core> [core/tcp_read.c:1493]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f45242be028 r: 0x7f45242be150 (-1) Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32426]: ERROR: tls [tls_server.c:1283]: tls_h_read_f(): protocol level error Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32426]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS write:error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32426]: ERROR: tls [tls_server.c:1287]: tls_h_read_f(): source IP: 52.114.132.46 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32426]: ERROR: tls [tls_server.c:1290]: tls_h_read_f(): destination IP: 161.35.44.66 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32426]: ERROR: <core> [core/tcp_read.c:1493]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f45242d9278 r: 0x7f45242d93a0 (-1) Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32427]: ERROR: tls [tls_server.c:1283]: tls_h_read_f(): protocol level error Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32427]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS write:error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32427]: ERROR: tls [tls_server.c:1287]: tls_h_read_f(): source IP: 52.114.14.70 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32427]: ERROR: tls [tls_server.c:1290]: tls_h_read_f(): destination IP: 161.35.44.66 Jan 6 15:13:55 Kamailio-Server /usr/sbin/kamailio[32427]: ERROR: <core> [core/tcp_read.c:1493]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f45242be028 r: 0x7f45242be150 (-1) Could you help me identify the problem please. Cheers -- 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/2597

2 2

[kamailio/kamailio] How can i send a UPDATE msg to the UAC? (#2596)
by leoapd19 06 Jan '21

06 Jan '21

I want to change the early media , does anyone knows how can I send the UPDATE msg before the INVITE msg is answed? -- 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/2596

2 2

git:master:aff06f6a: kemix: exported KSR.kx.get_send_sock_port()
by Daniel-Constantin Mierla 05 Jan '21

05 Jan '21

Module: kamailio Branch: master Commit: aff06f6a9daeb053587658ca6cf8e6c267ee36fe URL: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-05T16:57:13+01:00 kemix: exported KSR.kx.get_send_sock_port() - return send socket port if set, 0 otherwise --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… Patch: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fc4c6a2a69..5cb7b20e3f 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -522,6 +522,17 @@ static sr_kemi_xval_t* ki_kx_get_send_sock_name(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static int ki_kx_get_send_sock_port(sip_msg_t *msg) +{ + if (msg==NULL || msg->force_send_socket==0) { + return 0; + } + return (int)msg->force_send_socket->port_no; +} + /** * */ @@ -1325,6 +1336,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_send_sock_port"), + SR_KEMIP_INT, ki_kx_get_send_sock_port, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvip"), SR_KEMIP_XVAL, ki_kx_get_rcvip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:c5e2c397: pv: $fsp - return send socket port, or 0 if $fs not set
by Daniel-Constantin Mierla 05 Jan '21

05 Jan '21

Module: kamailio Branch: master Commit: c5e2c397d962aa4099df4b0b59f69fa89a045754 URL: https://github.com/kamailio/kamailio/commit/c5e2c397d962aa4099df4b0b59f69fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-05T16:52:32+01:00 pv: $fsp - return send socket port, or 0 if $fs not set --- 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/c5e2c397d962aa4099df4b0b59f69fa… Patch: https://github.com/kamailio/kamailio/commit/c5e2c397d962aa4099df4b0b59f69fa… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 20f0979d86..f797f3ab7d 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -253,6 +253,9 @@ static pv_export_t mod_pvs[] = { {{"fsn", (sizeof("fsn")-1)}, /* */ PVT_OTHER, pv_get_force_sock_name, pv_set_force_sock_name, 0, 0, 0, 0}, + {{"fsp", (sizeof("fsp")-1)}, /* */ + PVT_OTHER, pv_get_force_sock_port, 0, + 0, 0, 0, 0}, {{"ft", (sizeof("ft")-1)}, /* */ PVT_OTHER, pv_get_from_attr, 0, 0, 0, pv_init_iname, 4}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 746e12e3ed..5137048e10 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1075,6 +1075,19 @@ int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->force_send_socket->sockname); } +int pv_get_force_sock_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if (msg->force_send_socket==0) + return pv_get_uintval(msg, param, res, 0); + + return pv_get_intstrval(msg, param, res, (int)msg->force_send_socket->port_no, + &msg->force_send_socket->port_no_str); +} + int pv_get_useragent(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 865a48a2c0..2979e4cf9c 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -184,6 +184,9 @@ int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_force_sock_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

[kamailio/kamailio] dialog flag vs dlg_manage() - flag doesn't store uac_replace_* dialog variables (#2593)
by Sergiu Pojoga 05 Jan '21

05 Jan '21

### Description When invoking dialog tracking by flag instead of dlg_manage(), dialog doesn't store uac_replace_* variables. As a result, uac restore functionality doesn't work. ### Troubleshooting #### Reproduction #!define FLT_DIALOG 4 ... modparam("dialog", "dlg_flag", FLT_DIALOG) ... request_route { if (is_method("INVITE")) setflag(FLT_DIALOG); ... } Make a call. List dialogs (kamcmd dlg.list) You'll notice the dialog has no _uac_ variables  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.8 (x86_64/linux) a58155 ``` * **Operating System**:  ``` NAME="Debian GNU/Linux" VERSION="8 (jessie)" ``` -- 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/2593

2 3

[kamailio/kamailio] Fix 2 issues that prevent auto_bind_ipv6 from happening on my setup (#2595)
by Paul Komkoff 05 Jan '21

05 Jan '21

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Without the first commit, on my setup - which has lots of interfaces with lots of addresses - auto_bind_ipv6 will make kamailio stuck on startup. It actually happens in get_flags, where data sent back from kernel can't fit into 8K anymore. Second commit is fixing obvious typo while we're at it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2595 -- Commit Summary -- * core: work around interface enum buffer overrun * core: fix unused argument in socket_info.c:get_flags -- File Changes -- M src/core/socket_info.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2595.patch https://github.com/kamailio/kamailio/pull/2595.diff -- 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/pull/2595

3 7

git:master:d8257e3c: Merge pull request #2595 from theraphim/master
by GitHub 05 Jan '21

05 Jan '21

Module: kamailio Branch: master Commit: d8257e3c947c5619456dedcea51d28691a70fd84 URL: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-01-05T16:30:11+01:00 Merge pull request #2595 from theraphim/master Fix 2 issues that prevent auto_bind_ipv6 from happening on my setup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… Patch: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a46aba24ad..d55f506bcc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1070,6 +1070,7 @@ static int nl_bound_sock(void) req.g.rtgen_family = family;\ } while(0); +#define NETLINK_BUFFER_SIZE 32768 static int get_flags(int family){ struct { @@ -1079,12 +1080,12 @@ static int get_flags(int family){ int rtn = 0; struct nlmsghdr* nlp; struct ifinfomsg *ifi; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; int nl_sock = -1; - fill_nl_req(req, RTM_GETLINK, AF_INET); + fill_nl_req(req, RTM_GETLINK, family); if((nl_sock = nl_bound_sock()) < 0) return -1; @@ -1095,6 +1096,10 @@ static int get_flags(int family){ } while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in get_flags"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); nlp = (struct nlmsghdr *) p; if(nlp->nlmsg_type == NLMSG_DONE){ @@ -1148,7 +1153,7 @@ static int build_iface_list(void) struct nlmsghdr* nlp; struct ifaddrmsg *ifi; int rtl; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; struct rtattr * rtap; @@ -1184,6 +1189,10 @@ static int build_iface_list(void) nll = 0; p = buf; while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in build_iface_list"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *) p;

1 0

git:master:42f77024: core: fix unused argument in socket_info.c:get_flags
by Paul Komkoff 05 Jan '21

05 Jan '21

Module: kamailio Branch: master Commit: 42f7702430c312b2c9caea8f617af4e3719ef12f URL: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… Author: Paul Komkoff <i(a)stingr.net> Committer: Paul Komkoff <i(a)stingr.net> Date: 2021-01-05T14:55:11+04:00 core: fix unused argument in socket_info.c:get_flags get_flags has an argument - family - which is supposed to be used in netlink message, otherwise why would we need it? --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… Patch: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index d34f3fb4cd..d55f506bcc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1085,7 +1085,7 @@ static int get_flags(int family){ int nll = 0; int nl_sock = -1; - fill_nl_req(req, RTM_GETLINK, AF_INET); + fill_nl_req(req, RTM_GETLINK, family); if((nl_sock = nl_bound_sock()) < 0) return -1;

1 0

git:master:d2fd204b: core: work around interface enum buffer overrun
by Paul Komkoff 05 Jan '21

05 Jan '21

Module: kamailio Branch: master Commit: d2fd204b0ae35512a04702e480bb0d16878e98be URL: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… Author: Paul Komkoff <i(a)stingr.net> Committer: Paul Komkoff <i(a)stingr.net> Date: 2021-01-05T14:55:04+04:00 core: work around interface enum buffer overrun When a system has too many interfaces and too many addresses, 8 kilobytes isn't enough to fit all of the netlink responses. As the result, kamailio gets stuck in a loop where it tries to do a 0-length recv. Increase the buffer to 32K. It's a miniscule amount for modern times anyway. Also, add diagnostics to make further troubleshooting easier. Proper fix would be to switch to libnl here, which would make a good weekend project. --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… Patch: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a46aba24ad..d34f3fb4cd 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1070,6 +1070,7 @@ static int nl_bound_sock(void) req.g.rtgen_family = family;\ } while(0); +#define NETLINK_BUFFER_SIZE 32768 static int get_flags(int family){ struct { @@ -1079,7 +1080,7 @@ static int get_flags(int family){ int rtn = 0; struct nlmsghdr* nlp; struct ifinfomsg *ifi; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; int nl_sock = -1; @@ -1095,6 +1096,10 @@ static int get_flags(int family){ } while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in get_flags"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); nlp = (struct nlmsghdr *) p; if(nlp->nlmsg_type == NLMSG_DONE){ @@ -1148,7 +1153,7 @@ static int build_iface_list(void) struct nlmsghdr* nlp; struct ifaddrmsg *ifi; int rtl; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; struct rtattr * rtap; @@ -1184,6 +1189,10 @@ static int build_iface_list(void) nll = 0; p = buf; while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in build_iface_list"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *) p;

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 January 2021