sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

[tracker] Comment added: pua_reginfo: Fails to insert the contact into the location table (Attachment added)
by sip-router 16 Sep '13

16 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#339 - pua_reginfo: Fails to insert the contact into the location table User who did this - Wonbin Cho (wbcho) ---------- One of the patch was incomplete so I attach them here again. Thanks! ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=339#comment1076 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: core: added wrapper functions to return cfg line and name for current action
by Daniel-Constantin Mierla 16 Sep '13

16 Sep '13

Module: sip-router Branch: master Commit: ca568ee6996cc93e8518f277cf34111bc0c78299 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca568ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 16 09:53:15 2013 +0200 core: added wrapper functions to return cfg line and name for current action --- action.c | 17 ++++++++++++++++- action.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 72f4fe9..5fa50ee 100644 --- a/action.c +++ b/action.c @@ -114,12 +114,27 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ /* current action executed from config file */ static cfg_action_t *_cfg_crt_action = 0; -/* return currect action executed from config file */ +/* return current action executed from config file */ cfg_action_t *get_cfg_crt_action(void) { return _cfg_crt_action; } +/* return line in config for current executed action */ +int get_cfg_crt_line(void) +{ + if(_cfg_crt_action==0) + return 0; + return _cfg_crt_action->cline; +} + +/* return name of config for current executed action */ +char *get_cfg_crt_name(void) +{ + if(_cfg_crt_action==0) + return 0; + return _cfg_crt_action->cfile; +} /* handle the exit code of a module function call. * (used internally in do_action()) diff --git a/action.h b/action.h index d715a65..2ef00f7 100644 --- a/action.h +++ b/action.h @@ -69,6 +69,8 @@ int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); cfg_action_t *get_cfg_crt_action(void); +int get_cfg_crt_line(void); +char *get_cfg_crt_name(void); #ifdef USE_LONGJMP int run_actions_safe(struct run_act_ctx* c, struct action* a,

1 0

git:master: core: store current executed cfg action in a global variable
by Daniel-Constantin Mierla 16 Sep '13

16 Sep '13

Module: sip-router Branch: master Commit: 4294b7bf3b67f1405869e865c171e268e60d5ee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4294b7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 15 22:35:38 2013 +0200 core: store current executed cfg action in a global variable - can be retrieved by module to access name of config file and the line --- action.c | 10 ++++++++++ action.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index d9a7f2c..72f4fe9 100644 --- a/action.c +++ b/action.c @@ -111,6 +111,14 @@ int _last_returned_code = 0; struct onsend_info* p_onsend=0; /* onsend route send info */ +/* current action executed from config file */ +static cfg_action_t *_cfg_crt_action = 0; + +/* return currect action executed from config file */ +cfg_action_t *get_cfg_crt_action(void) +{ + return _cfg_crt_action; +} /* handle the exit code of a module function call. @@ -1572,7 +1580,9 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) for (t=a; t!=0; t=t->next){ if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) ms = TICKS_TO_MS(get_ticks_raw()); + _cfg_crt_action = t; ret=do_action(h, t, msg); + _cfg_crt_action = 0; if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { ms = TICKS_TO_MS(get_ticks_raw()) - ms; if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { diff --git a/action.h b/action.h index a2a5395..d715a65 100644 --- a/action.h +++ b/action.h @@ -68,6 +68,7 @@ int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); +cfg_action_t *get_cfg_crt_action(void); #ifdef USE_LONGJMP int run_actions_safe(struct run_act_ctx* c, struct action* a,

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 16 Sep '13

16 Sep '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 3130ddea401eb4b53fd4a8979c228922e70b139a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3130dde… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Sep 16 09:23:50 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 16 Sep '13

16 Sep '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: a46d1a65a46faab109ec8eb48d7cccb2f864715f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a46d1a6… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Sep 16 09:22:30 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

[tracker] Comment added: pua_reginfo: Fails to insert the contact into the location table (Attachment added)
by sip-router 16 Sep '13

16 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#339 - pua_reginfo: Fails to insert the contact into the location table User who did this - Wonbin Cho (wbcho) ---------- One of the patch was incomplete so I attach them here again. Thanks! ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=339#comment1075 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: pua_reginfo: Fails to insert the contact into the location table (Attachment added)
by sip-router 16 Sep '13

16 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#339 - pua_reginfo: Fails to insert the contact into the location table User who did this - Wonbin Cho (wbcho) ---------- Hi, I attached patch files to this comment. Please note that the patch for notify.c includes the fix to avoid the segfault I mentioned in FS#338. Thanks for your kind attention. Wonbin ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=339#comment1074 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify (Attachment added)
by sip-router 16 Sep '13

16 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#338 - Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify User who did this - Wonbin Cho (wbcho) ---------- Hi, I have attached the patch to this comment. --- patch/pua_reginfo/notify.c.old +++ kamailio-4.0.3/modules/pua_reginfo/notify.c @@ -374,7 +374,8 @@ next_registration: // if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ - ul.unlock_udomain(domain, &aor); + if (aor.len > 0) + ul.unlock_udomain(domain, &aor); registrations = registrations->next; } Thanks! ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=338#comment1073 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: dmq: regenerated readme
by Charles Chance 15 Sep '13

15 Sep '13

Module: sip-router Branch: master Commit: 923d09f0c1ece04c8d3c2755b5b201b3a2cd2deb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=923d09f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Sun Sep 15 23:38:45 2013 +0100 dmq: regenerated readme --- modules/dmq/README | 212 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 174 insertions(+), 38 deletions(-) diff --git a/modules/dmq/README b/modules/dmq/README index cd6a3ce..d5de540 100644 --- a/modules/dmq/README +++ b/modules/dmq/README @@ -2,11 +2,21 @@ Distributed Message Queue Module Marius Ovidiu Bucur +Charles Chance + + Sipcentric Ltd. + Edited by Marius Ovidiu Bucur - Copyright � 2011 Marius Bucur +Edited by + +Charles Chance + + Copyright © 2011 Marius Bucur + + Copyright © 2013 Charles Chance, Sipcentric Ltd. __________________________________________________________________ Table of Contents @@ -21,18 +31,38 @@ Marius Ovidiu Bucur 3. Parameters - 3.1. dmq_server_address(str) - 3.2. dmq_notification_address(str) + 3.1. server_address(str) + 3.2. notification_address(str) + 3.3. num_workers(int) + 3.4. ping_interval(int) + + 4. Functions + + 4.1. dmq_handle_message() + 4.2. dmq_send_message(peer, node, body) 2. Developer Guide 1. dmq_load_api(dmq_api_t* api) + 2. register_dmq_peer(dmq_peer_t* peer) + 3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, + dmq_resp_cback_t* resp_cback, int max_forwards) + + 4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, + dmq_resp_cback_t* resp_cback, int max_forwards) List of Examples - 1.1. Set dmq_server_address parameter - 1.2. Set dmq_notification_address parameter + 1.1. Set server_address parameter + 1.2. Set notification_address parameter + 1.3. Set num_workers parameter + 1.4. Set ping_interval parameter + 1.5. dmq_handle_message usage + 1.6. dmq_send_message usage 2.1. dmq_api_t structure + 2.2. register_dmq_peer usage + 2.3. bcast_message usage + 2.4. send_message usage Chapter 1. Admin Guide @@ -46,17 +76,31 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. dmq_server_address(str) - 3.2. dmq_notification_address(str) + 3.1. server_address(str) + 3.2. notification_address(str) + 3.3. num_workers(int) + 3.4. ping_interval(int) + + 4. Functions + + 4.1. dmq_handle_message() + 4.2. dmq_send_message(peer, node, body) 1. Overview - The DMQ module implements a distributed message passing system on top - of Kamailio. The DMQ nodes within the system are grouped in a logical - entity called DMQ bus and are able to communicate with each others by - sending/receiving messages (either by broadcast or sending a DMQ - message to a specific node). The system transparently deals with node - discovery, node consistency within the DMQ bus, retransmissions, etc. + The DMQ module implements a distributed message queue on top of + Kamailio in order to enable the passing/replication of data between + multiple instances. The DMQ "nodes" within the system are grouped in a + logical entity called the DMQ "bus" and are able to communicate with + each other by sending/receiving messages (either by broadcast or + directly to a specific node). The system transparently deals with node + discovery, consistency, retransmissions, etc. + + Other entities ("peers") are then able to utlize the DMQ bus to pass + messages between themselves. Peers are grouped by name in order to + ensure the correct messages are passed to the relevant peers. This + grouping of peers can be compared to a topic in a typical pub/sub + system. 2. Dependencies @@ -71,40 +115,99 @@ Chapter 1. Admin Guide 2.2. External Libraries or Applications - * Each peer needs to use its own serialization mechanism. Some + * The DMQ module itself has no external dependencies. However, each + peer will need to use its own (de)serialization mechanism. Some examples are libtpl, protobuf. . 3. Parameters - 3.1. dmq_server_address(str) - 3.2. dmq_notification_address(str) + 3.1. server_address(str) + 3.2. notification_address(str) + 3.3. num_workers(int) + 3.4. ping_interval(int) + +3.1. server_address(str) + + The local server address. This is the interface over which the DMQ + engine will send/receive messages. + + Default value is “NULL”. + + Example 1.1. Set server_address parameter +... +modparam("dmq", "server_address", "sip:10.0.0.20:5060") +... + +3.2. notification_address(str) + + The address of another DMQ node from which the local node should + retrieve initial information about all other nodes. + + Default value is “NULL”. + + Example 1.2. Set notification_address parameter +... +modparam("dmq", "notification_address", "sip:10.0.0.21:5060") +... + +3.3. num_workers(int) + + The number of worker threads for sending/receiving messages. + + Default value is “2”. -3.1. dmq_server_address(str) + Example 1.3. Set num_workers parameter +... +modparam("dmq", "num_threads", 4) +... + +3.4. ping_interval(int) + + The number of seconds between node pings (for checking status of other + nodes). + + Minimum value is “60” (default). + + Example 1.4. Set ping_interval parameter +... +modparam("dmq", "ping_interval", 90) +... + +4. Functions - The local server address. + 4.1. dmq_handle_message() + 4.2. dmq_send_message(peer, node, body) - The modules needs it to know on which interface the DMQ engine should - send and receive messages. +4.1. dmq_handle_message() - Default value is "NULL". + Handles a DMQ message by passing it to the appropriate local peer + (module). The peer is identified by the user part of the To header. - Example 1.1. Set dmq_server_address parameter + This function can be used from REQUEST_ROUTE. + + Example 1.5. dmq_handle_message usage ... -modparam("dmq", "dmq_server_address", "mysql://openser:openserrw@localhost/opens -er") + if(is_method("KDMQ")) + { + dmq_handle_message(); + } ... -3.2. dmq_notification_address(str) +4.2. dmq_send_message(peer, node, body) + + Sends a DMQ message directly from config file. - The address of the DMQ node from which the local node should retrieve - initial information. + Meaning of parameters: + * peer - name of peer that should handle the message. + * node - the node to which the message should be sent. + * body - the message body. - Default value is "NULL". + This function can be used from any route. - Example 1.2. Set dmq_notification_address parameter + Example 1.6. dmq_send_message usage ... -modparam("dmq", "dmq_notification_address", "mysql://openser:openserrw@localhost -/openser") + dmq_send_message("peer_name", "sip:10.0.0.21:5060", "Message body...\n") +; ... Chapter 2. Developer Guide @@ -112,18 +215,20 @@ Chapter 2. Developer Guide Table of Contents 1. dmq_load_api(dmq_api_t* api) + 2. register_dmq_peer(dmq_peer_t* peer) + 3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, + dmq_resp_cback_t* resp_cback, int max_forwards) + + 4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, + dmq_resp_cback_t* resp_cback, int max_forwards) The module provides the following functions that can be used in other Kamailio modules. -1. dmq_load_api(dmq_api_t* api) +1. dmq_load_api(dmq_api_t* api) - This function binds the dmq modules and fills the structure with the - exported functions -> register_dmq_peer - registers an entity as a DMQ - peer which permits receiving/sending messages between nodes which - support the same peer, -> bcast_message - broadcast a DMQ message to - all peers available in the DMQ bus, -> send_message - sends a DMQ - message to a specific peer in the local DMQ bus. + This function binds the DMQ module and fills the structure with the + exported functions below. Example 2.1. dmq_api_t structure ... @@ -133,3 +238,34 @@ typedef struct dmq_api { send_message_t send_message; } dmq_api_t; ... + +2. register_dmq_peer(dmq_peer_t* peer) + + Registers an entity as a DMQ peer which permits receiving/sending + messages between nodes which support the same peer. + + Example 2.2. register_dmq_peer usage +... + Example to follow. +... + +3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, +dmq_resp_cback_t* resp_cback, int max_forwards) + + Broadcast a DMQ message to all nodes in the DMQ bus excluding self, + inactive nodes and "except" if specified. + + Example 2.3. bcast_message usage +... + Example to follow. +... + +4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, +dmq_resp_cback_t* resp_cback, int max_forwards) + + Send a DMQ message to a single node. + + Example 2.4. send_message usage +... + Example to follow. +...

1 0

git:master: dmq: added dmq_load_api to exported functions
by Charles Chance 15 Sep '13

15 Sep '13

Module: sip-router Branch: master Commit: e63af00eaa92eed106356cbb1dd6afd8b09f3e69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e63af00… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Sun Sep 15 23:38:56 2013 +0100 dmq: added dmq_load_api to exported functions --- modules/dmq/dmq.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index 4ed75bf..f4eea3a 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -70,7 +70,7 @@ struct sip_uri dmq_server_uri; str dmq_notification_address = {0, 0}; struct sip_uri dmq_notification_uri; -int ping_interval = 4; +int ping_interval = MIN_PING_INTERVAL; /* TM bind */ struct tm_binds tmb; @@ -99,6 +99,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 3, send_dmq_fixup, 0, ANY_ROUTE}, + {"bind_dmq", (cmd_function)bind_dmq, 0, 0, 0}, {0, 0, 0, 0, 0, 0} };

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013