sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules_k/siptutils : Fixed small typo

by Marius Zbihlei

Module: sip-router Branch: master Commit: 5402db476a57a0f840e21b53291911b51a06d14a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5402db4… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Feb 3 14:25:18 2010 +0200 modules_k/siptutils : Fixed small typo --- modules_k/siputils/siputils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 2b3aec8..25e5f33 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -165,7 +165,7 @@ static int mod_init(void) return -1; } - if(cfg_declare("siptutils", siputils_cfg_def, &default_siputils_cfg, cfg_sizeof(siputils), &siputils_cfg)){ + if(cfg_declare("siputils", siputils_cfg_def, &default_siputils_cfg, cfg_sizeof(siputils), &siputils_cfg)){ LM_ERR("Fail to declare the configuration\n"); return -1; }

14 years, 12 months

git:master: test:unit Fixed unixodbc tests (tested with mysql connector)

by Marius Zbihlei

Module: sip-router Branch: master Commit: d5a382d95db57093a8e35f2018d18c998979005a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5a382d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Feb 3 14:19:51 2010 +0200 test:unit Fixed unixodbc tests (tested with mysql connector) --- test/unit/38.sh | 4 ++-- test/unit/39.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/38.sh b/test/unit/38.sh index eff3b28..29dd758 100755 --- a/test/unit/38.sh +++ b/test/unit/38.sh @@ -36,7 +36,7 @@ echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"unixodbc://openserro:openserro@localhost/openser\")" >> $CFG # start -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -45,4 +45,4 @@ $KILL mv $CFG.bak $CFG rm -f dispatcher.list -exit $ret \ No newline at end of file +exit $ret diff --git a/test/unit/39.sh b/test/unit/39.sh index d14cfff..9e8e2d6 100755 --- a/test/unit/39.sh +++ b/test/unit/39.sh @@ -45,7 +45,7 @@ COUNTER=0 CNT=0 while [ $COUNTER -lt $NR ]; do COUNTER=$(($COUNTER+1)) - echo -e "insert into location (id, username, domain, contact, user_agent) values ('$CNT', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+1', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+2', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+3', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+4', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+5', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, c ontact, user_agent) values ('$CNT+6', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+7', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+8', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+9', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n " | $ISQL > /dev/null + echo -e "insert into location (id, username, domain, contact, user_agent) values ('$CNT', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+1))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+2))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+3))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+4))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+5))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+6))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+7))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+8))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+9))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___');" | $ISQL CNT=$(($CNT+10)) done

14 years, 12 months

sip_msg changes - proposal

by Daniel-Constantin Mierla

Hello, some months ago (iirc) we had a discussion about the sip_msg structure and the fact that it has too many header hooks, some for pretty uncommon or not really used inside sip router code. I spotted - subject - accept_language - content_disposition - accept_disposition - unsupported - organization - diversion (expired draft?) The list can continue a bit ... I was thinking to replace them with a call of get_hdr_by_name|type() kind of function. The benefit will be lower structure. On the other hand, I would add a new field to hold the pid of the process that received the message. There are some potential races by using only id to identify a message, especially in serial forking. Opinions? Daniel -- Daniel-Constantin Mierla eLearning class for Kamailio 3.0.0 Starting Feb 8, 2010 * http://www.asipto.com/

14 years, 12 months

git:ebaixas/fixing_seas: Fixes in seas module to work with sip-router

by Elias Baixas

Module: sip-router Branch: ebaixas/fixing_seas Commit: ce08563a4701fd81759d500a7345b9fa26a9dc58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce08563… Author: Elias Baixas <elias(a)eresmas.net> Committer: Elias Baixas <elias(a)eresmas.net> Date: Mon Jan 25 12:32:14 2010 +0100 Fixes in seas module to work with sip-router --- Makefile.defs | 1 + modules/tm/dlg.c | 19 +++ modules/tm/dlg.h | 8 ++ modules/tm/h_table.h | 4 + modules/tm/t_cancel.c | 110 ++++++++++++++++++- modules/tm/t_cancel.h | 8 ++ modules/tm/t_msgbuilder.c | 111 ++++++++++++++++++ modules/tm/t_msgbuilder.h | 12 +- modules/tm/t_reply.c | 41 ++++---- modules/tm/t_reply.h | 6 +- modules/tm/tm_load.c | 2 + modules/tm/tm_load.h | 2 + modules_k/seas/encode_header.c | 4 + modules_k/seas/encode_parameters.c | 16 +++ modules_k/seas/event_dispatcher.c | 71 +++++++----- modules_k/seas/event_dispatcher.h | 6 +- modules_k/seas/seas.c | 18 ++-- modules_k/seas/seas_action.c | 222 ++++++++++++++++++++++------------- modules_k/seas/seas_action.h | 13 +- modules_k/seas/statistics.c | 2 +- modules_k/seas/statistics.h | 2 + 21 files changed, 516 insertions(+), 162 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ce0…

14 years, 12 months

git:kamailio_3.0: core: new param to give outbut buffer size

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a765213ffa3769577dd7438c95737cb6b98bff74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a765213… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 2 15:06:34 2010 +0100 core: new param to give outbut buffer size - int2strbuf requires now outbut buffer size as parameter - safer against misuses, suggested by Andrei Pelinescu-Onciul - if size is less than INT2STR_MAX_LEN, return null pointer --- ut.h | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ut.h b/ut.h index 3e4d7a6..3d98e11 100644 --- a/ut.h +++ b/ut.h @@ -294,10 +294,15 @@ static inline char* int2str_base(unsigned int l, int* len, int base) /* print int to asciiz in a string buffer * - be sure result buffer is at least INT2STR_MAX_LEN in size */ -static inline char* int2strbuf(unsigned int l, char *r, int* len) +static inline char* int2strbuf(unsigned int l, char *r, int r_size, int* len) { int i; - + + if(unlikely(r_size<INT2STR_MAX_LEN)) { + if (len) + *len = 0; + return 0; /* => if someone misuses it => crash (feature no. 1) */ + } i=INT2STR_MAX_LEN-2; r[INT2STR_MAX_LEN-1]=0; /* null terminate */ do{ @@ -316,7 +321,7 @@ extern char ut_buf_int2str[INT2STR_MAX_LEN]; /* returns a pointer to a static buffer containing l in asciiz & sets len */ static inline char* int2str(unsigned long l, int* len) { - return int2strbuf(l, ut_buf_int2str, len); + return int2strbuf(l, ut_buf_int2str, INT2STR_MAX_LEN, len); } /* Signed INTeger-TO-STRing: convers a long to a string

14 years, 12 months

SF.net SVN: openser:[5979] tags/1.4.5/

by Daniel-Constantin Mierla

Revision: 5979 http://openser.svn.sourceforge.net/openser/?rev=5979&view=rev Author: miconda Date: 2010-02-02 21:31:30 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Tagging the 1.4.5 release Added Paths: ----------- tags/1.4.5/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 12 months

SF.net SVN: openser:[5978] tags/1.5.4/

by Daniel-Constantin Mierla

Revision: 5978 http://openser.svn.sourceforge.net/openser/?rev=5978&view=rev Author: miconda Date: 2010-02-02 21:30:47 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Tagging the 1.5.4 release Added Paths: ----------- tags/1.5.4/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 12 months

Kamailio v1.5.4 and v1.4.5 released

by Daniel-Constantin Mierla

Hello, Kamailio version 1.5.4 is out, built from latest svn version of SVN branch 1.5. All details about it are available at: http://www.kamailio.org/mos/view/News/NewsItem/Kamailio-v1.5.4-Released/ Also Kamailio v1.4.5 was released to mark the end of official maintenance for SVN branch 1.4. Details at: http://www.kamailio.org/mos/view/News/NewsItem/Kamailio-v1.4.5-Released/ If you are using a version from these release series, consider updating to the last one. Personally I recommend that you upgrade to the latest stable branch release v3.0.0 -- you get access lot of new features and improvements. Cheers, Daniel

14 years, 12 months

git:master: debian: Module xmlrpc was moved to "modules".

by Jan Janak

Module: sip-router Branch: master Commit: 4705a5bca1df61c2d6702ae22f222af8f46742f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4705a5b… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Tue Feb 2 15:54:42 2010 -0500 debian: Module xmlrpc was moved to "modules". Update the packaging scripts. --- pkg/debian/rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/debian/rules b/pkg/debian/rules index 3d708f3..7b1f18d 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -50,7 +50,7 @@ MDIRS=modules modules_s modules_k # modules packaged in separate packages (complete with full modules_* path) # with the package name: ser-$(module_name)-module -MODULES_SP=modules/db_mysql modules/db_postgres modules/tls modules_s/xmlrpc +MODULES_SP=modules/db_mysql modules/db_postgres modules/tls modules/xmlrpc # module groups that are packaged in seperate packages # (with the name ser-$(group_name)-modules)

14 years, 12 months

git:kamailio_3.0: modules/mediaproxy: take boundary string from Content-Type header.

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 65659440162e612917e8a7992b775f6e2b248734 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6565944… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Feb 2 10:09:32 2010 +0200 modules/mediaproxy: take boundary string from Content-Type header. (cherry picked from commit 2031721948bfa6b444d9b18f7e3f195cfd7e1427) --- modules/mediaproxy/mediaproxy.c | 53 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index acedf5b..3f44595 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -45,6 +45,7 @@ #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" +#include "../../parser/parse_param.h" #include "../../msg_translator.h" #include "../../modules_k/dialog/dlg_load.h" #include "../../modules_k/dialog/dlg_hash.h" @@ -658,10 +659,12 @@ get_media_relay(struct sip_msg* msg) static int find_content_type_application_sdp(struct sip_msg *msg, str *sdp) { - str type; + str type, params, boundary; char *start, *s; unsigned int len; Bool done; + param_hooks_t hooks; + param_t *p, *list; if (!msg->content_type) { LM_WARN("the Content-Type header is missing! Assume the content type is text/plain\n"); @@ -688,6 +691,44 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) if (done) return 1; // Hack to find application/sdp bodypart + params.s = memchr(msg->content_type->body.s, ';', + msg->content_type->body.len); + if (params.s == NULL) { + LM_ERR("Content-Type hdr has no params\n"); + return -1; + } + params.len = msg->content_type->body.len - + (params.s - msg->content_type->body.s); + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { + LM_ERR("while parsing Content-Type params\n"); + return -1; + } + boundary.s = NULL; + boundary.len = 0; + for (p = list; p; p = p->next) { + if ((p->name.len == 8) + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { + boundary.s = pkg_malloc(p->body.len + 2 + 1); + if (boundary.s == NULL) { + free_params(list); + LM_ERR("no memory for boundary string\n"); + return -1; + } + *(boundary.s) = '-'; + *(boundary.s + 1) = '-'; + memcpy(boundary.s + 2, p->body.s, p->body.len); + boundary.len = 2 + p->body.len; + *(boundary.s + boundary.len) = 0; + LM_DBG("boundary is <%.*s>\n", boundary.len, boundary.s); + break; + } + } + free_params(list); + if (boundary.s == NULL) { + LM_ERR("no mandatory param \";boundary\"\n"); + return -1; + } + while ((s = find_line_starting_with(sdp, "Content-Type: ", True))) { start = s + 14; len = sdp->len - (s - sdp->s) - 14; @@ -696,7 +737,7 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) start = start + 15; if ((*start != 13) || (*(start + 1) != 10)) { LM_ERR("no CRLF found after content type\n"); - return -1; + goto err; } start = start + 2; len = len - 15 - 2; @@ -706,17 +747,21 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) } sdp->s = start; sdp->len = len; - s = find_line_starting_with(sdp, "--Boundary", False); + s = find_line_starting_with(sdp, boundary.s, False); if (s == NULL) { LM_ERR("boundary not found after bodypart\n"); - return -1; + goto err; } sdp->len = s - start - 2; + pkg_free(boundary.s); return 1; } } } LM_ERR("no application/sdp bodypart found\n"); + + err: + pkg_free(boundary.s); return -1; }

14 years, 12 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev