sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
382 discussions

git:master: CA example README update
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 576ade3a42557d0c499a01ab9f37e1f0f085580e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=576ade3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:19:05 2014 +0200 CA example README update --- etc/tls/README | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/tls/README b/etc/tls/README index 111cfe2..2ce7a27 100644 --- a/etc/tls/README +++ b/etc/tls/README @@ -1,12 +1,13 @@ - +Kamailio example CA +=================== This directory contains an already generated TLS certificate that can be -used in your OpenSER configuration. It's a generic certificate with the +used in your Kamailio configuration. It's a generic certificate with the main purpose of serving as example and for testings. IMPORTANT: it's not a trustable certificate - the CA is also an example. -All TLS configuration file may be found in "user" directory. If you want to +All TLS configuration files may be found in "user" directory. If you want to generate your own certificate, you may find in the "rootCA" directory the root CA to sign your request with. Use "kamctl tls userCERT" command to create a new certificate; the rootCA password is "openser". @@ -17,6 +18,5 @@ Second, to give access to the same CA root to a large community in order to encourage testings and interconnections via TLS with minimum of troubles. For any questions, please address to : - team(a)openser.org (if you want to keep your question private) - users(a)openser.org (public mailing list) + sr-users(a)lists.sip-router.org (public mailing list)

1 0

git:master: configuration update - version
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 292b21608bd830dee1f0affcdcdaa11548274abd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=292b216… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:14:38 2014 +0200 configuration update - version --- etc/kamailio-basic.cfg | 2 +- etc/kamailio-oob.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index 3f072b3..17d7bcb 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v4.2 - default configuration script +# Kamailio (OpenSER) SIP Server v4.3 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 2aa3289..6a16763 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v4.2 - default configuration script +# Kamailio (OpenSER) SIP Server v4.3 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org #

1 0

git:master: etc/kamailio.cfg - update version
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: e9b7e9121be27f6c2ad92643912afabc64019385 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9b7e91… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:13:43 2014 +0200 etc/kamailio.cfg - update version --- etc/kamailio.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ff67711..56b4ea5 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v4.2 - default configuration script +# Kamailio (OpenSER) SIP Server v4.3 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org #

1 0

git:master: test/unit - update README with dependency on sipp
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 18939df87a249a3a5bf17f7c00c6498b0ad75ceb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18939df… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:09:52 2014 +0200 test/unit - update README with dependency on sipp --- test/unit/README | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/test/unit/README b/test/unit/README index 85c5776..f09ede2 100644 --- a/test/unit/README +++ b/test/unit/README @@ -15,6 +15,11 @@ This tests should (in the current state) only run by developers who know what they do. They could delete your database, produce core dumps that fill your harddisk or do other nasty things.. +Dependencies +------------ +- SIPP (sipp.sourceforge.net) is required by some tests. + + Usage -----

1 0

git:4.2: README - updating version number
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: 4.2 Commit: af67db379b3053e4743c45bf93e6c6636f84cdd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af67db3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:06:28 2014 +0200 README - updating version number --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index cf5fff4..c255a0e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v4.1 +Kamailio v4.2 ============= http://www.kamailio.org

1 0

git:master: README minor typo fix
by Olle E. Johansson 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 4d0eae5c0decebfec024bf04dd6f724437627956 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d0eae5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 12 20:04:01 2014 +0200 README minor typo fix --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index cf5fff4..92816b1 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v4.1 +Kamailio v4.3 ============= http://www.kamailio.org

1 0

git:4.2: modules/pua: db_mode=2 send_publish fixes
by Juha Heinanen 12 Oct '14

12 Oct '14

Module: sip-router Branch: 4.2 Commit: 65659addafd0a492cafbb6c9cbaf3644442f333a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65659ad… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Oct 12 13:41:41 2014 +0300 modules/pua: db_mode=2 send_publish fixes - plus small debug message edits (cherry picked from commit 6822ff45e931ad3e93b22ebf7d1beb350bf27e70) --- modules/pua/send_publish.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index 27cfbd0..da74ab7 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -333,7 +333,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) etag= hdr->body; LM_DBG("completed with status %d [contact:%.*s]\n", - ps->code, hentity->pres_uri->len, hentity->pres_uri->s); + ps->code, hentity->pres_uri->len, hentity->pres_uri->s); if (lexpire == 0) { @@ -341,14 +341,15 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) goto done; } - if (pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) - { - if (find_and_update_record(hentity, hash_code, lexpire, &etag) > 0) - goto done; - } - else - { - if ((db_presentity = get_record_puadb(hentity->id, &hentity->etag, &dbpres, &res)) != NULL) + if (hentity->etag.s) { + if (pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) { + if (find_and_update_record(hentity, hash_code, + lexpire, &etag) > 0) + goto done; + } + else if ((db_presentity = + get_record_puadb(hentity->id, &hentity->etag, + &dbpres, &res)) != NULL) { update_record_puadb(hentity, lexpire, &etag); goto done; @@ -426,7 +427,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) insert_htable(presentity, hash_code); lock_release(&HashT->p_records[hash_code].lock); } - LM_DBG("***Inserted in hash table\n"); + LM_DBG("Inserted record\n"); done: if(hentity->ua_flag == REQ_OTHER) @@ -517,11 +518,14 @@ int send_publish( publ_info_t* publ ) if (dbmode==PUA_DB_ONLY) { - memset(&dbpres, 0, sizeof(dbpres)); - dbpres.pres_uri = &pres_uri; - dbpres.watcher_uri = &watcher_uri; - dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); + if (publ->etag) { + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + presentity = get_record_puadb(publ->id, publ->etag, + &dbpres, &res); + } } else { @@ -582,7 +586,7 @@ insert: } else { - LM_DBG("record found in hash_table\n"); + LM_DBG("record found\n"); publ->flag= UPDATE_TYPE; etag.s= (char*)pkg_malloc(presentity->etag.len* sizeof(char)); if(etag.s== NULL)

1 0

git:master: modules/pua: db_mode=2 send_publish fixes
by Juha Heinanen 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 6822ff45e931ad3e93b22ebf7d1beb350bf27e70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6822ff4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Oct 12 13:41:41 2014 +0300 modules/pua: db_mode=2 send_publish fixes - plus small debug message edits --- modules/pua/send_publish.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index 27cfbd0..da74ab7 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -333,7 +333,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) etag= hdr->body; LM_DBG("completed with status %d [contact:%.*s]\n", - ps->code, hentity->pres_uri->len, hentity->pres_uri->s); + ps->code, hentity->pres_uri->len, hentity->pres_uri->s); if (lexpire == 0) { @@ -341,14 +341,15 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) goto done; } - if (pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) - { - if (find_and_update_record(hentity, hash_code, lexpire, &etag) > 0) - goto done; - } - else - { - if ((db_presentity = get_record_puadb(hentity->id, &hentity->etag, &dbpres, &res)) != NULL) + if (hentity->etag.s) { + if (pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) { + if (find_and_update_record(hentity, hash_code, + lexpire, &etag) > 0) + goto done; + } + else if ((db_presentity = + get_record_puadb(hentity->id, &hentity->etag, + &dbpres, &res)) != NULL) { update_record_puadb(hentity, lexpire, &etag); goto done; @@ -426,7 +427,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) insert_htable(presentity, hash_code); lock_release(&HashT->p_records[hash_code].lock); } - LM_DBG("***Inserted in hash table\n"); + LM_DBG("Inserted record\n"); done: if(hentity->ua_flag == REQ_OTHER) @@ -517,11 +518,14 @@ int send_publish( publ_info_t* publ ) if (dbmode==PUA_DB_ONLY) { - memset(&dbpres, 0, sizeof(dbpres)); - dbpres.pres_uri = &pres_uri; - dbpres.watcher_uri = &watcher_uri; - dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); + if (publ->etag) { + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + presentity = get_record_puadb(publ->id, publ->etag, + &dbpres, &res); + } } else { @@ -582,7 +586,7 @@ insert: } else { - LM_DBG("record found in hash_table\n"); + LM_DBG("record found\n"); publ->flag= UPDATE_TYPE; etag.s= (char*)pkg_malloc(presentity->etag.len* sizeof(char)); if(etag.s== NULL)

1 0

pua module db query bug
by Juha Heinanen 12 Oct '14

12 Oct '14

while doing pua module tests in db_mode=2, i used pua_mi to send two publish requests. in both of them id and etag params had value '.'. first generated publish request without sip-if-match header (as it should) and after 200 ok was received, record was properly inserted to pua table with etag value a.1413029856.5521.112.0 and empty pres_id. the second for a different pres_uri however resulted in error in presence server: Oct 12 10:06:42 siika /usr/bin/pres-serv[5522]: ERROR: presence [presentity.c:807]: update_presentity(): No E_Tag match a.1413029856.5521.112.0 after digging into it, i found with wireshark that the second publish indeed included sip-if-match header with that etag value even when it was initial publish (etag and id params '.') for another pres_uri. then i took a look at pua source and found that if etag param is null it is not included in db query at all leaving only pres_id param to match against: ua_pres_t *get_record_puadb(str pres_id, str *etag, ua_pres_t *result, db1_res_t **dbres) { int n_query_cols = 0, nr_rows; ... q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; q_vals[n_query_cols].val.str_val = pres_id; n_query_cols++; if (etag != NULL) { q_cols[n_query_cols] = &str_etag_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; q_vals[n_query_cols].val.str_val.s = etag->s; q_vals[n_query_cols].val.str_val.len = etag->len; n_query_cols++; } ... if(query_fn(pua_db, q_cols, 0, q_vals, NULL,n_query_cols,0,0,&res) < 0) { LM_ERR("DB query error\n"); return(NULL); } of course this kind of query matched the just inserted record for another pres_uri, which is wrong. how should this be fixed? is it enough to always add etag value to the query or should also pres_uri be added just in case etags for different pres_uris would match? or perhaps the best fix would be to skip the query altogether in send_publish if etag is null? has anyone else ever used pua module in db_mode=2? -- juha

2 8

git:master: core: execute onsend_route for replies before sending out
by Daniel-Constantin Mierla 12 Oct '14

12 Oct '14

Module: sip-router Branch: master Commit: 214b161e644c2d7468d9ac3ea13ad0be5196d143 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=214b161… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 12 10:28:29 2014 +0200 core: execute onsend_route for replies before sending out - control execution of onsend_route block for replies via parameter onsend_route_reply --- cfg.lex | 3 ++- cfg.y | 3 +++ forward.c | 22 ++++++++++++++++------ globals.h | 3 +++ main.c | 3 +++ onsend.h | 1 + 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/cfg.lex b/cfg.lex index 10766b2..1d5e40a 100644 --- a/cfg.lex +++ b/cfg.lex @@ -495,7 +495,7 @@ LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action MSG_TIME msg_time - +ONSEND_RT_REPLY "onsend_route_reply" CFG_DESCRIPTION "description"|"descr"|"desc" LOADMODULE loadmodule @@ -938,6 +938,7 @@ IMPORTFILE "import_file" <INITIAL>{MAX_RECURSIVE_LEVEL} { count(); yylval.strval=yytext; return MAX_RECURSIVE_LEVEL;} <INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} <INITIAL>{MSG_TIME} { count(); yylval.strval=yytext; return MSG_TIME;} +<INITIAL>{ONSEND_RT_REPLY} { count(); yylval.strval=yytext; return ONSEND_RT_REPLY; } <INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} <INITIAL>{LATENCY_LIMIT_ACTION} { count(); yylval.strval=yytext; return LATENCY_LIMIT_ACTION;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } diff --git a/cfg.y b/cfg.y index 2e7a6b4..6a85292 100644 --- a/cfg.y +++ b/cfg.y @@ -547,6 +547,7 @@ extern char *default_routename; %token LATENCY_LIMIT_DB %token LATENCY_LIMIT_ACTION %token MSG_TIME +%token ONSEND_RT_REPLY %token FLAGS_DECL %token AVPFLAGS_DECL @@ -1579,6 +1580,8 @@ assign_stm: | LATENCY_LIMIT_ACTION EQUAL error { yyerror("number expected"); } | MSG_TIME EQUAL NUMBER { sr_msg_time=$3; } | MSG_TIME EQUAL error { yyerror("number expected"); } + | ONSEND_RT_REPLY EQUAL NUMBER { onsend_route_reply=$3; } + | ONSEND_RT_REPLY EQUAL error { yyerror("int value expected"); } | UDP_MTU EQUAL NUMBER { default_core_cfg.udp_mtu=$3; } | UDP_MTU EQUAL error { yyerror("number expected"); } | FORCE_RPORT EQUAL NUMBER diff --git a/forward.c b/forward.c index 3d50988..81e39fe 100644 --- a/forward.c +++ b/forward.c @@ -758,6 +758,7 @@ static int do_forward_reply(struct sip_msg* msg, int mode) struct dest_info dst; unsigned int new_len; int r; + struct ip_addr ip; #ifdef USE_TCP char* s; int len; @@ -836,11 +837,6 @@ static int do_forward_reply(struct sip_msg* msg, int mode) apply_force_send_socket(&dst, msg); - if (msg_send(&dst, new_buf, new_len)<0) - { - STATS_RPL_FWD_DROP(); - goto error; - } /* call onsend_route */ if(dst.send_sock == NULL) { dst.send_sock=get_send_socket(msg, &dst.to, dst.proto); @@ -849,7 +845,21 @@ static int do_forward_reply(struct sip_msg* msg, int mode) goto done; } } - run_onsend(msg, &dst, new_buf, new_len); + if (onsend_route_enabled(SIP_REPLY)){ + if (run_onsend(msg, &dst, new_buf, new_len)==0){ + su2ip_addr(&ip, &(dst.to)); + LOG(L_ERR, "forward_reply: reply to %s:%d(%d) dropped" + " (onsend_route)\n", ip_addr2a(&ip), + su_getport(&(dst.to)), dst.proto); + goto error; /* error ? */ + } + } + + if (msg_send(&dst, new_buf, new_len)<0) + { + STATS_RPL_FWD_DROP(); + goto error; + } done: #ifdef STATS diff --git a/globals.h b/globals.h index 76e7f35..0a62d3e 100644 --- a/globals.h +++ b/globals.h @@ -198,6 +198,9 @@ extern int open_files_limit; extern int shm_force_alloc; extern int mlock_pages; +/* execute onsend_route for replies */ +extern int onsend_route_reply; + /* real time stuff */ extern int real_time; extern int rt_prio; diff --git a/main.c b/main.c index dabac0b..5aebc79 100644 --- a/main.c +++ b/main.c @@ -427,6 +427,9 @@ int server_id = 0; /* Configurable unique ID of the server */ /* set timeval for each received sip message */ int sr_msg_time = 1; +/* onsend_route is executed for replies*/ +int onsend_route_reply = 0; + /* more config stuff */ int disable_core_dump=0; /* by default enabled */ int open_files_limit=-1; /* don't touch it by default */ diff --git a/onsend.h b/onsend.h index 0b2eb08..a8a4e6e 100644 --- a/onsend.h +++ b/onsend.h @@ -104,5 +104,6 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, return ret; } +#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) #endif

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014