sr-dev

sr-dev@lists.kamailio.org

5 participants
44698 discussions

git:kamailio_3.0: tm: added t_replicate(uri)
by Daniel-Constantin Mierla 06 Jan '10

06 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 64e19a6a44a21adf6f743420a26a48cc3acd099a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64e19a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 11:57:24 2010 +0100 tm: added t_replicate(uri) - the parameter has to be a valid SIP uri - it can be given via a script variable - K compatibility mode - reported by Santiago Gimeno --- modules/tm/tm.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 2774017..dcd9f83 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -114,6 +114,7 @@ #include "../../cfg/cfg.h" #include "../../globals.h" #include "../../timer_ticks.h" +#include "../../mod_fix.h" #include "config.h" #include "sip_msg.h" @@ -180,6 +181,9 @@ inline static int w_t_relay_to_sctp( struct sip_msg *p_msg , char *proxy, inline static int w_t_relay_to_sctp_uri( struct sip_msg*, char*, char*); #endif inline static int w_t_relay_to_avp(struct sip_msg* msg, char* str,char*); +inline static int w_t_replicate_uri( struct sip_msg *p_msg , + char *uri, /* sip uri as string or variable */ + char *_foo /* nothing expected */ ); inline static int w_t_replicate( struct sip_msg *p_msg , char *proxy, /* struct proxy_l *proxy expected */ char *_foo /* nothing expected */ ); @@ -289,6 +293,8 @@ static cmd_export_t cmds[]={ {T_RELAY_TO_SCTP, w_t_relay_to_sctp_uri, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE}, #endif + {"t_replicate", w_t_replicate_uri, 1, fixup_spve_null, + REQUEST_ROUTE}, {"t_replicate", w_t_replicate, 2, fixup_hostport2proxy, REQUEST_ROUTE}, {"t_replicate_udp", w_t_replicate_udp, 2, fixup_hostport2proxy, @@ -1365,6 +1371,39 @@ inline static int w_t_relay_to_avp( struct sip_msg *p_msg , return r; } +inline static int w_t_replicate_uri(struct sip_msg *msg , + char *uri, /* sip uri as string or variable */ + char *_foo /* nothing expected */ ) +{ + struct proxy_l *proxy; + struct sip_uri turi; + str suri; + int r = -1; + + memset(&turi, 0, sizeof(struct sip_uri)); + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("invalid replicate uri parameter"); + return -1; + } + if(parse_uri(suri.s, suri.len, &turi)!=0) + { + LM_ERR("bad replicate SIP address!\n"); + return -1; + } + + proxy=mk_proxy(&turi.host, turi.port_no, turi.proto); + if (proxy==0) { + LM_ERR("cannot create proxy from URI <%.*s>\n", + suri.len, suri.s ); + return -1; + } + + r = t_replicate(msg, proxy, proxy->proto); + free_proxy(proxy); + return r; + +} inline static int w_t_replicate( struct sip_msg *p_msg , char *proxy, /* struct proxy_l *proxy expected */

1 0

git:kamailio_3.0: db_oracle: use PARAM_TYPE_MASK when checking param type
by Daniel-Constantin Mierla 05 Jan '10

05 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: d1e89c65a9412d2a0560c5699a34dd01e231a2d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1e89c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 5 18:40:17 2010 +0100 db_oracle: use PARAM_TYPE_MASK when checking param type --- modules_k/db_oracle/asynch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/db_oracle/asynch.c b/modules_k/db_oracle/asynch.c index 173d572..bb92d35 100644 --- a/modules_k/db_oracle/asynch.c +++ b/modules_k/db_oracle/asynch.c @@ -66,7 +66,7 @@ static int set_tv(unsigned type, const char* val, struct timeval* tv) unsigned long s, ms; double dv; - if (type != STR_PARAM) { + if (PARAM_TYPE_MASK(type) != STR_PARAM) { LM_ERR("type of parameter is no STR\n"); return -1; }

1 0

git:kamailio_3.0: snmpstats: fix param type checking
by Daniel-Constantin Mierla 05 Jan '10

05 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 9cf36478222aaf573a6cd7b65e6a4fd6227eb8cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cf3647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 5 18:27:46 2010 +0100 snmpstats: fix param type checking - parameter type is given from definition of params not from modparam value type, resulting in mismatches for parameters that have USE_FUNC_PARAM flag set - reported by Santiago Gimeno --- modules_k/snmpstats/snmpObjects.c | 2 +- modules_k/snmpstats/utilities.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/snmpstats/snmpObjects.c b/modules_k/snmpstats/snmpObjects.c index b797317..b9b36af 100644 --- a/modules_k/snmpstats/snmpObjects.c +++ b/modules_k/snmpstats/snmpObjects.c @@ -611,7 +611,7 @@ static int set_if_valid_threshold(modparam_t type, void *val, char *varStr, return -1; } - if (type != INT_PARAM) { + if (PARAM_TYPE_MASK(type) != INT_PARAM) { LM_ERR("%s called with type %d instead of %d!\n", varStr, type, INT_PARAM); return -1; diff --git a/modules_k/snmpstats/utilities.c b/modules_k/snmpstats/utilities.c index 2097f88..9b4011d 100644 --- a/modules_k/snmpstats/utilities.c +++ b/modules_k/snmpstats/utilities.c @@ -78,7 +78,7 @@ int stringHandlerSanityCheck( modparam_t type, void *val, char *parameterName) char *theString = (char *)val; /* Make sure the function was called correctly. */ - if (type != STR_PARAM) { + if (PARAM_TYPE_MASK(type) != STR_PARAM) { LM_ERR("the %s parameter was assigned a type %d instead of %d\n", parameterName, type, STR_PARAM); return 0;

1 0

topoh issues
by Klaus Darilion 05 Jan '10

05 Jan '10

Hi Daniel! Thanks for topoh, a great module. 1. topology hiding is skipped for REGISTER and PUBLISH - why? For example I use Kamailio as an outbound proxy for our office as some kind of firewall and want to add topology hiding (to hide the details of our LAN). In this scenario it is also needed to mangle REGISTER and PUBLISH too. Are there any issues from implementation point of view which prevents mangling for REGISTER|PUBLISH? I tried removing the method-check and it seems to work fine (at least for REGISTER with single Contact headers) Of course this brings in another problem - at the upstream server the registered Contact is now sip:10.1.1.2;line=sr-...... It would be necessary to have the host part configurable, e.g. in my setup I would set it to the public IP address of the outbound proxy. Thus, str th_ip = {"10.1.1.2", 0}; should be the default and there should be a module paramter to override it. 2. the module uses a default value for encryption. IMO this is insecure. IMO, either the mask_key parameter should be mandatory or a random one should be generated at startup. regards klaus

2 8

git:master: auth_diameter(k): remove redundant declaration of find_credentials, now in core
by Henning Westerholt 05 Jan '10

05 Jan '10

Module: sip-router Branch: master Commit: fc323d03688bc93560a56cec9b2713c57a72389c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc323d0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 5 11:27:34 2010 +0100 auth_diameter(k): remove redundant declaration of find_credentials, now in core --- modules_k/auth_diameter/authorize.c | 82 ----------------------------------- modules_k/auth_diameter/authorize.h | 3 - 2 files changed, 0 insertions(+), 85 deletions(-) diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index d8b738c..a8c32d4 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -147,88 +147,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u) return 0; } -/* Find credentials with given realm in a SIP message header */ -int find_credentials(struct sip_msg* _m, str* _realm, int _hftype, - struct hdr_field** _h) -{ - struct hdr_field** hook, *ptr, *prev; - int res; - hdr_flags_t hdr_flags; - str* r; - - switch(_hftype) - { - case HDR_AUTHORIZATION_T: - hook = &(_m->authorization); - hdr_flags=HDR_AUTHORIZATION_F; - break; - case HDR_PROXYAUTH_T: - hook = &(_m->proxy_auth); - hdr_flags=HDR_PROXYAUTH_F; - break; - default: - hook = &(_m->authorization); - hdr_flags=HDR_T2F(_hftype); - break; - } - - /* If the credentials haven't been parsed yet, do it now */ - if (*hook == 0) - if (parse_headers(_m, hdr_flags, 0) == -1) - { - LM_ERR("failed to parse headers\n"); - return -1; - } - - ptr = *hook; - - /* Iterate through the credentials of the message to find - credentials with given realm - */ - while(ptr) - { - res = parse_credentials(ptr); - if (res < 0) - { - LM_ERR("failed to parse credentials\n"); - return (res == -1) ? -2 : -3; - } - else - if (res == 0) - { - r = &(((auth_body_t*)(ptr->parsed))->digest.realm); - - if (r->len == _realm->len) - { - if (!strncasecmp(_realm->s, r->s, r->len)) - { - *_h = ptr; - return 0; - } - } - } - - prev = ptr; - if (parse_headers(_m, hdr_flags, 1) == -1) - { - LM_ERR("failed to parse headers\n"); - return -4; - } - else - { - if (prev != _m->last_header) - { - if (_m->last_header->type == _hftype) ptr = _m->last_header; - else break; - } - else break; - } - } - - /* Credentials with given realm not found */ - return 1; -} - auth_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, struct hdr_field** _h) diff --git a/modules_k/auth_diameter/authorize.h b/modules_k/auth_diameter/authorize.h index bc9ba73..c3f96fb 100644 --- a/modules_k/auth_diameter/authorize.h +++ b/modules_k/auth_diameter/authorize.h @@ -45,9 +45,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u); auth_result_t diam_pre_auth(struct sip_msg* m, str* realm, int hftype, struct hdr_field** h); -int find_credentials(struct sip_msg* m, str* realm, int hftype, - struct hdr_field** h); - int authorize(struct sip_msg* msg, pv_elem_t* realm, int hftype); int diameter_authorize(struct hdr_field* cred, str* p_method,

1 0

git:kamailio_3.0: core: define module_loaded to use find_module_by_name
by Daniel-Constantin Mierla 04 Jan '10

04 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: d4db8304926d30a4244b9ee05d21b5614eae5f94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4db830… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 21:32:24 2010 +0100 core: define module_loaded to use find_module_by_name - it was declared but not implemented - in use by snmpstats and perlvdb modules - reported by Santiago Gimeno --- sr_module.h | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sr_module.h b/sr_module.h index 426729c..10afc55 100644 --- a/sr_module.h +++ b/sr_module.h @@ -389,6 +389,10 @@ int init_child(int rank); int init_modules(void); struct sr_module* find_module_by_name(char* mod); +/* true if the module with name 'mod_name' is loaded */ +#define module_loaded(mod_name) (find_module_by_name(mod_name)!=0) + + /*! \brief * Find a parameter with given type and return it's * address in memory @@ -520,18 +524,4 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param); int get_regex_fparam(regex_t *dst, struct sip_msg* msg, fparam_t* param); -/* functions needed for kamailio/openser compatibility */ - -/*! \brief Check if module is loaded - * \return Returns 1 if the module with name 'name' is loaded, and zero otherwise. */ -int module_loaded(char *name); - -/*! \brief Counts the additional the number of processes - requested by modules */ -int count_module_procs(void); - - -/*! \brief Forks and starts the additional processes required by modules */ -int start_module_procs(void); - #endif /* sr_module_h */

1 0

git:kamailio_3.0: topoh: documented mask_ip parameter
by Daniel-Constantin Mierla 04 Jan '10

04 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 15ece92703aa691333d06a79b7e9901bf893bf74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15ece92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 21:11:29 2010 +0100 topoh: documented mask_ip parameter --- modules/topoh/README | 89 ++++++++++++++++++++++--------------- modules/topoh/doc/topoh_admin.xml | 21 +++++++++ 2 files changed, 74 insertions(+), 36 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index d0249b1..16bb66b 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -26,12 +26,13 @@ Daniel-Constantin Mierla 3. Exported Parameters 3.1. mask_key (str) - 3.2. mask_callid (integer) - 3.3. uparam_name (str) - 3.4. uparam_prefix (str) - 3.5. vparam_name (str) - 3.6. vparam_prefix (str) - 3.7. callid_prefix (str) + 3.2. mask_ip (str) + 3.3. mask_callid (integer) + 3.4. uparam_name (str) + 3.5. uparam_prefix (str) + 3.6. vparam_name (str) + 3.7. vparam_prefix (str) + 3.8. callid_prefix (str) 4. Exported Functions @@ -40,12 +41,13 @@ Daniel-Constantin Mierla List of Examples 1.1. Set mask_key parameter - 1.2. Set mask_callid parameter - 1.3. Set uparam_name parameter - 1.4. Set uparam_prefix parameter - 1.5. Set vparam_name parameter - 1.6. Set vparam_prefix parameter - 1.7. Set callid_prefix parameter + 1.2. Set mask_ip parameter + 1.3. Set mask_callid parameter + 1.4. Set uparam_name parameter + 1.5. Set uparam_prefix parameter + 1.6. Set vparam_name parameter + 1.7. Set vparam_prefix parameter + 1.8. Set callid_prefix parameter Chapter 1. Admin Guide @@ -60,12 +62,13 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. mask_key (str) - 3.2. mask_callid (integer) - 3.3. uparam_name (str) - 3.4. uparam_prefix (str) - 3.5. vparam_name (str) - 3.6. vparam_prefix (str) - 3.7. callid_prefix (str) + 3.2. mask_ip (str) + 3.3. mask_callid (integer) + 3.4. uparam_name (str) + 3.5. uparam_prefix (str) + 3.6. vparam_name (str) + 3.7. vparam_prefix (str) + 3.8. callid_prefix (str) 4. Exported Functions @@ -107,12 +110,13 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. mask_key (str) - 3.2. mask_callid (integer) - 3.3. uparam_name (str) - 3.4. uparam_prefix (str) - 3.5. vparam_name (str) - 3.6. vparam_prefix (str) - 3.7. callid_prefix (str) + 3.2. mask_ip (str) + 3.3. mask_callid (integer) + 3.4. uparam_name (str) + 3.5. uparam_prefix (str) + 3.6. vparam_name (str) + 3.7. vparam_prefix (str) + 3.8. callid_prefix (str) 3.1. mask_key (str) @@ -125,7 +129,20 @@ Chapter 1. Admin Guide modparam("topoh", "mask_key", "some secret here") ... -3.2. mask_callid (integer) +3.2. mask_ip (str) + + IP address to be used in masked headers to build valid SIP URIs. Can be + any IP address, does not affect routing when used on the main SIP + server. + + Default value is "10.1.1.10". + + Example 1.2. Set mask_ip parameter +... +modparam("topoh", "mask_ip", "192.168.0.1") +... + +3.3. mask_callid (integer) Whether to encode or not the call-id. Some SIP extensions include the call-id in SIP message payload or header, so it is safe to not encode @@ -134,62 +151,62 @@ modparam("topoh", "mask_key", "some secret here") Default value is 0 (do not mask). - Example 1.2. Set mask_callid parameter + Example 1.3. Set mask_callid parameter ... modparam("topoh", "mask_callid", 1) ... -3.3. uparam_name (str) +3.4. uparam_name (str) Name of URI param where to store encoded value. Default value is "line". - Example 1.3. Set uparam_name parameter + Example 1.4. Set uparam_name parameter ... modparam("topoh", "uparam_name", "myparam") ... -3.4. uparam_prefix (str) +3.5. uparam_prefix (str) Prefix to be added in encoded URI params. Default value is "sr-". - Example 1.4. Set uparam_prefix parameter + Example 1.5. Set uparam_prefix parameter ... modparam("topoh", "uparam_prefix", "xyz") ... -3.5. vparam_name (str) +3.6. vparam_name (str) Name of Via param where to store encoded value. Default value is "branch". - Example 1.5. Set vparam_name parameter + Example 1.6. Set vparam_name parameter ... modparam("topoh", "vparam_name", "myv") ... -3.6. vparam_prefix (str) +3.7. vparam_prefix (str) Prefix to be added in encoded Via params. Default value is "z9hG4bKsr-". - Example 1.6. Set vparam_prefix parameter + Example 1.7. Set vparam_prefix parameter ... modparam("topoh", "vparam_prefix", "xyz") ... -3.7. callid_prefix (str) +3.8. callid_prefix (str) Prefix to be added in encoded Call-ID: headers. Default value is "!!:". - Example 1.7. Set callid_prefix parameter + Example 1.8. Set callid_prefix parameter ... modparam("topoh", "callid_prefix", "***") ... diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 1d3651f..119242a 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -86,6 +86,27 @@ modparam("topoh", "mask_key", "some secret here") </example> </section> <section> + <title><varname>mask_ip</varname> (str)</title> + <para> + IP address to be used in masked headers to build valid + SIP URIs. Can be any IP address, does not affect routing + when used on the main SIP server. + </para> + <para> + <emphasis> + Default value is "10.1.1.10". + </emphasis> + </para> + <example> + <title>Set <varname>mask_ip</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "mask_ip", "192.168.0.1") +... +</programlisting> + </example> + </section> + <section> <title><varname>mask_callid</varname> (integer)</title> <para> Whether to encode or not the call-id. Some SIP extensions include

1 0

git:kamailio_3.0: topoh: new mod param mask_ip
by Daniel-Constantin Mierla 04 Jan '10

04 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: ff748db23dfdbf022d37071181628ddf5591b58b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff748db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 20:15:12 2010 +0100 topoh: new mod param mask_ip - allow to set the value of IP address used in masked URIs - reported by Klaus Darilion --- modules/topoh/topoh_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 6cbd213..1d95c27 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -41,7 +41,7 @@ MODULE_VERSION str _th_key = { "aL9.n8~Hm]Z", 0 }; str th_cookie_name = {"TH", 0}; str th_cookie_value = {0, 0}; -str th_ip = {"10.1.1.2", 0}; +str th_ip = {"10.1.1.10", 0}; str th_uparam_name = {"line", 0}; str th_uparam_prefix = {"sr-", 0}; str th_vparam_name = {"branch", 0}; @@ -61,6 +61,7 @@ static int mod_init(void); static param_export_t params[]={ {"mask_key", STR_PARAM, &_th_key.s}, + {"mask_ip", STR_PARAM, &th_ip.s}, {"mask_callid", INT_PARAM, &th_param_mask_callid}, {"uparam_name", STR_PARAM, &th_uparam_name.s}, {"uparam_prefix", STR_PARAM, &th_uparam_prefix.s},

1 0

git:kamailio_3.0: drouting: updated db schema from master
by Daniel-Constantin Mierla 04 Jan '10

04 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 700fb1a97a5c6c089fce85f547117286644872b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=700fb1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 14:32:19 2010 +0100 drouting: updated db schema from master --- lib/srdb1/schema/dr_gateways.xml | 11 +++++- lib/srdb1/schema/dr_groups.xml | 64 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/dr_gw_lists.xml | 47 +++++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 2 +- lib/srdb1/schema/kamailio-drouting.xml | 2 + 5 files changed, 124 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index e96773b..9763c4b 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -9,7 +9,7 @@ <table id="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_gateways</name> - <version>1</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the douting module - keeps the @@ -60,6 +60,15 @@ <description>What to prefix to dialed number</description> </column> + <column id="attrs"> + <name>attrs</name> + <type>string</type> + <size>255</size> + <null/> + <default><null/></default> + <description>Generic string to be returned in cfg script</description> + </column> + <column id="description"> <name>description</name> <type>string</type> diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml new file mode 100644 index 0000000..92c2e5c --- /dev/null +++ b/lib/srdb1/schema/dr_groups.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="dr_groups" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_groups</name> + <version>2</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the drouting module to store + information about the routing groups (users mapped over groups). + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. + </db:para> + </description> + + <column id="gwid"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="username"> + <name>username</name> + <type>string</type> + <size>64</size> + <description>Username part of user</description> + </column> + + <column id="domain"> + <name>domain</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Domain part of user</description> + </column> + + <column id="groupid"> + <name>groupid</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>The ID of the routing group the user belongs to. + </description> + </column> + + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the group/user</description> + </column> + +</table> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml new file mode 100644 index 0000000..6375c0d --- /dev/null +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="dr_gw_lists" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_gw_lists</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the drouting module to define + lists of gateways to be used in rule definitions. + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>List of GW ids. + </description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the GW list</description> + </column> + +</table> diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml index 213332a..a469a77 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -9,7 +9,7 @@ <table id="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_rules</name> - <version>1</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the drouting module - keeps the diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml index 183c87b..7a95020 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -11,4 +11,6 @@ <name>DRouting</name> <xi:include href="dr_gateways.xml"/> <xi:include href="dr_rules.xml"/> + <xi:include href="dr_gw_lists.xml"/> + <xi:include href="dr_groups.xml"/> </database>

1 0

git:kamailio_3.0: kamctl: regenerate db creation scripts
by Daniel-Constantin Mierla 04 Jan '10

04 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: af5463d865bde28d1a2f977d0c9bd9347588b6e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af5463d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 14:35:19 2010 +0100 kamctl: regenerate db creation scripts --- utils/kamctl/db_berkeley/kamailio/version | 8 ++++++ utils/kamctl/dbtext/kamailio/version | 4 +++ utils/kamctl/mysql/drouting-create.sql | 21 +++++++++++++++- utils/kamctl/oracle/drouting-create.sql | 37 +++++++++++++++++++++++++++- utils/kamctl/postgres/drouting-create.sql | 21 +++++++++++++++- 5 files changed, 85 insertions(+), 6 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index cd6c6dc..88278aa 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -38,6 +38,14 @@ domain_name| domain_name|1 domainpolicy| domainpolicy|2 +dr_gateways| +dr_gateways|3 +dr_groups| +dr_groups|2 +dr_gw_lists| +dr_gw_lists|1 +dr_rules| +dr_rules|3 globalblacklist| globalblacklist|1 grp| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index abd03a6..685386f 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -14,6 +14,10 @@ dispatcher:3 domain:1 domain_name:1 domainpolicy:2 +dr_gateways:3 +dr_groups:2 +dr_gw_lists:1 +dr_rules:3 globalblacklist:1 grp:2 gw:10 diff --git a/utils/kamctl/mysql/drouting-create.sql b/utils/kamctl/mysql/drouting-create.sql index 9b4388f..8f72794 100644 --- a/utils/kamctl/mysql/drouting-create.sql +++ b/utils/kamctl/mysql/drouting-create.sql @@ -1,14 +1,15 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, type INT(11) UNSIGNED DEFAULT 0 NOT NULL, address VARCHAR(128) NOT NULL, strip INT(11) UNSIGNED DEFAULT 0 NOT NULL, pri_prefix VARCHAR(64) DEFAULT NULL, + attrs VARCHAR(255) DEFAULT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ) ENGINE=MyISAM; -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, groupid VARCHAR(255) NOT NULL, @@ -20,3 +21,19 @@ CREATE TABLE dr_rules ( description VARCHAR(128) DEFAULT '' NOT NULL ) ENGINE=MyISAM; +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + gwlist VARCHAR(255) NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +) ENGINE=MyISAM; + +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + username VARCHAR(64) NOT NULL, + domain VARCHAR(128) DEFAULT '' NOT NULL, + groupid INT(11) UNSIGNED DEFAULT 0 NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +) ENGINE=MyISAM; + diff --git a/utils/kamctl/oracle/drouting-create.sql b/utils/kamctl/oracle/drouting-create.sql index a5dde37..4d2a005 100644 --- a/utils/kamctl/oracle/drouting-create.sql +++ b/utils/kamctl/oracle/drouting-create.sql @@ -1,10 +1,11 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid NUMBER(10) PRIMARY KEY, type NUMBER(10) DEFAULT 0 NOT NULL, address VARCHAR2(128), strip NUMBER(10) DEFAULT 0 NOT NULL, pri_prefix VARCHAR2(64) DEFAULT NULL, + attrs VARCHAR2(255) DEFAULT NULL, description VARCHAR2(128) DEFAULT '' ); @@ -16,7 +17,7 @@ END dr_gateways_tr; / BEGIN map2users('dr_gateways'); END; / -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid NUMBER(10) PRIMARY KEY, groupid VARCHAR2(255), @@ -36,3 +37,35 @@ END dr_rules_tr; / BEGIN map2users('dr_rules'); END; / +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id NUMBER(10) PRIMARY KEY, + gwlist VARCHAR2(255), + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_gw_lists_tr +before insert on dr_gw_lists FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_gw_lists_tr; +/ +BEGIN map2users('dr_gw_lists'); END; +/ +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id NUMBER(10) PRIMARY KEY, + username VARCHAR2(64), + domain VARCHAR2(128) DEFAULT '', + groupid NUMBER(10) DEFAULT 0 NOT NULL, + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_groups_tr +before insert on dr_groups FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_groups_tr; +/ +BEGIN map2users('dr_groups'); END; +/ diff --git a/utils/kamctl/postgres/drouting-create.sql b/utils/kamctl/postgres/drouting-create.sql index 4defbfe..73c2c7f 100644 --- a/utils/kamctl/postgres/drouting-create.sql +++ b/utils/kamctl/postgres/drouting-create.sql @@ -1,14 +1,15 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid SERIAL PRIMARY KEY NOT NULL, type INTEGER DEFAULT 0 NOT NULL, address VARCHAR(128) NOT NULL, strip INTEGER DEFAULT 0 NOT NULL, pri_prefix VARCHAR(64) DEFAULT NULL, + attrs VARCHAR(255) DEFAULT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ); -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid SERIAL PRIMARY KEY NOT NULL, groupid VARCHAR(255) NOT NULL, @@ -20,3 +21,19 @@ CREATE TABLE dr_rules ( description VARCHAR(128) DEFAULT '' NOT NULL ); +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id SERIAL PRIMARY KEY NOT NULL, + gwlist VARCHAR(255) NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +); + +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id SERIAL PRIMARY KEY NOT NULL, + username VARCHAR(64) NOT NULL, + domain VARCHAR(128) DEFAULT '' NOT NULL, + groupid INTEGER DEFAULT 0 NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +); +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev