sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
174 discussions

git:master: modules/db_postgres: Retries are disabled within transactions
by Peter Dunkley 02 May '12

02 May '12

Module: sip-router Branch: master Commit: 765a538aa9d5e2d56cf980ad6adab17d0a1fbc73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=765a538… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 2 17:43:14 2012 +0100 modules/db_postgres: Retries are disabled within transactions - You don't want automatic retries in the database when inside a transaction (that is after an SQL BEGIN). This is because if the database connection fails the outstanding operations will be rolled back. If you automatically connect and retry the failed operation it will be acting on a database table/rows that are in a different state from which it expects. - This change disables retries on any SQL operations between a start_transaction and an (end|abort)_transaction. - Other database operations are unaffected. --- modules/db_postgres/km_dbase.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index b1ac34b..d2be696 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -163,7 +163,7 @@ void db_postgres_close(db1_con_t* _h) */ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { - int i; + int i, retries; ExecStatusType pqresult; if(! _con || !_s || !_s->s) @@ -194,7 +194,12 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) return -1; } - for(i = 0; i <= pg_retries; i++) { + if (CON_TRANSACTION(_con) == 1) + retries = 0; + else + retries = pg_retries; + + for(i = 0; i <= retries; i++) { /* free any previous query that is laying about */ db_postgres_free_query(_con); /* exec the query */

1 0

git:master: modules/db_postgres: Fixed bug in insert/delete/ update operations where success is returned when there are some errors
by Peter Dunkley 02 May '12

02 May '12

Module: sip-router Branch: master Commit: c4ee278460bdd9c12962d77ebafcab511a203e43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4ee278… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 2 17:40:29 2012 +0100 modules/db_postgres: Fixed bug in insert/delete/update operations where success is returned when there are some errors - Some PostgreSQL errors are only identified when the store_result() function is called. Even if store_result() returns < 0 (indicating an error has occurred) the insert/delete/update functions can still return success. --- modules/db_postgres/km_dbase.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 101cc8e..b1ac34b 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -543,15 +543,19 @@ int db_postgres_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* { db1_res_t* _r = NULL; - int tmp = db_do_insert(_h, _k, _v, _n, db_postgres_val2str, db_postgres_submit_query); + int ret = db_do_insert(_h, _k, _v, _n, db_postgres_val2str, db_postgres_submit_query); // finish the async query, otherwise the next query will not complete - if (db_postgres_store_result(_h, &_r) != 0) + int tmp = db_postgres_store_result(_h, &_r); + + if (tmp < 0) { LM_WARN("unexpected result returned"); + ret = tmp; + } if (_r) db_free_result(_r); - return tmp; + return ret; } @@ -568,16 +572,19 @@ int db_postgres_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _ const db_val_t* _v, const int _n) { db1_res_t* _r = NULL; - int tmp = db_do_delete(_h, _k, _o, _v, _n, db_postgres_val2str, + int ret = db_do_delete(_h, _k, _o, _v, _n, db_postgres_val2str, db_postgres_submit_query); + int tmp = db_postgres_store_result(_h, &_r); - if (db_postgres_store_result(_h, &_r) != 0) + if (tmp < 0) { LM_WARN("unexpected result returned"); - + ret = tmp; + } + if (_r) db_free_result(_r); - return tmp; + return ret; } @@ -598,16 +605,19 @@ int db_postgres_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _ const int _un) { db1_res_t* _r = NULL; - int tmp = db_do_update(_h, _k, _o, _v, _uk, _uv, _n, _un, db_postgres_val2str, + int ret = db_do_update(_h, _k, _o, _v, _uk, _uv, _n, _un, db_postgres_val2str, db_postgres_submit_query); + int tmp = db_postgres_store_result(_h, &_r); - if (db_postgres_store_result(_h, &_r) != 0) + if (tmp < 0) { LM_WARN("unexpected result returned"); + ret = tmp; + } if (_r) db_free_result(_r); - return tmp; + return ret; } /**

1 0

git:master: modules_k/rls: Tidied up the use of (start|end|abort) _transaction
by Peter Dunkley 02 May '12

02 May '12

Module: sip-router Branch: master Commit: b5e1edb80c459e09b8097c45643c6afc44ab2ed4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5e1edb… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 2 17:55:50 2012 +0100 modules_k/rls: Tidied up the use of (start|end|abort)_transaction --- modules_k/rls/notify.c | 62 +++++++++++++++++++-------------------- modules_k/rls/resource_notify.c | 3 +- modules_k/rls/rls_db.c | 27 +---------------- 3 files changed, 32 insertions(+), 60 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 1e06d57..a460fa0 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -121,6 +121,11 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, result_cols[pres_state_col= n_result_cols++]= &str_presence_state_col; result_cols[auth_state_col= n_result_cols++]= &str_auth_state_col; result_cols[reason_col= n_result_cols++]= &str_reason_col; + + update_cols[0]= &str_updated_col; + update_vals[0].type = DB1_INT; + update_vals[0].nul = 0; + update_vals[0].val.int_val= NO_UPDATE_TYPE; if (rlpres_dbf.use_table(rlpres_db, &rlpres_table) < 0) { @@ -143,8 +148,30 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, LM_ERR("in sql query\n"); goto error; } - if(result== NULL) + if(result == NULL) + { + LM_ERR("bad result\n"); goto error; + } + + if (result->n > 0) + { + if(rlpres_dbf.update(rlpres_db, query_cols, 0, query_vals, + update_cols, update_vals, 1, 1) < 0) + { + LM_ERR("in sql update\n"); + goto error; + } + } + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) + { + if (rlpres_dbf.end_transaction(rlpres_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } /* Allocate an initial buffer for the multipart body. * This buffer will be reallocated if neccessary */ @@ -238,9 +265,6 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, &rlmi_cont->len, (rls_max_notify_body_len == 0)); xmlFreeDoc(rlmi_body); - rlpres_dbf.free_result(rlpres_db, result); - result= NULL; - if(agg_body_sendn_update(rl_uri, boundary_string, rlmi_cont, multipart_body, subs, hash_code)< 0) { @@ -248,33 +272,6 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - /* update updated col in rlpres_table*/ - update_cols[0]= &str_updated_col; - update_vals[0].type = DB1_INT; - update_vals[0].nul = 0; - update_vals[0].val.int_val= NO_UPDATE_TYPE; - - if (rlpres_dbf.use_table(rlpres_db, &rlpres_table) < 0) - { - LM_ERR("in use_table\n"); - goto error; - } - if(rlpres_dbf.update(rlpres_db, query_cols, 0, query_vals, update_cols, - update_vals, 1, 1)< 0) - { - LM_ERR("in sql update\n"); - goto error; - } - - if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) - { - if (rlpres_dbf.end_transaction(rlpres_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - xmlFree(rlmi_cont->s); pkg_free(rlmi_cont); @@ -286,7 +283,8 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, } multipart_body_size = 0; pkg_free(rlsubs_did.s); - + rlpres_dbf.free_result(rlpres_db, result); + return 0; error: if(rlmi_cont) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 310b0af..ba4af35 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -1063,10 +1063,9 @@ static void timer_send_update_notifies(int round) LM_ERR("in sql query\n"); goto done; } - if(result== NULL || result->n<= 0) + if(result == NULL || result->n <= 0) goto done; - /* update the rlpres table */ if(rlpres_dbf.update(rlpres_db, query_cols, 0, query_vals, update_cols, update_vals, 1, 1)< 0) { diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index cabd164..a4e7327 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -148,15 +148,6 @@ int delete_expired_subs_rlsdb( void ) result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; - if (rls_dbf.start_transaction) - { - if (rls_dbf.start_transaction(rls_db) < 0) - { - LM_ERR("in start_transaction\n"); - goto error; - } - } - if(rls_dbf.query(rls_db, query_cols, query_ops, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) { @@ -221,28 +212,12 @@ int delete_expired_subs_rlsdb( void ) pkg_free(rlsubs_did.s); } - if (rls_dbf.end_transaction) - { - if (rls_dbf.end_transaction(rls_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - - if(result) rls_dbf.free_result(rls_db, result); + rls_dbf.free_result(rls_db, result); return 1; error: if (result) rls_dbf.free_result(rls_db, result); if (rlsubs_did.s) pkg_free(rlsubs_did.s); - - if (rls_dbf.abort_transaction) - { - if (rls_dbf.abort_transaction(rls_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return -1; }

1 0

git:master: modules_k/rls: Updated module documentation
by Peter Dunkley 02 May '12

02 May '12

Module: sip-router Branch: master Commit: e09bc9d58b472e2becdba2b5745d26b703018b9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e09bc9d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 2 17:48:47 2012 +0100 modules_k/rls: Updated module documentation --- modules_k/rls/README | 9 --------- modules_k/rls/doc/rls_admin.xml | 15 ++------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index 955b16d..62c9f96 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -267,15 +267,6 @@ modparam("rls", "xcap_db_url", "dbdriver://username:password@dbhost/dbname") in a database, allowing scalability at the expense of speed. Mode 1 is reserved. - The RLS modules uses SQL BEGIN/COMMIT statements around related sets of - database queries to make sure they are a single transaction when - database only mode is used. This means you should ensure that automatic - retries/reconnects are disabled for your database (for example, by - setting the retries parameter for db_mysql or db_postgres to 0). This - is needed because if the connection fails any unCOMMITed queries will - be automatically rolled back by the database. This means that automatic - retries could result in data inconsistencies. - Default value is “0” Example 1.4. Set db_mode parameter diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index 18f784f..6386f10 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -171,19 +171,8 @@ modparam("rls", "xcap_db_url", "&exampledb;") <para> The module supports 2 modes of operation, high speed memory based storage (mode 0), and database only (mode 2) where all - data is stored in a database, allowing scalability at the expense of speed. - Mode 1 is reserved. - </para> - <para> - The RLS modules uses SQL BEGIN/COMMIT statements around related - sets of database queries to make sure they are a single - transaction when database only mode is used. This means you - should ensure that automatic retries/reconnects are disabled - for your database (for example, by setting the retries - parameter for db_mysql or db_postgres to 0). This is needed - because if the connection fails any unCOMMITed queries will - be automatically rolled back by the database. This means that - automatic retries could result in data inconsistencies. + data is stored in a database, allowing scalability at the + expense of speed. Mode 1 is reserved. </para> <para> <emphasis> Default value is <quote>0</quote>

1 0

[tracker] Task closed: notify cseq is not incremented
by sip-router 02 May '12

02 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#228 - notify cseq is not incremented User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Thanks to Anca, the bug is now fixed. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=228 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

notify cseq is not incremented
by Juha Heinanen 02 May '12

02 May '12

while doing some presence tests with master i noticed that when presence server sends notify that terminates subscription due to change in xcap authorization rules, cseq in the notify is same as in previous one. rfc3261 says in 12.2.1 UAC Behavior: Requests within a dialog MUST contain strictly monotonically increasing and contiguous CSeq sequence numbers (increasing-by-one) in each direction (excepting ACK and CANCEL of course, whose numbers equal the requests being acknowledged or cancelled). so this looks like a bug to twinkle (and me). below is sip debug from twinkle (subscriber). -- juha +++ 2-5-2012 08:50:41.158705 INFO SIP ::process_sip_msg Received from: tcp:192.98.103.10:5060 NOTIFY sip:jh@192.98.103.10:5074;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.6447f6ae08e84f0c0fbec6f7090757cc.0;i=c1 Via: SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.4e788af3000000000000000000000000.0 To: sip:jh@test.fi;tag=pqazy From: sip:test@test.fi;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b CSeq: 2 NOTIFY Call-ID: byxobtomskpzmos(a)siika.tutpro.com Content-Length: 210 User-Agent: OpenXg Presence/XCAP Server (3.3.0-dev8 (x86_64/linux)) Max-Forwards: 69 Event: presence Contact: <sip:127.0.0.1:5082;alias=127.0.0.1~35306~2;transport=tcp> Subscription-State: active;expires=3670 Content-Type: application/pidf+xml <?xml version="1.0" encoding="UTF-8"?> <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@test.fi"> <tuple id="gxsdoz"> <status> <basic>open</basic> </status> </tuple> </presence> --- +++ 2-5-2012 08:50:41.161169 INFO SIP ::send_sip_tcp Send to: tcp:192.98.103.10:5060 SIP/2.0 200 OK Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.6447f6ae08e84f0c0fbec6f7090757cc.0;i=c1,SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.4e788af3000000000000000000000000.0 To: <sip:jh@test.fi>;tag=pqazy From: <sip:test@test.fi>;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b Call-ID: byxobtomskpzmos(a)siika.tutpro.com CSeq: 2 NOTIFY Server: Twinkle/1.4.2 Content-Length: 0 --- +++ 2-5-2012 08:51:00.381465 INFO SIP ::process_sip_msg Received from: tcp:192.98.103.10:5060 NOTIFY sip:jh@192.98.103.10:5074;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.fd70b43b9da3c3b488208a61595b1112.0;i=c1 Via: SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.444a74e2000000000000000000000000.0 To: sip:jh@test.fi;tag=pqazy From: sip:test@test.fi;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b CSeq: 2 NOTIFY Call-ID: byxobtomskpzmos(a)siika.tutpro.com Content-Length: 0 User-Agent: OpenXg Presence/XCAP Server (3.3.0-dev8 (x86_64/linux)) Max-Forwards: 69 Event: presence Contact: <sip:127.0.0.1:5082;alias=127.0.0.1~35306~2;transport=tcp> Subscription-State: terminated;reason=terminated --- +++ 2-5-2012 08:51:00.381794 WARNING NORMAL t_subscription_dialog::recvd_request CSeq seqnr is out of sequence. Reveived seqnr: 2 Remote seqnr: 2

4 9

git:master: modules_k/presence Fixed wrong cseq and wrong expires bugs
by Anca Vamanu 02 May '12

02 May '12

Module: sip-router Branch: master Commit: cd1ff5364786f8b32058921be6f3216b48e34792 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd1ff53… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed May 2 18:42:55 2012 +0300 modules_k/presence Fixed wrong cseq and wrong expires bugs 1. Wrong cseq bug: happened in subs_db_mode!= DB_ONLY when generating Notify with expires=0 that was not triggered by a received Subscribe 2. Problem with expires raported in Notify message. There was a static buffer used twice when building the extra headers for Notify leading to expires parameter value always having last digits '70' (the value of Max-Forwards). --- modules_k/presence/notify.c | 116 ++++++++++++++-------------------------- modules_k/presence/presence.c | 4 +- modules_k/presence/subscribe.c | 2 + 3 files changed, 45 insertions(+), 77 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 4f8d68b..f778511 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -134,18 +134,17 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) pres_ev_t* event= subs->event; str expires = {0, 0}; str status = {0, 0}; - str tmp = {0, 0}; + char* p; str trans = {";transport=", 11}; - if(hdr == NULL) - { + if(hdr == NULL) { LM_ERR("bad parameter\n"); return -1; } expires.s = int2str(subs->expires, &expires.len); + status.s= get_status_str(subs->status); - if(status.s == NULL) - { + if(status.s == NULL) { LM_ERR("bad status %d\n", subs->status); return -1; } @@ -161,104 +160,71 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) (14 /*Content-Type: */+subs->event->content_type.len + CRLF_LEN):0) + 1; hdr->s = (char*)pkg_malloc(hdr->len); - if(hdr->s == NULL) - { - LM_ERR("no more pkg\n"); + if(hdr->s == NULL) { + LM_ERR("no more pkg memory\n"); return -1; } - strncpy(hdr->s, "Max-Forwards: ", 14); - tmp.s = int2str((unsigned long)MAX_FORWARD, &tmp.len); - strncpy(hdr->s+14, tmp.s, tmp.len); - tmp.s = hdr->s + tmp.len + 14; - strncpy(tmp.s, CRLF, CRLF_LEN); - tmp.s += CRLF_LEN; - - strncpy(tmp.s ,"Event: ", 7); - tmp.s += 7; - strncpy(tmp.s, event->name.s, event->name.len); - tmp.s += event->name.len; - if(subs->event_id.len && subs->event_id.s) - { - strncpy(tmp.s, ";id=", 4); - tmp.s += 4; - strncpy(tmp.s, subs->event_id.s, subs->event_id.len); - tmp.s += subs->event_id.len; - } - strncpy(tmp.s, CRLF, CRLF_LEN); - tmp.s += CRLF_LEN; - - strncpy(tmp.s, "Contact: <", 10); - tmp.s += 10; - strncpy(tmp.s, subs->local_contact.s, subs->local_contact.len); - tmp.s += subs->local_contact.len; + p = hdr->s; + p += sprintf(p, "Max-Forwards: %d\r\n", MAX_FORWARD); + + p += sprintf(p ,"Event: %.*s", event->name.len, event->name.s); + if(subs->event_id.len && subs->event_id.s) { + p += sprintf(p, ";id=%.*s", subs->event_id.len, subs->event_id.s); + } + memcpy(p, CRLF, CRLF_LEN); + p += CRLF_LEN; + + p += sprintf(p, "Contact: <%.*s", subs->local_contact.len, subs->local_contact.s); if(subs->sockinfo_str.s!=NULL - && str_search(&subs->local_contact, &trans)==0) - { + && str_search(&subs->local_contact, &trans)==0) { /* fix me */ switch(subs->sockinfo_str.s[0]) { case 's': case 'S': - strncpy(tmp.s, ";transport=sctp", 15); - tmp.s += 15; + memcpy(p, ";transport=sctp", 15); + p += 15; break; case 't': case 'T': switch(subs->sockinfo_str.s[1]) { case 'c': case 'C': - strncpy(tmp.s, ";transport=tcp", 14); - tmp.s += 14; + memcpy(p, ";transport=tcp", 14); + p += 14; break; case 'l': case 'L': - strncpy(tmp.s, ";transport=tls", 14); - tmp.s += 14; + memcpy(p, ";transport=tls", 14); + p += 14; break; } break; } } - *tmp.s = '>'; - tmp.s++; - strncpy(tmp.s, CRLF, CRLF_LEN); - tmp.s += CRLF_LEN; - - strncpy(tmp.s, "Subscription-State: ", 20); - tmp.s += 20; - strncpy(tmp.s, status.s, status.len); - tmp.s += status.len; - - if(subs->status == TERMINATED_STATUS) - { + *p = '>'; + p++; + memcpy(p, CRLF, CRLF_LEN); + p += CRLF_LEN; + + p += sprintf(p, "Subscription-State: %.*s", status.len, status.s); + + if(subs->status == TERMINATED_STATUS) { LM_DBG("state = terminated\n"); - - strncpy(tmp.s, ";reason=", 8); - tmp.s += 8; - strncpy(tmp.s, subs->reason.s, subs->reason.len); - tmp.s += subs->reason.len; - } else { - strncpy(tmp.s, ";expires=", 9); - tmp.s += 9; - LM_DBG("expires = %d\n", subs->expires); - strncpy(tmp.s, expires.s, expires.len); - tmp.s += expires.len; - } - strncpy(tmp.s, CRLF, CRLF_LEN); - tmp.s += CRLF_LEN; - - if(is_body) - { - strncpy(tmp.s,"Content-Type: ", 14); - tmp.s += 14; - strncpy(tmp.s, event->content_type.s, event->content_type.len); - tmp.s += event->content_type.len; - strncpy(tmp.s, CRLF, CRLF_LEN); - tmp.s += CRLF_LEN; + p += sprintf(p, ";reason=%.*s", subs->reason.len, subs->reason.s); + } else { + p += sprintf(p, ";expires=%.*s", expires.len, expires.s); + } + memcpy(p, CRLF, CRLF_LEN); + p += CRLF_LEN; + + if(is_body) { + p += sprintf(p,"Content-Type: %.*s\r\n", event->content_type.len, + event->content_type.s); } - *tmp.s = '\0'; - hdr->len = tmp.s - hdr->s; + *p = '\0'; + hdr->len = p - hdr->s; return 0; } diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 1580942..e9b5681 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -1143,7 +1143,6 @@ send_notify: while(s) { - if(notify(s, NULL, NULL, 0)< 0) { LM_ERR( "sending Notify request\n"); @@ -1376,7 +1375,7 @@ static int update_pw_dialogs_dbonlymode(subs_t* subs, subs_t** subs_array) pa_dbf.free_result(pa_db, result); return(-1); } - + cs->local_cseq++; cs->next= (*subs_array); (*subs_array)= cs; @@ -1458,6 +1457,7 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs lock_release(&subs_htable[hash_code].lock); return -1; } + cs->local_cseq++; cs->expires-= (int)time(NULL); cs->next= (*subs_array); (*subs_array)= cs; diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 161a2a0..add1581 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -1472,6 +1472,7 @@ int handle_expired_subs(subs_t* s) s->reason.s= "timeout"; s->reason.len= 7; s->expires= 0; + s->local_cseq++; if(send_notify_request(s, NULL, NULL, 1)< 0) { @@ -2270,6 +2271,7 @@ int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, return -1; } lock_release(&subs_htable[hash_code].lock); + s_copy->local_cseq++; if(notify(s_copy, NULL, NULL, 0)< 0) { LM_ERR("in notify function\n");

1 0

[tracker] Task opened: notify cseq is not incremented
by sip-router 02 May '12

02 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - notify cseq is not incremented Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - while doing some presence tests with master i noticed that when presence server sends notify that terminates subscription due to change in xcap authorization rules and pres_update_watchers() call, cseq in the notify is same as in previous one. rfc3261 says in 12.2.1 UAC Behavior: Requests within a dialog MUST contain strictly monotonically increasing and contiguous CSeq sequence numbers (increasing-by-one) in each direction (excepting ACK and CANCEL of course, whose numbers equal the requests being acknowledged or cancelled). so this looks like a bug to twinkle (and me). below is sip debug from twinkle (the subscriber). -- juha +++ 2-5-2012 08:50:41.158705 INFO SIP ::process_sip_msg Received from: tcp:192.98.103.10:5060 NOTIFY sip:jh@192.98.103.10:5074;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.6447f6ae08e84f0c0fbec6f7090757cc.0;i=c1 Via: SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.4e788af3000000000000000000000000.0 To: sip:jh@test.fi;tag=pqazy From: sip:test@test.fi;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b CSeq: 2 NOTIFY Call-ID: byxobtomskpzmos(a)siika.tutpro.com Content-Length: 210 User-Agent: OpenXg Presence/XCAP Server (3.3.0-dev8 (x86_64/linux)) Max-Forwards: 69 Event: presence Contact: <sip:127.0.0.1:5082;alias=127.0.0.1~35306~2;transport=tcp> Subscription-State: active;expires=3670 Content-Type: application/pidf+xml <?xml version="1.0" encoding="UTF-8"?> <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@test.fi"> <tuple id="gxsdoz"> <status> <basic>open</basic> </status> </tuple> </presence> --- +++ 2-5-2012 08:50:41.161169 INFO SIP ::send_sip_tcp Send to: tcp:192.98.103.10:5060 SIP/2.0 200 OK Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.6447f6ae08e84f0c0fbec6f7090757cc.0;i=c1,SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.4e788af3000000000000000000000000.0 To: <sip:jh@test.fi>;tag=pqazy From: <sip:test@test.fi>;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b Call-ID: byxobtomskpzmos(a)siika.tutpro.com CSeq: 2 NOTIFY Server: Twinkle/1.4.2 Content-Length: 0 --- +++ 2-5-2012 08:51:00.381465 INFO SIP ::process_sip_msg Received from: tcp:192.98.103.10:5060 NOTIFY sip:jh@192.98.103.10:5074;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 192.98.103.10;branch=z9hG4bK4da2.fd70b43b9da3c3b488208a61595b1112.0;i=c1 Via: SIP/2.0/TCP 127.0.0.1:5082;branch=z9hG4bK4da2.444a74e2000000000000000000000000.0 To: sip:jh@test.fi;tag=pqazy From: sip:test@test.fi;tag=4a664ec84c547b2d0bc0fe8965f834e4-8a4b CSeq: 2 NOTIFY Call-ID: byxobtomskpzmos(a)siika.tutpro.com Content-Length: 0 User-Agent: OpenXg Presence/XCAP Server (3.3.0-dev8 (x86_64/linux)) Max-Forwards: 69 Event: presence Contact: <sip:127.0.0.1:5082;alias=127.0.0.1~35306~2;transport=tcp> Subscription-State: terminated;reason=terminated --- +++ 2-5-2012 08:51:00.381794 WARNING NORMAL t_subscription_dialog::recvd_request CSeq seqnr is out of sequence. Reveived seqnr: 2 Remote seqnr: 2 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=228 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: Makefile: version set to 3.3.0-pre1
by Daniel-Constantin Mierla 02 May '12

02 May '12

Module: sip-router Branch: master Commit: 08e0fdec38269a5ee5aa628deefcb24d49d011c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08e0fde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 2 00:37:51 2012 +0200 Makefile: version set to 3.3.0-pre1 - pre-release phase reflected in verson string --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4fd657f..e13fd95 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev8 +EXTRAVERSION = -pre1 # memory debugger switcher # 0 - off (release mode)

1 0

git:master: core: log message about dlflags from modules was made notice instead of warning
by Daniel-Constantin Mierla 02 May '12

02 May '12

Module: sip-router Branch: master Commit: 1cd9a9c32a323e6811e1d536566ab88fa93625e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cd9a9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 2 14:21:23 2012 +0200 core: log message about dlflags from modules was made notice instead of warning --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index 8bc52d9..172b400 100644 --- a/sr_module.c +++ b/sr_module.c @@ -622,7 +622,7 @@ reload: if (new_dlflags!=dlflags && new_dlflags!=DEFAULT_DLFLAGS) { /* we have to reload the module */ dlclose(handle); - WARN("%s: exports dlflags interface is deprecated and it will not" + NOTICE("%s: exports dlflags interface is deprecated and it will not" " be supported in newer versions; consider using" " mod_register() instead\n", path); dlflags=new_dlflags;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012