sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:3d6bf976: modules: readme files regenerated - sdpops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3d6bf976944580a06a9019966e4af5850bc9b7d8 URL: https://github.com/kamailio/kamailio/commit/3d6bf976944580a06a9019966e4af58… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-16T09:01:26+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/3d6bf976944580a06a9019966e4af58… Patch: https://github.com/kamailio/kamailio/commit/3d6bf976944580a06a9019966e4af58… --- diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 573e1fc68a..6e6fa7ff08 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -35,7 +35,7 @@ Daniel-Constantin Mierla 4.7. sdp_with_active_media(type) 4.8. sdp_remove_media(type) 4.9. sdp_with_transport(type) - 4.10. sdp_with_transport_like(string) + 4.10. sdp_with_transport_like(type) 4.11. sdp_transport(pv) 4.12. sdp_remove_transport(type) 4.13. sdp_with_codecs_by_id(list) @@ -90,7 +90,7 @@ Chapter 1. Admin Guide 4.7. sdp_with_active_media(type) 4.8. sdp_remove_media(type) 4.9. sdp_with_transport(type) - 4.10. sdp_with_transport_like(string) + 4.10. sdp_with_transport_like(type) 4.11. sdp_transport(pv) 4.12. sdp_remove_transport(type) 4.13. sdp_with_codecs_by_id(list) @@ -142,7 +142,7 @@ Chapter 1. Admin Guide 4.7. sdp_with_active_media(type) 4.8. sdp_remove_media(type) 4.9. sdp_with_transport(type) - 4.10. sdp_with_transport_like(string) + 4.10. sdp_with_transport_like(type) 4.11. sdp_transport(pv) 4.12. sdp_remove_transport(type) 4.13. sdp_with_codecs_by_id(list) @@ -329,26 +329,27 @@ sdp_remove_media("video"); 4.9. sdp_with_transport(type) Return true of the SDP has 'media=media port type ...' line. Useful to - check the transport of the RTP sessions, such as 'RTP/AVP', 'RTP/SAVP' - or 'RTP/SAVPF'. The parameter can be static string or variable holding - the transport type. + check the transport of the RTP sessions, such as 'RTP/AVP', 'RTP/SAVP', + 'RTP/SAVPF' or 'UDP/TLS/RTP/SAVPF'. The parameter can be static string + or variable holding the transport type. The function does an exact + match of the strings. This function can be used from ANY_ROUTE. Example 1.9. sdp_with_transport usage ... # check for RTP/SAVP stream -if(sdp_with_transport("RTP/SAVP")) +if(sdp_with_transport("UDP/TLS/RTP/SAVPF")) { - # the session has a SRTP/SAVP stream + # the session has a UDP/TLS/RTP/SAVPF stream } ... -4.10. sdp_with_transport_like(string) +4.10. sdp_with_transport_like(type) Returns true if the SDP has 'media=media port type ...' line, where - type contains string. The parameter can be static string or variable - holding a string. + type contains the string in the parameter. The parameter can be static + string or variable holding a string. This function can be used from ANY_ROUTE.

7 years

git:master:cad4b8f4: sdpops: more details for sdp_with_transport() docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cad4b8f456d3508a2ec3196c89a4a8e3ce9d9d32 URL: https://github.com/kamailio/kamailio/commit/cad4b8f456d3508a2ec3196c89a4a8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-16T08:55:30+02:00 sdpops: more details for sdp_with_transport() docs --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cad4b8f456d3508a2ec3196c89a4a8e… Patch: https://github.com/kamailio/kamailio/commit/cad4b8f456d3508a2ec3196c89a4a8e… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 53a255209c..7065f688b1 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -10,13 +10,13 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module provides functions for checking and managing the + This module provides functions for checking and managing the <acronym>SDP</acronym> payloads of SIP messages. </para> <para> @@ -321,9 +321,11 @@ sdp_remove_media("video"); <function moreinfo="none">sdp_with_transport(type)</function> </title> <para> - Return true of the SDP has 'media=media port type ...' line. Useful to check - the transport of the RTP sessions, such as 'RTP/AVP', 'RTP/SAVP' or 'RTP/SAVPF'. The - parameter can be static string or variable holding the transport type. + Return true of the SDP has 'media=media port type ...' line. Useful to + check the transport of the RTP sessions, such as 'RTP/AVP', 'RTP/SAVP', + 'RTP/SAVPF' or 'UDP/TLS/RTP/SAVPF'. The parameter can be static string + or variable holding the transport type. The function does an exact + match of the strings. </para> <para> This function can be used from ANY_ROUTE. @@ -333,9 +335,9 @@ sdp_remove_media("video"); <programlisting format="linespecific"> ... # check for RTP/SAVP stream -if(sdp_with_transport("RTP/SAVP")) +if(sdp_with_transport("UDP/TLS/RTP/SAVPF")) { - # the session has a SRTP/SAVP stream + # the session has a UDP/TLS/RTP/SAVPF stream } ... </programlisting> @@ -343,11 +345,11 @@ if(sdp_with_transport("RTP/SAVP")) </section> <section id="sdpops.f.sdp_with_transport_like"> <title> - <function moreinfo="none">sdp_with_transport_like(string)</function> + <function moreinfo="none">sdp_with_transport_like(type)</function> </title> <para> Returns true if the SDP has 'media=media port type ...' line, - where type contains string. The + where type contains the string in the parameter. The parameter can be static string or variable holding a string. </para> <para>

7 years

git:5.0:7859dd23: core: build reply of core.sockets_list as an array

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 7859dd239303f6f98f99a2bace8d7a05b49e337c URL: https://github.com/kamailio/kamailio/commit/7859dd239303f6f98f99a2bace8d7a0… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-15T14:51:14+02:00 core: build reply of core.sockets_list as an array (cherry picked from commit e3ea10ccfcd94af0e7ce6908a1e378b4a9555b93) --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/7859dd239303f6f98f99a2bace8d7a0… Patch: https://github.com/kamailio/kamailio/commit/7859dd239303f6f98f99a2bace8d7a0… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index b7e4b020bb..096ac82db9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -920,7 +920,7 @@ static void core_sockets_list(rpc_t* rpc, void* c) unsigned short proto; proto=PROTO_UDP; - rpc->add(c, "{", &hr); + rpc->add(c, "[", &hr); do{ list=get_sock_info_list(proto); for(si=list?*list:0; si; si=si->next){ @@ -991,7 +991,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

git:master:a545a1ad: Merge pull request #1187 from grumvalski/sockets_list_fix

by GitHub

Module: kamailio Branch: master Commit: a545a1ad3367fef4e8a5a4a4cd4f9157623f6cf9 URL: https://github.com/kamailio/kamailio/commit/a545a1ad3367fef4e8a5a4a4cd4f915… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-15T14:50:30+02:00 Merge pull request #1187 from grumvalski/sockets_list_fix core: build reply of core.sockets_list as an array --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a545a1ad3367fef4e8a5a4a4cd4f915… Patch: https://github.com/kamailio/kamailio/commit/a545a1ad3367fef4e8a5a4a4cd4f915… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index b7e4b020bb..096ac82db9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -920,7 +920,7 @@ static void core_sockets_list(rpc_t* rpc, void* c) unsigned short proto; proto=PROTO_UDP; - rpc->add(c, "{", &hr); + rpc->add(c, "[", &hr); do{ list=get_sock_info_list(proto); for(si=list?*list:0; si; si=si->next){ @@ -991,7 +991,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

git:master:e3ea10cc: core: build reply of core.sockets_list as an array

by grumvalski

Module: kamailio Branch: master Commit: e3ea10ccfcd94af0e7ce6908a1e378b4a9555b93 URL: https://github.com/kamailio/kamailio/commit/e3ea10ccfcd94af0e7ce6908a1e378b… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-07-15T09:03:03+02:00 core: build reply of core.sockets_list as an array --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/e3ea10ccfcd94af0e7ce6908a1e378b… Patch: https://github.com/kamailio/kamailio/commit/e3ea10ccfcd94af0e7ce6908a1e378b… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index b7e4b020bb..096ac82db9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -920,7 +920,7 @@ static void core_sockets_list(rpc_t* rpc, void* c) unsigned short proto; proto=PROTO_UDP; - rpc->add(c, "{", &hr); + rpc->add(c, "[", &hr); do{ list=get_sock_info_list(proto); for(si=list?*list:0; si; si=si->next){ @@ -991,7 +991,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

[kamailio/kamailio] core: build reply of core.sockets_list as an array (#1187)

by Federico Cabiddu

I realized with more tests that my previous commit for core.sockets_list 38f514064a326f759e0e88adeffd03b32b35d6c0 is not working. The result is returned yes as an array but inside there is still the sockets list as an object (so with multiple "socket" keys). Digging more in kamailio json lib I understood that to be considered an array the rpc result must be enclosed in "[]". I was misled by a wrong test result, sorry for the noise. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1187 -- Commit Summary -- * core: build reply of core.sockets_list as an array -- File Changes -- M src/core/core_cmd.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1187.patch https://github.com/kamailio/kamailio/pull/1187.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/1187

7 years

git:master:19f37c94: core: dns cache condition for both proto ws and wss

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 19f37c944748c72a7069a4fd5e3d8c6160a1e557 URL: https://github.com/kamailio/kamailio/commit/19f37c944748c72a7069a4fd5e3d8c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T09:25:44+02:00 core: dns cache condition for both proto ws and wss --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/19f37c944748c72a7069a4fd5e3d8c6… Patch: https://github.com/kamailio/kamailio/commit/19f37c944748c72a7069a4fd5e3d8c6… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 577eb48d1f..e37361ffbb 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2668,7 +2668,7 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, return ip_addr2he(name,ip); } - if(srv_proto==PROTO_WS || srv_proto==PROTO_WS) { + if(srv_proto==PROTO_WS || srv_proto==PROTO_WSS) { /* no srv records for web sockets */ return 0; }

7 years

git:master:6b82a103: auth_xkeys: use the right size when initializing xkeys list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b82a103650fd0036490cf02dffcc5ad50c6f669 URL: https://github.com/kamailio/kamailio/commit/6b82a103650fd0036490cf02dffcc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T09:09:04+02:00 auth_xkeys: use the right size when initializing xkeys list --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/6b82a103650fd0036490cf02dffcc5a… Patch: https://github.com/kamailio/kamailio/commit/6b82a103650fd0036490cf02dffcc5a… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 65a8dd16ce..ad3bed70d6 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -59,7 +59,7 @@ int auth_xkeys_list_init(void) { if(_auth_xkeys_list!=NULL) return 0; - _auth_xkeys_list = shm_malloc(sizeof(auth_xkey_t)); + _auth_xkeys_list = shm_malloc(sizeof(auth_xkey_t*)); if(_auth_xkeys_list==NULL) { LM_ERR("no more shared memory\n"); return -1;

7 years

git:master:59dde423: speeddial: add missing break when handling blob db result type

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59dde423db52e7a8c69072685c99cd6a11440017 URL: https://github.com/kamailio/kamailio/commit/59dde423db52e7a8c69072685c99cd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T09:05:18+02:00 speeddial: add missing break when handling blob db result type --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/59dde423db52e7a8c69072685c99cd6… Patch: https://github.com/kamailio/kamailio/commit/59dde423db52e7a8c69072685c99cd6… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index 13c7095db8..c4f655efce 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -196,6 +196,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) RES_ROWS(db_res)[0].values[0].val.blob_val.len); user_s.len = RES_ROWS(db_res)[0].values[0].val.blob_val.len; user_s.s[user_s.len] = '\0'; + break; default: LM_ERR("unknown type of DB new_uri column\n"); if (db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0)

7 years

git:master:5a577ab3: cnxcc: safety check for credit data search return value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a577ab37719d48fb9a6bc1b200c8892d95ccbdc URL: https://github.com/kamailio/kamailio/commit/5a577ab37719d48fb9a6bc1b200c889… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-15T09:01:38+02:00 cnxcc: safety check for credit data search return value --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a577ab37719d48fb9a6bc1b200c889… Patch: https://github.com/kamailio/kamailio/commit/5a577ab37719d48fb9a6bc1b200c889… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index ef897460e3..91a914f8d1 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -914,14 +914,21 @@ void terminate_all_calls(credit_data_t *credit_data) { LM_ERR("BUG: Something went terribly wrong\n"); return; } - - cd_entry = str_hash_get(hts->credit_data_by_client, credit_data->call_list->client_id.s, credit_data->call_list->client_id.len); + cd_entry = str_hash_get(hts->credit_data_by_client, + credit_data->call_list->client_id.s, + credit_data->call_list->client_id.len); + + if(cd_entry==NULL) { + LM_WARN("credit data itme not found\n"); + return; + } credit_data->deallocating = 1; clist_foreach_safe(credit_data->call_list, call, tmp, next) { if(call->sip_data.callid.s!=NULL) { - LM_DBG("Killing call with CID [%.*s]\n", call->sip_data.callid.len, call->sip_data.callid.s); + LM_DBG("Killing call with CID [%.*s]\n", call->sip_data.callid.len, + call->sip_data.callid.s); /* * Update number of calls forced to end @@ -936,29 +943,29 @@ void terminate_all_calls(credit_data_t *credit_data) { cnxcc_lock(hts->lock); - if (_data.redis) { + if (_data.redis) { redis_clean_up_if_last(credit_data); shm_free(credit_data->str_id); } - + /* * Remove the credit_data_t from the hash table */ str_hash_del(cd_entry); - + cnxcc_unlock(hts->lock); - + /* * Free client_id in list's root */ shm_free(credit_data->call_list->client_id.s); shm_free(credit_data->call_list); - + /* * Release the lock since we are going to free the entry down below */ cnxcc_unlock(credit_data->lock); - + /* * Free the whole entry */

7 years

← Newer
1
...
24
25
26
27
28
29
30
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017