sr-dev December 2015

sr-dev@lists.kamailio.org

30 participants
230 discussions

[kamailio] modules/websocket: ensure linkage to libcrypto (#439)

by Andrey Utkin

Fixes linkage for Ubuntu Wily (15.10). The issue manifests itself as "undefined symbol: SHA1" error at module loading. In Ubuntu 14 LTS (Trusty), ```pkg-config --libs libssl``` returns ```-lssl -lcrypto```, but in Ubuntu 15.10 (Wily) it returns only ```-lssl```. In the end, websocket.so gets SHA1 symbol (and some more) unresolved. For unclear reason, this change is not needed for tls.so - it gets linked to libcrypto automatically, despite it is linked only with ```-lssl``` flag. Maybe it is something symbol-specific, or something I am completely unaware of. SSL_BUILDER stuff in Makefile seems to become even more mostruous with the proposed change. Keep in mind that there is ~5 more modules with identical construction in their Makefiles. Rejection of this patch in favor of cleaner solution is appreciated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/439 -- Commit Summary -- * modules/websocket: ensure linkage to libcrypto -- File Changes -- M modules/websocket/Makefile (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/439.patch https://github.com/kamailio/kamailio/pull/439.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/439

9 years

git:master:e0f7a0c6: websocket: fixed Makefile after previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e0f7a0c678b37c44312369dd90ffdc531782bb99 URL: https://github.com/kamailio/kamailio/commit/e0f7a0c678b37c44312369dd90ffdc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-15T12:26:02+01:00 websocket: fixed Makefile after previous commit - whitespace required after ifneq --- Modified: modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e0f7a0c678b37c44312369dd90ffdc5… Patch: https://github.com/kamailio/kamailio/commit/e0f7a0c678b37c44312369dd90ffdc5… --- diff --git a/modules/websocket/Makefile b/modules/websocket/Makefile index 010aa90..42c4c79 100644 --- a/modules/websocket/Makefile +++ b/modules/websocket/Makefile @@ -13,12 +13,14 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) -ifneq($(SSL_BUILDER),) + +ifneq ($(SSL_BUILDER),) SSL_BUILDER+=$(shell \ if pkg-config --exists libcrypto; then \ echo 'libcrypto'; \ fi) endif + endif ifneq ($(SSL_BUILDER),)

9 years

git:master:b8309bd5: curl Update TODO.txt after Hugh's contribution

by Olle E. Johansson

Module: kamailio Branch: master Commit: b8309bd5fef4647c13cbabae768c47fdb7c8bc59 URL: https://github.com/kamailio/kamailio/commit/b8309bd5fef4647c13cbabae768c47f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-12-15T11:25:41+01:00 curl Update TODO.txt after Hugh's contribution --- Modified: modules/curl/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/b8309bd5fef4647c13cbabae768c47f… Patch: https://github.com/kamailio/kamailio/commit/b8309bd5fef4647c13cbabae768c47f… --- diff --git a/modules/curl/TODO.txt b/modules/curl/TODO.txt index 0a728fd..2bb134f 100644 --- a/modules/curl/TODO.txt +++ b/modules/curl/TODO.txt @@ -53,3 +53,6 @@ The curl module - todo $curlcon == connection $curl == URL $curlres == result + +- API for other modules - done by Hugh Waite + - Needs documentation

9 years

[kamailio] Fixes and improvements to curl module (#435)

by Hugh Waite

- Fix invalid check of uri and postdata parameters - Fix fixup functions - Refactor curl function to remove dependance on pv/fixup structures - Export curl_connect through C API - Fix buffer overflow in curl write function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/435 -- Commit Summary -- * Fixes and improvements to curl module -- File Changes -- M modules/curl/curl.c (172) A modules/curl/curl_api.c (12) A modules/curl/curl_api.h (36) M modules/curl/functions.c (202) M modules/curl/functions.h (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/435.patch https://github.com/kamailio/kamailio/pull/435.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/435

9 years

git:master:a3c212f2: Fixing typo, adding copyright header

by Olle E. Johansson

Module: kamailio Branch: master Commit: a3c212f2489e4ba01c7592f68cd35fdb8e16ce71 URL: https://github.com/kamailio/kamailio/commit/a3c212f2489e4ba01c7592f68cd35fd… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-12-15T11:13:21+01:00 Fixing typo, adding copyright header --- Modified: modules/curl/curl_api.h --- Diff: https://github.com/kamailio/kamailio/commit/a3c212f2489e4ba01c7592f68cd35fd… Patch: https://github.com/kamailio/kamailio/commit/a3c212f2489e4ba01c7592f68cd35fd… --- diff --git a/modules/curl/curl_api.h b/modules/curl/curl_api.h index cc61069..362b625 100644 --- a/modules/curl/curl_api.h +++ b/modules/curl/curl_api.h @@ -1,4 +1,31 @@ -#ifndef _CURL_CPI_H_ +/* + * Copyright (C) 2015 Hugh Waite + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio 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 + * + * Kamailio 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 + * + */ + +/*! + * \file + * \brief Kamailio curl :: Core API include file + * \ingroup curl + * Module: \ref curl + */ +#ifndef _CURL_API_H_ #define _CURL_API_H_ #include "../../sr_module.h"

9 years

git:master:f87327e6: Merge pull request #435 from kamailio/tmp/hpw_curl_improvements

by Olle E. Johansson

Module: kamailio Branch: master Commit: f87327e6d89c280fed31ed7961c117063dadc605 URL: https://github.com/kamailio/kamailio/commit/f87327e6d89c280fed31ed7961c1170… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-12-15T10:54:52+01:00 Merge pull request #435 from kamailio/tmp/hpw_curl_improvements Fixes and improvements to curl module --- Added: modules/curl/curl_api.c Added: modules/curl/curl_api.h Modified: modules/curl/curl.c Modified: modules/curl/functions.c Modified: modules/curl/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/f87327e6d89c280fed31ed7961c1170… Patch: https://github.com/kamailio/kamailio/commit/f87327e6d89c280fed31ed7961c1170…

9 years

git:master:9fd99efc: Fixes and improvements to curl module

by Hugh Waite

Module: kamailio Branch: master Commit: 9fd99efc683f2ccb4e5b7e88ae891d808e2efdcd URL: https://github.com/kamailio/kamailio/commit/9fd99efc683f2ccb4e5b7e88ae891d8… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2015-12-09T09:59:46Z Fixes and improvements to curl module - Fix invalid check of uri and postdata parameters - Fix fixup functions - Refactor curl function to remove dependance on pv/fixup structures - Export curl_connect through C API - Fix buffer overflow in curl write function --- Added: modules/curl/curl_api.c Added: modules/curl/curl_api.h Modified: modules/curl/curl.c Modified: modules/curl/functions.c Modified: modules/curl/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/9fd99efc683f2ccb4e5b7e88ae891d8… Patch: https://github.com/kamailio/kamailio/commit/9fd99efc683f2ccb4e5b7e88ae891d8…

9 years

[kamailio] how to send BYE to outbound leg in kamailio? (#437)

by DileepNunna

After credit limit reached(ims_charging), tried to send BYE to both legs in kamailo (modules/dialog_ng/dlg_req_within.c).Bye sent to caller, but when sending bye to callee it is failing.(it is considering record-routes from caller invite, not in 200 OK from callee).Is there any changes necessary? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/437

9 years

git:4.3:05ec88af: modules/lcr: backported ruri_user_avp fix

by Juha Heinanen

Module: kamailio Branch: 4.3 Commit: 05ec88af66344c2897f34b51b0ca7fc6d66ee2a1 URL: https://github.com/kamailio/kamailio/commit/05ec88af66344c2897f34b51b0ca7fc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-12-15T00:15:07+02:00 modules/lcr: backported ruri_user_avp fix --- Modified: modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/05ec88af66344c2897f34b51b0ca7fc… Patch: https://github.com/kamailio/kamailio/commit/05ec88af66344c2897f34b51b0ca7fc… --- diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index ae01b24..9f1da65 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1829,6 +1829,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, int_str val; delete_avp(gw_uri_avp_type|AVP_VAL_STR, gw_uri_avp); + delete_avp(ruri_user_avp_type|AVP_VAL_STR, ruri_user_avp); for (i = 0; i < gw_cnt; i++) { if (matched_gws[i].duplicate == 1) continue;

9 years

[kamailio] Bad usage of presence, xcap server and pidf-manipulation makes Kamailio crash (#441)

by foucse

Hi everyone, ``` version: kamailio 440-dev7 (i386/linux) c73b9c-dirty flags: STATS: Off, EXTRA_DEBUG, 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: c73b9c -dirty compiled on 10:17:41 Dec 14 2015 with gcc 493 ``` A call of "pres_refresh_watchers" on a malformed (empty) pidf document makes Kamailio crash Steps to reproduce: 1 Send a PUT of an empty PIDF document on /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index 2 Then try to process it with pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri(u=>uri_adoc)", "$xcapuri(u=>file)") 3 Kamailio crashes with the following messages in logs: ``` Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: request [HTTP/11] PUT => /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: Accessing XCAP root Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: Parsed XCAP URI : {data : /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index, uri : /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index, auid : pidf-manipulation, root : /xcap-root/, type : 16, xuid : sip:alice@exampleorg, file : index, node : <null>, target : <null>, domain : /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index, uri_adoc : /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index} Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: Validating user URI Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: User URI is valid Dec 14 11:10:41 kamailio-0[9460]: INFO: <script>: XHTTP: PUT sip:alice@exampleorg Dec 14 11:10:41 kamailio-0[9460]: ERROR: xcap_server [xcap_serverc:574]: w_xcaps_put(): invalid body parameter Dec 14 11:10:41 kamailio-0[9460]: ERROR: presence [presentityc:844]: update_presentity(): No E_Tag match index Dec 14 11:10:41 kamailio-0[9365]: ALERT: <core> [mainc:738]: handle_sigs(): child process 9460 exited by a signal 11 Dec 14 11:10:41 kamailio-0[9365]: ALERT: <core> [mainc:741]: handle_sigs(): core was generated ``` We got an error with "invalid body parameter" which is good but this wont prevent Kamailio from continuing and crashing Here is a config code snippet: ``` [] xcaps_put("$var(uri)", "$hu", "$rb"); pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri(u=>uri_adoc)", "$xcapuri(u=>file)"); [] ``` Maybe "xcaps_put" return value maybe used to prevent such issues But my opinion is that it should not crash Here is the stack trace: ``` Program terminated with signal SIGSEGV, Segmentation fault #0 0xb1ab8a4d in update_hard_presentity (pres_uri=0xbffd5710, event=0xb2623ae8, file_uri=0xbffd5720, filename=0xbffd5728) at publishc:592 592 if(pidf_doc->s) (gdb) bt #0 0xb1ab8a4d in update_hard_presentity (pres_uri=0xbffd5710, event=0xb2623ae8, file_uri=0xbffd5720, filename=0xbffd5728) at publishc:592 #1 0xb1a8833b in pres_refresh_watchers (pres=0xbffd5710, event=0xbffd5718, type=2, file_uri=0xbffd5720, filename=0xbffd5728) at presencec:691 #2 0xb1a96ded in w_pres_refresh_watchers5 (msg=0xbffd6a58, puri=0xb6e15a78 "\260\274", <incomplete sequence \341\266>, pevent=0xb6e15aec "\344\225\341\266 ", ptype=0xb6e15b2c "x\220\341\266\001", furi=0xb6e730dc "", fname=0xb6e73150 <incomplete sequence \341\266>) at presencec:1722 #3 0x08062367 in do_action (h=0xbffd69b0, a=0xb6e1a2c4, msg=0xbffd6a58) at actionc:1087 #4 0x0806d2c6 in run_actions (h=0xbffd69b0, a=0xb6e17b34, msg=0xbffd6a58) at actionc:1549 #5 0x0806a717 in do_action (h=0xbffd69b0, a=0xb6e2c64c, msg=0xbffd6a58) at actionc:1301 #6 0x0806d2c6 in run_actions (h=0xbffd69b0, a=0xb6e2c64c, msg=0xbffd6a58) at actionc:1549 #7 0x0806a717 in do_action (h=0xbffd69b0, a=0xb6e55490, msg=0xbffd6a58) at actionc:1301 #8 0x0806d2c6 in run_actions (h=0xbffd69b0, a=0xb6df39e0, msg=0xbffd6a58) at actionc:1549 #9 0x08062021 in do_action (h=0xbffd69b0, a=0xb6e5566c, msg=0xbffd6a58) at actionc:1045 #10 0x0806d2c6 in run_actions (h=0xbffd69b0, a=0xb6ded644, msg=0xbffd6a58) at actionc:1549 #11 0xb1da33a5 in xhttp_process_request (orig_msg=0xb6e87774, new_buf=0xb6e87d40 "PUT /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index HTTP/11\r\nVia: SIP/20/TCP 1921681501:40618\r\nHost: xcapexampleorg:5050\r\nContent-Length: 0\r\nUser-Agent: p", new_len=331) at xhttp_modc:282 #12 0xb1da42af in xhttp_handler (msg=0xb6e87774) at xhttp_modc:357 #13 0x081127ab in nonsip_msg_run_hooks (msg=0xb6e87774) at nonsip_hooksc:111 #14 0x081368b1 in receive_msg ( buf=0x9cdf838 "PUT /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index HTTP/11\r\nHost: xcapexampleorg:5050\r\nContent-Length: 0\r\nUser-Agent: python-requests/270 CPython/276 Lin", len=293, rcv_info=0xb26398ac) at receivec:145 #15 0x08208f85 in receive_tcp_msg ( tcpbuf=0xb2639a68 "PUT /xcap-root/pidf-manipulation/users/sip:alice@exampleorg/index HTTP/11\r\nHost: xcapexampleorg:5050\r\nContent-Length: 0\r\nUser-Agent: python-requests/270 CPython/276 Lin", len=293, rcv_info=0xb26398ac, con=0xb2639898) at tcp_readc:1254 #16 0x0820bb37 in tcp_read_req (con=0xb2639898, bytes_read=0xbffd7208, read_flags=0xbffd720c) at tcp_readc:1410 #17 0x0820e346 in handle_io (fm=0xb6e788a4, events=1, idx=-1) at tcp_readc:1584 #18 0x082016c2 in io_wait_loop_epoll (h=0x8411480 <io_w>, t=2, repeat=0) at io_waith:1061 #19 0x0820fd0a in tcp_receive_loop (unix_sock=37) at tcp_readc:1754 #20 0x081f8fc8 in tcp_init_children () at tcp_mainc:4788 #21 0x080df306 in main_loop () at mainc:1679 #22 0x080e4ca1 in main (argc=17, argv=0xbffd7734) at mainc:2597 ``` Tell me if you need more information ? Maybe the full stack I think the error is here (presence/publishc:590-595) : ``` if(pidf_doc) { if(pidf_doc->s) pkg_free(pidf_doc->s); pkg_free(pidf_doc); } ``` Maybe more validation should be done on "pidf_doc" before trying to access "pidf_doc->s" But I haven't investigated the issue more than that --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/441

9 years

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2015