sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
292 discussions

git:alexh/master DELETED: modules_k/pv: Add s.replace transformation.
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: alexh/master DELETED Commit: 7ef14ec53505e269b85c5fe511e93c61fd380d37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ef14ec… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 24 14:12:05 2011 +0100 modules_k/pv: Add s.replace transformation. Syntax: {s.replace,<search>,<replace>} Replaces every occurance of <search> with <replace>. Both parameters may contain pvars. --- modules_k/pv/pv_trans.c | 89 +++++++++++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 3 +- 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 4842a06..b60f529 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -69,8 +69,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { int i, j, max; char *p, *s; - str st; - pv_value_t v; + str st, st2; + pv_value_t v, w; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -496,6 +496,61 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = j-1; break; + + case TR_S_REPLACE: + if(tp==NULL || tp->next==NULL) + { + LM_ERR("select invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("replace cannot get p1\n"); + return -1; + } + st = v.rs; + } + + if(tp->next->type==TR_PARAM_STRING) + { + st2 = tp->next->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->next->v.data, &w)!=0 + || (!(w.flags&PV_VAL_STR)) || w.rs.len<=0) + { + LM_ERR("replace cannot get p2\n"); + return -1; + } + st2 = w.rs; + } + + val->flags = PV_VAL_STR; + val->ri = 0; + + i = 0; + j = 0; + max = val->rs.len - st.len; + while (i < val->rs.len && j < TR_BUFFER_SIZE) { + if (i <= max && val->rs.s[i] == st.s[0] && strncmp(val->rs.s+i, st.s, st.len) == 0) { + strncpy(_tr_buffer+j, st2.s, st2.len); + i += st.len; + j += st2.len; + } else { + _tr_buffer[j++] = val->rs.s[i++]; + } + } + val->rs.s = _tr_buffer; + val->rs.len = j; + break; + case TR_S_TIMEFORMAT: if(tp==NULL) { @@ -1483,6 +1538,36 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "replace", 7)==0) { + t->subtype = TR_S_REPLACE; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid replace transformation: %.*s!\n", in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid replace transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid replace transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 222c09e..0938ddc 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -39,7 +39,8 @@ enum _tr_s_subtype { TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, - TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_TIMEFORMAT + TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, + TR_S_TIMEFORMAT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:3.1: modules/tm: fix t_load_contacts for failure_route. Ignore ruri if it has already been used.
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: 3.1 Commit: e66d50297ca9a4b1eb3f0c7c61095ffb26a44af8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e66d502… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 1 16:09:38 2011 +0200 modules/tm: fix t_load_contacts for failure_route. Ignore ruri if it has already been used. Commit e973bbe5e7310861f77b17ce0afaf1cca35fe48a removed the logic for handling failure_route. The result was that when t_load_contacts is called from failure_route, the current request-uri is added as branch _again_. This commit restores the original functionality by ignoring the request uri if it is marked as consumed. --- modules/tm/t_serial.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 899cb5b..bd5ae27 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -242,15 +242,21 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value) } ruri = (str *)0; - - /* Take first q from Request-URI */ - ruri = GET_RURI(msg); - if (!ruri) { - LM_ERR("no Request-URI found\n"); - return -1; + if (ruri_is_new) { + /* Take first q from Request-URI */ + ruri = GET_RURI(msg); + if (!ruri) { + LM_ERR("no Request-URI found\n"); + return -1; + } + first_q = get_ruri_q(); + first_idx = 0; + } else { + /* Take first q from first branch */ + uri.s = get_branch(0, &uri.len, &first_q, &dst_uri, &path, &flags, + &sock); + first_idx = 1; } - first_q = get_ruri_q(); - first_idx = 0; /* Check if all q values are equal */ for(idx = first_idx; (tmp.s = get_branch(idx, &tmp.len, &q, 0, 0, 0, 0)) @@ -272,15 +278,24 @@ rest: return -1; } - /* Insert Request-URI branch to first contact */ - contacts->uri.s = ruri->s; - contacts->uri.len = ruri->len; - contacts->dst_uri = msg->dst_uri; - contacts->sock = msg->force_send_socket; - getbflagsval(0, &contacts->flags); - contacts->path = msg->path_vec; - contacts->q = first_q; - contacts->next = (struct contact *)0; + if (ruri_is_new) { + /* Insert Request-URI branch to first contact */ + contacts->uri.s = ruri->s; + contacts->uri.len = ruri->len; + contacts->dst_uri = msg->dst_uri; + contacts->sock = msg->force_send_socket; + getbflagsval(0, &contacts->flags); + contacts->path = msg->path_vec; + } else { + /* Insert first branch to first contact */ + contacts->uri = uri; + contacts->dst_uri = dst_uri; + contacts->sock = sock; + contacts->flags = flags; + contacts->path = path; + } + contacts->q = first_q; + contacts->next = (struct contact *)0; /* Insert (remaining) branches to contact list in increasing q order */

1 0

git:master: modules/tm: fix t_load_contacts for failure_route. Ignore ruri if it has already been used.
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 30ff67af2030f8ff83c479c8c754ff734b35a71e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30ff67a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 1 16:09:38 2011 +0200 modules/tm: fix t_load_contacts for failure_route. Ignore ruri if it has already been used. Commit e973bbe5e7310861f77b17ce0afaf1cca35fe48a removed the logic for handling failure_route. The result was that when t_load_contacts is called from failure_route, the current request-uri is added as branch _again_. This commit restores the original functionality by ignoring the request uri if it is marked as consumed. --- modules/tm/t_serial.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 899cb5b..bd5ae27 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -242,15 +242,21 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value) } ruri = (str *)0; - - /* Take first q from Request-URI */ - ruri = GET_RURI(msg); - if (!ruri) { - LM_ERR("no Request-URI found\n"); - return -1; + if (ruri_is_new) { + /* Take first q from Request-URI */ + ruri = GET_RURI(msg); + if (!ruri) { + LM_ERR("no Request-URI found\n"); + return -1; + } + first_q = get_ruri_q(); + first_idx = 0; + } else { + /* Take first q from first branch */ + uri.s = get_branch(0, &uri.len, &first_q, &dst_uri, &path, &flags, + &sock); + first_idx = 1; } - first_q = get_ruri_q(); - first_idx = 0; /* Check if all q values are equal */ for(idx = first_idx; (tmp.s = get_branch(idx, &tmp.len, &q, 0, 0, 0, 0)) @@ -272,15 +278,24 @@ rest: return -1; } - /* Insert Request-URI branch to first contact */ - contacts->uri.s = ruri->s; - contacts->uri.len = ruri->len; - contacts->dst_uri = msg->dst_uri; - contacts->sock = msg->force_send_socket; - getbflagsval(0, &contacts->flags); - contacts->path = msg->path_vec; - contacts->q = first_q; - contacts->next = (struct contact *)0; + if (ruri_is_new) { + /* Insert Request-URI branch to first contact */ + contacts->uri.s = ruri->s; + contacts->uri.len = ruri->len; + contacts->dst_uri = msg->dst_uri; + contacts->sock = msg->force_send_socket; + getbflagsval(0, &contacts->flags); + contacts->path = msg->path_vec; + } else { + /* Insert first branch to first contact */ + contacts->uri = uri; + contacts->dst_uri = dst_uri; + contacts->sock = sock; + contacts->flags = flags; + contacts->path = path; + } + contacts->q = first_q; + contacts->next = (struct contact *)0; /* Insert (remaining) branches to contact list in increasing q order */

1 0

git:master: modules/tm: add faked_reply_prio parameter to be able to punish faked replies
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 6b2d6a3f8bc1f9d2a9d48fa6e7e67c4c0a5879ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b2d6a3… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 5 17:30:57 2011 +0200 modules/tm: add faked_reply_prio parameter to be able to punish faked replies Thi should fix FS#54. --- modules/tm/README | 112 +++++++++++++++++++++++++++------------------ modules/tm/doc/params.xml | 40 ++++++++++++++++ modules/tm/t_reply.c | 37 ++++++++++++--- modules/tm/t_reply.h | 4 ++ modules/tm/tm.c | 1 + 5 files changed, 142 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6b2…

1 0

git:master: core: add functions remove_branch(int) and clear_branches()
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 9fa304f16f3152cae3b35b18b00ecd560c03c404 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fa304f… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 5 14:49:16 2011 +0200 core: add functions remove_branch(int) and clear_branches() remove_branch(int) - removes the specified branch from the destination set. If the parameter is absent, the last branch is removed. clear_branches() - empties the destination set. --- action.c | 15 +++++++++++++++ cfg.lex | 6 ++++++ cfg.y | 13 +++++++++++++ route_struct.h | 2 +- 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 8ca143a..6d22bf2 100644 --- a/action.c +++ b/action.c @@ -559,6 +559,21 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ruri_mark_consumed(); break; + /* remove last branch */ + case REMOVE_BRANCH_T: + if (a->val[0].type!=NUMBER_ST) { + ret=drop_sip_branch(0) ? -1 : 1; + } else { + ret=drop_sip_branch(a->val[0].u.number) ? -1 : 1; + } + break; + + /* remove all branches */ + case CLEAR_BRANCHES_T: + clear_branches(); + ret=1; + break; + /* jku begin: is_length_greater_than */ case LEN_GT_T: if (a->val[0].type!=NUMBER_ST) { diff --git a/cfg.lex b/cfg.lex index bfcf832..ff35a8a 100644 --- a/cfg.lex +++ b/cfg.lex @@ -237,6 +237,8 @@ STRIP "strip" STRIP_TAIL "strip_tail" SET_USERPHONE "userphone" APPEND_BRANCH "append_branch" +REMOVE_BRANCH "remove_branch" +CLEAR_BRANCHES "clear_branches" IF "if" ELSE "else" SET_ADV_ADDRESS "set_advertised_address" @@ -623,6 +625,10 @@ IMPORTFILE "import_file" <INITIAL>{STRIP_TAIL} { count(); yylval.strval=yytext; return STRIP_TAIL; } <INITIAL>{APPEND_BRANCH} { count(); yylval.strval=yytext; return APPEND_BRANCH; } +<INITIAL>{REMOVE_BRANCH} { count(); yylval.strval=yytext; + return REMOVE_BRANCH; } +<INITIAL>{CLEAR_BRANCHES} { count(); yylval.strval=yytext; + return CLEAR_BRANCHES; } <INITIAL>{SET_USERPHONE} { count(); yylval.strval=yytext; return SET_USERPHONE; } <INITIAL>{FORCE_RPORT} { count(); yylval.strval=yytext; return FORCE_RPORT; } diff --git a/cfg.y b/cfg.y index e5679e5..daf38e0 100644 --- a/cfg.y +++ b/cfg.y @@ -324,6 +324,8 @@ extern char *finame; %token STRIP_TAIL %token SET_USERPHONE %token APPEND_BRANCH +%token REMOVE_BRANCH +%token CLEAR_BRANCHES %token SET_USER %token SET_USERPASS %token SET_PORT @@ -3198,6 +3200,17 @@ cmd: NUMBER_ST, (void *)Q_UNSPECIFIED); set_cfg_pos($$); } + | REMOVE_BRANCH LPAREN NUMBER RPAREN { + $$=mk_action(REMOVE_BRANCH_T, 1, NUMBER_ST, (void*)$3); + set_cfg_pos($$); + } + | REMOVE_BRANCH LPAREN RPAREN { + $$=mk_action(REMOVE_BRANCH_T, 0); + set_cfg_pos($$); + } + | REMOVE_BRANCH error { $$=0; yyerror("missing '(' or ')' ?"); } + | REMOVE_BRANCH LPAREN error RPAREN { $$=0; yyerror("bad argument, number expected"); } + | CLEAR_BRANCHES LPAREN RPAREN { $$=mk_action(CLEAR_BRANCHES_T, 0); set_cfg_pos($$); } | SET_HOSTPORT LPAREN STRING RPAREN { $$=mk_action(SET_HOSTPORT_T, 1, STRING_ST, $3); set_cfg_pos($$); } | SET_HOSTPORT error { $$=0; yyerror("missing '(' or ')' ?"); } | SET_HOSTPORT LPAREN error RPAREN { $$=0; yyerror("bad argument, string expected"); } diff --git a/route_struct.h b/route_struct.h index 08a576c..4bb5045 100644 --- a/route_struct.h +++ b/route_struct.h @@ -94,7 +94,7 @@ enum action_type{ SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, LEN_GT_T, PREFIX_T, STRIP_T,STRIP_TAIL_T, - APPEND_BRANCH_T, + APPEND_BRANCH_T, REMOVE_BRANCH_T, CLEAR_BRANCHES_T, REVERT_URI_T, FORWARD_TCP_T, FORWARD_UDP_T,

1 0

git:master: modules_k/htable: Only save/load not yet expired entries to/ from database.
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: f0af7250822a80ed55f41216e84f1a3481413655 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0af725… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Jul 28 16:39:17 2011 +0200 modules_k/htable: Only save/load not yet expired entries to/from database. --- modules_k/htable/ht_db.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 5785ecf..2a349c3 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -140,6 +140,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) int i; int ret; int cnt; + int now; if(ht_db_con==NULL) { @@ -195,10 +196,10 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) pname.s = ""; n = 0; last_ktype = 0; + now = (int)time(NULL); do { for(i=0; i<RES_ROW_N(db_res); i++) { - cnt++; /* not NULL values enforced in table definition ?!?! */ kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { @@ -206,6 +207,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) goto error; } kname.len = strlen(kname.s); + + expires.n = RES_ROWS(db_res)[i].values[4].val.int_val; + if (expires.n > 0 && expires.n < now) { + LM_DBG("skipping expired entry [%.*s] (%d)\n", kname.len, kname.s, expires.n-now); + continue; + } + + cnt++; ktype = RES_ROWS(db_res)[i].values[1].val.int_val; if(last_ktype==1) { @@ -264,14 +273,11 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } /* set expiry */ - if (ht->htexpire > 0) { - expires.n = RES_ROWS(db_res)[i].values[4].val.int_val; - if (expires.n > 0) { - expires.n -= now; - if(ht_set_cell_expire(ht, &hname, 0, &expires)) { - LM_ERR("error setting expires to hash entry [%*.s]\n", hname.len, hname.s); - goto error; - } + if (ht->htexpire > 0 && expires.n > 0) { + expires.n -= now; + if(ht_set_cell_expire(ht, &hname, 0, &expires)) { + LM_ERR("error setting expires to hash entry [%*.s]\n", hname.len, hname.s); + goto error; } } } @@ -321,6 +327,7 @@ int ht_db_save_table(ht_t *ht, str *dbtable) ht_cell_t *it; str tmp; int i; + time_t now; if(ht_db_con==NULL) { @@ -337,6 +344,8 @@ int ht_db_save_table(ht_t *ht, str *dbtable) LM_DBG("save the content of hash table [%.*s] to database in [%.*s]\n", ht->name.len, ht->name.s, dbtable->len, dbtable->s); + now = time(NULL); + for(i=0; i<ht->htsize; i++) { lock_get(&ht->entries[i].lock); @@ -351,6 +360,12 @@ int ht_db_save_table(ht_t *ht, str *dbtable) it->name.len, it->name.s, it->value.n); } + if (it->expire <= now) { + LM_DBG("skipping expired entry"); + it = it->next; + continue; + } + db_vals[0].type = DB1_STR; db_vals[0].nul = 0; db_vals[0].val.str_val.s = it->name.s;

1 0

git:master: modules_k/htable: Correctly save the value type in the database .
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 1a15c075076b5df815749bc28961bc088108f852 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a15c07… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Jul 28 12:42:50 2011 +0200 modules_k/htable: Correctly save the value type in the database. Instead of always saving '0' (string), write a '1' (int) if value is integer. --- modules_k/htable/ht_db.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 66402fe..c50021b 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -340,14 +340,15 @@ int ht_db_save_table(ht_t *ht, str *dbtable) db_vals[2].type = DB1_INT; db_vals[2].nul = 0; - db_vals[2].val.int_val = 0; db_vals[3].type = DB1_STR; db_vals[3].nul = 0; if(it->flags&AVP_VAL_STR) { + db_vals[2].val.int_val = 0; db_vals[3].val.str_val.s = it->value.s.s; db_vals[3].val.str_val.len = it->value.s.len; } else { + db_vals[2].val.int_val = 1; tmp.s = sint2str((long)it->value.n, &tmp.len); db_vals[3].val.str_val.s = tmp.s; db_vals[3].val.str_val.len = tmp.len;

1 0

git:master: modules/tm: reverted previous commit on t_load_contacts()
by Juha Heinanen 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 39189746aa99623860b97c676a62a8793af0daa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3918974… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Aug 8 11:22:23 2011 +0300 modules/tm: reverted previous commit on t_load_contacts() (cherry picked from commit cc4bcb18b064f7d66b16db2b452c0e36f14aecc3) --- modules/tm/t_serial.c | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index bd5ae27..899cb5b 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -242,21 +242,15 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value) } ruri = (str *)0; - if (ruri_is_new) { - /* Take first q from Request-URI */ - ruri = GET_RURI(msg); - if (!ruri) { - LM_ERR("no Request-URI found\n"); - return -1; - } - first_q = get_ruri_q(); - first_idx = 0; - } else { - /* Take first q from first branch */ - uri.s = get_branch(0, &uri.len, &first_q, &dst_uri, &path, &flags, - &sock); - first_idx = 1; + + /* Take first q from Request-URI */ + ruri = GET_RURI(msg); + if (!ruri) { + LM_ERR("no Request-URI found\n"); + return -1; } + first_q = get_ruri_q(); + first_idx = 0; /* Check if all q values are equal */ for(idx = first_idx; (tmp.s = get_branch(idx, &tmp.len, &q, 0, 0, 0, 0)) @@ -278,24 +272,15 @@ rest: return -1; } - if (ruri_is_new) { - /* Insert Request-URI branch to first contact */ - contacts->uri.s = ruri->s; - contacts->uri.len = ruri->len; - contacts->dst_uri = msg->dst_uri; - contacts->sock = msg->force_send_socket; - getbflagsval(0, &contacts->flags); - contacts->path = msg->path_vec; - } else { - /* Insert first branch to first contact */ - contacts->uri = uri; - contacts->dst_uri = dst_uri; - contacts->sock = sock; - contacts->flags = flags; - contacts->path = path; - } - contacts->q = first_q; - contacts->next = (struct contact *)0; + /* Insert Request-URI branch to first contact */ + contacts->uri.s = ruri->s; + contacts->uri.len = ruri->len; + contacts->dst_uri = msg->dst_uri; + contacts->sock = msg->force_send_socket; + getbflagsval(0, &contacts->flags); + contacts->path = msg->path_vec; + contacts->q = first_q; + contacts->next = (struct contact *)0; /* Insert (remaining) branches to contact list in increasing q order */

1 0

git:3.1: modules/tm: reverted previous commit on t_load_contacts()
by Juha Heinanen 08 Aug '11

08 Aug '11

Module: sip-router Branch: 3.1 Commit: cc4bcb18b064f7d66b16db2b452c0e36f14aecc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc4bcb1… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Aug 8 11:22:23 2011 +0300 modules/tm: reverted previous commit on t_load_contacts() --- modules/tm/t_serial.c | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index bd5ae27..899cb5b 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -242,21 +242,15 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value) } ruri = (str *)0; - if (ruri_is_new) { - /* Take first q from Request-URI */ - ruri = GET_RURI(msg); - if (!ruri) { - LM_ERR("no Request-URI found\n"); - return -1; - } - first_q = get_ruri_q(); - first_idx = 0; - } else { - /* Take first q from first branch */ - uri.s = get_branch(0, &uri.len, &first_q, &dst_uri, &path, &flags, - &sock); - first_idx = 1; + + /* Take first q from Request-URI */ + ruri = GET_RURI(msg); + if (!ruri) { + LM_ERR("no Request-URI found\n"); + return -1; } + first_q = get_ruri_q(); + first_idx = 0; /* Check if all q values are equal */ for(idx = first_idx; (tmp.s = get_branch(idx, &tmp.len, &q, 0, 0, 0, 0)) @@ -278,24 +272,15 @@ rest: return -1; } - if (ruri_is_new) { - /* Insert Request-URI branch to first contact */ - contacts->uri.s = ruri->s; - contacts->uri.len = ruri->len; - contacts->dst_uri = msg->dst_uri; - contacts->sock = msg->force_send_socket; - getbflagsval(0, &contacts->flags); - contacts->path = msg->path_vec; - } else { - /* Insert first branch to first contact */ - contacts->uri = uri; - contacts->dst_uri = dst_uri; - contacts->sock = sock; - contacts->flags = flags; - contacts->path = path; - } - contacts->q = first_q; - contacts->next = (struct contact *)0; + /* Insert Request-URI branch to first contact */ + contacts->uri.s = ruri->s; + contacts->uri.len = ruri->len; + contacts->dst_uri = msg->dst_uri; + contacts->sock = msg->force_send_socket; + getbflagsval(0, &contacts->flags); + contacts->path = msg->path_vec; + contacts->q = first_q; + contacts->next = (struct contact *)0; /* Insert (remaining) branches to contact list in increasing q order */

1 0

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()
by Juha Heinanen 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

2 16

← Newer
1
...
21
22
23
24
25
26
27
...
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