sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

[kamailio] Error building Kamailio in Debian 8.0 (#157)

by hellc2

I'm testing the code into my new Debian 8.0 in a proxmox environment and I get some errors... Linux kamailio2 2.6.32-34-pve #1 SMP Fri Dec 19 07:42:04 CET 2014 i686 GNU/Linux model name : Intel(R) Xeon(R) CPU W3520 @ 2.67GHz root@kamailio2:/usr/src/kamailio# make cfg target architecture <i386>, host architecture <i386> making config... rm -f modules.lst make --no-print-directory modules.lst saving modules list... root@kamailio2:/usr/src/kamailio# make all CC (gcc) [kamailio] basex.o CC (gcc) [kamailio] rvalue.o CC (gcc) [kamailio] str_list.o CC (gcc) [kamailio] pv_core.o CC (gcc) [kamailio] udp_server.o CC (gcc) [kamailio] receive.o ... ... make[2]: 'libsrdb1.so.1.0' is up to date. make[2]: 'libkmi.so.1.0' is up to date. make[2]: 'libsrdb1.so.1.0' is up to date. make[2]: 'libkcore.so.1.0' is up to date. CC (gcc) [M dialog.so] dlg_hash.o dlg_hash.c: In function 'dlg_ka_run': dlg_hash.c:206:5: error: too few arguments to function 'dlg_send_ka' dlg_send_ka(dlg, DLG_CALLER_LEG); ^ In file included from dlg_hash.c:63:0: dlg_req_within.h:55:5: note: declared here int dlg_send_ka(dlg_cell_t *dlg, int dir, str *hdrs); ^ dlg_hash.c:209:5: error: too few arguments to function 'dlg_send_ka' dlg_send_ka(dlg, DLG_CALLEE_LEG); ^ In file included from dlg_hash.c:63:0: dlg_req_within.h:55:5: note: declared here int dlg_send_ka(dlg_cell_t *dlg, int dir, str *hdrs); ^ ../../Makefile.rules:114: recipe for target 'dlg_hash.o' failed make[1]: *** [dlg_hash.o] Error 1 Makefile:572: recipe for target 'modules' failed make: *** [modules] Error 1 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/157

9 years, 7 months

git:4.2:b73897a2: dialog: fixed backport conflict for keepalive dialog state check

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: b73897a21afec416195c159858a20fc35f6889f0 URL: https://github.com/kamailio/kamailio/commit/b73897a21afec416195c159858a20fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T20:18:04+02:00 dialog: fixed backport conflict for keepalive dialog state check --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b73897a21afec416195c159858a20fc… Patch: https://github.com/kamailio/kamailio/commit/b73897a21afec416195c159858a20fc… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index c1bbbd6..f98207b 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -203,10 +203,10 @@ int dlg_ka_run(ticks_t ti) } else { if((dka->iflags & DLG_IFLAG_KA_SRC) && (dlg->state==DLG_STATE_CONFIRMED)) - dlg_send_ka(dlg, DLG_CALLER_LEG); + dlg_send_ka(dlg, DLG_CALLER_LEG, 0); if((dka->iflags & DLG_IFLAG_KA_DST) && (dlg->state==DLG_STATE_CONFIRMED)) - dlg_send_ka(dlg, DLG_CALLEE_LEG); + dlg_send_ka(dlg, DLG_CALLEE_LEG, 0); if(dlg->state==DLG_STATE_DELETED) { shm_free(dka); dka = NULL;

9 years, 7 months

jessie run_target

by Juha Heinanen

i had to add run_target=/var/run/$(MAIN_NAME) to jessie rules make command, because without that the default run dir of the ctl socket was incorrect. perhaps it is only me. -- juha

9 years, 7 months

git:master:7048d597: rtpengine: decrease log level of a message

by lucian balanceanu

Module: kamailio Branch: master Commit: 7048d597b9e74d22fa32b6e5c809986089462c39 URL: https://github.com/kamailio/kamailio/commit/7048d597b9e74d22fa32b6e5c809986… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: 2015-05-12T14:46:50+03:00 rtpengine: decrease log level of a message - decrease logging level for "force_send_ip_str not specified in .cfg file" to DBG --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/7048d597b9e74d22fa32b6e5c809986… Patch: https://github.com/kamailio/kamailio/commit/7048d597b9e74d22fa32b6e5c809986… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index bb66b7b..609ebc5 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -452,7 +452,7 @@ static int bind_force_send_ip(int sock_idx) break; default: - LM_INFO("force_send_ip_str not specified in .cfg file!\n"); + LM_DBG("force_send_ip_str not specified in .cfg file!\n"); break; }

9 years, 7 months

git: new commits in branch 4.2

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/2786d32a29e29c77f7b5ea0f2e044c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:06:37+02:00 uac_redirect: updated the example script (cherry picked from commit 1a3ce79cc058c57197a7b3736b3ec8b08be5c33f) - URL: https://github.com/kamailio/kamailio/commit/d5220ac3efc2df4a1995fc79425340c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:06:56+02:00 kamctl: added help for 'db connect' command (cherry picked from commit 545037884e806df0d450fd6d7b425808c944d8a8) - URL: https://github.com/kamailio/kamailio/commit/9ab45a4b0c557aa2bfcf12136134659… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:07:21+02:00 ndb_mongodb: fixed name of the function in docs (cherry picked from commit c6eff0f5f6ec33fba5d61e4a6616d1bddfe6f958) - URL: https://github.com/kamailio/kamailio/commit/9839280c0c2aabdd7749cb7553354fb… Author: Mickael Marrache <mickaelmarrache(a)gmail.com> Date: 2015-05-12T12:09:02+02:00 db_mongodb: change warn to info for log message on unhandled data type log - less verbosity to syslog (cherry picked from commit ebf6483650c0cff88703e071383184b3f4ac7309) - URL: https://github.com/kamailio/kamailio/commit/c8e704539cd64ce932b276f455524dd… Author: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-05-12T12:10:47+02:00 mem: add a multiprocess-safe shm_available() new safe_shm_available() function secured with shm_lock() (cherry picked from commit 51e263de80532e297546f17d2f2ed528ffe9731b) - URL: https://github.com/kamailio/kamailio/commit/177a169e4eb883b8a38bdab2ba0dd44… Author: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-05-12T12:10:58+02:00 tls: use multiprocess-safe shm_available() under high load, the values returned by shm_available() can be inconsistent. Use safe_shm_available() instead. (cherry picked from commit 1fe36fa983b8f271165750977120d758faf84d01) - URL: https://github.com/kamailio/kamailio/commit/e463d8333d12b8d320106725938e542… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:12:08+02:00 usrloc: change log level from info to dbg when socket is not local - common scenario when working with shared db, reducing the syslog thoughput - based on a patch by Mickael Marrache (cherry picked from commit 1f2921097316925600573402793b5332a6535e7d) - URL: https://github.com/kamailio/kamailio/commit/f9a0c9b4d49acedc34fead30e69e997… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:12:33+02:00 tls: removed inline specifier and renamed safe_shm_available() - became shm_available_safe() to have the shm_ prefix which common for shm functions - declaring inline in c header file and implementing in c source file makes clang throw compile warnings (cherry picked from commit c4d48f3ae363fb6f6a7d789a0f32b28eb60c2404) - URL: https://github.com/kamailio/kamailio/commit/3d2e3433fd6a3e3f886e1591b116148… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:13:02+02:00 tls: updated to use shm_available_safe() (cherry picked from commit c178f4427af82d6d33101677835c60de1c343073) - URL: https://github.com/kamailio/kamailio/commit/e6c9a20503538b70dc01a9a9ee6299f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:13:43+02:00 acc: DLGCB_TERMINATED callback can be run without received request - the case of local generated bye (cherry picked from commit 1e7e0279bbf53c4a530aa3a8c1d322a68d8090f9) - URL: https://github.com/kamailio/kamailio/commit/cf9e203c912d66e5a498e50b97118af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:14:10+02:00 dialog: run both DLGCB_TERMINATED and DLGCB_TERMINATED_CONFIRMED callbacks for local BYE - only DLGCB_TERMINATED was run, but that resulted in CDRs not being stored by acc for that situation - on a report by Mickael Marrache (cherry picked from commit 265dc95aac8eb4b5cee7992dde55ff08c92a7ac5) - URL: https://github.com/kamailio/kamailio/commit/b5cd3fdea7e37ce3bfb28fcde252012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:15:30+02:00 acc: warning set to debug level if request is missing for dialog cdrs - self generating bye requests don't have incoming request (cherry picked from commit 26543b90f80791b9e2b763fb97d78a8c90e445dc) - URL: https://github.com/kamailio/kamailio/commit/ed2c270ee1b4d447796803c37241a12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:16:58+02:00 textopsx: fixed clang compile warning on comparing bool with char (cherry picked from commit bc5ac8caee55f8d197992fb00b4cb098eeb69843) - URL: https://github.com/kamailio/kamailio/commit/e2f304fb532da500d7fc6c790c4750a… Author: mikomarrache <mikomarrache(a)users.noreply.github.com> Date: 2015-05-12T12:18:09+02:00 db_mongodb: fix typo (cherry picked from commit aa87b852fbfd333f2073ac7390c3f3b6568e0024) - URL: https://github.com/kamailio/kamailio/commit/574c8bab52d3aad39ae21dfb39a756e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:18:44+02:00 permissions: store src ip in zero terminated string for trusted table - it is printed as string via rpc, resulting in invalid chars in the output - reported by Emmanuel Schmidbauer, GH#137 (cherry picked from commit 89642d3cddd90ba3e3f6d310e239492634fa6405) - URL: https://github.com/kamailio/kamailio/commit/e1d8b50c8e262c259c57f91de95efae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:19:02+02:00 permissions: fixed reload trusted rpc command - reported by Emmanuel Schmidbauer, GH#138 (cherry picked from commit 48663e4239f819b42e7035d9f4023c161eb71d05) - URL: https://github.com/kamailio/kamailio/commit/4ba9c0ed412310d97b9a4fda3830d93… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-05-12T12:20:21+02:00 pua_mi: document missing mi_pua_publish parameter "id" (cherry picked from commit 201dc5b600d8516368a54c70af6f02c3ea06353b) - URL: https://github.com/kamailio/kamailio/commit/5b0fa2fedbf4ffc81d0ac322a68bd29… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-05-12T12:20:39+02:00 sctp: fix typo scp_register_rpc -> sctp_register_rpc (cherry picked from commit 177b0d2807763b13d30148f44c1cc4d3d765d67c) - URL: https://github.com/kamailio/kamailio/commit/4f2339fd9f8cff6c2649a22242dd305… Author: Jon Bergli Heier <jon.bergli.heier(a)zisson.no> Date: 2015-05-12T12:22:59+02:00 htable: Add missing ht_slot_unlock in ht_cell_value_add (cherry picked from commit ace37c7a60e5d931216339c179de6e91615dac7e) - URL: https://github.com/kamailio/kamailio/commit/766542727ab054c790fc820e4a09a4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:23:12+02:00 dialog: check if dialog is still in confirmed state when processing keepalive reply (cherry picked from commit 04410aef38f5ed40c8f4a6796d95658407e1597c) - URL: https://github.com/kamailio/kamailio/commit/bf8be8c52039fc50dafd0c9c140c01a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:23:51+02:00 tm: disabled use of dedicated mutex for async continue - it can be enabled by defining ENABLE_ASYNC_MUTEX - reply mutex is re-entrant and protects better the transaction strucutre - a dedicated lock for async continue exposes a race on removing from timer when suspended transaction is resument at the same time when the timer fires expiration event (cherry picked from commit 96b84ba4d7f5ee4a763fe7db81bbf4f9a6a3ef77) - URL: https://github.com/kamailio/kamailio/commit/b4e39387136bf1850a486c4ae5b4970… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:25:48+02:00 dialog: don't send keepalive if dialog not in confirmed state - if dialog is in deleted state, remove it from keep alive list immediately (cherry picked from commit 0e22abe2b89be8936df4b8230955fbaf43ad40e7) - URL: https://github.com/kamailio/kamailio/commit/0a1865e84b2b1e2b5ee06966b91680d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T12:26:09+02:00 presence_dialoginfo: fixed several libxml2 API usage leaks - reported by dkovik, GH#155 (cherry picked from commit 6390b0506856529849ef02001a992db9057c795f)

9 years, 7 months

debian lib dir question

by Juha Heinanen

building of k debian package (jessie) sets LIBDIR like this: DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) LIBDIR ?= lib/$(DEB_HOST_MULTIARCH) if the package is build on amd64 architecture, LIBDIR becomes lib/x86_64-linux-gnu and on i386 architecture lib/i386-linux-gnu. however, when the package is then installed on some host, how can the loadpath for the modules be figured automatically out? dpkg-architecture command cannot be used, because it is not installed unless the host is used for software development. i have tried 'uname -m', but sometimes on i386 arch, it gives i386 and and sometimes i686. -- juha

9 years, 7 months

git:master:4e856f95: rtjon: fixed compile warnings and branch index iteration

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e856f952575722914fa0f609a538ef3fc670a94 URL: https://github.com/kamailio/kamailio/commit/4e856f952575722914fa0f609a538ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-12T10:13:39+02:00 rtjon: fixed compile warnings and branch index iteration --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/4e856f952575722914fa0f609a538ef… Patch: https://github.com/kamailio/kamailio/commit/4e856f952575722914fa0f609a538ef… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 2b46036..f8d6fdf 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -393,7 +393,6 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) str xdsp = {0}; str xuri = {0}; str xhdr = {0}; - unsigned int bflags = 0; unsigned int fr = 0; unsigned int fr_inv = 0; struct lump *anchor = NULL; @@ -574,7 +573,6 @@ int rtjson_next_route(sip_msg_t *msg) srjson_t *nj = NULL; str val; str xname; - int ret; int i; xname.s = "json"; @@ -621,8 +619,10 @@ int rtjson_next_route(sip_msg_t *msg) goto error; } + i = 0; while(nj && i<iavp->val.v.i) { nj = nj->next; + i++; } if(nj==NULL) goto error; @@ -650,7 +650,6 @@ int rtjson_update_branch(sip_msg_t *msg) srjson_t *nj = NULL; str val; str xname; - int ret; int i; xname.s = "json"; @@ -697,8 +696,10 @@ int rtjson_update_branch(sip_msg_t *msg) goto error; } + i = 0; while(nj && i<iavp->val.v.i) { nj = nj->next; + i++; } if(nj==NULL) goto error;

9 years, 7 months

git:master:6390b050: presence_dialoginfo: fixed several libxml2 API usage leaks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6390b0506856529849ef02001a992db9057c795f URL: https://github.com/kamailio/kamailio/commit/6390b0506856529849ef02001a992db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-11T22:13:31+02:00 presence_dialoginfo: fixed several libxml2 API usage leaks - reported by dkovik, GH#155 --- Modified: modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/6390b0506856529849ef02001a992db… Patch: https://github.com/kamailio/kamailio/commit/6390b0506856529849ef02001a992db…

9 years, 7 months

git:master:0e22abe2: dialog: don't send keepalive if dialog not in confirmed state

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e22abe2b89be8936df4b8230955fbaf43ad40e7 URL: https://github.com/kamailio/kamailio/commit/0e22abe2b89be8936df4b8230955fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-11T17:16:09+02:00 dialog: don't send keepalive if dialog not in confirmed state - if dialog is in deleted state, remove it from keep alive list immediately --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/0e22abe2b89be8936df4b8230955fba… Patch: https://github.com/kamailio/kamailio/commit/0e22abe2b89be8936df4b8230955fba… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 1c42bed..536fe32 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -169,8 +169,9 @@ int dlg_ka_run(ticks_t ti) if(*dlg_ka_list_head == *dlg_ka_list_tail) { *dlg_ka_list_head = NULL; *dlg_ka_list_tail = NULL; + } else { + *dlg_ka_list_head = dka->next; } - *dlg_ka_list_head = dka->next; lock_release(dlg_ka_list_lock); /* send keep-alive for dka */ @@ -179,10 +180,16 @@ int dlg_ka_run(ticks_t ti) shm_free(dka); dka = NULL; } else { - if(dka->iflags & DLG_IFLAG_KA_SRC) + if((dka->iflags & DLG_IFLAG_KA_SRC) + && (dlg->state==DLG_STATE_CONFIRMED)) dlg_send_ka(dlg, DLG_CALLER_LEG); - if(dka->iflags & DLG_IFLAG_KA_DST) + if((dka->iflags & DLG_IFLAG_KA_DST) + && (dlg->state==DLG_STATE_CONFIRMED)) dlg_send_ka(dlg, DLG_CALLEE_LEG); + if(dlg->state==DLG_STATE_DELETED) { + shm_free(dka); + dka = NULL; + } dlg_release(dlg); } /* append to tail */

9 years, 7 months

git:master:d3a0cad1: modules/dialog.c: added MI command dlg_end_dlg

by Richard Good

Module: kamailio Branch: master Commit: d3a0cad18d3a38af7c56b9317a0ca59e19a87724 URL: https://github.com/kamailio/kamailio/commit/d3a0cad18d3a38af7c56b9317a0ca59… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-05-11T15:43:19+02:00 modules/dialog.c: added MI command dlg_end_dlg --- Modified: modules/dialog_ng/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/d3a0cad18d3a38af7c56b9317a0ca59… Patch: https://github.com/kamailio/kamailio/commit/d3a0cad18d3a38af7c56b9317a0ca59… --- diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 77e97ebc..cdf54e4 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -915,14 +915,53 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { dlg = lookup_dlg(h_entry, h_id); if (dlg) { //dlg_bye_all(dlg, (rpc_extra_hdrs.len>0)?&rpc_extra_hdrs:NULL); - unref_dlg(dlg, 1); - } + unref_dlg(dlg, 1); +} }*/ +static const char *rpc_end_dlg_entry_id_doc[2] = { + "End a given dialog based on [h_entry] [h_id]", 0 +}; + + + + + +/* Wrapper for terminating dialog from API - from other modules */ +static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { + unsigned int h_entry, h_id; + struct dlg_cell * dlg = NULL; + str rpc_extra_hdrs = {NULL,0}; + int n; + + n = rpc->scan(c, "dd", &h_entry, &h_id); + if (n < 2) { + LM_ERR("unable to read the parameters (%d)\n", n); + rpc->fault(c, 500, "Invalid parameters"); + return; + } + if(rpc->scan(c, "*S", &rpc_extra_hdrs)<1) + { + rpc_extra_hdrs.s = NULL; + rpc_extra_hdrs.len = 0; + } + + dlg = lookup_dlg(h_entry, h_id);//increments ref count! + if(dlg==NULL) { + rpc->fault(c, 404, "Dialog not found"); + return; + } + + unref_dlg(dlg, 1); + + dlg_terminate(dlg, NULL, NULL/*reason*/, 2, NULL); + +} + static rpc_export_t rpc_methods[] = { {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, - //{"dlg.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, + {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, {0, 0, 0, 0} };

9 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015