sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

ndb_redis: Antisocial behaviour on startup if Redis server unavailable
by Alex Balashov 17 Nov '14

17 Nov '14

If I kill my Redis server and boot Kamailio with an ndb_redis configuration to connect to Redis via TCP, I get an infinite loop of: Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] Nov 11 20:37:00 centosity6 /usr/local/sbin/kamailio[1892]: ERROR: <core> [io_wait.h:1048]: io_wait_loop_epoll(): epoll_wait(29, 0x7fe025ea06f8, 0, 5000): Invalid argument [22] [...] <ad infinitum/nauseum/full filesystem> -- Alex -- Alex Balashov - Principal Evariste Systems LLC 235 E Ponce de Leon Ave Suite 106 Decatur, GA 30030 United States Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/

2 3

git:4.2: pua_reginfo: avoid sending notify when processing location record action triggered by itself
by lejarreta.e＠sarenet.es 17 Nov '14

17 Nov '14

Good evening. Sorry for the delay. It has been hard to me to find what was happening. Found 2 errors on this patch. 1.- On notify.c on "process_contact" function we've forgotten one "return". 2.- On notify.c on "process_body" there is an "uri" string unassigned and we think "if clause" based on "reginfo_use_domain" var is not necessary. diff master_branch_corrected.c master_branch.c 137,140c137 < if (VALID_CONTACT(ul_contact, time(0))){ < ret = RESULT_CONTACTS_FOUND; < goto done; < } --- > if (VALID_CONTACT(ul_contact, time(0))) return > RESULT_CONTACTS_FOUND; 222a220 > char uri[MAX_URI_SIZE]; 276,277c274,278 < aor_key.s = parsed_aor.user.s; < --- > if (reginfo_use_domain) { > aor_key.s = uri; > } else { > aor_key.s = parsed_aor.user.s; > } We could also simplify this code leaving prior "process_contact" function as it was before and round it with "pua_reginfo_update_self_op" function as: ... /* Add to Usrloc: */ pua_reginfo_update_self_op(1); result = process_contact(domain, &ul_record, aor_key, callid, cseq, expires, event, contact_uri); pua_reginfo_update_self_op(0); ... I'll send you our changes to "path", "received", "ua" and son on "Contact" header params when we finish to test them. Thanks and best regards. Eduardo Lejarreta.

1 0

[tracker] Comment added: kamctl warning when greadlink does not exist
by sip-router 17 Nov '14

17 Nov '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#492 - kamctl warning when greadlink does not exist User who did this - Morten Tryfoss (mtryfoss) ---------- I was a bit too quick. Try this instead: — utils/kamctl/kamctl 2014-11-11 13:48:48.000000000 +0100 +++ utils/kamctl/kamctl 2014-11-17 14:14:36.389779782 +0100 @@ -16,12 +16,12 @@ ### include config files # check for rc file at same location with kamctl -which greadlink > /dev/null +which greadlink &> /dev/null ret=$? if [ $ret -eq 0 ] ; then KAMCTLFULLPATH=$(greadlink -f “$0”) else - which readlink > /dev/null + which readlink &> /dev/null ret=$? if [ $ret -eq 0 ] ; then KAMCTLFULLPATH=$(readlink -f “$0”) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=492#comment1694 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] Task opened: Fix kamalio.spec for Centos (Attachment added)
by sip-router 17 Nov '14

17 Nov '14

1 0

[tracker] Task opened: kamctl warning when greadlink does not exist
by sip-router 17 Nov '14

17 Nov '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Morten Tryfoss (mtryfoss) Attached to Project - sip-router Summary - kamctl warning when greadlink does not exist Task Type - Bug Report Category - utils Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.2 Due in Version - Undecided Due Date - Undecided Details - kamctl prints: /usr/bin/which: no greadlink in (/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin) Causes pacemaker monitoring to fail. I think this will be ok: --- utils/kamctl/kamctl 2014-11-11 13:48:48.000000000 +0100 +++ utils/kamctl/kamctl 2014-11-17 14:14:36.389779782 +0100 @@ -16,12 +16,12 @@ ### include config files # check for rc file at same location with kamctl -which greadlink > /dev/null +which greadlink 2> /dev/null ret=$? if [ $ret -eq 0 ] ; then KAMCTLFULLPATH=$(greadlink -f "$0") else - which readlink > /dev/null + which readlink 2> /dev/null ret=$? if [ $ret -eq 0 ] ; then KAMCTLFULLPATH=$(readlink -f "$0") More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=492 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: modules/tsilo: added MI commands
by Federico Cabiddu 15 Nov '14

15 Nov '14

Module: sip-router Branch: master Commit: a255911902788bf74a7f4279fce4758b2f2a4613 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a255911… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: Wed Nov 12 11:52:29 2014 +0100 modules/tsilo: added MI commands --- modules/tsilo/Makefile | 5 +++- modules/tsilo/README | 51 +++++++++++++++++++++++++++++-------- modules/tsilo/doc/tsilo_admin.xml | 44 ++++++++++++++++++++++++++------ modules/tsilo/ts_hash.c | 2 +- modules/tsilo/ts_hash.h | 16 ++++++------ modules/tsilo/tsilo.c | 30 ++++++++++++++++----- 6 files changed, 112 insertions(+), 36 deletions(-) diff --git a/modules/tsilo/Makefile b/modules/tsilo/Makefile index 40b04cb..c179aec 100644 --- a/modules/tsilo/Makefile +++ b/modules/tsilo/Makefile @@ -9,10 +9,13 @@ include ../../Makefile.defs auto_gen= NAME=tsilo.so LIBS= -DEFS+= -DSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE ifeq ($(INSTALL_FLAVOUR),kamailio) DEFS+= -DWITH_EVENT_LOCAL_REQUEST endif # INSTALL_FLAVOUR +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi + include ../../Makefile.modules diff --git a/modules/tsilo/README b/modules/tsilo/README index 4790ad1..297c435 100644 --- a/modules/tsilo/README +++ b/modules/tsilo/README @@ -10,7 +10,7 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> - Copyright � 2014 Federico Cabiddu + Copyright © 2014 Federico Cabiddu __________________________________________________________________ Table of Contents @@ -33,7 +33,10 @@ Federico Cabiddu 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) - 5. Statistics + 5. MI Commands + + 5.1. ts_dump + 5.2. ts_lookup List of Examples @@ -62,19 +65,26 @@ Chapter 1. Admin Guide 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) - 5. Statistics + 5. MI Commands + + 5.1. ts_dump + 5.2. ts_lookup 1. Overview This modules provides transaction storage for the Kamailio SIP Server - Platform. It stores in an internal table transactions for an user and - add branches to them if new contacts are added. + Platform. It stores in an internal table transactions for a Request-URI + (R-URI) and add branches to them later if new contacts for the AOR are + added. - For each message, the modules stores "Request-URI" ("R-URI"), URI and - the internal transaction index and label. + When the ts_store function is called, the modules stores the current + transaction R-URI URI, index and label. Two functions (ts_append and + ts_append_to) provide the ability to add new branches either to a + specific transaction or to all of the transactions stored for a given + R-URI. - When the transaction is destroyed (by the TM module, the transaction is - removed from the module table. + When a transaction is destroyed by the TM module, it is removed from + the module's table too. 2. Dependencies @@ -105,7 +115,7 @@ Chapter 1. Admin Guide must be a power of two, otherwise it will be rounded down to the nearest power of two. - Default value is "2048". + Default value is “2048”. Example 1.1. Set hash_size parameter ... @@ -182,4 +192,23 @@ if (is_method("REGISTER")) { } ... -5. Statistics +5. MI Commands + + 5.1. ts_dump + 5.2. ts_lookup + +5.1. ts_dump + + Dumps the entire content of the TSILO table + + Parameters: + * brief - (optional, may not be present); if equals to string + “brief”, a brief dump will be done (only RURI, without the + transaction(s) details) + +5.2. ts_lookup + + Dumps the transactions stored for the given RURI + + Parameters: + * ruri - RURI for which we want to show the transactions. diff --git a/modules/tsilo/doc/tsilo_admin.xml b/modules/tsilo/doc/tsilo_admin.xml index 4c35e69..36180d1 100644 --- a/modules/tsilo/doc/tsilo_admin.xml +++ b/modules/tsilo/doc/tsilo_admin.xml @@ -17,17 +17,15 @@ <title>Overview</title> <para> This modules provides transaction storage for the &kamailioname;. It - stores in an internal table transactions for an user and add branches - to them if new contacts are added. + stores in an internal table transactions for a Request-URI (R-URI) and add branches + to them later if new contacts for the AOR are added. </para> <para> - For each message, the modules stores <quote>Request-URI</quote> - (<quote>R-URI</quote>), &uri; and the internal transaction index - and label. + When the <emphasis>ts_store</emphasis> function is called, the modules stores the current transaction R-URI &uri;, index and label. Two functions (<emphasis>ts_append</emphasis> and <emphasis>ts_append_to</emphasis>) provide the ability to add new branches either to a specific transaction or to all of the transactions stored for a given R-URI. </para> <para> - When the transaction is destroyed (by the <emphasis>TM</emphasis> module, - the transaction is removed from the module table. + When a transaction is destroyed by the <emphasis>TM</emphasis> module, + it is removed from the module's table too. </para> </section> <section> @@ -201,6 +199,36 @@ if (is_method("REGISTER")) { </section> <section> - <title>Statistics</title> + <title>MI Commands</title> + <section id="tsilo.mi.ts_dump"> + <title> + <function moreinfo="none">ts_dump</function> + </title> + <para> + Dumps the entire content of the TSILO table + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + <emphasis>brief</emphasis> - (optional, may not be present); if + equals to string <quote>brief</quote>, a brief dump will be + done (only RURI, without the transaction(s) details) + </para></listitem> + </itemizedlist> + </section> + <section id="tsilo.mi.ts_lookup"> + <title> + <function moreinfo="none">ts_lookup</function> + </title> + <para> + Dumps the transactions stored for the given RURI + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + <emphasis>ruri</emphasis> - RURI for which we want to show the transactions. + </para></listitem> + </itemizedlist> + </section> </section> </chapter> diff --git a/modules/tsilo/ts_hash.c b/modules/tsilo/ts_hash.c index 089f425..6225db6 100644 --- a/modules/tsilo/ts_hash.c +++ b/modules/tsilo/ts_hash.c @@ -162,7 +162,7 @@ void unlock_entry(ts_entry_t *entry) { void lock_entry_by_ruri(str* ruri) { - unsigned int sl; + unsigned int sl; sl = core_hash(ruri, 0, 0) & (t_table->size-1); ts_lock(t_table, &t_table->entries[sl]); diff --git a/modules/tsilo/ts_hash.h b/modules/tsilo/ts_hash.h index b895c26..bc7adf1 100644 --- a/modules/tsilo/ts_hash.h +++ b/modules/tsilo/ts_hash.h @@ -26,8 +26,8 @@ * Module: \ref tsilo */ -#ifndef _DIALOG_TS_HASH_H_ -#define _DIALOG_TS_HASH_H_ +#ifndef _TS_HASH_H_ +#define _TS_HASH_H_ #include "../../locking.h" #include "../../lib/kmi/mi.h" @@ -64,10 +64,10 @@ typedef struct ts_urecord /*! entries in the main transaction table */ typedef struct ts_entry { - int n; /*!< Number of elements in the collision slot */ + int n; /*!< Number of elements in the collision slot */ struct ts_urecord *first; /*!< urecord list */ - struct ts_urecord *last; /*!< optimisation, end of the urecord list */ - unsigned int next_id; /*!< next id */ + struct ts_urecord *last; /*!< optimisation, end of the urecord list */ + unsigned int next_id; /*!< next id */ unsigned int lock_idx; /*!< lock index */ } ts_entry_t; @@ -75,13 +75,13 @@ typedef struct ts_entry /*! main transaction table */ typedef struct ts_table { - unsigned int size; /*!< size of the dialog table */ + unsigned int size; /*!< size of the tsilo table */ struct ts_entry *entries; /*!< urecord hash table */ unsigned int locks_no; /*!< number of locks */ - gen_lock_set_t *locks; /*!< lock table */ + gen_lock_set_t *locks; /*!< lock table */ } ts_table_t; -/*! global dialog table */ +/*! global transactions table */ extern ts_table_t *t_table; /*! diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index 90eb292..9c404dd 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -32,11 +32,13 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/registrar/api.h" #include "../../dset.h" +#include "../../lib/kmi/mi.h" #include "ts_hash.h" #include "ts_handlers.h" #include "ts_append.h" #include "ts_store.h" +#include "ts_mi.h" MODULE_VERSION @@ -57,20 +59,24 @@ static int w_ts_append_to(struct sip_msg* msg, char *idx, char *lbl, char *d); static int fixup_ts_append_to(void** param, int param_no); static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri); static int fixup_ts_append(void** param, int param_no); - static int w_ts_store(struct sip_msg* msg); - static cmd_export_t cmds[]={ {"ts_append_to", (cmd_function)w_ts_append_to, 3, - fixup_ts_append_to, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_ts_append_to, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"ts_append", (cmd_function)w_ts_append, 2, - fixup_ts_append, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_ts_append, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"ts_store", (cmd_function)w_ts_store, 0, - 0 , REQUEST_ROUTE | FAILURE_ROUTE }, + 0 , 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0,0,0,0,0} }; +static mi_export_t mi_cmds[] = { + { "ts_dump", mi_tsilo_dump, 0, 0, 0 }, + { "ts_lookup", mi_tsilo_lookup, 0, 0, 0 }, + { 0, 0, 0, 0, 0} +}; + static param_export_t params[]={ {"hash_size", INT_PARAM, &hash_size}, {0,0,0} @@ -80,13 +86,16 @@ static param_export_t params[]={ /** module exports */ struct module_exports exports= { "tsilo", + DEFAULT_DLFLAGS, cmds, - 0, /* RPC methods */ params, + 0, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, + 0, mod_init, /* module initialization function */ 0, (destroy_function) destroy, /* destroy function */ - 0, 0 }; @@ -97,6 +106,13 @@ static int mod_init(void) { unsigned int n; + /* register the MI commands */ + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + /* load the TM API */ if (load_tm_api(&_tmb)!=0) { LM_ERR("can't load TM API\n");

5 9

New module DMQ_SYNC and patch for DMQ
by Андрей Рыбкин 13 Nov '14

13 Nov '14

Hi all! Module DMQ_SYNC: The module add replication between multiple servers via DMQ module. Currently only usrloc replications. TODO: 1. dialog replications. 2. bugfixes. Patch fo DMQ: 1. add find_dmq_node_uri function to API dmq_node_t* find_dmq_node_uri(str* uri) 2. add init_callback to dmq_peer int init_callback() ______________________________ Andrey Rybkin JID: rybkin.a(a)bks.tv E-Mail: rybkin.a(a)bks.tv

5 11

git:master: dmq: Add find_dmq_node_uri function to API - based on patch submitted by Andrey Rybkin .
by Charles Chance 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: 80a7d7bb647a73098798fdc4f1c8acf40563ac7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80a7d7b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Nov 13 21:43:22 2014 +0000 dmq: Add find_dmq_node_uri function to API - based on patch submitted by Andrey Rybkin. --- modules/dmq/bind_dmq.c | 1 + modules/dmq/bind_dmq.h | 2 ++ modules/dmq/dmqnode.c | 5 +++++ modules/dmq/dmqnode.h | 1 + 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/dmq/bind_dmq.c b/modules/dmq/bind_dmq.c index 37c2a7e..5d80e12 100644 --- a/modules/dmq/bind_dmq.c +++ b/modules/dmq/bind_dmq.c @@ -34,6 +34,7 @@ int bind_dmq(dmq_api_t* api) { api->register_dmq_peer = register_dmq_peer; api->send_message = dmq_send_message; api->bcast_message = bcast_dmq_message; + api->find_dmq_node_uri = find_dmq_node_uri2; return 0; } diff --git a/modules/dmq/bind_dmq.h b/modules/dmq/bind_dmq.h index 0447040..dc90fb4 100644 --- a/modules/dmq/bind_dmq.h +++ b/modules/dmq/bind_dmq.h @@ -34,11 +34,13 @@ typedef int (*bcast_message_t)(dmq_peer_t* peer, str* body, dmq_node_t* except, dmq_resp_cback_t* resp_cback, int max_forwards, str* content_type); typedef int (*send_message_t)(dmq_peer_t* peer, str* body, dmq_node_t* node, dmq_resp_cback_t* resp_cback, int max_forwards, str* content_type); +typedef dmq_node_t* (*find_dmq_node_uri_t)(str* uri); typedef struct dmq_api { register_dmq_peer_t register_dmq_peer; bcast_message_t bcast_message; send_message_t send_message; + find_dmq_node_uri_t find_dmq_node_uri; } dmq_api_t; typedef int (*bind_dmq_f)(dmq_api_t* api); diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index b293369..d4bde2a 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -239,6 +239,11 @@ dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) return ret; } +dmq_node_t* find_dmq_node_uri2(str* uri) +{ + return find_dmq_node_uri(node_list, uri); +} + /** * @brief destroy dmq node */ diff --git a/modules/dmq/dmqnode.h b/modules/dmq/dmqnode.h index 10e2962..0bfd9ba 100644 --- a/modules/dmq/dmqnode.h +++ b/modules/dmq/dmqnode.h @@ -66,6 +66,7 @@ int update_node_list(dmq_node_list_t* remote_list); dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri); dmq_node_t* find_dmq_node(dmq_node_list_t* list, dmq_node_t* node); dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri); +dmq_node_t* find_dmq_node_uri2(str* uri); int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node); int cmp_dmq_node(dmq_node_t* node, dmq_node_t* cmpnode); dmq_node_t* shm_dup_node(dmq_node_t* node);

1 0

git:master: dmq: Let the handler know about the sending node
by Charles Chance 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: c2dcf4dbd884b13423159a7d94a3cb9f4e1a3e87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2dcf4d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Nov 13 19:54:26 2014 +0000 dmq: Let the handler know about the sending node Try to find a node based on the from uri of the incoming request and hand it to the request handler. --- modules/dmq/notification_peer.c | 2 +- modules/dmq/notification_peer.h | 2 +- modules/dmq/peer.c | 2 +- modules/dmq/peer.h | 5 +++-- modules/dmq/worker.c | 12 +++++++++++- modules/htable/ht_dmq.c | 2 +- modules/htable/ht_dmq.h | 2 +- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index e7d8930..1d804bd 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -187,7 +187,7 @@ int run_init_callbacks() { /** * @brief dmq notification callback */ -int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp) +int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node) { int nodes_recv; str* response_body = NULL; diff --git a/modules/dmq/notification_peer.h b/modules/dmq/notification_peer.h index ff9871d..99be339 100644 --- a/modules/dmq/notification_peer.h +++ b/modules/dmq/notification_peer.h @@ -37,7 +37,7 @@ extern str notification_content_type; extern int *dmq_init_callback_done; int add_notification_peer(); -int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp); +int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node); int extract_node_list(dmq_node_list_t* update_list, struct sip_msg* msg); str* build_notification_body(); int build_node_str(dmq_node_t* node, char* buf, int buflen); diff --git a/modules/dmq/peer.c b/modules/dmq/peer.c index b93cf3a..f54a2c0 100644 --- a/modules/dmq/peer.c +++ b/modules/dmq/peer.c @@ -97,7 +97,7 @@ dmq_peer_t* find_peer(str peer_id) /** * @empty callback */ -int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp) +int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node) { return 0; } diff --git a/modules/dmq/peer.h b/modules/dmq/peer.h index bd1a15d..8b6fc32 100644 --- a/modules/dmq/peer.h +++ b/modules/dmq/peer.h @@ -28,6 +28,7 @@ #include <string.h> #include <stdlib.h> +#include "dmqnode.h" #include "../../lock_ops.h" #include "../../str.h" #include "../../mem/mem.h" @@ -41,7 +42,7 @@ typedef struct peer_response { str body; } peer_reponse_t; -typedef int(*peer_callback_t)(struct sip_msg*, peer_reponse_t* resp); +typedef int(*peer_callback_t)(struct sip_msg*, peer_reponse_t* resp, dmq_node_t* node); typedef int(*init_callback_t)(); typedef struct dmq_peer { @@ -66,7 +67,7 @@ typedef dmq_peer_t* (*register_dmq_peer_t)(dmq_peer_t*); dmq_peer_t* add_peer(dmq_peer_list_t* peer_list, dmq_peer_t* peer); dmq_peer_t* find_peer(str peer_id); -int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp); +int empty_peer_callback(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node); #endif diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c index 1ac77f0..8426730 100644 --- a/modules/dmq/worker.c +++ b/modules/dmq/worker.c @@ -29,6 +29,8 @@ #include "../../data_lump_rpl.h" #include "../../mod_fix.h" #include "../../sip_msg_clone.h" +#include "../../parser/parse_from.h" +#include "../../parser/parse_to.h" /** * @brief set the body of a response @@ -74,6 +76,7 @@ void worker_loop(int id) dmq_job_t* current_job; peer_reponse_t peer_response; int ret_value; + dmq_node_t *dmq_node = NULL; worker = &workers[id]; for(;;) { @@ -88,7 +91,14 @@ void worker_loop(int id) current_job = job_queue_pop(worker->queue); /* job_queue_pop might return NULL if queue is empty */ if(current_job) { - ret_value = current_job->f(current_job->msg, &peer_response); + /* extract the from uri */ + if (parse_from_header(current_job->msg) < 0) { + LM_ERR("bad sip message or missing From hdr\n"); + } else { + dmq_node = find_dmq_node_uri(node_list, &((struct to_body*)current_job->msg->from->parsed)->uri); + } + + ret_value = current_job->f(current_job->msg, &peer_response, dmq_node); if(ret_value < 0) { LM_ERR("running job failed\n"); continue; diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index 21755a7..7fa2959 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -89,7 +89,7 @@ int ht_dmq_broadcast(str* body) { /** * @brief ht dmq callback */ -int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) +int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node) { int content_length; str body; diff --git a/modules/htable/ht_dmq.h b/modules/htable/ht_dmq.h index 7a0ca88..e9189ec 100644 --- a/modules/htable/ht_dmq.h +++ b/modules/htable/ht_dmq.h @@ -40,7 +40,7 @@ typedef enum { } ht_dmq_action_t; int ht_dmq_initialize(); -int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp); +int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node); int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode); int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode); int ht_dmq_resp_callback_f(struct sip_msg* msg, int code, dmq_node_t* node, void* param);

1 0

git:master: dmq: Add init_callback() to API
by Charles Chance 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: b1aadf4cf9ea8fa91465fadc24ad268398a74880 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1aadf4… Author: Alex Hermann <alex(a)speakup.nl> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Nov 13 19:45:32 2014 +0000 dmq: Add init_callback() to API The init_callback is called after DMQ has synced with the notification_peer. This callback can thus be used to send/broadcast messages as early as possible. --- modules/dmq/dmq.c | 12 +++++++++++- modules/dmq/notification_peer.c | 34 +++++++++++++++++++++++++++++++++- modules/dmq/notification_peer.h | 1 + modules/dmq/peer.h | 2 ++ modules/htable/ht_dmq.c | 1 + 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index 7e4defb..6d53baf 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -239,7 +239,14 @@ static int mod_init(void) LM_ERR("error in shm_malloc\n"); return -1; } - + + dmq_init_callback_done = shm_malloc(sizeof(int)); + if (!dmq_init_callback_done) { + LM_ERR("no more shm\n"); + return -1; + } + *dmq_init_callback_done = 0; + /** * add the dmq notification peer. * the dmq is a peer itself so that it can receive node notifications @@ -326,6 +333,9 @@ static void destroy(void) { if (dmq_server_socket.s) { pkg_free(dmq_server_socket.s); } + if (dmq_init_callback_done) { + shm_free(dmq_init_callback_done); + } } static int handle_dmq_fixup(void** param, int param_no) diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 2acb9a8..e7d8930 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -29,6 +29,9 @@ str notification_content_type = str_init("text/plain"); dmq_resp_cback_t notification_callback = {&notification_resp_callback_f, 0}; +int *dmq_init_callback_done; + + /** * @brief add notification peer */ @@ -36,6 +39,7 @@ int add_notification_peer() { dmq_peer_t not_peer; not_peer.callback = dmq_notification_callback; + not_peer.init_callback = NULL; not_peer.description.s = "notification_peer"; not_peer.description.len = 17; not_peer.peer_id.s = "notification_peer"; @@ -165,6 +169,21 @@ error: return -1; } + +int run_init_callbacks() { + dmq_peer_t* crt; + + crt = peer_list->peers; + while(crt) { + if (crt->init_callback) { + crt->init_callback(); + } + crt = crt->next; + } + return 0; +} + + /** * @brief dmq notification callback */ @@ -206,6 +225,10 @@ int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp) &notification_callback, maxforwards, &notification_content_type); } pkg_free(response_body); + if (!*dmq_init_callback_done) { + *dmq_init_callback_done = 1; + run_init_callbacks(); + } return 0; error: return -1; @@ -292,8 +315,17 @@ int notification_resp_callback_f(struct sip_msg* msg, int code, dmq_node_t* node, void* param) { int ret; + int nodes_recv; + LM_DBG("notification_callback_f triggered [%p %d %p]\n", msg, code, param); - if(code == 408) { + if(code == 200) { + nodes_recv = extract_node_list(node_list, msg); + LM_DBG("received %d new or changed nodes\n", nodes_recv); + if (!*dmq_init_callback_done) { + *dmq_init_callback_done = 1; + run_init_callbacks(); + } + } else if(code == 408) { /* deleting node - the server did not respond */ LM_ERR("deleting server %.*s because of failed request\n", STR_FMT(&node->orig_uri)); if (STR_EQ(node->orig_uri, dmq_notification_address)) { diff --git a/modules/dmq/notification_peer.h b/modules/dmq/notification_peer.h index 72df4ec..ff9871d 100644 --- a/modules/dmq/notification_peer.h +++ b/modules/dmq/notification_peer.h @@ -34,6 +34,7 @@ #include "dmq_funcs.h" extern str notification_content_type; +extern int *dmq_init_callback_done; int add_notification_peer(); int dmq_notification_callback(struct sip_msg* msg, peer_reponse_t* resp); diff --git a/modules/dmq/peer.h b/modules/dmq/peer.h index 7ce4434..bd1a15d 100644 --- a/modules/dmq/peer.h +++ b/modules/dmq/peer.h @@ -42,11 +42,13 @@ typedef struct peer_response { } peer_reponse_t; typedef int(*peer_callback_t)(struct sip_msg*, peer_reponse_t* resp); +typedef int(*init_callback_t)(); typedef struct dmq_peer { str peer_id; str description; peer_callback_t callback; + init_callback_t init_callback; struct dmq_peer* next; } dmq_peer_t; diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index 284c3dc..21755a7 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -59,6 +59,7 @@ int ht_dmq_initialize() } not_peer.callback = ht_dmq_handle_msg; + not_peer.init_callback = NULL; not_peer.description.s = "htable"; not_peer.description.len = 6; not_peer.peer_id.s = "htable";

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014