sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:3d6f5770: websocket: split the addition of info structure for ws.dump rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3d6f5770b456f2ec63d1c722fc7d3c518cb7c326 URL: https://github.com/kamailio/kamailio/commit/3d6f5770b456f2ec63d1c722fc7d3c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-09T12:02:57+01:00 websocket: split the addition of info structure for ws.dump rpc - related to GH #1022 --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/3d6f5770b456f2ec63d1c722fc7d3c5… Patch: https://github.com/kamailio/kamailio/commit/3d6f5770b456f2ec63d1c722fc7d3c5… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 8b0dc84..ad3d216 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -622,8 +622,7 @@ void ws_rpc_dump(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error root reply"); return; } - if(rpc->struct_add(th, "[{", - "connections", &ih, "info", &dh)<0) + if(rpc->struct_add(th, "[", "connections", &ih)<0) { rpc->fault(ctx, 500, "Internal error connections structure"); return; @@ -702,6 +701,11 @@ void ws_rpc_dump(rpc_t* rpc, void* ctx) } WSCONN_UNLOCK; + if(rpc->struct_add(th, "{", "info", &dh)<0) + { + rpc->fault(ctx, 500, "Internal error info structure"); + return; + } if(rpc->struct_add(dh, "ds", "wscounter", connections, "truncated", (truncated==1)?"yes":"no")<0)

7 years, 2 months

git:master:22c07bbd: topos_redis: updated topos dialog update api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 22c07bbd962ea5e0ff814d059c279a435a4e7338 URL: https://github.com/kamailio/kamailio/commit/22c07bbd962ea5e0ff814d059c279a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-09T11:30:44+01:00 topos_redis: updated topos dialog update api --- Modified: src/modules/topos_redis/topos_redis_storage.c Modified: src/modules/topos_redis/topos_redis_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/22c07bbd962ea5e0ff814d059c279a4… Patch: https://github.com/kamailio/kamailio/commit/22c07bbd962ea5e0ff814d059c279a4… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 100e823..6a39f03 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -809,7 +809,8 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) /** * */ -int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) +int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, + uint32_t mode) { char* argv[TPS_REDIS_NR_KEYS]; size_t argvlen[TPS_REDIS_NR_KEYS]; @@ -871,9 +872,14 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) argvlen[argc] = rkey.len; argc++; - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen); + if(mode & TPS_DBU_CONTACT) { + TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + argv, argvlen); + TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + argv, argvlen); + } - if(msg->first_line.type==SIP_REPLY) { + if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { if(sd->b_tag.len<=0 && msg->first_line.u.reply.statuscode>=200 && msg->first_line.u.reply.statuscode<300) { @@ -890,6 +896,10 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) } } + if(argc<=2) { + return 0; + } + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); diff --git a/src/modules/topos_redis/topos_redis_storage.h b/src/modules/topos_redis/topos_redis_storage.h index cdeb56f..a3f62c2 100644 --- a/src/modules/topos_redis/topos_redis_storage.h +++ b/src/modules/topos_redis/topos_redis_storage.h @@ -38,7 +38,8 @@ int tps_redis_insert_branch(tps_data_t *td); int tps_redis_clean_branches(void); int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); -int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); +int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, + uint32_t mode); int tps_redis_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); #endif

7 years, 2 months

git:master:639013a1: topos: reworked dialog update in order to refresh contact values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 639013a14d46790dd5605f58f683317eb6b9f3f4 URL: https://github.com/kamailio/kamailio/commit/639013a14d46790dd5605f58f683317… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-09T11:30:44+01:00 topos: reworked dialog update in order to refresh contact values - related to GH #1005 --- Modified: src/modules/topos/api.h Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/639013a14d46790dd5605f58f683317… Patch: https://github.com/kamailio/kamailio/commit/639013a14d46790dd5605f58f683317…

7 years, 2 months

Kamailio push for Android VoIP Application and VoIP Contacts update

by sscc

good day, i have a running kamailio server having 200 users. I maintain the user ids in a vcf (vCard Format) form. i have developed an Android VoIP application. Android application is given to the user along with the contact vcf. The contact list get increased day by day and consequently the user ids in vcf (vCard Format) as well. the application is also updated. Aim is to update application and the contact list by sending push notification to user. (we don't want to place our application at play store). i want to do push notification from Kamilio server for application and contact list update. Is there any way to do push notification from server to users to update the app and VoIP contact list. regards sscc -- View this message in context: http://sip-router.1086192.n5.nabble.com/Kamailio-push-for-Android-VoIP-Appl… Sent from the Development mailing list archive at Nabble.com.

7 years, 2 months

git:master:498b5c7c: modules: readme files regenerated - ims_charging ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 498b5c7cf541b21f596cd69aa9ebc86c80311c5f URL: https://github.com/kamailio/kamailio/commit/498b5c7cf541b21f596cd69aa9ebc86… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-03-09T09:46:34+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/498b5c7cf541b21f596cd69aa9ebc86… Patch: https://github.com/kamailio/kamailio/commit/498b5c7cf541b21f596cd69aa9ebc86… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index 66a69fd..2d26fba 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -17,7 +17,7 @@ Carlos Ruiz Diaz Copyright © 2013 Smile Communications - Copyright © 2013 ng-voice GmbH + Copyright © 2013-2017 ng-voice GmbH __________________________________________________________________ Table of Contents @@ -61,6 +61,7 @@ Carlos Ruiz Diaz 4.21. video_rating_group(string) 4.22. service_context_id_mcc(string) 4.23. service_context_id_release(string) + 4.24. custom_user_avp (avp string) 5. Functions @@ -113,8 +114,9 @@ Carlos Ruiz Diaz 1.21. video_rating_groupparameter usage 1.22. service_context_id_mccparameter usage 1.23. service_context_id_releaseparameter usage - 1.24. Ro_CCR - 1.25. Ro_set_session_id_avp + 1.24. custom_user_avpparameter usage + 1.25. Ro_CCR + 1.26. Ro_set_session_id_avp Chapter 1. Admin Guide @@ -157,6 +159,7 @@ Chapter 1. Admin Guide 4.21. video_rating_group(string) 4.22. service_context_id_mcc(string) 4.23. service_context_id_release(string) + 4.24. custom_user_avp (avp string) 5. Functions @@ -354,6 +357,7 @@ Chapter 1. Admin Guide 4.21. video_rating_group(string) 4.22. service_context_id_mcc(string) 4.23. service_context_id_release(string) + 4.24. custom_user_avp (avp string) 4.1. hash_size(int) @@ -666,6 +670,23 @@ modparam("ims_charging", "service_context_id_mcc", "262") modparam("ims_charging", "service_context_id_release", "262") ... +4.24. custom_user_avp (avp string) + + When this parameter is set and the contents of the AVP is not empty, + the User-AVP in the Ro-Charging-Request will be based on the this + parameter rather than on the P-Asserted or From-Header. + + This parameter allows you to setup an AVP with which you can customise + the user to be used in the Diameter-Request. + + Default value: if not set, P-Asserted-Identity with a fallback to the + From-Header is used. + + Example 1.24. custom_user_avpparameter usage +... +modparam("ims_charging", "custom_user_avp", "$avp(from_user)") +... + 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, domain, @@ -694,7 +715,7 @@ incoming_trunk_id, outgoing_trunk_id This method is executed asynchronously. See example on how to retrieve return value. - Example 1.24. Ro_CCR + Example 1.25. Ro_CCR ... xlog("L_DBG","Sending initial CCR Request for call\n"); Ro_CCR("RO_ASYNC_TERM_REPLY", "term", 30, "1", "1"); @@ -730,7 +751,7 @@ n"); This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. - Example 1.25. Ro_set_session_id_avp + Example 1.26. Ro_set_session_id_avp ... Ro_set_session_id_avp(); xlog("L_DBG","Ro session AVP has been set: $avp(ro_session_id)\n");

7 years, 2 months

git:5.0:05bd71e3: pkg/kamailio/centos/7: added jansson package

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 05bd71e3c834ae5fa2991a814634b95cbd45a142 URL: https://github.com/kamailio/kamailio/commit/05bd71e3c834ae5fa2991a814634b95… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-03-09T09:43:04+01:00 pkg/kamailio/centos/7: added jansson package (cherry picked from commit ed956f980014ecb3d44fe1531b1655b2ad1ba2ac) --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/05bd71e3c834ae5fa2991a814634b95… Patch: https://github.com/kamailio/kamailio/commit/05bd71e3c834ae5fa2991a814634b95… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 3281184..053fe9a 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -207,6 +207,15 @@ BuildRequires: libxml2-devel %description ims IMS modules and extensions module for Kamailio. +%package jansson +Summary: json string handling and RPC modules for Kamailio using JANSSON library. +Group: System Environment/Daemons +Requires: json-c, libevent, kamailio = %ver +BuildRequires: jansson-devel + +%description jansson +json string handling and RPC modules for Kamailio using JANSSON library. + %package json Summary: json string handling and RPC modules for Kamailio. @@ -559,7 +568,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with dnssec} kdnssec \ %endif - kgeoip kgzcompress khttp_async kims kjson kjsonrpcs \ + kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ %if %{with kazoo} kkazoo \ %endif @@ -582,7 +591,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with dnssec} kdnssec \ %endif - kgeoip kgzcompress khttp_async kims kjson kjsonrpcs \ + kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ %if %{with kazoo} kkazoo \ %endif @@ -1044,6 +1053,13 @@ fi %{_libdir}/kamailio/modules/statsc.so %{_libdir}/kamailio/modules/topos.so +%files jansson +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.jansson +%doc %{_docdir}/kamailio/modules/README.janssonrpcc +%{_libdir}/kamailio/modules/jansson.so +%{_libdir}/kamailio/modules/janssonrpcc.so + %files json %defattr(-,root,root) @@ -1319,6 +1335,8 @@ fi %changelog +* Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> + - added jansson package * Sat Feb 04 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - added http_async_client package - fix http_client package

7 years, 2 months

git:master:ba3556a8: ims_charging: Add a custom_user_avp parameter, to allow a custom from user in Diameter rather than PAI/From

by Carsten Bock

Module: kamailio Branch: master Commit: ba3556a80aef67228980ac377d9722ffc9657487 URL: https://github.com/kamailio/kamailio/commit/ba3556a80aef67228980ac377d9722f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-03-09T09:41:36+01:00 ims_charging: Add a custom_user_avp parameter, to allow a custom from user in Diameter rather than PAI/From --- Modified: src/modules/ims_charging/doc/ims_charging.xml Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ims_ro.h --- Diff: https://github.com/kamailio/kamailio/commit/ba3556a80aef67228980ac377d9722f… Patch: https://github.com/kamailio/kamailio/commit/ba3556a80aef67228980ac377d9722f…

7 years, 2 months

git:master:88b99b53: pkg/kamailio/centos/7: updated version to 5.1.0-dev1

by Victor Seva

Module: kamailio Branch: master Commit: 88b99b53dd35691eae9f488f4b877e3d731473d9 URL: https://github.com/kamailio/kamailio/commit/88b99b53dd35691eae9f488f4b877e3… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-03-09T09:40:26+01:00 pkg/kamailio/centos/7: updated version to 5.1.0-dev1 --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/88b99b53dd35691eae9f488f4b877e3… Patch: https://github.com/kamailio/kamailio/commit/88b99b53dd35691eae9f488f4b877e3… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 6b4abbe..f8207e2 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio -%define ver 5.0.0 -%define rel dev0.0%{dist} +%define ver 5.1.0 +%define rel dev1%{dist} %bcond_with dnssec %bcond_with kazoo @@ -1342,6 +1342,8 @@ fi %changelog * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> + - Updated version to 5.1.0-dev1 +* Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - added jansson package * Sat Feb 04 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - added http_async_client package

7 years, 2 months

git:master:ed956f98: pkg/kamailio/centos/7: added jansson package

by Victor Seva

Module: kamailio Branch: master Commit: ed956f980014ecb3d44fe1531b1655b2ad1ba2ac URL: https://github.com/kamailio/kamailio/commit/ed956f980014ecb3d44fe1531b1655b… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-03-09T09:40:26+01:00 pkg/kamailio/centos/7: added jansson package --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ed956f980014ecb3d44fe1531b1655b… Patch: https://github.com/kamailio/kamailio/commit/ed956f980014ecb3d44fe1531b1655b… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 4458ad1..6b4abbe 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -207,6 +207,15 @@ BuildRequires: libxml2-devel %description ims IMS modules and extensions module for Kamailio. +%package jansson +Summary: json string handling and RPC modules for Kamailio using JANSSON library. +Group: System Environment/Daemons +Requires: json-c, libevent, kamailio = %ver +BuildRequires: jansson-devel + +%description jansson +json string handling and RPC modules for Kamailio using JANSSON library. + %package json Summary: json string handling and RPC modules for Kamailio. @@ -559,7 +568,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with dnssec} kdnssec \ %endif - kgeoip kgzcompress khttp_async kims kjson kjsonrpcs \ + kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ %if %{with kazoo} kkazoo \ %endif @@ -582,7 +591,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with dnssec} kdnssec \ %endif - kgeoip kgzcompress khttp_async kims kjson kjsonrpcs \ + kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ %if %{with kazoo} kkazoo \ %endif @@ -1050,6 +1059,13 @@ fi %{_libdir}/kamailio/modules/statsc.so %{_libdir}/kamailio/modules/topos.so +%files jansson +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.jansson +%doc %{_docdir}/kamailio/modules/README.janssonrpcc +%{_libdir}/kamailio/modules/jansson.so +%{_libdir}/kamailio/modules/janssonrpcc.so + %files json %defattr(-,root,root) @@ -1325,6 +1341,8 @@ fi %changelog +* Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> + - added jansson package * Sat Feb 04 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - added http_async_client package - fix http_client package

7 years, 2 months

[kamailio/kamailio] Centos7 spec fixes (#1025)

by Federico Cabiddu

A couple of patches for Centos 7 spec file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1025 -- Commit Summary -- * pkg/kamailio/centos/7: added jansson package * pkg/kamailio/centos/7: updated version to 5.1.0-dev1 -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1025.patch https://github.com/kamailio/kamailio/pull/1025.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/1025

7 years, 2 months

← Newer
1
...
18
19
20
21
22
23
24
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017