sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
296 discussions

git:master:65750d34: rtpengine: Update kamailio-db-devel db scripts
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 65750d3422f97568623036a027ddebcbe636198d URL: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:29:00+02:00 rtpengine: Update kamailio-db-devel db scripts Add rtpengine 'utils/kamctl/$dbschema' scripts. --- Added: utils/kamctl/db_berkeley/kamailio/rtpengine Added: utils/kamctl/db_sqlite/rtpengine-create.sql Added: utils/kamctl/dbtext/kamailio/rtpengine Added: utils/kamctl/mysql/rtpengine-create.sql Added: utils/kamctl/oracle/rtpengine-create.sql Added: utils/kamctl/postgres/rtpengine-create.sql Added: utils/kamctl/xhttp_pi/rtpengine-mod Added: utils/kamctl/xhttp_pi/rtpengine-table --- Diff: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc… Patch: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc…

1 0

git:master:174c7ab0: rtpengine: Update kamailio-db-devel .xml
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 174c7ab05e803e9c0288ada8bc4578bf7e6ea567 URL: https://github.com/kamailio/kamailio/commit/174c7ab05e803e9c0288ada8bc4578b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:29:00+02:00 rtpengine: Update kamailio-db-devel .xml Add rtpengine .xml table documentation. Update version files. --- Added: lib/srdb1/schema/kamailio-rtpengine.xml Added: lib/srdb1/schema/rtpengine.xml Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/174c7ab05e803e9c0288ada8bc4578b… Patch: https://github.com/kamailio/kamailio/commit/174c7ab05e803e9c0288ada8bc4578b…

1 0

git:master:fd90308d: rtpengine: Check node address when adding to set
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: fd90308dd76d16452805edad713026c4a9f3bcea URL: https://github.com/kamailio/kamailio/commit/fd90308dd76d16452805edad713026c… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:29:00+02:00 rtpengine: Check node address when adding to set The node address has to start with 'udp:', 'udp6:' or 'unix:' and to end with a valid port number. Else, the node is ignored and is not added to the set. --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/fd90308dd76d16452805edad713026c… Patch: https://github.com/kamailio/kamailio/commit/fd90308dd76d16452805edad713026c…

1 0

git:master:0def3282: rtpengine: Check set uniqueness for rtpp node
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 0def328282cb8551823554978d7e32afa7ca4110 URL: https://github.com/kamailio/kamailio/commit/0def328282cb8551823554978d7e32a… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:28:59+02:00 rtpengine: Check set uniqueness for rtpp node If node already found in set, update details like weight, recheck_ticks, disabled status. Else, create new node for the specific set. This is especially useful when reloading the nodes from database via 'kamctl fifo nh_rtpp_reload'; just to update the nodes,no shm_free and realloc needed. Also applicable for the config file nodes. This per set uniqueness of the nodes is plausible given the possibility to set the weight of the rtpp nodes. --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/0def328282cb8551823554978d7e32a… Patch: https://github.com/kamailio/kamailio/commit/0def328282cb8551823554978d7e32a… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 36b09a8..501763b 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -204,7 +204,7 @@ static char *send_rtpp_command(struct rtpp_node *, bencode_item_t *, int *); static int get_extra_id(struct sip_msg* msg, str *id_str); static int rtpengine_set_store(modparam_t type, void * val); -static int rtpengine_add_rtpengine_set( char * rtp_proxies); +static int rtpengine_add_rtpengine_set(char * rtp_proxies, int disabled, unsigned int ticks); static int mod_init(void); static int child_init(int); @@ -521,6 +521,9 @@ static int bind_force_send_ip(int sock_idx) return 0; } +static inline int str_cmp(const str *a , const str *b) { + return ! (a->len == b->len && ! strncmp(a->s, b->s, a->len)); +} static inline int str_eq(const str *p, const char *q) { int l = strlen(q); @@ -530,6 +533,7 @@ static inline int str_eq(const str *p, const char *q) { return 0; return 1; } + static inline str str_prefix(const str *p, const char *q) { str ret; ret.s = NULL; @@ -587,6 +591,25 @@ static int rtpengine_set_store(modparam_t type, void * val){ return 0; } +struct rtpp_node *get_rtpp_node(struct rtpp_set *rtpp_list, str *url) +{ + struct rtpp_node *rtpp_node; + + if (rtpp_list == NULL) { + return NULL; + } + + rtpp_node = rtpp_list->rn_first; + while (rtpp_node) { + if (str_cmp(&rtpp_node->rn_url, url) == 0) { + return rtpp_node; + } + rtpp_node = rtpp_node->rn_next; + } + + return NULL; +} + struct rtpp_set *get_rtpp_set(int set_id) { struct rtpp_set * rtpp_list; @@ -659,6 +682,7 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, int disabl /* Make rtp proxies list. */ char *p, *p1, *p2, *plim; struct rtpp_node *pnode; + struct rtpp_node *rtpp_node; int weight; p = rtpproxy; @@ -720,6 +744,16 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, int disabl pnode->rn_address += 5; } + // if node found in set, update it for disabled state + rtpp_node = get_rtpp_node(rtpp_list, &pnode->rn_url); + if (rtpp_node) { + rtpp_node->rn_disabled = pnode->rn_disabled; + rtpp_node->rn_recheck_ticks = pnode->rn_recheck_ticks; + rtpp_node->rn_weight = pnode->rn_weight; + shm_free(pnode); + continue; + } + if (rtpp_list->rn_first == NULL) { rtpp_list->rn_first = pnode; } else { @@ -736,7 +770,7 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, int disabl /* 0-succes * -1 - erorr * */ -static int rtpengine_add_rtpengine_set( char * rtp_proxies) +static int rtpengine_add_rtpengine_set(char * rtp_proxies, int disabled, unsigned int ticks) { char *p,*p2; struct rtpp_set * rtpp_list; @@ -789,7 +823,8 @@ static int rtpengine_add_rtpengine_set( char * rtp_proxies) if (rtpp_list != NULL) { - if (add_rtpengine_socks(rtpp_list, rtp_proxies, 0, 0) != 0) + + if (add_rtpengine_socks(rtpp_list, rtp_proxies, disabled, ticks) != 0) goto error; else return 0; @@ -1439,7 +1474,7 @@ mod_init(void) { /* storing the list of rtp proxy sets in shared memory*/ for(i=0;i<rtpp_sets;i++){ - if(rtpengine_add_rtpengine_set(rtpp_strings[i]) !=0){ + if(rtpengine_add_rtpengine_set(rtpp_strings[i], 0, 0) !=0){ for(;i<rtpp_sets;i++) if(rtpp_strings[i]) pkg_free(rtpp_strings[i]); diff --git a/modules/rtpengine/rtpengine.h b/modules/rtpengine/rtpengine.h index 48eeaf1..adf1692 100644 --- a/modules/rtpengine/rtpengine.h +++ b/modules/rtpengine/rtpengine.h @@ -61,6 +61,7 @@ struct rtpp_set_head{ }; +struct rtpp_node *get_rtpp_node(struct rtpp_set *rtpp_list, str *url); struct rtpp_set *get_rtpp_set(int set_id); int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, int disabled, unsigned int ticks);

1 0

git:master:410151eb: rtpengine: Add db 'weight' column
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 410151eb6c7d992f9b7a7fd21e7a7f5ee1a44e67 URL: https://github.com/kamailio/kamailio/commit/410151eb6c7d992f9b7a7fd21e7a7f5… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:28:59+02:00 rtpengine: Add db 'weight' column Add weight column with weight_col modparam. Updated doku. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/410151eb6c7d992f9b7a7fd21e7a7f5… Patch: https://github.com/kamailio/kamailio/commit/410151eb6c7d992f9b7a7fd21e7a7f5…

1 0

git:master:d884698c: rtpengine: Add kamctl nh_reload_rtpp
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: d884698c9184cc649a2846b8070b78900cc7a215 URL: https://github.com/kamailio/kamailio/commit/d884698c9184cc649a2846b8070b789… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:28:59+02:00 rtpengine: Add kamctl nh_reload_rtpp Fifo command to allow reload from database node table. Updates the state of the nodes or creates new ones; does not delete the old nodes, not present anymore in the database. Updated doku. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d884698c9184cc649a2846b8070b789… Patch: https://github.com/kamailio/kamailio/commit/d884698c9184cc649a2846b8070b789…

1 0

git:master:3e25dce1: rtpengine: Add setid_default modparam
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 3e25dce1918e007a5db3752143c427a512a08dd2 URL: https://github.com/kamailio/kamailio/commit/3e25dce1918e007a5db3752143c427a… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:24:03+02:00 rtpengine: Add setid_default modparam Add option to change the default set id. If setid_avp is configured, the active set used is the avp value. If setid_avp is not configured, the active set used is setid_default value. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3e25dce1918e007a5db3752143c427a… Patch: https://github.com/kamailio/kamailio/commit/3e25dce1918e007a5db3752143c427a… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 4fd0481..8333378 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -294,7 +294,7 @@ modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") </example> </section> - <section id="rtpengine.p.setid_pv"> + <section id="rtpengine.p.setid_avp"> <title><varname>setid_avp</varname> (string)</title> <para> The parameter defines an AVP that, if set, @@ -597,8 +597,29 @@ modparam("rtpengine", "disabled_col", "disabled_column_name") </section> + <section id="rtpengine.p.setid_default"> + <title><varname>setid_default</varname> (string)</title> + <para> + The default set of nodes to be used. + </para> + <para> + By default, the setid is 0. + </para> + <para> + NOTE that if setid_avp is configured, this value will be ignored and + the active set will be chosen according to the setid_avp. + </para> + <example> + <title>Set <varname>setid_default</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "setid_default", 11) +... +</programlisting> + </example> </section> + </section> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 42646b3..4b84d59 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -235,6 +235,7 @@ static str extra_id_pv_param = {NULL, 0}; static char *setid_avp_param = NULL; static int hash_table_tout = 3600; static int hash_table_size = 256; +static int setid_default = DEFAULT_RTPP_SET_ID; static char ** rtpp_strings=0; static int rtpp_sets=0; /*used in rtpengine_set_store()*/ @@ -340,14 +341,15 @@ static param_export_t params[] = { {"setid_col", PARAM_STR, &rtpp_setid_col }, {"url_col", PARAM_STR, &rtpp_url_col }, {"disabled_col", PARAM_STR, &rtpp_disabled_col }, - {"extra_id_pv", PARAM_STR, &extra_id_pv_param }, - {"setid_avp", PARAM_STRING, &setid_avp_param }, - {"force_send_interface", PARAM_STRING, &force_send_ip_str }, - {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param }, - {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str }, - {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str }, + {"extra_id_pv", PARAM_STR, &extra_id_pv_param }, + {"setid_avp", PARAM_STRING, &setid_avp_param }, + {"force_send_interface", PARAM_STRING, &force_send_ip_str }, + {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param }, + {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str }, + {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str }, {"hash_table_tout", INT_PARAM, &hash_table_tout }, {"hash_table_size", INT_PARAM, &hash_table_size }, + {"setid_default", INT_PARAM, &setid_default }, {0, 0, 0} }; @@ -1505,6 +1507,14 @@ mod_init(void) LM_DBG("rtpengine_hash_table_init(%d) success!\n", hash_table_size); } + /* select the default set */ + default_rtpp_set = select_rtpp_set(setid_default); + if (!default_rtpp_set) { + LM_NOTICE("Default rtpp set %d NOT found\n", setid_default); + } else { + LM_DBG("Default rtpp set %d found\n", setid_default); + } + return 0; }

1 0

git:master:20e4a5d5: rtpengine: Update doku for rtpengine database
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 20e4a5d5d415e12e3dca5dd3dab5f36c49058b42 URL: https://github.com/kamailio/kamailio/commit/20e4a5d5d415e12e3dca5dd3dab5f36… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:21:12+02:00 rtpengine: Update doku for rtpengine database The module is able to load nodes specified in a database. Update doku for this. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/20e4a5d5d415e12e3dca5dd3dab5f36… Patch: https://github.com/kamailio/kamailio/commit/20e4a5d5d415e12e3dca5dd3dab5f36…

1 0

git:master:55734eb2: rtpengine: Add setid_col modparam
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 55734eb2ea6dfcda679570f08b3bf331a4f44f76 URL: https://github.com/kamailio/kamailio/commit/55734eb2ea6dfcda679570f08b3bf33… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:21:12+02:00 rtpengine: Add setid_col modparam Allow setid column name. Updated doku. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/55734eb2ea6dfcda679570f08b3bf33… Patch: https://github.com/kamailio/kamailio/commit/55734eb2ea6dfcda679570f08b3bf33… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index b29a108..d2b28bd 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -458,12 +458,33 @@ modparam("rtpengine", "hash_table_tout", "300") </section> + <section id="rtpengine.p.setid_col"> + <title><varname>setid_col</varname> (string)</title> + <para> + Column name in the rtpproxy table. If database mode is activated, + set the setid of rtp nodes according to this column, on startup. + The MySQL value for this column should be INT UNSIGNED. + </para> + <para> + By default, the column name is "setid". + </para> + <example> + <title>Set <varname>setid_col</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "setid_col", "setid_column_name") +... +</programlisting> + </example> + </section> + + <section id="rtpengine.p.disabled_col"> <title><varname>disabled_col</varname> (string)</title> <para> Column name in the rtpproxy table. If database mode is activated, set the state of rtp nodes according to this column, on startup. - The MySQL value for this column is INT. + The MySQL value for this column should be INT. </para> <para> By default, the column name is "disabled". diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 016d82c..42646b3 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -337,6 +337,7 @@ static param_export_t params[] = { {"queried_nodes_limit", INT_PARAM, &queried_nodes_limit }, {"db_url", PARAM_STR, &rtpp_db_url }, {"table_name", PARAM_STR, &rtpp_table_name }, + {"setid_col", PARAM_STR, &rtpp_setid_col }, {"url_col", PARAM_STR, &rtpp_url_col }, {"disabled_col", PARAM_STR, &rtpp_disabled_col }, {"extra_id_pv", PARAM_STR, &extra_id_pv_param }, diff --git a/modules/rtpengine/rtpengine.h b/modules/rtpengine/rtpengine.h index 5d46b5b..48eeaf1 100644 --- a/modules/rtpengine/rtpengine.h +++ b/modules/rtpengine/rtpengine.h @@ -69,6 +69,7 @@ int init_rtpproxy_db(void); extern str rtpp_db_url; extern str rtpp_table_name; +extern str rtpp_setid_col; extern str rtpp_url_col; extern str rtpp_disabled_col; diff --git a/modules/rtpengine/rtpengine_db.c b/modules/rtpengine/rtpengine_db.c index bd4f08f..87cdc60 100644 --- a/modules/rtpengine/rtpengine_db.c +++ b/modules/rtpengine/rtpengine_db.c @@ -32,7 +32,7 @@ static db1_con_t *rtpp_db_handle = NULL; str rtpp_db_url = {NULL, 0}; str rtpp_table_name = str_init("rtpproxy"); -str rtpp_set_id_col = str_init("set_id"); +str rtpp_setid_col = str_init("setid"); str rtpp_url_col = str_init("url"); str rtpp_disabled_col = str_init("disabled"); @@ -64,10 +64,10 @@ static int rtpp_load_db(void) db1_res_t *res = NULL; db_val_t *values = NULL; db_row_t *rows = NULL; - db_key_t query_cols[] = {&rtpp_set_id_col, &rtpp_url_col, &rtpp_disabled_col}; + db_key_t query_cols[] = {&rtpp_setid_col, &rtpp_url_col, &rtpp_disabled_col}; str url; - int set_id; + int setid; int disabled; unsigned int ticks; @@ -102,7 +102,7 @@ static int rtpp_load_db(void) { values = ROW_VALUES(rows + i); - set_id = VAL_INT(values); + setid = VAL_INT(values); url.s = VAL_STR(values+1).s; url.len = strlen(url.s); disabled = VAL_INT(values+2); @@ -115,16 +115,16 @@ static int rtpp_load_db(void) weight = VAL_INT(values+2); flags = VAL_INT(values+3); */ - if ((rtpp_list = get_rtpp_set(set_id)) == NULL) + if ((rtpp_list = get_rtpp_set(setid)) == NULL) { - LM_ERR("error getting rtpp_list for set %d\n", set_id); + LM_ERR("error getting rtpp_list for set %d\n", setid); continue; } if (add_rtpengine_socks(rtpp_list, url.s, disabled, ticks) != 0) { LM_ERR("error inserting '%.*s' into set %d disabled=%d\n", - url.len, url.s, set_id, disabled); + url.len, url.s, setid, disabled); } }

1 0

git:master:5192377b: rtpengine: Add db 'disabled' column
by Stefan Mititelu 26 Jan '16

26 Jan '16

Module: kamailio Branch: master Commit: 5192377be91a09b48476944b05c3ec182758e88c URL: https://github.com/kamailio/kamailio/commit/5192377be91a09b48476944b05c3ec1… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:21:12+02:00 rtpengine: Add db 'disabled' column Able to load rtp nodes state from database. Add "disabled" column with disabled_col modparam: - if disabled != 0, disable the node permanent (similar to disabling it manually using kamctl fifo command) - if disabled == 0, keep the current behaviour (set ticks to 0, ping and disable temporary in case the node is not responding) --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5192377be91a09b48476944b05c3ec1… Patch: https://github.com/kamailio/kamailio/commit/5192377be91a09b48476944b05c3ec1…

1 0

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