[sr-dev] [kamailio/kamailio] remove lib/kcore/faked_msg.h (#880)
Looks like lib/kcore/faked_msg.h is not needed anymore You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/880 -- Commit Summary -- * modules: faked message api has moved to core * lib/kcore: faked_msg.h not referenced anymore -- File Changes -- M fmsg.h (2) D lib/kcore/faked_msg.h (27) M modules/cnxcc/cnxcc_mod.c (2) M modules/dialog/dialog.c (2) M modules/dialog/dlg_handlers.c (2) M modules/dispatcher/dispatch.c (2) M modules/erlang/handle_emsg.c (2) M modules/evapi/evapi_dispatch.c (2) M modules/evapi/evapi_mod.c (2) M modules/htable/ht_api.c (2) M modules/htable/htable.c (2) M modules/http_async_client/async_http.c (2) M modules/http_async_client/http_async_client_mod.c (2) M modules/ims_dialog/dlg_handlers.c (2) M modules/ims_dialog/ims_dialog.c (2) M modules/kazoo/kz_amqp.h (2) M modules/mqueue/mqueue_api.c (2) M modules/registrar/regpv.c (2) M modules/rtimer/rtimer_mod.c (2) M modules/uac/uac_send.c (2) M modules/websocket/ws_conn.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/880.patch https://github.com/kamailio/kamailio/pull/880.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/880 ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:938ac5e7: modules/ims_qos: added patch for flow-description bug when request originates from called party
Module: kamailio Branch: master Commit: 938ac5e7223001fb9e3b748262283d323a23c539 URL: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d323a23c539 Author: Richard GoodCommitter: Richard Good Date: 2016-12-02T16:30:10+02:00 modules/ims_qos: added patch for flow-description bug when request originates from called party Fix for incorrect IP swap in flow description AVP when called party originates a request that triggers Rx --- Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d323a23c539.diff Patch: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d323a23c539.patch --- diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 8ba6f4e..f23740b 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -436,8 +436,15 @@ int add_media_components(AAAMessage* aar, struct sip_msg *req, sdp_session_cell_t* req_sdp_session, *rpl_sdp_session; sdp_stream_cell_t* req_sdp_stream, *rpl_sdp_stream; int add_flow = 1; - -if (!req || !rpl) { + str ttag = {0, 0}; + str ftag = {0, 0}; + int request_originated_from_callee = 0; + str ipA, ipB; + + rx_authsessiondata_t* p_session_data = 0; +p_session_data = (rx_authsessiondata_t*) auth->u.auth.generic_data; + + if (!req || !rpl) { goto error; } @@ -497,23 +504,57 @@ int add_media_components(AAAMessage* aar, struct sip_msg *req, if(add_flow) { - str ipA = req_sdp_session->ip_addr; - str ipB = rpl_sdp_session->ip_addr; + + if (cscf_get_to_tag(rpl, ) && cscf_get_from_tag(rpl, )) { + LM_DBG("Original ftag [%.*s] ttag [%.*s]. Current ftag [%.*s] ttag [%.*s]\n", + p_session_data->ftag.len, p_session_data->ftag.s, p_session_data->ttag.len, p_session_data->ttag.s, + ftag.len, ftag.s, ttag.len, ttag.s); + if (!(strncmp(p_session_data->ttag.s, ttag.s, p_session_data->ttag.len) == 0 && strncmp(p_session_data->ftag.s, ftag.s, p_session_data->ftag.len) == 0)) { + LM_DBG("ftag and ttag of this response do not match initial response so this request came from callee\n"); + request_originated_from_callee = 1; + } + } else { + LM_ERR("Couldn't retrieve ftag so assume this request originated from caller\n"); + } + + if (request_originated_from_callee) { + LM_DBG("Request originated from callee so IPs are reversed\n"); + ipA = rpl_sdp_session->ip_addr; + ipB = req_sdp_session->ip_addr; + } else { + ipA = req_sdp_session->ip_addr; + ipB = rpl_sdp_session->ip_addr; + } + if (ipA.len <= 0) { - LM_DBG("Request SDP connection IP could not be retrieved, so we use SDP 1st stream IP"); - ipA = req_sdp_stream->ip_addr; + LM_DBG("Request SDP connection IP could not be retrieved, so we use SDP 1st stream IP\n"); + if (request_originated_from_callee) { + LM_DBG("Request originated from callee so IPs are reversed\n"); + ipA = rpl_sdp_stream->ip_addr; + } else { + ipA = req_sdp_stream->ip_addr; +
Re: [sr-dev] [kamailio/kamailio] sipcapture: expose pv $hep(src_ip) (#879)
@adubovikov I hope this is better. If you find I'm not adhering in any way to guidelines, please point them out as it's my first time contributing. Many thanks! David -- 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/879#issuecomment-264459253___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] sipcapture: expose pv $hep(src_ip) (#879)
- modified pv_parse_hep_name() and pv_get_hep() to expose the HEP's packet source ip address on replies. The associated pv $hep(src_ip), i.e.: onreply_route { ... xlog("[onreply_route] Source IP: $hep(src_ip)\n"); ... } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/879 -- Commit Summary -- * sipcapture: expose pv $hep(src_ip) -- File Changes -- M modules/sipcapture/sipcapture.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/879.patch https://github.com/kamailio/kamailio/pull/879.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/879 ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] kamailio crashes on CANCEL due to empty reply_lumps (#872)
Hi @miconda, thanks for the good point. There was indeed another call to append_to_reply in failure_route, rather due to an oversight than by intention. After removing it I'm not getting any new crashes. -- 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/872#issuecomment-264448340___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] sipcapture: expose pv $hep(src_ip) (#877)
Closed #877. -- 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/877#event-879881875___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Sipcapture: When inserting a reply, this module would insert the SIP … (#876)
I've been looking into Homer's source code, and you are correct. It's easier doing it on the resultCtrl.js. In any case, this has been a good exercise for me in terms of working with Kamailio's source code, as I'm just a beginner. Thanks! -- 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/876#issuecomment-264429830___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Sipcapture: When inserting a reply, this module would insert the SIP … (#876)
Closed #876. -- 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/876#event-879833214___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] kamailio crashes on CANCEL due to empty reply_lumps (#872)
Are you adding the reply headers in the failure_route? Or in the request_route? The transaction is not deleted immediately once it is cancelled (or sends out a negative response), but it is kept in memory for wait_time to absorb the retransmissions. So this situation might be in the case one adds reply lumps (headers to replies) in a failure route, which are deleted once the failure route is executed... -- 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/872#issuecomment-264427030___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [SR-Users] VERY IMPORTANT: deciding when to remove the MI code
On 02/12/2016 11:21, Alex Hermann wrote: > On donderdag 1 december 2016 15:17:18 CET Daniel-Constantin Mierla wrote: >> RPC is the alternative, a more standardized >> concept, with better structured format. > Before removing MI and letting everyone move to RPC, it might be wise to go > over all RPC interfaces and fix them to be neat , sane and somewhat > consistent. > For example, there are still interfaces coding arrays as hashes with multiple > identically named fields (htable.dump is one i recently ran into) . There is > no > language and/or JSON/XML library i know of that can properly handle those > (most of them will just end up with the last entry). In such case the value can be constructed as an array. And I think leaving it at the free will means it won't happen -- we aimed at this since 2008 more or less. Hopefully there are only of few cases that need fixes and can be done while testing 5.0. But for htable there should not be more than one item with the same name, so such situation should not be for htable.dump. Can you give an example that you encountered, how do you set two items with same name? Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio crashes when it receives a 404 reply to an INVITE originated after a 302. (#875)
The backtrace is not pointing correctly to source code -- the lines in the files referred in the first frames of the backtrace are not containing related code. Can you reproduce the issue and attach the backtrace full from a new core file? Be sure you use latest version of branch 4.4 (nightly builds from branch 4.4 -- hopefully the debs are still created), it will help being sure it is not something fixed since release of 4.4.4. -- 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/875#issuecomment-264422843___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] ratelimit module not working properly when FEEDBACK algorithm is used (#873)
Anyone having more comments on this pull request or issue #871? I all fine I will merge. Also, I guess that the pipelimit is affected as well. -- 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/873#issuecomment-264421117___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] implement pua.publish rpc command in order to get rid of mi interface (#878)
There was also another later thread related to my pua.publish effort: http://lists.sip-router.org/pipermail/sr-dev/2014-December/026293.html -- 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/878#issuecomment-264403198___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] implement pua.publish rpc command in order to get rid of mi interface (#878)
There is currently no rpc version of mi pua_publish. I once tried to implement it, but was not successful: http://lists.sip-router.org/pipermail/sr-dev/2014-November/026177.html Perhaps someone else could complete the job. -- Juha -- 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/878___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b72af394: modules: readme files regenerated - jsonrpc-s ...
Module: kamailio Branch: master Commit: b72af394936be5b69cb83ff768f11e2dc33bfc19 URL: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2dc33bfc19 Author: Kamailio DevCommitter: Kamailio Dev Date: 2016-12-02T09:16:18+01:00 modules: readme files regenerated - jsonrpc-s ... --- Modified: modules/jsonrpc-s/README --- Diff: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2dc33bfc19.diff Patch: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2dc33bfc19.patch ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [SR-Users] VERY IMPORTANT: deciding when to remove the MI code
On 02/12/2016 00:24, Juha Heinanen wrote: > Brandon Armstead writes: > >> +1 - I'm all for cleaning up any technical debt and moving on with more >> normalized concept. > I'm also in favor of getting rid on MI interface. I'm myself relying > only on one MI command (pua_publish) for which an RPC command does not > exist (or did not exist last time when I checked). > > Some years ago I tried to implement RPC version of pua_publish, but was > not able to get the call back working correctly. I also sent some > messages including a piece of code to the dev list, but it was a dead > end then. > > Very nice if pua.publish would see a day of light again. Can you find that discussion in the archive? Open an item on bug tracker and add the link to the discussion there, so we don't forget about it. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:e8086c7d: kamctl: implemented moni command for jsonrpc engine
Module: kamailio Branch: master Commit: e8086c7db45d5b0136e4c5871cb1a2c5a0e1d5d5 URL: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c5a0e1d5d5 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2016-12-02T08:43:10+01:00 kamctl: implemented moni command for jsonrpc engine --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c5a0e1d5d5.diff Patch: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c5a0e1d5d5.patch --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 5fa09a1..27929dd 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -204,15 +204,23 @@ rpc_kamailio_monitor() { cat < $path | filter_fl & cat > $RPCFIFOPATH < $RPCFIFOPATH << EOF -:uptime:$name - +{ + "jsonrpc": "2.0", + "method": "core.uptime", + "reply_name": "${name}", + "id": $$ +} EOF wait echo @@ -220,11 +228,13 @@ EOF mecho "Transaction Statistics: " cat < $path | filter_fl & cat > $RPCFIFOPATH < $RPCFIFOPATH < $RPCFIFOPATH
[sr-dev] git:master:10912437: jsonrpc-s: use same name when setting user/group via str/int values
Module: kamailio Branch: master Commit: 10912437a992048c4b5ab297ace4f29cbf9b9f3d URL: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29cbf9b9f3d Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2016-12-02T09:01:34+01:00 jsonrpc-s: use same name when setting user/group via str/int values --- Modified: modules/jsonrpc-s/jsonrpc-s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29cbf9b9f3d.diff Patch: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29cbf9b9f3d.patch --- diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index eb91b02..488ca62 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -155,9 +155,9 @@ static param_export_t params[] = { {"dgram_timeout",PARAM_INT,_dgram_timeout}, {"dgram_mode", PARAM_INT,_dgram_unix_socket_mode}, {"dgram_group", PARAM_STRING, _dgram_unix_socket_gid_s}, - {"dgram_group_id", PARAM_INT,_dgram_unix_socket_gid}, + {"dgram_group", PARAM_INT,_dgram_unix_socket_gid}, {"dgram_user", PARAM_STRING, _dgram_unix_socket_uid_s}, - {"dgram_user_id",PARAM_INT,_dgram_unix_socket_uid}, + {"dgram_user", PARAM_INT,_dgram_unix_socket_uid}, {0, 0, 0} }; ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:cf5a7487: jsonrpc-s: added documentation for datagram transport
Module: kamailio Branch: master Commit: cf5a748719e4770e481601e75adb3e89b33d910b URL: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e89b33d910b Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2016-12-02T09:00:46+01:00 jsonrpc-s: added documentation for datagram transport --- Modified: modules/jsonrpc-s/doc/jsonrpc-s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e89b33d910b.diff Patch: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e89b33d910b.patch ___ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev