sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: sdpops: fixes in some debug messages
by Daniel-Constantin Mierla 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: c8d99c6586549972d2eaa54a1327c877b0c1da68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8d99c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Aug 20 09:23:24 2011 +0200 sdpops: fixes in some debug messages --- modules/sdpops/sdpops_mod.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index eca4558..732acf2 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -142,6 +142,7 @@ int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, if(payload->rtp_enc.s!=NULL) { if(sdp_locate_line(msg, payload->rtp_enc.s, &aline)==0) { + LM_DBG("removing line: %.*s", aline.len, aline.s); anchor = del_lump(msg, aline.s - msg->buf, aline.len, 0); if (anchor == NULL) { @@ -155,6 +156,7 @@ int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, if(payload->fmtp_string.s!=NULL) { if(sdp_locate_line(msg, payload->fmtp_string.s, &aline)==0) { + LM_DBG("removing line: %.*s\n", aline.len, aline.s); anchor = del_lump(msg, aline.s - msg->buf, aline.len, 0); if (anchor == NULL) { @@ -407,7 +409,7 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) return -1; } - LM_ERR("attempting to remove codecs from sdp: [%.*s]\n", + LM_ERR("attempting to keep codecs in sdp: [%.*s]\n", codecs->len, codecs->s); sdp = (sdp_info_t*)msg->body;

1 0

git:master: sdpops: added functions to keep in SDP only a set of codecs
by Daniel-Constantin Mierla 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: 9ed8d781d8ac8a0fba808d2f62162f267a065ec4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ed8d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 19 14:41:43 2011 +0200 sdpops: added functions to keep in SDP only a set of codecs - sdp_keep_codecs_by_id(idlist) - keep in SDP only the codecs that are also in idlist, parameter being a list of codec integer IDs - sdp_keep_codecs_by_name(list) - keep in SDP only the codecs that are also in list, parameter being a list of codec names --- modules/sdpops/sdpops_mod.c | 183 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 9e47a0c..29ee993 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -41,6 +41,8 @@ MODULE_VERSION static int w_sdp_remove_codecs_by_id(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_remove_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar); +static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char *bar); +static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); @@ -51,6 +53,10 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_remove_codecs_by_name", (cmd_function)w_sdp_remove_codecs_by_name, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_keep_codecs_by_id", (cmd_function)w_sdp_keep_codecs_by_id, + 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_keep_codecs_by_name", (cmd_function)w_sdp_keep_codecs_by_name, + 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_media", (cmd_function)w_sdp_with_media, 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_print", (cmd_function)w_sdp_print, @@ -169,6 +175,42 @@ int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, /** * */ +int sdp_codec_in_str(str *allcodecs, str* codec) +{ + int i; + int cmp; + + if(allcodecs==NULL || codec==NULL + || allcodecs->len<=0 || codec->len<=0) + return 0; + + cmp = 1; + for(i=0; i<allcodecs->len; i++) { + if(cmp==1) { + if(codec->len <= allcodecs->len-i) { + if(strncmp(&allcodecs->s[i], codec->s, codec->len)==0) { + if(&allcodecs->s[i+codec->len] + == &allcodecs->s[allcodecs->len] + || allcodecs->s[i+codec->len] == ' ') { + /* match */ + return 1; + } + } + } + } + if(allcodecs->s[i]==' ') + cmp = 1; + else + cmp = 0; + } + + return 0; +} + + +/** + * + */ int sdp_remove_str_codec_id(sip_msg_t* msg, str *allcodecs, str* rmcodec) { int i; @@ -321,6 +363,7 @@ int sdp_remove_codecs_by_name(sip_msg_t* msg, str* codecs) return 0; } + /** * */ @@ -345,6 +388,140 @@ static int w_sdp_remove_codecs_by_name(sip_msg_t* msg, char* codecs, char* bar) return 1; } +/** + * + */ +int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) +{ + sdp_info_t *sdp = NULL; + int sdp_session_num; + int sdp_stream_num; + sdp_session_cell_t* sdp_session; + sdp_stream_cell_t* sdp_stream; + str sdp_codecs; + str tmp_codecs; + str rm_codec; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + LM_ERR("attempting to remove codecs from sdp: [%.*s]\n", + codecs->len, codecs->s); + + sdp = (sdp_info_t*)msg->body; + + sdp_session_num = 0; + for(;;) + { + sdp_session = get_sdp_session(msg, sdp_session_num); + if(!sdp_session) break; + sdp_stream_num = 0; + for(;;) + { + sdp_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num); + if(!sdp_stream) break; + + LM_DBG("stream %d of %d - payloads [%.*s]\n", + sdp_stream_num, sdp_session_num, + sdp_stream->payloads.len, sdp_stream->payloads.s); + sdp_codecs = sdp_stream->payloads; + tmp_codecs = sdp_stream->payloads; + while(str_find_token(&tmp_codecs, &rm_codec, ' ')==0 + && rm_codec.len>0) + { + tmp_codecs.len -=(int)(&rm_codec.s[rm_codec.len]-tmp_codecs.s); + tmp_codecs.s = rm_codec.s + rm_codec.len; + + if(sdp_codec_in_str(codecs, &rm_codec)==0) { + LM_DBG("codecs [%.*s] - remove [%.*s]\n", + sdp_codecs.len, sdp_codecs.s, + rm_codec.len, rm_codec.s); + sdp_remove_str_codec_id(msg, &sdp_codecs, &rm_codec); + sdp_remove_str_codec_id_attrs(msg, sdp_stream, &rm_codec); + } + } + sdp_stream_num++; + } + sdp_session_num++; + } + + return 0; +} + +/** + * + */ +static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char* bar) +{ + str lcodecs = {0, 0}; + + if(codecs==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)codecs, &lcodecs)!=0) + { + LM_ERR("unable to get the list of codecs\n"); + return -1; + } + + if(sdp_keep_codecs_by_id(msg, &lcodecs)<0) + return -1; + return 1; +} + +/** + * + */ +int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) +{ + str idslist; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + LM_ERR("attempting to keep codecs in sdp: [%.*s]\n", + codecs->len, codecs->s); + + if(sdpops_build_ids_list(codecs, &idslist)<0) + return -1; + + if(sdp_keep_codecs_by_id(msg, &idslist)<0) + return -1; + + return 0; + +} + +/** + * + */ +static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char* bar) +{ + str lcodecs = {0, 0}; + + if(codecs==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)codecs, &lcodecs)!=0) + { + LM_ERR("unable to get the list of codecs\n"); + return -1; + } + + if(sdp_keep_codecs_by_name(msg, &lcodecs)<0) + return -1; + return 1; +} /** * @brief check 'media' matches the value of any 'm=value ...' lines @@ -419,6 +596,9 @@ static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar) } +/** + * + */ static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) { sdp_info_t *sdp = NULL; @@ -441,6 +621,9 @@ static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) return 1; } +/** + * + */ int bind_sdpops(struct sdpops_binds *sob){ if (sob == NULL) { LM_WARN("bind_sdpops: Cannot load sdpops API into a NULL pointer\n");

1 0

git:master: sdpops: documented the functions for keeping only a set of codecs
by Daniel-Constantin Mierla 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: fb92dde610813b6f305d31b380019053505e5628 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb92dde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Aug 20 08:33:38 2011 +0200 sdpops: documented the functions for keeping only a set of codecs --- modules/sdpops/README | 72 +++++++++++++++++++++++++++------- modules/sdpops/doc/sdpops_admin.xml | 52 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 15 deletions(-) diff --git a/modules/sdpops/README b/modules/sdpops/README index 6ce43ed..35f5566 100644 --- a/modules/sdpops/README +++ b/modules/sdpops/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2011 asipto.com + Copyright � 2011 asipto.com __________________________________________________________________ Table of Contents @@ -28,15 +28,19 @@ Daniel-Constantin Mierla 4.1. sdp_remove_codecs_by_id(list) 4.2. sdp_remove_codecs_by_name(list) - 4.3. sdp_with_media(type) - 4.4. sdp_print(level) + 4.3. sdp_keep_codecs_by_id(list) + 4.4. sdp_keep_codecs_by_name(list) + 4.5. sdp_with_media(type) + 4.6. sdp_print(level) List of Examples 1.1. sdp_remove_codecs_by_id usage 1.2. sdp_remove_codecs_by_name usage - 1.3. sdp_with_media usage - 1.4. sdp_print usage + 1.3. sdp_keep_codecs_by_id usage + 1.4. sdp_keep_codecs_by_name usage + 1.5. sdp_with_media usage + 1.6. sdp_print usage Chapter 1. Admin Guide @@ -53,8 +57,10 @@ Chapter 1. Admin Guide 4.1. sdp_remove_codecs_by_id(list) 4.2. sdp_remove_codecs_by_name(list) - 4.3. sdp_with_media(type) - 4.4. sdp_print(level) + 4.3. sdp_keep_codecs_by_id(list) + 4.4. sdp_keep_codecs_by_name(list) + 4.5. sdp_with_media(type) + 4.6. sdp_print(level) 1. Overview @@ -90,10 +96,12 @@ Chapter 1. Admin Guide 4.1. sdp_remove_codecs_by_id(list) 4.2. sdp_remove_codecs_by_name(list) - 4.3. sdp_with_media(type) - 4.4. sdp_print(level) + 4.3. sdp_keep_codecs_by_id(list) + 4.4. sdp_keep_codecs_by_name(list) + 4.5. sdp_with_media(type) + 4.6. sdp_print(level) -4.1. sdp_remove_codecs_by_id(list) +4.1. sdp_remove_codecs_by_id(list) Remove the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must be one or a @@ -110,7 +118,7 @@ sdp_remove_codecs_by_id("0"); sdp_remove_codecs_by_id("0,8,3"); ... -4.2. sdp_remove_codecs_by_name(list) +4.2. sdp_remove_codecs_by_name(list) Remove the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must be one or a @@ -127,7 +135,41 @@ sdp_remove_codecs_by_name("PCMU"); sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); ... -4.3. sdp_with_media(type) +4.3. sdp_keep_codecs_by_id(list) + + Keep only the codecs provided in the parameter 'list' from all media + streams found in SDP payload. The parameter 'list' must be one or a + comma separated list of numeric codec IDs. The parameter can be a + static string or a variable holding the list of numeric codec IDs. + + This function can be used from ANY_ROUTE. + + Example 1.3. sdp_keep_codecs_by_id usage +... +# keep only PCMU +sdp_keep_codecs_by_id("0"); +# keep PCMU, PCMA and GSM +sdp_keep_codecs_by_id("0,8,3"); +... + +4.4. sdp_keep_codecs_by_name(list) + + Keep only the codecs provided in the parameter 'list' from all media + streams found in SDP payload. The parameter 'list' must be one or a + comma separated list of codec names. The parameter can be a static + string or a variable holding the list of codec names. + + This function can be used from ANY_ROUTE. + + Example 1.4. sdp_keep_codecs_by_name usage +... +# keep only PCMU +sdp_keep_codecs_by_name("PCMU"); +# keep PCMU, PCMA and GSM +sdp_keep_codecs_by_name("PCMU,PCMA,GSM"); +... + +4.5. sdp_with_media(type) Return true of the SDP has 'media=type ...' line. Useful to check the content of the RTP sessions, such as 'audio' or 'video'. The parameter @@ -135,7 +177,7 @@ sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); This function can be used from ANY_ROUTE. - Example 1.3. sdp_with_media usage + Example 1.5. sdp_with_media usage ... # check for video stream if(sdp_with_media("video")) @@ -144,14 +186,14 @@ if(sdp_with_media("video")) } ... -4.4. sdp_print(level) +4.6. sdp_print(level) Print the SDP internal structure to log 'level'. The parameter can be static integer or variable holding the integer value of the log level. This function can be used from ANY_ROUTE. - Example 1.4. sdp_print usage + Example 1.6. sdp_print usage ... # print the SDP sdp_print("1"); diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index d571c66..9219b93 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -121,6 +121,58 @@ sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); </section> <section> <title> + <function moreinfo="none">sdp_keep_codecs_by_id(list)</function> + </title> + <para> + Keep only the codecs provided in the parameter 'list' from all + media streams found in SDP payload. The parameter 'list' must + be one or a comma separated list of numeric codec IDs. The + parameter can be a static string or a variable holding the + list of numeric codec IDs. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sdp_keep_codecs_by_id</function> usage</title> + <programlisting format="linespecific"> +... +# keep only PCMU +sdp_keep_codecs_by_id("0"); +# keep PCMU, PCMA and GSM +sdp_keep_codecs_by_id("0,8,3"); +... +</programlisting> + </example> + </section> + <section> + <title> + <function moreinfo="none">sdp_keep_codecs_by_name(list)</function> + </title> + <para> + Keep only the codecs provided in the parameter 'list' from all + media streams found in SDP payload. The parameter 'list' must + be one or a comma separated list of codec names. The + parameter can be a static string or a variable holding the + list of codec names. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sdp_keep_codecs_by_name</function> usage</title> + <programlisting format="linespecific"> +... +# keep only PCMU +sdp_keep_codecs_by_name("PCMU"); +# keep PCMU, PCMA and GSM +sdp_keep_codecs_by_name("PCMU,PCMA,GSM"); +... +</programlisting> + </example> + </section> + <section> + <title> <function moreinfo="none">sdp_with_media(type)</function> </title> <para>

1 0

git:master: sdpops: make delim char a parameter for function to search codec
by Daniel-Constantin Mierla 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: 8ad53ff31e15ace4600f32da94925c4667ee7754 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ad53ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 19 14:46:48 2011 +0200 sdpops: make delim char a parameter for function to search codec --- modules/sdpops/sdpops_mod.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 29ee993..eca4558 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -175,7 +175,7 @@ int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, /** * */ -int sdp_codec_in_str(str *allcodecs, str* codec) +int sdp_codec_in_str(str *allcodecs, str* codec, char delim) { int i; int cmp; @@ -191,7 +191,7 @@ int sdp_codec_in_str(str *allcodecs, str* codec) if(strncmp(&allcodecs->s[i], codec->s, codec->len)==0) { if(&allcodecs->s[i+codec->len] == &allcodecs->s[allcodecs->len] - || allcodecs->s[i+codec->len] == ' ') { + || allcodecs->s[i+codec->len] == delim) { /* match */ return 1; } @@ -434,7 +434,7 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) tmp_codecs.len -=(int)(&rm_codec.s[rm_codec.len]-tmp_codecs.s); tmp_codecs.s = rm_codec.s + rm_codec.len; - if(sdp_codec_in_str(codecs, &rm_codec)==0) { + if(sdp_codec_in_str(codecs, &rm_codec, ',')==0) { LM_DBG("codecs [%.*s] - remove [%.*s]\n", sdp_codecs.len, sdp_codecs.s, rm_codec.len, rm_codec.s);

1 0

git:master: lib/srdb1/schema/mtrees.xml: fixed c&p error reported by Daniel
by Juha Heinanen 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: 4e2315c120cd5a67d1d67c1225d3a5a7f94d6155 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e2315c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Aug 20 09:48:28 2011 +0300 lib/srdb1/schema/mtrees.xml: fixed c&p error reported by Daniel --- lib/srdb1/schema/mtrees.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/mtrees.xml b/lib/srdb1/schema/mtrees.xml index 6a32055..fb3e3f9 100644 --- a/lib/srdb1/schema/mtrees.xml +++ b/lib/srdb1/schema/mtrees.xml @@ -7,8 +7,8 @@ ]> -<table id="mtree" xmlns:db="http://docbook.org/ns/docbook"> - <name>mtree</name> +<table id="mtrees" xmlns:db="http://docbook.org/ns/docbook"> + <name>mtrees</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

git:master: lib/srdb1/schema: added schema for mtrees table.
by Juha Heinanen 20 Aug '11

20 Aug '11

Module: sip-router Branch: master Commit: 8052c90610cf13a30d0a0b541bbc154669d117da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8052c90… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Aug 20 08:21:39 2011 +0300 lib/srdb1/schema: added schema for mtrees table. --- lib/srdb1/schema/kamailio-mtree.xml | 1 + lib/srdb1/schema/mtrees.xml | 60 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-mtree.xml b/lib/srdb1/schema/kamailio-mtree.xml index c10f26c..ec3de72 100644 --- a/lib/srdb1/schema/kamailio-mtree.xml +++ b/lib/srdb1/schema/kamailio-mtree.xml @@ -9,4 +9,5 @@ <database xmlns:xi="http://www.w3.org/2001/XInclude"> <name>MTree keys-values</name> <xi:include href="mtree.xml"/> + <xi:include href="mtrees.xml"/> </database> diff --git a/lib/srdb1/schema/mtrees.xml b/lib/srdb1/schema/mtrees.xml new file mode 100644 index 0000000..6a32055 --- /dev/null +++ b/lib/srdb1/schema/mtrees.xml @@ -0,0 +1,60 @@ +<?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="mtree" xmlns:db="http://docbook.org/ns/docbook"> + <name>mtree</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the mtree module to load values in shared memory trees at start up. More information about the mtree module can be found at: &KAMAILIO_MOD_DOC;mtree.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="tname"> + <name>tname</name> + <type>string</type> + <size>128</size> + <default/> + <description>Name of shared memory tree.</description> + </column> + + <column id="tprefix"> + <name>tprefix</name> + <type>string</type> + <size>32</size> + <default/> + <description>Key to be used to index the values in the tree, usually a DID or prefix.</description> + </column> + + <column id="tvalue"> + <name>tvalue</name> + <type>string</type> + <size>128</size> + <default/> + <description>The value of the key</description> + </column> + + <index> + <name>tname_tprefix_idx</name> + <colref linkend="tname"/> + <colref linkend="tprefix"/> + <unique/> + </index> + +</table>

2 1

git:adubovikov/homer: Crontab script to clear the captute table for the next day.
by Alexandr Dubovikov 19 Aug '11

19 Aug '11

Module: sip-router Branch: adubovikov/homer Commit: fd49c4d7e1df51a15a143d7a7fa52b3b23c7df92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd49c4d… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Sat Aug 20 00:38:44 2011 +0200 Crontab script to clear the captute table for the next day. --- modules/sipcapture/examples/crontabtruncate.pl | 28 ++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/modules/sipcapture/examples/crontabtruncate.pl b/modules/sipcapture/examples/crontabtruncate.pl new file mode 100644 index 0000000..50bddda --- /dev/null +++ b/modules/sipcapture/examples/crontabtruncate.pl @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +#Crontab script, to clear table/partition for the next day +#set crontab at 23:50 + +my $mysqlstring = "/usr/bin/mysql -uhomer_user -phomer_password -hlocalhost homer_db"; + +#homer node +my $wday = (localtime())[6] + 1; + +#uncomment if you use separate tables +#Separate tables +#for(my $i=0; $i < 24; $i++) { +# my $query = sprintf("TRUNCATE TABLE sip_capture_%02d_%02d", $wday, $i); +# `echo \"$query\"| $mysqlstring`; +#} + +#uncomment if you use partitioning table and MySQL >= 5.5 +#my $query = sprintf("ALTER TABLE sip_capture TRUNCATE PARTITION p%d", $wday); +#`echo \"$query\"| $mysqlstring`; + +#or Mysql < 5.5 +my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time() - (86400*6)); +$year+=1900; +$mon++; + +my $query = sprintf("DELETE FROM sip_capture WHERE `date` < '%d-%02d-%02d 00:00:00' ", $year, $mon, $mday); +`echo \"$query\"| $mysqlstring`;

1 0

mtree table, mtrees table or both?
by Juha Heinanen 19 Aug '11

19 Aug '11

daniel, after playing with mtree module, it worked for me when i used mtrees table instead of mtree table. in schema dir, there is schema only for mtree table. clearly schema for mtrees table should be added, but what to do with existing mtree table schema? is it ok to remove it? -- juha

2 1

git:master: modules/mtree: added new mode to mt_match()
by Juha Heinanen 19 Aug '11

19 Aug '11

Module: sip-router Branch: master Commit: bd8b01b9e236f9b3dbf20a4c3a153057dc8daa52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd8b01b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 18 20:04:32 2011 +0300 modules/mtree: added new mode to mt_match() - Added mode=2 to mt_match() call that instead of setting value of longest matching prefix to a pv, sets values of all matching prefixes to an avp so that value of longest matching prefix is in avp index 0. --- modules/mtree/README | 67 ++++++++++++++++++++++++++++--------- modules/mtree/doc/mtree.xml | 14 ++++++++ modules/mtree/doc/mtree_admin.xml | 25 ++++++++++++-- modules/mtree/mtree.c | 53 ++++++++++++++++++++++++++++- modules/mtree/mtree_mod.c | 17 +++++++++- 5 files changed, 154 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd8…

2 4

git:master: srdb1: column expires in htable set to type int
by Daniel-Constantin Mierla 19 Aug '11

19 Aug '11

Module: sip-router Branch: master Commit: d23aff6ed1e42b1c81b60805f3c1d5fea94cf310 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d23aff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 19 12:23:05 2011 +0200 srdb1: column expires in htable set to type int - it was string, reported by Mészáros Mihály --- lib/srdb1/schema/htable.xml | 2 +- utils/kamctl/db_berkeley/kamailio/htable | 2 +- utils/kamctl/db_berkeley/kamailio/version | 2 ++ utils/kamctl/db_sqlite/htable-create.sql | 2 +- utils/kamctl/dbtext/kamailio/htable | 2 +- utils/kamctl/dbtext/kamailio/version | 1 + utils/kamctl/mysql/htable-create.sql | 2 +- utils/kamctl/oracle/htable-create.sql | 2 +- utils/kamctl/postgres/htable-create.sql | 2 +- 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/srdb1/schema/htable.xml b/lib/srdb1/schema/htable.xml index 913bcc1..b820d23 100644 --- a/lib/srdb1/schema/htable.xml +++ b/lib/srdb1/schema/htable.xml @@ -58,7 +58,7 @@ <column id="expires"> <name>expires</name> - <type>string</type> + <type>int</type> <default>0</default> <description>The epoch at which the key expires</description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/htable b/utils/kamctl/db_berkeley/kamailio/htable index 5a0b29c..dfc53a1 100644 --- a/utils/kamctl/db_berkeley/kamailio/htable +++ b/utils/kamctl/db_berkeley/kamailio/htable @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) key_name(str) key_type(int) value_type(int) key_value(str) expires(str) +id(int) key_name(str) key_type(int) value_type(int) key_value(str) expires(int) METADATA_KEY METADATA_READONLY diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 030f358..f5c5a19 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -28,6 +28,8 @@ dbaliases| dbaliases|1 dialog| dialog|5 +METADATA_DEFAULTS +NIL|NIL|NIL|NIL|NIL dialplan| dialplan|1 dispatcher| diff --git a/utils/kamctl/db_sqlite/htable-create.sql b/utils/kamctl/db_sqlite/htable-create.sql index 990334f..494bc39 100644 --- a/utils/kamctl/db_sqlite/htable-create.sql +++ b/utils/kamctl/db_sqlite/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INTEGER DEFAULT 0 NOT NULL, value_type INTEGER DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INTEGER DEFAULT 0 NOT NULL ); diff --git a/utils/kamctl/dbtext/kamailio/htable b/utils/kamctl/dbtext/kamailio/htable index 1abd0d5..55a9ac4 100644 --- a/utils/kamctl/dbtext/kamailio/htable +++ b/utils/kamctl/dbtext/kamailio/htable @@ -1 +1 @@ -id(int,auto) key_name(string) key_type(int) value_type(int) key_value(string) expires(string) +id(int,auto) key_name(string) key_type(int) value_type(int) key_value(string) expires(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 85315a2..f1516c8 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -9,6 +9,7 @@ carrierroute:3 cpl:1 dbaliases:1 dialog:5 +id(int,auto) hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) dialplan:1 dispatcher:4 domain:1 diff --git a/utils/kamctl/mysql/htable-create.sql b/utils/kamctl/mysql/htable-create.sql index 6adfa48..79eb43b 100644 --- a/utils/kamctl/mysql/htable-create.sql +++ b/utils/kamctl/mysql/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INT DEFAULT 0 NOT NULL, value_type INT DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INT DEFAULT 0 NOT NULL ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/htable-create.sql b/utils/kamctl/oracle/htable-create.sql index 0ccb6b1..7748aae 100644 --- a/utils/kamctl/oracle/htable-create.sql +++ b/utils/kamctl/oracle/htable-create.sql @@ -5,7 +5,7 @@ CREATE TABLE htable ( key_type NUMBER(10) DEFAULT 0 NOT NULL, value_type NUMBER(10) DEFAULT 0 NOT NULL, key_value VARCHAR2(128) DEFAULT '', - expires VARCHAR2 DEFAULT 0 NOT NULL + expires NUMBER(10) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER htable_tr diff --git a/utils/kamctl/postgres/htable-create.sql b/utils/kamctl/postgres/htable-create.sql index 705ca0e..a63245a 100644 --- a/utils/kamctl/postgres/htable-create.sql +++ b/utils/kamctl/postgres/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INTEGER DEFAULT 0 NOT NULL, value_type INTEGER DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INTEGER DEFAULT 0 NOT NULL );

2 2

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