sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
208 discussions

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

git:master: dmq: Don't delete the original notification_peer on timeout
by Charles Chance 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: 69dc8ec9fce8628cdf9bf39f7a25136544ae9a29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69dc8ec… Author: Alex Hermann <alex(a)speakup.nl> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Tue Aug 26 16:37:08 2014 +0200 dmq: Don't delete the original notification_peer on timeout (cherry picked from commit e73aa4032873b3fca88bb809d6d4ce4f28c0f237) --- modules/dmq/notification_peer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 85584d2..2acb9a8 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -296,9 +296,12 @@ int notification_resp_callback_f(struct sip_msg* msg, int code, 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)) { + LM_ERR("not deleting notification_peer\n"); + return 0; + } ret = del_dmq_node(node_list, node); LM_DBG("del_dmq_node returned %d\n", ret); } return 0; } -

1 0

git:master: dmq: force to send replicated messages from configured server address - as reported on list by Victor Kustov
by Charles Chance 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: 7b5f79f9f384bfe3c16c399184281ebe63bb7785 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b5f79f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Nov 13 18:30:34 2014 +0000 dmq: force to send replicated messages from configured server address - as reported on list by Victor Kustov --- modules/dmq/dmq_funcs.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index 4b323c2..7430193 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -383,6 +383,7 @@ error: int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) { dmq_node_t* node; + struct socket_info* sock; int i = 0; /* avoid loops - do not replicate if message has come from another node @@ -394,6 +395,12 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) return -1; } + /* TODO - backup/restore original send socket */ + sock = lookup_local_socket(&dmq_server_socket); + if (sock) { + set_force_socket(msg, sock); + } + lock_get(&node_list->lock); node = node_list->nodes; while(node) {

1 0

Partial Cherry Commit
by Charles Chance 13 Nov '14

13 Nov '14

Hi, Are there any guidelines/opinions regarding this? I would like to cherry pick some of the changes to dmq module from https://github.com/kamailio/kamailio/commit/144737c482d39ae276e8a09f7dea01c…, in order to attribute authorship - trouble is, in the same commit there are changes to files in other modules too. Perhaps the simpler approach would be to replicate the changes and attribute the original author in the new commit message. Any advice? Cheers, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

2 1

tsilo: Missing include file
by Olle E. Johansson 13 Nov '14

13 Nov '14

Compilation of git master fails today: CC (gcc) [M tsilo.so] tsilo.o tsilo.c:41:10: fatal error: 'ts_mi.h' file not found #include "ts_mi.h" ^ 1 error generated. /O

2 1

git:master: modules/tsilo: added missing ts_rpc* files
by Federico Cabiddu 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: 72106469e7135024877a08d316091c48aace67d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7210646… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: Thu Nov 13 14:48:25 2014 +0100 modules/tsilo: added missing ts_rpc* files --- modules/tsilo/ts_rpc.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/tsilo/ts_rpc.h | 35 ++++++++ modules/tsilo/tsilo.c | 1 - 3 files changed, 256 insertions(+), 1 deletions(-) diff --git a/modules/tsilo/ts_rpc.c b/modules/tsilo/ts_rpc.c new file mode 100644 index 0000000..cae2941 --- /dev/null +++ b/modules/tsilo/ts_rpc.c @@ -0,0 +1,221 @@ +/** + * $Id$ + * + * Copyright (C) 2014 Federico Cabiddu (federico.cabiddu(a)gmail.com) + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#include <string.h> +#include <stdio.h> +#include "ts_hash.h" +#include "ts_rpc.h" + + +static const char* rpc_tsilo_dump_doc[2] = { + "Dump tsilo transactions table", + 0 +}; + + +static const char* rpc_tsilo_lookup_doc[2] = { + "Lookup one R-URI in the tsilo transactions table", + 0 +}; + +/************************ helper functions ****************************/ + +/*! + * \brief Add a node for a transaction + */ +static inline int rpc_dump_transaction(rpc_t* rpc, void* ctx, void *ih, ts_transaction_t* t) +{ + void* vh; + + if(rpc->struct_add(ih, "{", "Transaction", &vh)<0) + { + rpc->fault(ctx, 500, "Internal error creating transaction struct"); + return -1; + } + if(rpc->struct_add(vh, "d", "Tindex", t->tindex)<0) { + rpc->fault(ctx, 500, "Internal error adding tindex"); + return -1; + } + + if(rpc->struct_add(vh, "d", "Tlabel", t->tlabel)<0) { + rpc->fault(ctx, 500, "Internal error adding tlabel"); + return -1; + } + return 0; +} + + +/*************************** RPC functions *****************************/ + + +/*! + * \brief Dump the content of the tsilo table + * \param rpc RPC node that should be filled + * \param c RPC void pointer + */ +static void rpc_tsilo_dump(rpc_t *rpc, void *c) +{ + ts_transaction_t* trans; + struct ts_urecord* record; + struct ts_entry* entry; + + str brief = {0, 0}; + + int max, res, n, ntrans, i; + int short_dump = 0; + + void* th; + void* ah; + void* ih; + void* sh; + + rpc->scan(c, "*S", &brief); + + if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) + /* short version */ + short_dump = 1; + + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating top rpc"); + return; + } + + if (short_dump==0) { + res = rpc->struct_add(th, "d{", + "Size", t_table->size, + "R-URIs", &ah); + } else { + res = rpc->struct_add(th, "d", + "Size", t_table->size); + } + if (res<0) + { + rpc->fault(c, 500, "Internal error creating inner struct"); + return; + } + + /* add the entries per hash */ + for(i=0,n=0,max=0,ntrans=0; i<t_table->size; i++) { + entry = &t_table->entries[i]; + lock_entry(entry); + + n += entry->n; + if(max<entry->n) + max= entry->n; + for( record = entry->first ; record ; record=record->next ) { + /* add entry */ + if(short_dump==0) + { + if(rpc->struct_add(ah, "Sd{", + "R-URI", &record->ruri, + "Hash", record->rurihash, + "Transactions", &ih)<0) + { + unlock_entry(entry); + rpc->fault(c, 500, "Internal error creating ruri struct"); + return; + } + } + for( trans=record->transactions ; trans ; trans=trans->next) { + ntrans += 1; + if (short_dump==0) { + if (rpc_dump_transaction(rpc, c, ih, trans) == -1) { + unlock_entry(entry); + return; + } + } + } + } + unlock_entry(entry); + } + + /* extra attributes node */ + if(rpc->struct_add(th, "{", "Stats", &sh)<0) { + rpc->fault(c, 500, "Internal error creating stats struct"); + return; + } + if(rpc->struct_add(sh, "ddd", + "RURIs", n, + "Max-Slots", max, + "Transactions", ntrans)<0) + { + rpc->fault(c, 500, "Internal error adding stats"); + return; + } +} +/*! + * \brief Show the transactions for a given R-URI + * \param rpc RPC node that should be filled + * \param c RPC void pointer + */ +static void rpc_tsilo_lookup(rpc_t *rpc, void *c) +{ + ts_transaction_t* trans; + struct ts_urecord* record; + + str ruri = {0, 0}; + + int res; + + void* th; + + if (rpc->scan(c, "S", &ruri) != 1) { + rpc->fault(c, 500, "No RURI to lookup specified"); + return; + } + + lock_entry_by_ruri(&ruri); + + /* look for urecord */ + res = get_ts_urecord(&ruri, &record); + if (res) { + unlock_entry_by_ruri(&ruri); + rpc->fault(c, 404, "RURI not found in tsilo table"); + return; + } + + if (rpc->add(c, "{", &th) < 0) + { + unlock_entry_by_ruri(&ruri); + rpc->fault(c, 500, "Internal error creating top rpc"); + return; + } + + /* add the transactions */ + for( trans=record->transactions ; trans ; trans=trans->next) { + if (rpc_dump_transaction(rpc, c, th, trans) == -1) { + unlock_entry_by_ruri(&ruri); + return; + } + } + unlock_entry_by_ruri(&ruri); + return; +} + +rpc_export_t rpc_methods[] = { + { "ts.dump", rpc_tsilo_dump, rpc_tsilo_dump_doc, 0 }, + { "ts.lookup", rpc_tsilo_lookup, rpc_tsilo_lookup_doc, 0 }, + { 0, 0, 0, 0} +}; + diff --git a/modules/tsilo/ts_rpc.h b/modules/tsilo/ts_rpc.h new file mode 100644 index 0000000..f85798f --- /dev/null +++ b/modules/tsilo/ts_rpc.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2014 Federico Cabiddu, federico.cabiddu(a)gmail.com + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +/*! + * \file + * \brief Functions and definitions related to per user transaction indexing and searching + * \ingroup tsilo + * Module: \ref tsilo + */ + +#ifndef _TS_RPC_H_ +#define _TS_RPC_H_ + +#include "../../rpc.h" + +extern rpc_export_t rpc_methods[]; +#endif diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index a0e9a21..267fcf3 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -32,7 +32,6 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/registrar/api.h" #include "../../dset.h" -#include "../../lib/kmi/mi.h" #include "../../rpc_lookup.h" #include "ts_hash.h"

1 0

git:master: modules/tsilo: removed MI commands
by Federico Cabiddu 13 Nov '14

13 Nov '14

Module: sip-router Branch: master Commit: c0f58d77fc6cff80cf6a4fc62cd9e8acb9e5ba79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f58d7… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: Thu Nov 13 14:41:07 2014 +0100 modules/tsilo: removed MI commands (revert commit a255911902788bf74a7f4279fce4758b2f2a4613) --- modules/tsilo/Makefile | 3 -- modules/tsilo/README | 53 +++++++----------------------------- modules/tsilo/doc/tsilo_admin.xml | 33 ----------------------- modules/tsilo/tsilo.c | 18 ++++-------- 4 files changed, 17 insertions(+), 90 deletions(-) diff --git a/modules/tsilo/Makefile b/modules/tsilo/Makefile index c179aec..3ce15b4 100644 --- a/modules/tsilo/Makefile +++ b/modules/tsilo/Makefile @@ -15,7 +15,4 @@ 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 af1ade0..46d8574 100644 --- a/modules/tsilo/README +++ b/modules/tsilo/README @@ -33,15 +33,10 @@ Federico Cabiddu 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) - 5. MI Commands + 5. Exported RPC Functions - 5.1. ts_dump - 5.2. ts_lookup - - 6. Exported RPC Functions - - 6.1. ts.dump - 6.2. ts.lookup + 5.1. ts.dump + 5.2. ts.lookup List of Examples @@ -70,15 +65,10 @@ Chapter 1. Admin Guide 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) - 5. MI Commands - - 5.1. ts_dump - 5.2. ts_lookup - - 6. Exported RPC Functions + 5. Exported RPC Functions - 6.1. ts.dump - 6.2. ts.lookup + 5.1. ts.dump + 5.2. ts.lookup 1. Overview @@ -202,33 +192,12 @@ if (is_method("REGISTER")) { } ... -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. - -6. Exported RPC Functions +5. Exported RPC Functions - 6.1. ts.dump - 6.2. ts.lookup + 5.1. ts.dump + 5.2. ts.lookup -6.1. ts.dump +5.1. ts.dump Dumps the content of the TSILO table @@ -237,7 +206,7 @@ if (is_method("REGISTER")) { RPC Command Format: kamcmd ts.dump -6.2. ts.lookup +5.2. ts.lookup Dumps the transactions stored for the given RURI diff --git a/modules/tsilo/doc/tsilo_admin.xml b/modules/tsilo/doc/tsilo_admin.xml index 32acf8b..749ba25 100644 --- a/modules/tsilo/doc/tsilo_admin.xml +++ b/modules/tsilo/doc/tsilo_admin.xml @@ -199,39 +199,6 @@ if (is_method("REGISTER")) { </section> <section> - <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> - <section> <title>Exported RPC Functions</title> <section> <title><varname>ts.dump</varname></title> diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index 9c404dd..a0e9a21 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -33,12 +33,13 @@ #include "../../modules/registrar/api.h" #include "../../dset.h" #include "../../lib/kmi/mi.h" +#include "../../rpc_lookup.h" #include "ts_hash.h" #include "ts_handlers.h" #include "ts_append.h" #include "ts_store.h" -#include "ts_mi.h" +#include "ts_rpc.h" MODULE_VERSION @@ -71,12 +72,6 @@ static cmd_export_t cmds[]={ {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} @@ -90,7 +85,7 @@ struct module_exports exports= { cmds, params, 0, /* exported statistics */ - mi_cmds, /* exported MI functions */ + 0, /* exported MI functions */ 0, 0, mod_init, /* module initialization function */ @@ -106,13 +101,12 @@ static int mod_init(void) { unsigned int n; - /* register the MI commands */ - if(register_mi_mod(exports.name, mi_cmds)!=0) + /* register the RPC methods */ + if(rpc_register_array(rpc_methods)!=0) { - LM_ERR("failed to register MI commands\n"); + LM_ERR("failed to register RPC commands\n"); return -1; } - /* load the TM API */ if (load_tm_api(&_tmb)!=0) { LM_ERR("can't load TM API\n");

1 0

git:4.1: app_python Avoid collission in name space - rename init_modules to ap_init_modules
by Olle E. Johansson 13 Nov '14

13 Nov '14

Module: sip-router Branch: 4.1 Commit: e9ca0a2c4e5ca2a77020dda247a9eaa641cd5557 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9ca0a2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 13 12:16:25 2014 +0100 app_python Avoid collission in name space - rename init_modules to ap_init_modules --- modules/app_python/python_iface.c | 2 +- modules/app_python/python_iface.h | 2 +- modules/app_python/python_mod.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/app_python/python_iface.c b/modules/app_python/python_iface.c index 3c7aed3..951efca 100644 --- a/modules/app_python/python_iface.c +++ b/modules/app_python/python_iface.c @@ -43,7 +43,7 @@ #include "mod_Logger.h" -int init_modules(void) +int ap_init_modules(void) { init_mod_Router(); init_mod_Core(); diff --git a/modules/app_python/python_iface.h b/modules/app_python/python_iface.h index 2693917..3b58afa 100644 --- a/modules/app_python/python_iface.h +++ b/modules/app_python/python_iface.h @@ -26,6 +26,6 @@ #include <Python.h> extern PyMethodDef RouterMethods[]; -int init_modules(void); +int ap_init_modules(void); #endif diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index 1f6e30e..bef35ca 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -166,7 +166,7 @@ static int mod_init(void) PyList_Insert(sys_path, 0, pDir); Py_DECREF(pDir); - if (init_modules() != 0) { + if (ap_init_modules() != 0) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_AttributeError, "init_modules() has failed"); python_handle_exception("mod_init");

1 0

git:4.0: app_python Avoid collission in name space - rename init_modules to ap_init_modules
by Olle E. Johansson 13 Nov '14

13 Nov '14

Module: sip-router Branch: 4.0 Commit: c237310ebf6a2b78b28b23e758dadb484c5bb7ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c237310… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 13 12:16:25 2014 +0100 app_python Avoid collission in name space - rename init_modules to ap_init_modules --- modules/app_python/python_iface.c | 2 +- modules/app_python/python_iface.h | 2 +- modules/app_python/python_mod.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/app_python/python_iface.c b/modules/app_python/python_iface.c index 3c7aed3..951efca 100644 --- a/modules/app_python/python_iface.c +++ b/modules/app_python/python_iface.c @@ -43,7 +43,7 @@ #include "mod_Logger.h" -int init_modules(void) +int ap_init_modules(void) { init_mod_Router(); init_mod_Core(); diff --git a/modules/app_python/python_iface.h b/modules/app_python/python_iface.h index 2693917..3b58afa 100644 --- a/modules/app_python/python_iface.h +++ b/modules/app_python/python_iface.h @@ -26,6 +26,6 @@ #include <Python.h> extern PyMethodDef RouterMethods[]; -int init_modules(void); +int ap_init_modules(void); #endif diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index 1f6e30e..bef35ca 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -166,7 +166,7 @@ static int mod_init(void) PyList_Insert(sys_path, 0, pDir); Py_DECREF(pDir); - if (init_modules() != 0) { + if (ap_init_modules() != 0) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_AttributeError, "init_modules() has failed"); python_handle_exception("mod_init");

1 0

git:4.2: app_python Avoid collission in name space - rename init_modules to ap_init_modules
by Olle E. Johansson 13 Nov '14

13 Nov '14

Module: sip-router Branch: 4.2 Commit: ca60c77acddc13d36ab691f8cac1f566323f6d86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca60c77… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 13 12:16:25 2014 +0100 app_python Avoid collission in name space - rename init_modules to ap_init_modules --- modules/app_python/python_iface.c | 2 +- modules/app_python/python_iface.h | 2 +- modules/app_python/python_mod.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/app_python/python_iface.c b/modules/app_python/python_iface.c index a98ac48..4993757 100644 --- a/modules/app_python/python_iface.c +++ b/modules/app_python/python_iface.c @@ -43,7 +43,7 @@ #include "mod_Logger.h" -int init_modules(void) +int ap_init_modules(void) { init_mod_Router(); init_mod_Core(); diff --git a/modules/app_python/python_iface.h b/modules/app_python/python_iface.h index 9219213..b01b115 100644 --- a/modules/app_python/python_iface.h +++ b/modules/app_python/python_iface.h @@ -26,6 +26,6 @@ #include <Python.h> extern PyMethodDef RouterMethods[]; -int init_modules(void); +int ap_init_modules(void); #endif diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index 7f23994..74aa1ef 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -156,7 +156,7 @@ static int mod_init(void) PyList_Insert(sys_path, 0, pDir); Py_DECREF(pDir); - if (init_modules() != 0) { + if (ap_init_modules() != 0) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_AttributeError, "init_modules() has failed"); python_handle_exception("mod_init");

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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