sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: modules_k/rls: rls_presentity can now be in a different DB from rls_watchers
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: ca6d901216360694d7834cde05c875c5c141af66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca6d901… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:18:05 2012 +0000 modules_k/rls: rls_presentity can now be in a different DB from rls_watchers - During performance testing it was observed that the rls_presentity table is hit very hard. Separating it off into a different table helps. - It may also be a good candidate for use with db_cassandra, and putting it in its own DB is a first step. - There are two new modparams, one for the dburl and one to give rls_presentity it's own clean period. Leaving these unset maintains the current behaviour. Using a different dburl and leaving the new clean period parameter unset puts rls_presentity in a different DB, but still uses the existing clean period for it (and rls_watchers). - Setting the new clean period parameter to 0 means that the timer to clean the rls_presentity table is not started at all. - Also cleaned up the xcap table query a little. The arrays allocated for it were larger than they needed to be. --- modules_k/rls/README | 286 ++++++++++++++++++++++----------------- modules_k/rls/doc/rls_admin.xml | 53 +++++++- modules_k/rls/notify.c | 18 ++-- modules_k/rls/resource_notify.c | 24 ++-- modules_k/rls/rls.c | 88 +++++++++++- modules_k/rls/rls.h | 2 + 6 files changed, 319 insertions(+), 152 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ca6…

1 0

git:master: modules_k/rls: made rls_handle_notify() send SIP error responses when things go wrong
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: 5c61d09717c7254d42458f549e02fb59d2d52162 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c61d09… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:24:09 2012 +0000 modules_k/rls: made rls_handle_notify() send SIP error responses when things go wrong - Currently it just silently drops the request - leaving the far end with stuck dialogs. - After this change 400/481/489/500 responses are returned as appropriate. - Also downgraded the "no presence dialog record for non-TERM.." ERR to INFO. This was helpful when looking for holes and race-hazards, but it can also occur a lot when the system is overloaded - obscuring real problems. For example... RLS Presence --- -------- SUBSCRIBE --> <-- 200 OK <-- NOTIFY 200 OK --> un-SUBSCRIBE --> <-- 503 (overload) - un-SUBSCRIBE not processed ...later... <-- NOTIFY 481 --> ("no presence dialog record for...") - With the latest updates RLS, PUA, and Presence dialogs are correctly removed when error responses are received (and the error responses are sent at the correct times). Some of these diagnostics are no longer errors, or even warnings. --- modules_k/rls/resource_notify.c | 41 ++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 378035c..382d8d9 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -47,6 +47,10 @@ * winner: sol3 * */ static str su_200_rpl = str_init("OK"); +static str pu_400_rpl = str_init("Bad Request"); +static str pu_481_rpl = str_init("Call/Transaction Does Not Exist"); +static str pu_489_rpl = str_init("Bad Event"); +static str pu_500_rpl = str_init("Server Internal Error"); int parse_rlsubs_did(char* str_did, str* callid, str* from_tag, str* to_tag) { @@ -506,24 +510,31 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) struct hdr_field* hdr= NULL; int n, expires= -1; str content_type= {0, 0}; - + int reply_code = 500; + str reply_str = pu_500_rpl; LM_DBG("start\n"); /* extract the dialog information and check if an existing dialog*/ if( parse_headers(msg,HDR_EOH_F, 0)==-1 ) { LM_ERR("parsing headers\n"); - return -1; + reply_code = 400; + reply_str = pu_400_rpl; + goto error; } if((!msg->event ) ||(msg->event->body.len<=0)) { LM_ERR("Missing event header field value\n"); - return -1; + reply_code = 400; + reply_str = pu_400_rpl; + goto error; } if( msg->to==NULL || msg->to->body.s==NULL) { LM_ERR("cannot parse TO header\n"); - return -1; + reply_code = 400; + reply_str = pu_400_rpl; + goto error; } if(msg->to->parsed != NULL) { @@ -537,6 +548,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if(TO.uri.len <= 0) { LM_ERR(" 'To' header NOT parsed\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } pto = &TO; @@ -546,12 +559,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if (pto->tag_value.s==NULL || pto->tag_value.len==0 ) { LM_ERR("to tag value not parsed\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } dialog.from_tag= pto->tag_value; if( msg->callid==NULL || msg->callid->body.s==NULL) { LM_ERR("cannot parse callid header\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } dialog.call_id = msg->callid->body; @@ -559,6 +576,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if (!msg->from || !msg->from->body.s) { LM_ERR("cannot find 'from' header!\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } if (msg->from->parsed == NULL) @@ -568,6 +587,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if ( parse_from_header( msg )<0 ) { LM_ERR("cannot parse From header\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } } @@ -577,6 +598,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if( pfrom->tag_value.s ==NULL || pfrom->tag_value.len == 0) { LM_ERR("no from tag value present\n"); + reply_code = 400; + reply_str = pu_400_rpl; goto error; } dialog.to_tag= pfrom->tag_value; @@ -586,6 +609,8 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) if(dialog.event< 0) { LM_ERR("unrecognized event package\n"); + reply_code = 489; + reply_str = pu_489_rpl; goto error; } @@ -628,8 +653,10 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) */ if(auth_flag==TERMINATED_STATE) goto done; - LM_ERR("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", + LM_INFO("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", dialog.pres_uri->len, dialog.pres_uri->s, dialog.watcher_uri->len, dialog.watcher_uri->s); + reply_code = 481; + reply_str = pu_481_rpl; goto error; } @@ -784,6 +811,10 @@ done: return 1; error: + if(slb.freply(msg, reply_code, &reply_str) < 0) + { + LM_ERR("failed sending reply\n"); + } if(res_id!=NULL) { pkg_free(res_id->s);

1 0

git:master: modules_k/pua: Simplified dialog matching in hash-table and DB
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: 4b30db3bce5211b34d6988e585a839fa7bcf4c66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b30db3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:38:27 2012 +0000 modules_k/pua: Simplified dialog matching in hash-table and DB - SIP dialogs can be matched with just Call-ID, From-Tag, and To-Tag so I have simplified the lookups/queries to just use those. - Also some tidy-up of pua_db.c --- modules_k/pua/hash.c | 26 +-- modules_k/pua/pua_db.c | 505 +++++++++++++----------------------------------- modules_k/pua/pua_db.h | 1 - 3 files changed, 146 insertions(+), 386 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4b3…

1 0

git:master: modules_k/presence: Presence performance and stability changes
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: e142f4d8f15c87586ad4e001306a9bf81fbe983b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e142f4d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:00:24 2012 +0000 modules_k/presence: Presence performance and stability changes - Changed DB only mode queries to use simpler queries (match on Call-ID, From-Tag, and To-Tag - all that should be needed to match a SIP dialog). - Fixed some whitespace issues - Added and changed some error diagnostics. In particular made Kamailio quieter (reduced from ERR to INFO) when a dialog cannot be found in the DB or hash-table. This can happen in normal-ish use and was just too noisy. Example: UA/Proxy Kamailio -------- -------- SUBSCRIBE --> <-- 200 OK <-- NOTIFY 503 (overload) --> Dialog removed from DB ...later... un-SUBSCRIBE --> Error message <-- 481 The error message doesn't really help here and on a busy system floods the logs. --- modules_k/presence/subscribe.c | 173 +++++++++++---------------------------- 1 files changed, 49 insertions(+), 124 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 95f6895..7f40872 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -326,43 +326,11 @@ int insert_subs_db(subs_t* s, int type) int update_subs_db(subs_t* subs, int type) { - db_key_t query_cols[22], update_keys[7]; - db_val_t query_vals[22], update_vals[7]; + db_key_t query_cols[3], update_keys[4]; + db_val_t query_vals[3], update_vals[4]; int n_update_cols= 0; int n_query_cols = 0; - query_cols[n_query_cols] = &str_presentity_uri_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->pres_uri; - n_query_cols++; - - query_cols[n_query_cols] = &str_watcher_username_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->from_user; - n_query_cols++; - - query_cols[n_query_cols] = &str_watcher_domain_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->from_domain; - n_query_cols++; - - query_cols[n_query_cols] = &str_event_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->event->name; - n_query_cols++; - - if(subs->event_id.s) - { - query_cols[n_query_cols] = &str_event_id_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->event_id; - n_query_cols++; - } query_cols[n_query_cols] = &str_callid_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; @@ -544,7 +512,11 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, } else { - if(insert_subs_db(subs, REMOTE_TYPE)); + if(insert_subs_db(subs, REMOTE_TYPE) < 0) + { + LM_ERR("inserting new record in db\n"); + goto error; + } } /* TODO if req_auth, the subscription was in the watcher table first, we must delete it */ } @@ -762,7 +734,7 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) { if(get_stored_info(msg, &subs, &reply_code, &reply_str )< 0) { - LM_ERR("getting stored info\n"); + LM_INFO("getting stored info\n"); goto error; } reason= subs.reason; @@ -1082,21 +1054,21 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, subs->contact.s, subs->contact.len); if (EVENT_DIALOG_SLA(subs->event->evp)) - { - /* user_contact@from_domain */ - if(parse_uri(subs->contact.s, subs->contact.len, &uri)< 0) - { - LM_ERR("failed to parse contact uri\n"); - goto error; - } - if(uandd_to_uri(uri.user, subs->from_domain, &subs->pres_uri)< 0) - { - LM_ERR("failed to construct uri\n"); - goto error; - } - LM_DBG("&&&&&&&&&&&&&&& dialog pres_uri= %.*s\n",subs->pres_uri.len, subs->pres_uri.s); - } - + { + /* user_contact@from_domain */ + if(parse_uri(subs->contact.s, subs->contact.len, &uri)< 0) + { + LM_ERR("failed to parse contact uri\n"); + goto error; + } + if(uandd_to_uri(uri.user, subs->from_domain, &subs->pres_uri)< 0) + { + LM_ERR("failed to construct uri\n"); + goto error; + } + LM_DBG("&&&&&&&&&&&&&&& dialog pres_uri= %.*s\n", + subs->pres_uri.len, subs->pres_uri.s); + } /*process record route and add it to a string*/ if(*to_tag_gen && msg->record_route!=NULL) @@ -1152,18 +1124,17 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, unsigned int hash_code; /* first try to_user== pres_user and to_domain== pres_domain */ - - if(subs->pres_uri.s == NULL) - { - uandd_to_uri(subs->to_user, subs->to_domain, &pres_uri); - if(pres_uri.s== NULL) - { - LM_ERR("creating uri from user and domain\n"); - return -1; - } - } - else - pres_uri = subs->pres_uri; + if(subs->pres_uri.s == NULL) + { + uandd_to_uri(subs->to_user, subs->to_domain, &pres_uri); + if(pres_uri.s== NULL) + { + LM_ERR("creating uri from user and domain\n"); + return -1; + } + } + else + pres_uri = subs->pres_uri; hash_code= core_hash(&pres_uri, &subs->event->name, shtable_size); lock_get(&subs_htable[hash_code].lock); @@ -1176,14 +1147,13 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, } lock_release(&subs_htable[hash_code].lock); - if(subs->pres_uri.s) - goto not_found; + if(subs->pres_uri.s) + goto not_found; - pkg_free(pres_uri.s); + pkg_free(pres_uri.s); pres_uri.s= NULL; - - LM_DBG("record not found using R-URI search iteratively\n"); + LM_DBG("record not found using R-URI search iteratively\n"); /* take one row at a time */ for(i= 0; i< shtable_size; i++) { @@ -1207,26 +1177,25 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, lock_release(&subs_htable[i].lock); } +not_found: if(dbmode != DB_MEMORY_ONLY) { - return get_database_info(msg, subs, reply_code, reply_str); + return get_database_info(msg, subs, reply_code, reply_str); } -not_found: - - LM_ERR("record not found in hash_table\n"); + LM_INFO("record not found in hash_table\n"); *reply_code= 481; *reply_str= pu_481_rpl; return -1; found_rec: - + LM_DBG("Record found in hash_table\n"); - + if(!EVENT_DIALOG_SLA(s->event->evp)) subs->pres_uri= pres_uri; - + subs->version = s->version; subs->status= s->status; if(s->reason.s && s->reason.len) @@ -1282,64 +1251,20 @@ error: int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* reply_str) { - db_key_t query_cols[10]; - db_val_t query_vals[10]; - db_key_t result_cols[9]; + db_key_t query_cols[3]; + db_val_t query_vals[3]; + db_key_t result_cols[7]; db1_res_t *result= NULL; db_row_t *row ; db_val_t *row_vals ; int n_query_cols = 0; int n_result_cols = 0; int remote_cseq_col= 0, local_cseq_col= 0, status_col, reason_col; - int record_route_col, version_col; - int pres_uri_col; + int record_route_col, version_col, pres_uri_col; unsigned int remote_cseq; str pres_uri, record_route; str reason; - query_cols[n_query_cols] = &str_to_user_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->to_user; - n_query_cols++; - - query_cols[n_query_cols] = &str_to_domain_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->to_domain; - n_query_cols++; - - query_cols[n_query_cols] = &str_watcher_username_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->from_user; - n_query_cols++; - - query_cols[n_query_cols] = &str_watcher_domain_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->from_domain; - n_query_cols++; - - query_cols[n_query_cols] = &str_event_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = subs->event->name; - n_query_cols++; - - query_cols[n_query_cols] = &str_event_id_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; - if( subs->event_id.s != NULL) - { - query_vals[n_query_cols].val.str_val.s = subs->event_id.s; - query_vals[n_query_cols].val.str_val.len = subs->event_id.len; - } else { - query_vals[n_query_cols].val.str_val.s = ""; - query_vals[n_query_cols].val.str_val.len = 0; - } - n_query_cols++; - query_cols[n_query_cols] = &str_callid_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; @@ -1385,7 +1310,7 @@ int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* r if(result && result->n <=0) { - LM_ERR("No matching subscription dialog found in database\n"); + LM_INFO("No matching subscription dialog found in database\n"); pa_dbf.free_result(pa_db, result); *reply_code= 481;

1 0

git:master: modules_k/rls: New modparam to disable remote ( to a domain that is not local) back-end SUBSCRIBEs
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: ee94f5341864d6a9e74e60935f61862832ae1112 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee94f53… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:10:52 2012 +0000 modules_k/rls: New modparam to disable remote (to a domain that is not local) back-end SUBSCRIBEs - RLS and presence put heavy loads on servers and networks - especially interconnects between networks. - Using this modparam disables federation with non-local domains and prevents RLS sending back-end SUBSCRIBEs to remote destinations. --- modules_k/rls/README | 74 +++++++++++++++++++++++++-------------- modules_k/rls/doc/rls_admin.xml | 26 ++++++++++++++ modules_k/rls/rls.c | 3 ++ modules_k/rls/rls.h | 2 + modules_k/rls/subscribe.c | 15 +++++++- 5 files changed, 93 insertions(+), 27 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ee9…

1 0

git:master: Revert "modules_k/presence: Improved handling of retransmitted SUBSCRIBE requests"
by Peter Dunkley 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: f989c490e67b053e7d17e4f2083336083f71bbba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f989c49… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 15:53:12 2012 +0000 Revert "modules_k/presence: Improved handling of retransmitted SUBSCRIBE requests" - Have recently made a set of better fixes for presence. Reverting this and will commit the new fixes shortly. This reverts commit e6a50c5c0957a5ad3e08e57ede5be775a41ac24f. --- modules_k/presence/subscribe.c | 247 ++++++++++++++++++--------------------- 1 files changed, 114 insertions(+), 133 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 3bef56c..95f6895 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -762,10 +762,7 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) { if(get_stored_info(msg, &subs, &reply_code, &reply_str )< 0) { - if (msg->rcv.proto == PROTO_UDP) - LM_INFO("problem getting stored info - possible retransmission\n"); - else - LM_ERR("getting stored info\n"); + LM_ERR("getting stored info\n"); goto error; } reason= subs.reason; @@ -888,26 +885,9 @@ error: if(sent_reply== 0) { - if (reply_code == 200) + if(send_error_reply(msg, reply_code, reply_str)< 0) { - if(subs.event->type & PUBL_TYPE) - { - if(send_2XX_reply(msg, 202, subs.expires, - &subs.local_contact) <0) - LM_ERR("failed to send reply on error case\n"); - } - else - { - /* For presence.winfo */ - if(send_2XX_reply(msg, 200, subs.expires, - &subs.local_contact) <0) - LM_ERR("failed to send reply on error case\n"); - } - } - else - { - if(send_error_reply(msg, reply_code, reply_str)< 0) - LM_ERR("failed to send reply on error case\n"); + LM_ERR("failed to send reply on error case\n"); } } @@ -1102,21 +1082,21 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, subs->contact.s, subs->contact.len); if (EVENT_DIALOG_SLA(subs->event->evp)) - { - /* user_contact@from_domain */ - if(parse_uri(subs->contact.s, subs->contact.len, &uri)< 0) - { - LM_ERR("failed to parse contact uri\n"); - goto error; - } - if(uandd_to_uri(uri.user, subs->from_domain, &subs->pres_uri)< 0) - { - LM_ERR("failed to construct uri\n"); - goto error; - } - LM_DBG("&&&&&&&&&&&&&&& dialog pres_uri= %.*s\n", - subs->pres_uri.len, subs->pres_uri.s); - } + { + /* user_contact@from_domain */ + if(parse_uri(subs->contact.s, subs->contact.len, &uri)< 0) + { + LM_ERR("failed to parse contact uri\n"); + goto error; + } + if(uandd_to_uri(uri.user, subs->from_domain, &subs->pres_uri)< 0) + { + LM_ERR("failed to construct uri\n"); + goto error; + } + LM_DBG("&&&&&&&&&&&&&&& dialog pres_uri= %.*s\n",subs->pres_uri.len, subs->pres_uri.s); + } + /*process record route and add it to a string*/ if(*to_tag_gen && msg->record_route!=NULL) @@ -1172,17 +1152,18 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, unsigned int hash_code; /* first try to_user== pres_user and to_domain== pres_domain */ - if(subs->pres_uri.s == NULL) - { - uandd_to_uri(subs->to_user, subs->to_domain, &pres_uri); - if(pres_uri.s== NULL) - { - LM_ERR("creating uri from user and domain\n"); - return -1; - } - } - else - pres_uri = subs->pres_uri; + + if(subs->pres_uri.s == NULL) + { + uandd_to_uri(subs->to_user, subs->to_domain, &pres_uri); + if(pres_uri.s== NULL) + { + LM_ERR("creating uri from user and domain\n"); + return -1; + } + } + else + pres_uri = subs->pres_uri; hash_code= core_hash(&pres_uri, &subs->event->name, shtable_size); lock_get(&subs_htable[hash_code].lock); @@ -1195,13 +1176,14 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, } lock_release(&subs_htable[hash_code].lock); - if(subs->pres_uri.s) - goto not_found; + if(subs->pres_uri.s) + goto not_found; - pkg_free(pres_uri.s); + pkg_free(pres_uri.s); pres_uri.s= NULL; + - LM_DBG("record not found using R-URI search iteratively\n"); + LM_DBG("record not found using R-URI search iteratively\n"); /* take one row at a time */ for(i= 0; i< shtable_size; i++) { @@ -1225,35 +1207,26 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, lock_release(&subs_htable[i].lock); } -not_found: if(dbmode != DB_MEMORY_ONLY) { - return get_database_info(msg, subs, reply_code, reply_str); + return get_database_info(msg, subs, reply_code, reply_str); } - if (msg->rcv.proto == PROTO_UDP && subs->expires == 0) - { - /* Assume it's a retransmission of an un-SUBSCRIBE */ - LM_INFO("No matching subscription dialog found in database - possible retransmission of un-SUBSCRIBE?\n"); - *reply_code= 200; - *reply_str= su_200_rpl; - } - else - { - /* It's definitely an error */ - LM_ERR("record not found in hash_table\n"); - *reply_code= 481; - *reply_str= pu_481_rpl; - } +not_found: + + LM_ERR("record not found in hash_table\n"); + *reply_code= 481; + *reply_str= pu_481_rpl; return -1; found_rec: + LM_DBG("Record found in hash_table\n"); - + if(!EVENT_DIALOG_SLA(s->event->evp)) subs->pres_uri= pres_uri; - + subs->version = s->version; subs->status= s->status; if(s->reason.s && s->reason.len) @@ -1284,25 +1257,14 @@ found_rec: if(subs->remote_cseq<= s->remote_cseq) { + LM_ERR("wrong sequence number;received: %d - stored: %d\n", + subs->remote_cseq, s->remote_cseq); + + *reply_code= 400; + *reply_str= pu_400_rpl; lock_release(&subs_htable[i].lock); - if (msg->rcv.proto == PROTO_UDP) - { - /* Assume it's a retransmission of a SUBSCRIBE */ - LM_INFO("Possible retransmission of SUBSCRIBE?\n"); - *reply_code= 200; - *reply_str= su_200_rpl; - return -1; - } - else - { - /* It's definitely an error */ - LM_ERR("wrong sequence number received: %d - stored: %d\n", - subs->remote_cseq, s->remote_cseq); - *reply_code= 400; - *reply_str= pu_400_rpl; - goto error; - } + goto error; } lock_release(&subs_htable[i].lock); @@ -1320,20 +1282,64 @@ error: int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* reply_str) { - db_key_t query_cols[3]; - db_val_t query_vals[3]; - db_key_t result_cols[7]; + db_key_t query_cols[10]; + db_val_t query_vals[10]; + db_key_t result_cols[9]; db1_res_t *result= NULL; db_row_t *row ; db_val_t *row_vals ; int n_query_cols = 0; int n_result_cols = 0; int remote_cseq_col= 0, local_cseq_col= 0, status_col, reason_col; - int record_route_col, version_col, pres_uri_col; + int record_route_col, version_col; + int pres_uri_col; unsigned int remote_cseq; str pres_uri, record_route; str reason; + query_cols[n_query_cols] = &str_to_user_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs->to_user; + n_query_cols++; + + query_cols[n_query_cols] = &str_to_domain_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs->to_domain; + n_query_cols++; + + query_cols[n_query_cols] = &str_watcher_username_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs->from_user; + n_query_cols++; + + query_cols[n_query_cols] = &str_watcher_domain_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs->from_domain; + n_query_cols++; + + query_cols[n_query_cols] = &str_event_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = subs->event->name; + n_query_cols++; + + query_cols[n_query_cols] = &str_event_id_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + if( subs->event_id.s != NULL) + { + query_vals[n_query_cols].val.str_val.s = subs->event_id.s; + query_vals[n_query_cols].val.str_val.len = subs->event_id.len; + } else { + query_vals[n_query_cols].val.str_val.s = ""; + query_vals[n_query_cols].val.str_val.len = 0; + } + n_query_cols++; + query_cols[n_query_cols] = &str_callid_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; @@ -1379,29 +1385,29 @@ int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* r if(result && result->n <=0) { + LM_ERR("No matching subscription dialog found in database\n"); + pa_dbf.free_result(pa_db, result); - - if (msg->rcv.proto == PROTO_UDP && subs->expires == 0) - { - /* Assume it's a retransmission of an un-SUBSCRIBE */ - LM_INFO("No matching subscription dialog found in database - possible retransmission of un-SUBSCRIBE?\n"); - *reply_code= 200; - *reply_str= su_200_rpl; - } - else - { - /* It's definitely an error */ - LM_ERR("No matching subscription dialog found in database\n"); - *reply_code= 481; - *reply_str= pu_481_rpl; - } + *reply_code= 481; + *reply_str= pu_481_rpl; return -1; } row = &result->rows[0]; row_vals = ROW_VALUES(row); - + remote_cseq= row_vals[remote_cseq_col].val.int_val; + + if(subs->remote_cseq<= remote_cseq) + { + LM_ERR("wrong sequence number received: %d - stored: %d\n", + subs->remote_cseq, remote_cseq); + *reply_code= 400; + *reply_str= pu_400_rpl; + pa_dbf.free_result(pa_db, result); + return -1; + } + subs->status= row_vals[status_col].val.int_val; reason.s= (char*)row_vals[reason_col].val.string_val; if(reason.s) @@ -1447,31 +1453,6 @@ int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* r subs->record_route.len= record_route.len; } - remote_cseq= row_vals[remote_cseq_col].val.int_val; - if(subs->remote_cseq<= remote_cseq) - { - pa_dbf.free_result(pa_db, result); - - if (msg->rcv.proto == PROTO_UDP) - { - /* Assume it's a retransmission of a SUBSCRIBE */ - LM_INFO("Possible retransmission of SUBSCRIBE?\n"); - *reply_code= 200; - *reply_str= su_200_rpl; - } - else - { - /* It's definitely an error */ - LM_ERR("wrong sequence number received: %d - stored: %d\n", - subs->remote_cseq, remote_cseq); - *reply_code= 400; - *reply_str= pu_400_rpl; - } - - return -1; - } - - pa_dbf.free_result(pa_db, result); result= NULL;

1 0

git:master: lib/kcore: cleaned up unused code
by Daniel-Constantin Mierla 10 Feb '12

10 Feb '12

1 0

git:master: kcore: removed local_route.{c, h} - they are not used
by Daniel-Constantin Mierla 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: 04979bc60fcd22752ab74521e1e56da9090a1607 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04979bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 10 11:28:06 2012 +0100 kcore: removed local_route.{c,h} - they are not used - removed unused code from acc related to local route --- lib/kcore/local_route.c | 78 ----------------------------------------------- lib/kcore/local_route.h | 42 ------------------------- modules_k/acc/acc_mod.c | 19 ----------- 3 files changed, 0 insertions(+), 139 deletions(-) diff --git a/lib/kcore/local_route.c b/lib/kcore/local_route.c deleted file mode 100644 index ba2f156..0000000 --- a/lib/kcore/local_route.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - *$Id: local_route.c 5132 2008-10-24 11:49:14Z miconda $ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! - * \file - * \brief Local Route related functions. - */ - -#include <string.h> - -#include "../../dprint.h" -#include "../../mem/mem.h" - -#include "local_route.h" - -static lrt_info_t* lrt_info_list = 0; -static int lrt_info_no = 0; - - -int lrt_do_init_child(void) -{ - int i; - - for ( i=0; i< lrt_info_no; i++ ) - { - if ( lrt_info_list[i].init && lrt_info_list[i].init()!=0 ) - { - LM_ERR("failed to init child for local route <%s>\n", - lrt_info_list[i].name); - return -1; - } - } - return 0; -} - -int register_lrt_info(lrt_info_t *lrti) -{ - lrt_info_t *l; - - if(lrti==NULL || lrti->name==NULL || lrti->init==NULL) - return 0; - - l = (lrt_info_t*)pkg_realloc(lrt_info_list, - (lrt_info_no+1)*sizeof(lrt_info_t)); - if (l==0) - { - LM_ERR("no more pkg memory\n"); - return -1; - } - - lrt_info_list = l; - lrt_info_list[lrt_info_no].init = lrti->init; - lrt_info_list[lrt_info_no].name = lrti->name; - lrt_info_no++; - - return 0; -} - - diff --git a/lib/kcore/local_route.h b/lib/kcore/local_route.h deleted file mode 100644 index fe1da2c..0000000 --- a/lib/kcore/local_route.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - *$Id: local_route.h 5132 2008-10-24 11:49:14Z miconda $ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! - * \file - * \brief Local Route related functions. - */ - -#ifndef _LOCAL_ROUTE_H_ -#define _LOCAL_ROUTE_H_ - -typedef int (lrt_child_init_f)(void); - -typedef struct _lrt_info { - char *name; - lrt_child_init_f *init; -} lrt_info_t; - -int lrt_do_init_child(void); -int register_lrt_info(lrt_info_t *lrti); - -#endif - diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index c913eba..c1d6d68 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -63,7 +63,6 @@ #include <string.h> #include "../../sr_module.h" -#include "../../lib/kcore/local_route.h" #include "../../dprint.h" #include "../../mem/mem.h" #include "../../modules/tm/tm_load.h" @@ -362,18 +361,6 @@ static int free_acc_fixup(void** param, int param_no) /************************** INTERFACE functions ****************************/ -static int mod_lrt_init( void ) -{ - -#ifdef SQL_ACC - if(db_url.s && acc_db_init_child(&db_url)<0) { - LM_ERR("could not open database connection"); - return -1; - } -#endif - - return 0; -} static int parse_failed_filter(char *s, unsigned short *failed_filter) { @@ -416,12 +403,6 @@ static int parse_failed_filter(char *s, unsigned short *failed_filter) static int mod_init( void ) { - lrt_info_t li; - li.init = mod_lrt_init; - li.name = "acc"; - if(register_lrt_info(&li)!=0) - return -1; - #ifdef SQL_ACC if (db_url.s) { db_url.len = strlen(db_url.s);

1 0

git:master: pv: new pv $sid returning server_id value
by Daniel-Constantin Mierla 10 Feb '12

10 Feb '12

Module: sip-router Branch: master Commit: 70e4496102ebdb83f6abfa65b14481752bc73ffc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70e4496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 10 11:13:49 2012 +0100 pv: new pv $sid returning server_id value - server_id can be set via global parameter with same name --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 8 ++++++++ modules_k/pv/pv_core.h | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index bc47e1a..d907fe5 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -339,6 +339,9 @@ static pv_export_t mod_pvs[] = { {{"si", (sizeof("si")-1)}, /* */ PVT_OTHER, pv_get_srcip, 0, 0, 0, 0, 0}, + { {"sid", (sizeof("sid")-1)}, /* server id */ + PVT_OTHER, pv_get_server_id, 0, + 0, 0, 0, 0}, {{"sp", (sizeof("sp")-1)}, /* */ PVT_OTHER, pv_get_srcport, 0, 0, 0, 0, 0}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 1edaa77..d29b87c 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1592,6 +1592,14 @@ int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, } return 0; } + +int pv_get_server_id(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_sintval(msg, param, res, server_id); +} + + /********* end PV get functions *********/ /********* start PV set functions *********/ diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index f222f59..4fb83d5 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -199,6 +199,8 @@ int pv_get_true(struct sip_msg *msg, pv_param_t *param, int pv_get_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_server_id(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); /********* end PV get functions *********/ /********* start PV set functions *********/

1 0

git:master: dialog(k): match on callid and ftag for no ACK'ed dialogs
by Daniel-Constantin Mierla 09 Feb '12

09 Feb '12

Module: sip-router Branch: master Commit: 390383e2d0dff755ff9f0eb6a6b1fe627dc29949 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=390383e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 9 15:28:44 2012 +0100 dialog(k): match on callid and ftag for no ACK'ed dialogs - some of the TM callbacks look for the dialog with initial INVITE that has no to-tag yet, even that the callback is run on 200ok and dialog was updated with this field - reported by Jon Bergli Heier --- modules_k/dialog/dlg_hash.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index fa7566b..06fbd75 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -458,6 +458,16 @@ static inline int match_dialog(dlg_cell_t *dlg, str *callid, *dir = DLG_DIR_DOWNSTREAM; return 1; } + /* if no ACK yet, might be a lookup of dlg from a TM callback that + * runs on 200ok but with initial INVITE that has no to-tag */ + if(ttag->len==0 && dlg->state==DLG_STATE_CONFIRMED_NA + && dlg->tag[DLG_CALLER_LEG].len == ftag->len && + strncmp(dlg->tag[DLG_CALLER_LEG].s, ftag->s, ftag->len)==0 && + strncmp(dlg->callid.s, callid->s, callid->len)==0) { + + *dir = DLG_DIR_DOWNSTREAM; + return 1; + } } }

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012