sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

git:master:3636551e: tm: uac: Add failover support for local requests

by Alex Hermann

Module: kamailio Branch: master Commit: 3636551ec6a97fbfa9bdea551534adf78c1d6770 URL: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T11:53:59+02:00 tm: uac: Add failover support for local requests DNS failover code needs a uas and a dns_h to function. By creating the new cell earlier, dst2dst2 can put the dns_h into the cell instead of in a throwaway variable. The UAS is set to a faked message created from the outgoing request. --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf… Patch: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf…

7 years, 8 months

[kamailio/kamailio] The changes in this PR implement DNS failover for locally generated requests (#727)

by Alex

The first patch does the actual failover part. Second is for readability. Third adds onsend_route support for local requests. This fixes #210. As this touches tm, a review would be welcomed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/727 -- Commit Summary -- * tm: uac: Add failover support for local requests * tm: uac: Split t_uac_prepare * tm: uac: Add support for onsend route to local request -- File Changes -- M modules/tm/uac.c (447) -- Patch Links -- https://github.com/kamailio/kamailio/pull/727.patch https://github.com/kamailio/kamailio/pull/727.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/727

7 years, 8 months

[kamailio] uac module (uac_req_send, register) doesn't do failover (#210)

by Alex

Requests send with uac module's functions like uac_req_send() and remote registrations use the TM module, but don't actually do (DNS) failover when a destination is unreachable or sends a 503. In the tm's uac.c, t_uac_prepare() function, i can already see that the dns handle is stored in a throwaway variable instead of in the transaction, but fixing the issue isn't as simple as just storing it in the transaction (print_uac_request_from_buf() needs a uas in the transaction). Due to github not supporting attachments to issues, the sample config and debug log are inline.... :( DNS entry: ``` $ host -t SRV _sip._udp.failover.test.speakup.nl _sip._udp.failover.test.speakup.nl has SRV record 10 0 1111 try1.test.speakup.nl. _sip._udp.failover.test.speakup.nl has SRV record 100 0 2222 try2.test.speakup.nl. ``` Log snippet: ```syslog Jun 15 10:00:03 rio UACFailover[18178]: INFO: <script>: Sending OPTIONS request to sip:failover.test.speakup.nl Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.failover.test.speakup.nl(34), 33), h=825 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [resolve.c:937]: get_record(): skipping 8 NS (p=0x9ea284, end=0x9ea3e9) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [resolve.c:952]: get_record(): parsing 9 ARs (p=0x9ea335, end=0x9ea3e9) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:1741]: dns_get_related(): (0x7f225233eb38 (_sip._udp.failover.test.speakup.nl, 33), 33, *0x7f2257baf2b8) (0) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding _sip._udp.failover.test.speakup.nl(34) 33 (flags=0) at 825 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding try1.test.speakup.nl(20) 1 (flags=0) at 310 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding try2.test.speakup.nl(20) 1 (flags=0) at 307 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:2336]: dns_srv_get_nxt_rr(): (0x7f225233eb38, 0, 0, 1597643831): selected 0/1 in grp. 0 (rand_w=0, rr=0x7f225233eba0 rd=0x7f225233ebb8 p=10 w=0 rsum=0) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (try1.test.speakup.nl(20), 1), h=310 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:2926]: dns_a_resolve(): (try1.test.speakup.nl, 0) returning 0 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:3169]: dns_srv_resolve_ip(): ("_sip._udp.failover.test.speakup.nl", 0, 0), ret=0, ip=192.168.1.245 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:3260]: dns_srv_sip_resolve(): (failover.test.speakup.nl, 0, 0), srv0, ret=0 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 54501 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:351]: t_uac_prepare(): executing event_route[tm:local-request] Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:606]: parse_msg(): SIP Request: Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:608]: parse_msg(): method: <OPTIONS> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:610]: parse_msg(): uri: <sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:612]: parse_msg(): version: <SIP/2.0> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK5e4d.47adbbf5000000000000000000000000.0>; state=16 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:173]: get_hdr_field(): DEBUG: get_hdr_field: <To> [22]; uri=[sip:to.example.com] Jun 15 10:00:03 rio UACFailover[18178]: [97B blob data] Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:153]: get_hdr_field(): get_hdr_field: cseq <CSeq>: <10> <OPTIONS> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: pv [pv_core.c:376]: pv_get_xto_attr(): no Tag parameter Jun 15 10:00:03 rio UACFailover[18178]: INFO: <script>: [udp:172.28.4.128:6789] [10 OPTIONS] Request (cid: 6cd531e47cc63e20-18178(a)172.28.4.128 Branch: -1 ToTag: <null> len:382) To <sip:failover.test.speakup.nl> via <sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:1230]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=408 Jun 15 10:00:05 rio UACFailover[18176]: WARNING: tm [t_reply.c:957]: run_failure_handlers(): Warning: run_failure_handlers: no UAC support (1, 0) Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:2016]: local_reply(): DEBUG: local_reply: branch=0, save=0, winner=0 Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:2053]: local_reply(): DEBUG: local transaction completed ``` Sample config: ```python #------------------ # Flags #------------------ debug=3 memdbg=5 mem_summary=5 #fork=no # This option should not be present to enable forking but disable daemonize, also -D commandline parameter is needed log_stderror=no sip_warning=no listen=172.28.4.128 port=6789 children=2 shm_mem_size=64 log_name="UACFailover" check_via=no # (cmd. line: -v) dns=no # (cmd. line: -r) rev_dns=no # (cmd. line: -R) dns_use_search_list=no use_dns_failover=yes dns_srv_lb=yes disable_tcp=yes mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" loadmodule "pv.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "xlog.so" loadmodule "rr.so" loadmodule "uac.so" loadmodule "rtimer.so" # ----------------------------------------------------------------- # Module settings # ----------------------------------------------------------------- modparam("pv", "varset", "server=s:LOGNAME") modparam("tm", "auto_inv_100", 0) # Time until provisional response (eg "100 Trying") is received modparam("tm", "fr_timer", 2000) # Time to await final response on INVITE per branch (eg per branch ring time) modparam("tm", "fr_inv_timer", 10000) # Time to await final response on INVITE (eg ring time) modparam("tm", "max_inv_lifetime", 20000) modparam("tm", "restart_fr_on_each_reply", 0) modparam("tm", "failure_reply_mode", 3) modparam("rtimer", "timer", "name=uac;interval=10;mode=1;") modparam("rtimer", "exec", "timer=uac;route=TIMER") route { xlog("L_NOTICE", "[$pr:$si:$sp] [$cs $rm] Request. (cid: $ci <$fu> => <$ru> len: $ml)"); drop(); } event_route[tm:local-request] { xlog("L_INFO", " [$pr:$si:$sp] [$cs $rm] Request (cid: $ci Branch: $T_branch_idx ToTag: $tt len:$ml) To <$ru> via <$du>"); } onreply_route { xlog("L_INFO", " [$pr:$si:$sp] [$cs $rm] Reply (cid: $ci Branch: $T_branch_idx Status: $rs $rr ToTag: $tt len:$ml)"); } route[TIMER] { if not $var(done) == 1 { $var(done) = 1; $uac_req(method) = "OPTIONS"; $uac_req(ruri) = "sip:failover.test.speakup.nl"; $uac_req(furi) = "sip:from.example.com"; $uac_req(turi) = "sip:to.example.com"; xlog("L_INFO", "Sending $uac_req(method) request to $uac_req(ruri)"); uac_req_send(); } } ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/210

7 years, 8 months

git:master:597242df: http_async_client: init PV API sooner

by Camille Oudot

Module: kamailio Branch: master Commit: 597242dfbfd883d136aa49d88266fc9edb6b8e09 URL: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-08-30T11:43:26+02:00 http_async_client: init PV API sooner fixes #760 --- Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… Patch: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 54a0878..74900d0 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -54,6 +54,7 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" + #include "async_http.h" MODULE_VERSION @@ -227,6 +228,18 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + pv_register_api_t pvra; + + pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); + if (!pvra) { + LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); + return -1; + } + pvra(&pv_api); + return 0; +} /** * init module function @@ -234,7 +247,6 @@ struct module_exports exports = { static int mod_init(void) { unsigned int n; - pv_register_api_t pvra; LM_INFO("Initializing Http Async module\n"); #ifdef STATISTICS @@ -295,13 +307,6 @@ static int mod_init(void) memset(&tmb, 0, sizeof(tm_api_t)); } - pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); - if (!pvra) { - LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); - return -1; - } - pvra(&pv_api); - /* allocate workers array */ workers = shm_malloc(num_workers * sizeof(*workers)); if(workers == NULL) {

7 years, 8 months

[kamailio/kamailio] modules/sipcapture: fixed priorisation X-RTP headers (#761)

by Alexandr Dubovikov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/761 -- Commit Summary -- * modules/sipcapture fixed priorisation X-RTP headers -- File Changes -- M modules/sipcapture/sipcapture.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/761.patch https://github.com/kamailio/kamailio/pull/761.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/761

7 years, 8 months

git:master:46c59ce6: Merge pull request #761 from adubovikov/master

by GitHub

Module: kamailio Branch: master Commit: 46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8 URL: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-29T16:37:47+02:00 Merge pull request #761 from adubovikov/master modules/sipcapture: fixed priorisation X-RTP headers --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… Patch: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 33c96cd..466b7d7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1840,8 +1840,16 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * sco.originator_port = 0; } + /* X-RTP-Stat-Add */ + if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } + /* X-RTP-Stat-T38 */ + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } /* X-RTP-Stat */ - if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } /* P-RTP-Stat */ @@ -1860,17 +1868,8 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else if((tmphdr[3] = get_hdr_by_name(msg,"RTP-RxStat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } - /* X-RTP-Stat-Add */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } - /* X-RTP-Stat-T38 */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } else { EMPTY_STR(sco.rtp_stat); } - /* PROTO TYPE */ sco.proto = msg->rcv.proto;

7 years, 8 months

git:master:8cc1c065: modules/sipcapture fixed priorisation X-RTP headers

by Alexandr Dubovikov

Module: kamailio Branch: master Commit: 8cc1c0657c6cf95d48e88f90027a4bb051414f68 URL: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-08-29T16:36:24+02:00 modules/sipcapture fixed priorisation X-RTP headers --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… Patch: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 33c96cd..466b7d7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1840,8 +1840,16 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * sco.originator_port = 0; } + /* X-RTP-Stat-Add */ + if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } + /* X-RTP-Stat-T38 */ + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } /* X-RTP-Stat */ - if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } /* P-RTP-Stat */ @@ -1860,17 +1868,8 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else if((tmphdr[3] = get_hdr_by_name(msg,"RTP-RxStat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } - /* X-RTP-Stat-Add */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } - /* X-RTP-Stat-T38 */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } else { EMPTY_STR(sco.rtp_stat); } - /* PROTO TYPE */ sco.proto = msg->rcv.proto;

7 years, 8 months

git:master:0dcf9cf2: pkg/kamailio/deb: version set to 5.0.0~dev6

by Victor Seva

Module: kamailio Branch: master Commit: 0dcf9cf28ec4dc46679915d48e5e0623e0cdfa96 URL: https://github.com/kamailio/kamailio/commit/0dcf9cf28ec4dc46679915d48e5e062… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-08-29T11:37:28+02:00 pkg/kamailio/deb: version set to 5.0.0~dev6 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0dcf9cf28ec4dc46679915d48e5e062… Patch: https://github.com/kamailio/kamailio/commit/0dcf9cf28ec4dc46679915d48e5e062… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index df4eb6d..bbff155 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev6) unstable; urgency=medium + + * version set to 5.0.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 29 Aug 2016 11:36:17 +0200 + kamailio (5.0.0~dev5) unstable; urgency=medium * version set to 5.0.0-dev5

7 years, 8 months

git:master:a187d9ec: Merge pull request #759 from kelchy/master

by GitHub

Module: kamailio Branch: master Commit: a187d9ec0e465141ad2466d84dfac8e2a4338911 URL: https://github.com/kamailio/kamailio/commit/a187d9ec0e465141ad2466d84dfac8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-29T11:20:59+02:00 Merge pull request #759 from kelchy/master pike: fixed rpc array --- Modified: modules/pike/pike_rpc.c Modified: modules/pike/pike_top.c Modified: modules/pike/pike_top.h --- Diff: https://github.com/kamailio/kamailio/commit/a187d9ec0e465141ad2466d84dfac8e… Patch: https://github.com/kamailio/kamailio/commit/a187d9ec0e465141ad2466d84dfac8e… --- diff --git a/modules/pike/pike_rpc.c b/modules/pike/pike_rpc.c index b8cc1f4..ef2d171 100644 --- a/modules/pike/pike_rpc.c +++ b/modules/pike/pike_rpc.c @@ -101,42 +101,15 @@ static void collect_data(int options) } } -/* do not use static buffer with this function */ -static const char *concat_err = "ERROR while concatenating string"; -static char *concat(char *buff, size_t buffsize, const char *first, int second) -{ - int rv; - size_t size; - - while ( (rv = snprintf(buff, buffsize, "%s%d", first, second)) >= buffsize ) { - size = rv > 128 ? rv : 128; - buff = (char *)realloc(buff, size); - if ( buff == 0 ) - return (char*)concat_err; - buffsize = size; - DBG("pike:rpc:concat: new buffer size for %s: %d", first, - (int)buffsize); - } - return buff; -} - static void pike_top(rpc_t *rpc, void *c) { int i; void *handle; + void *list; + void *item; struct TopListItem_t *top_list_root; struct TopListItem_t *ti = 0; - char addr_buff[40]; - char *ip_addr = 0; - char *leaf_hits_prev = 0; - char *leaf_hits_curr = 0; - char *expires = 0; - char *status = 0; - size_t ip_addr_size = 0; - size_t leaf_hits_prev_size = 0; - size_t leaf_hits_curr_size = 0; - size_t expires_size = 0; - size_t status_size = 0; + char addr_buff[PIKE_BUFF_SIZE*sizeof(char)]; char *stropts; int options = 0; @@ -170,7 +143,7 @@ static void pike_top(rpc_t *rpc, void *c) DBG("pike_top: top_list_root = %p", top_list_root); rpc->add(c, "{", &handle); - rpc->struct_add(handle, "d", "max_hits", get_max_hits()); + rpc->struct_add(handle, "d[", "max_hits", get_max_hits(), "list", &list); i = 0; // it is passed as number of rows if ( top_list_root == 0 ) { DBG("pike_top: no data"); @@ -181,24 +154,17 @@ static void pike_top(rpc_t *rpc, void *c) DBG("pike:top: result[%d]: %s leaf_hits[%d,%d] hits[%d,%d] expires: %d status: 0x%02x", i, addr_buff, ti->leaf_hits[0], ti->leaf_hits[1], ti->hits[0], ti->hits[1], ti->expires, ti->status); - rpc->struct_add(handle, "sddds", - concat(ip_addr, ip_addr_size, "ip_addr", i), addr_buff, - concat(leaf_hits_prev, leaf_hits_prev_size, "leaf_hits_prev", i), ti->leaf_hits[0], - concat(leaf_hits_curr, leaf_hits_curr_size, "leaf_hits_curr", i), ti->leaf_hits[1], - concat(expires, expires_size, "expires", i), ti->expires, - concat(status, status_size, "status", i), node_status_array[ti->status]); + rpc->array_add(list, "{", &item); + rpc->struct_add(item, "sddds", + "ip_addr", addr_buff, + "leaf_hits_prev", ti->leaf_hits[0], + "leaf_hits_curr", ti->leaf_hits[1], + "expires", ti->expires, + "status", node_status_array[ti->status]); } } rpc->struct_add(handle, "d", "number_of_rows", i); - /* free buffers */ - free(ip_addr); - free(leaf_hits_prev); - free(leaf_hits_curr); - free(expires); - free(status); pike_top_list_clear(); - - rpc->send(c); } /* ----- exported data structure with methods ----- */ diff --git a/modules/pike/pike_top.c b/modules/pike/pike_top.c index fbf5367..e187a0b 100644 --- a/modules/pike/pike_top.c +++ b/modules/pike/pike_top.c @@ -33,7 +33,6 @@ static struct TopListItem_t *top_list_root = 0; static struct TopListItem_t *top_list_iter = 0; -#define PIKE_BUFF_SIZE 128 static char buff[PIKE_BUFF_SIZE]; struct TopListItem_t *pike_top_get_root() { return top_list_root; } diff --git a/modules/pike/pike_top.h b/modules/pike/pike_top.h index 805a825..74bb8e3 100644 --- a/modules/pike/pike_top.h +++ b/modules/pike/pike_top.h @@ -24,6 +24,8 @@ #include "ip_tree.h" #include "../../ip_addr.h" +#define PIKE_BUFF_SIZE 128 + struct TopListItem_t { int addr_len; unsigned char ip_addr[45]; /*!< Make room for IPv6 */

7 years, 8 months

git:master:e6526455: pike: fixed rpc array

by Kelvin Chua

Module: kamailio Branch: master Commit: e6526455e1108f80e0fb2a420af8de386739be62 URL: https://github.com/kamailio/kamailio/commit/e6526455e1108f80e0fb2a420af8de3… Author: Kelvin Chua <kelchy(a)gmail.com> Committer: Kelvin Chua <kelchy(a)gmail.com> Date: 2016-08-27T19:14:40Z pike: fixed rpc array - added array structure when returning multiple addresses instead of concatenated strings - fixed buffer overflow on incorrect buffer size allocation --- Modified: modules/pike/pike_rpc.c Modified: modules/pike/pike_top.c Modified: modules/pike/pike_top.h --- Diff: https://github.com/kamailio/kamailio/commit/e6526455e1108f80e0fb2a420af8de3… Patch: https://github.com/kamailio/kamailio/commit/e6526455e1108f80e0fb2a420af8de3… --- diff --git a/modules/pike/pike_rpc.c b/modules/pike/pike_rpc.c index b8cc1f4..ef2d171 100644 --- a/modules/pike/pike_rpc.c +++ b/modules/pike/pike_rpc.c @@ -101,42 +101,15 @@ static void collect_data(int options) } } -/* do not use static buffer with this function */ -static const char *concat_err = "ERROR while concatenating string"; -static char *concat(char *buff, size_t buffsize, const char *first, int second) -{ - int rv; - size_t size; - - while ( (rv = snprintf(buff, buffsize, "%s%d", first, second)) >= buffsize ) { - size = rv > 128 ? rv : 128; - buff = (char *)realloc(buff, size); - if ( buff == 0 ) - return (char*)concat_err; - buffsize = size; - DBG("pike:rpc:concat: new buffer size for %s: %d", first, - (int)buffsize); - } - return buff; -} - static void pike_top(rpc_t *rpc, void *c) { int i; void *handle; + void *list; + void *item; struct TopListItem_t *top_list_root; struct TopListItem_t *ti = 0; - char addr_buff[40]; - char *ip_addr = 0; - char *leaf_hits_prev = 0; - char *leaf_hits_curr = 0; - char *expires = 0; - char *status = 0; - size_t ip_addr_size = 0; - size_t leaf_hits_prev_size = 0; - size_t leaf_hits_curr_size = 0; - size_t expires_size = 0; - size_t status_size = 0; + char addr_buff[PIKE_BUFF_SIZE*sizeof(char)]; char *stropts; int options = 0; @@ -170,7 +143,7 @@ static void pike_top(rpc_t *rpc, void *c) DBG("pike_top: top_list_root = %p", top_list_root); rpc->add(c, "{", &handle); - rpc->struct_add(handle, "d", "max_hits", get_max_hits()); + rpc->struct_add(handle, "d[", "max_hits", get_max_hits(), "list", &list); i = 0; // it is passed as number of rows if ( top_list_root == 0 ) { DBG("pike_top: no data"); @@ -181,24 +154,17 @@ static void pike_top(rpc_t *rpc, void *c) DBG("pike:top: result[%d]: %s leaf_hits[%d,%d] hits[%d,%d] expires: %d status: 0x%02x", i, addr_buff, ti->leaf_hits[0], ti->leaf_hits[1], ti->hits[0], ti->hits[1], ti->expires, ti->status); - rpc->struct_add(handle, "sddds", - concat(ip_addr, ip_addr_size, "ip_addr", i), addr_buff, - concat(leaf_hits_prev, leaf_hits_prev_size, "leaf_hits_prev", i), ti->leaf_hits[0], - concat(leaf_hits_curr, leaf_hits_curr_size, "leaf_hits_curr", i), ti->leaf_hits[1], - concat(expires, expires_size, "expires", i), ti->expires, - concat(status, status_size, "status", i), node_status_array[ti->status]); + rpc->array_add(list, "{", &item); + rpc->struct_add(item, "sddds", + "ip_addr", addr_buff, + "leaf_hits_prev", ti->leaf_hits[0], + "leaf_hits_curr", ti->leaf_hits[1], + "expires", ti->expires, + "status", node_status_array[ti->status]); } } rpc->struct_add(handle, "d", "number_of_rows", i); - /* free buffers */ - free(ip_addr); - free(leaf_hits_prev); - free(leaf_hits_curr); - free(expires); - free(status); pike_top_list_clear(); - - rpc->send(c); } /* ----- exported data structure with methods ----- */ diff --git a/modules/pike/pike_top.c b/modules/pike/pike_top.c index fbf5367..e187a0b 100644 --- a/modules/pike/pike_top.c +++ b/modules/pike/pike_top.c @@ -33,7 +33,6 @@ static struct TopListItem_t *top_list_root = 0; static struct TopListItem_t *top_list_iter = 0; -#define PIKE_BUFF_SIZE 128 static char buff[PIKE_BUFF_SIZE]; struct TopListItem_t *pike_top_get_root() { return top_list_root; } diff --git a/modules/pike/pike_top.h b/modules/pike/pike_top.h index 805a825..74bb8e3 100644 --- a/modules/pike/pike_top.h +++ b/modules/pike/pike_top.h @@ -24,6 +24,8 @@ #include "ip_tree.h" #include "../../ip_addr.h" +#define PIKE_BUFF_SIZE 128 + struct TopListItem_t { int addr_len; unsigned char ip_addr[45]; /*!< Make room for IPv6 */

7 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016