sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:3.2: modules_k/xcap_server: Changed the XCAP server so that existing documents are updated instead of deleted and inserted

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: 938854019b05f63d91243e0c0ca8bed2c007d635 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9388540… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:23:12 2011 +0000 modules_k/xcap_server: Changed the XCAP server so that existing documents are updated instead of deleted and inserted - Affects XCAP PUT and XCAP partial DELETE - Some RLS clients send multiple HTTP updates in very close succession. One client has even been observed to upload an identical document several times in a row. - I use rls_update_subs() when any resource-list related document is uploaded. With Kamailio being multi-process and the client re-uploading an indentical document several times with no time between I was frequently hitting the window where rls_update_subs() was called after the DB delete for the second upload but before the insert happened. - Now the DB put operation checks for the presence of a document and does an insert only if the document does not exist. It does an update if the document does exist. (cherry picked from commit 80b8e30b8a8de950354c1e8b510a03ad9ed98992) --- modules_k/xcap_server/xcap_server.c | 134 +++++++++++++++++++++------------- 1 files changed, 83 insertions(+), 51 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 66dac1f..9580e53 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -88,6 +88,7 @@ static str xcaps_buf = {0, 8192}; #define XCAPS_ETAG_SIZE 128 static char xcaps_etag_buf[XCAPS_ETAG_SIZE]; +static str str_id_col = str_init("id"); static str str_source_col = str_init("source"); static str str_doc_col = str_init("doc"); static str str_etag_col = str_init("etag"); @@ -331,9 +332,10 @@ int xcaps_xpath_hack(str *buf, int type) static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, str* doc) { - db_key_t qcols[9]; - db_val_t qvals[9]; - int ncols = 0; + db_key_t qcols[9], rcols[2], ucols[5]; + db_val_t qvals[9], uvals[5]; + db1_res_t *res = NULL; + int ncols = 0, num_ucols = 0, nrows = 0; if(xcaps_check_doc_validity(doc)<0) { @@ -341,7 +343,6 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, goto error; } - /* insert in xcap table*/ qcols[ncols] = &str_username_col; qvals[ncols].type = DB1_STR; qvals[ncols].nul = 0; @@ -360,35 +361,13 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, qvals[ncols].val.int_val= xuri->type; ncols++; - qcols[ncols] = &str_doc_col; - qvals[ncols].type = DB1_BLOB; - qvals[ncols].nul = 0; - qvals[ncols].val.str_val= *doc; - ncols++; - - qcols[ncols] = &str_etag_col; - qvals[ncols].type = DB1_STR; - qvals[ncols].nul = 0; - qvals[ncols].val.str_val= *etag; - ncols++; - - qcols[ncols] = &str_source_col; - qvals[ncols].type = DB1_INT; - qvals[ncols].nul = 0; - qvals[ncols].val.int_val = 0; - ncols++; - qcols[ncols] = &str_doc_uri_col; qvals[ncols].type = DB1_STR; qvals[ncols].nul = 0; qvals[ncols].val.str_val= xuri->adoc; ncols++; - qcols[ncols] = &str_port_col; - qvals[ncols].type = DB1_INT; - qvals[ncols].nul = 0; - qvals[ncols].val.int_val= 0; - ncols++; + rcols[0] = &str_id_col; if (xcaps_dbf.use_table(xcaps_db, &xcaps_db_table) < 0) { @@ -396,10 +375,83 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, xcaps_db_table.s); goto error; } - - if(xcaps_dbf.insert(xcaps_db, qcols, qvals, ncols)< 0) + + if (xcaps_dbf.query(xcaps_db, qcols, 0, qvals, rcols, ncols, 1, 0, &res) < 0) + { + LM_ERR("in sql query\n"); + goto error; + } + + nrows = RES_ROW_N(res); + xcaps_dbf.free_result(xcaps_db, res); + + if (nrows == 0) + { + qcols[ncols] = &str_doc_col; + qvals[ncols].type = DB1_BLOB; + qvals[ncols].nul = 0; + qvals[ncols].val.str_val= *doc; + ncols++; + + qcols[ncols] = &str_etag_col; + qvals[ncols].type = DB1_STR; + qvals[ncols].nul = 0; + qvals[ncols].val.str_val= *etag; + ncols++; + + qcols[ncols] = &str_source_col; + qvals[ncols].type = DB1_INT; + qvals[ncols].nul = 0; + qvals[ncols].val.int_val = 0; + ncols++; + + qcols[ncols] = &str_port_col; + qvals[ncols].type = DB1_INT; + qvals[ncols].nul = 0; + qvals[ncols].val.int_val = 0; + ncols++; + + if(xcaps_dbf.insert(xcaps_db, qcols, qvals, ncols)< 0) + { + LM_ERR("in sql insert\n"); + goto error; + } + } + else if (nrows == 1) + { + ucols[num_ucols] = &str_doc_col; + uvals[num_ucols].type = DB1_BLOB; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.str_val= *doc; + num_ucols++; + + ucols[num_ucols] = &str_etag_col; + uvals[num_ucols].type = DB1_STR; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.str_val= *etag; + num_ucols++; + + ucols[num_ucols] = &str_source_col; + uvals[num_ucols].type = DB1_INT; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.int_val = 0; + num_ucols++; + + ucols[num_ucols] = &str_port_col; + uvals[num_ucols].type = DB1_INT; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.int_val = 0; + num_ucols++; + + if (xcaps_dbf.update(xcaps_db, qcols, 0, qvals, ucols, uvals, ncols, num_ucols) < 0) + { + LM_ERR("in sql update\n"); + goto error; + } + } + else { - LM_ERR("in sql insert\n"); + LM_ERR("found %d copies of the same document in XCAP Server\n", nrows); goto error; } @@ -518,18 +570,8 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, return -2; } - if(xuri.nss==NULL || xuri.node.len<=0) + if(xuri.nss!=NULL && xuri.node.len>0) { - /* full document upload - * - fetch and then delete is too expensive if record in db - * - just try to delete - */ - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } - } else { /* partial document upload * - fetch, update, delete and store */ @@ -560,11 +602,6 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, LM_ERR("could not hack xcap document\n"); goto error; } - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } } if(xcaps_generate_etag_hdr(&etag_hdr)<0) @@ -1077,11 +1114,6 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not hack xcap document\n"); goto error; } - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } if(xcaps_generate_etag_hdr(&etag_hdr)<0) { LM_ERR("could not generate etag\n");

13 years

git:3.2: modules_k/presence, modules_k/pua, modules_k/rls: Changed rls_update_subs() to not send unnecessary back-end re-SUBSCRIBEs.

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: de9aec3bdb850ab100145b4d03b42f10855c07a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de9aec3… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 22:01:06 2011 +0000 modules_k/presence, modules_k/pua, modules_k/rls: Changed rls_update_subs() to not send unnecessary back-end re-SUBSCRIBEs. - The initial implementation sent a re-SUBSCRIBE for each existing back-end dialog and create new back-end dialogs as required (depending on the contents of the updated resource-list) documents. - This was very wasteful, so this version only sends the new SUBSCRIBEs (cherry picked from commit e9e6d51b87cea0d60c47200ab1f99948b1d9bc48) - This required a manual merge on a couple of files to get the cherry-pick to work --- modules_k/presence/subscribe.h | 4 ++++ modules_k/pua/send_subscribe.c | 14 ++++++++++++++ modules_k/pua/send_subscribe.h | 1 + modules_k/rls/subscribe.c | 4 ++++ 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index 3e318a1..b216fff 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -47,6 +47,9 @@ struct pres_ev; #define TERMINATED_STATUS 3 #define WAITING_STATUS 4 +#define INTERNAL_UPDATE_FALSE 0 +#define INTERNAL_UPDATE_TRUE 1 + struct subscription { str pres_uri; @@ -72,6 +75,7 @@ struct subscription int send_on_cback; int db_flag; str* auth_rules_doc; + int internal_update_flag; struct subscription* next; }; diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index bce59b8..f9d72df 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -46,6 +46,7 @@ #include "send_subscribe.h" #include "pua_callback.h" #include "event_list.h" +#include "../presence/subscribe.h" void print_subs(subs_info_t* subs) @@ -1019,6 +1020,19 @@ insert: */ dlg_t* td= NULL; + + if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) + { + LM_INFO("attempting to re-SUBSCRIBE on internal (rls_update_subs()) update - skipping\n"); + goto done; + } + + if (presentity->to_tag.len == 0) + { + LM_WARN("attempting to re-SUBSCRIBE to temporary (non-established) dialog - skipping\n"); + goto done; + } + td= pua_build_dlg_t(presentity); if(td== NULL) { diff --git a/modules_k/pua/send_subscribe.h b/modules_k/pua/send_subscribe.h index a6ff737..cddb33a 100644 --- a/modules_k/pua/send_subscribe.h +++ b/modules_k/pua/send_subscribe.h @@ -49,6 +49,7 @@ typedef struct subs_info for the received reply; it must be allocated in share memory; a reference to it will be found in the cb_param filed of the ua_pres_structure receied as a parameter for the registered function*/ + int internal_update_flag; }subs_info_t; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index e9ae601..e74c69b 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -852,6 +852,8 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) extra_headers.len = strlen(extra_headers.s); s.extra_headers = &extra_headers; + + s.internal_update_flag = subs->internal_update_flag; if(process_list_and_exec(xmlnode, subs->from_user, subs->from_domain, send_resource_subs, (void*)(&s))<0) @@ -993,6 +995,8 @@ int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) goto loop_done; } + subs_copy->internal_update_flag = INTERNAL_UPDATE_TRUE; + if(resource_subscriptions(subs_copy, service_node)< 0) { LM_ERR("failed sending subscribe requests to resources in list\n");

13 years

git:3.2: modules_k/rls: Memory allocation problem for NOTIFY bodies

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: 30f6510eb8470e118984397e1944402a2198b05a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30f6510… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:40:20 2011 +0000 modules_k/rls: Memory allocation problem for NOTIFY bodies - A few problems here: - The actual allocated buffer size was not used in the calculations in constr_multipart_body - The buffer pointer was copied to a local variable and not copied back after a realloc in constr_mulitpart_body(). This resulted in a double free when the realloc moved the buffer. - The length of the data in string buffer was never copied back to the str in constr_multipart_body(). - In both constr_multipart_body() and resource_notify.c when the buffer does not contain enough space another 2048 bytes is allocated. This is regardless of how much more space is actually needed. So if 4096 bytes were needed 2048 bytes would be allocated and then the end of the buffer would be overwritten by 4096 bytes of data. - Problem found and diagnosed during testing at Crocodile RCS - Fix implemented by Hugh Waite @ Crocodile RCS (cherry picked from commit 0f79902f0e44f0cc3c01607a917121fbce8d30a3) --- modules_k/rls/notify.c | 55 +++++++++++++++++++++++--------------- modules_k/rls/resource_notify.c | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index e964520..b9bad7f 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -51,6 +51,9 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> +static str *multipart_body = NULL; +static int multipart_body_size = 0; + typedef struct res_param { struct uri_link **next; @@ -68,7 +71,7 @@ int resource_uri_col=0, content_type_col, pres_state_col= 0, xmlDocPtr constr_rlmi_doc(db1_res_t* result, str* rl_uri, int version, xmlNodePtr rl_node, char*** cid_array, str username, str domain); -void constr_multipart_body(str *multipart_body, const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string); +void constr_multipart_body(const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string); dlg_t* rls_notify_dlg(subs_t* subs); @@ -78,14 +81,13 @@ int parse_xcap_uri(char *uri, str *host, unsigned short *port, str *path); int rls_get_resource_list(str *rl_uri, str *username, str *domain, xmlNodePtr *rl_node, xmlDocPtr *xmldoc); int add_resource_to_list(char* uri, void* param); -int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * boundary_string, db1_res_t *result, int *len_est); +int add_resource(char* uri, xmlNodePtr list_node, char * boundary_string, db1_res_t *result, int *len_est); int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, unsigned int hash_code) { xmlDocPtr rlmi_body= NULL; xmlNodePtr list_node= NULL; - str* multipart_body= NULL; db_key_t query_cols[2], update_cols[2], result_cols[7]; db_val_t query_vals[2], update_vals[2]; db1_res_t *result= NULL; @@ -96,8 +98,6 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, uri_link_t *uri_list_head = NULL; int len_est; res_param_t param; - char* body_buffer; - int size= BUF_REALLOC_SIZE; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ LM_DBG("start\n"); @@ -137,19 +137,20 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, /* Allocate an initial buffer for the multipart body. * This buffer will be reallocated if neccessary */ - body_buffer= (char *)pkg_malloc(size); - if(body_buffer== NULL) + multipart_body= (str*)pkg_malloc(sizeof(str)); + if(multipart_body== NULL) { ERR_MEM(PKG_MEM_STR); } - - multipart_body= (str*)pkg_malloc(sizeof(str)); - if(multipart_body== NULL) + + multipart_body_size = BUF_REALLOC_SIZE; + multipart_body->s = (char *)pkg_malloc(multipart_body_size); + + if(multipart_body->s== NULL) { ERR_MEM(PKG_MEM_STR); } - - multipart_body->s= body_buffer; + multipart_body->len= 0; /* Create an empty rlmi document */ @@ -169,7 +170,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, while (uri_list_head) { uri_link_t *last = uri_list_head; - if (add_resource(uri_list_head->uri, list_node, multipart_body, boundary_string, result, &len_est) >0) + if (add_resource(uri_list_head->uri, list_node, boundary_string, result, &len_est) >0) { if (resource_added == 0) { @@ -257,9 +258,11 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, if(multipart_body) { - pkg_free(multipart_body->s); + if (multipart_body->s) + pkg_free(multipart_body->s); pkg_free(multipart_body); } + multipart_body_size = 0; pkg_free(rlsubs_did.s); return 0; @@ -277,6 +280,7 @@ error: pkg_free(multipart_body->s); pkg_free(multipart_body); } + multipart_body_size = 0; if(result) rls_dbf.free_result(rls_db, result); @@ -357,7 +361,7 @@ error: int add_resource_instance(char* uri, xmlNodePtr resource_node, - db1_res_t* result, str *multipart_body, char * boundary_string, + db1_res_t* result, char * boundary_string, int *len_est) { xmlNodePtr instance_node= NULL; @@ -438,7 +442,7 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, if(auth_state_flag & ACTIVE_STATE) { - constr_multipart_body (multipart_body, &content_type, &body, &cid, boundary_len, boundary_string); + constr_multipart_body (&content_type, &body, &cid, boundary_len, boundary_string); xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid.s); } @@ -457,7 +461,7 @@ error: return -1; } -int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * boundary_string, db1_res_t *result, int *len_est) +int add_resource(char* uri, xmlNodePtr list_node, char * boundary_string, db1_res_t *result, int *len_est) { xmlNodePtr resource_node= NULL; int res; @@ -477,7 +481,7 @@ int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * bo } xmlNewProp(resource_node, BAD_CAST "uri", BAD_CAST uri); - res = add_resource_instance(uri, resource_node, result, multipart_body, boundary_string, len_est); + res = add_resource_instance(uri, resource_node, result, boundary_string, len_est); if(res < 0) { LM_ERR("while adding resource instance node\n"); @@ -575,10 +579,9 @@ error: } -void constr_multipart_body(str *multipart_body, const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string) +void constr_multipart_body(const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string) { char* buf= multipart_body->s; - int size= BUF_REALLOC_SIZE; int length= multipart_body->len; int chunk_len; @@ -589,10 +592,16 @@ void constr_multipart_body(str *multipart_body, const str *const content_type, c + 16 + cid->len + 18 + content_type->len + 4 + body->len + 8; - if(length + chunk_len >= size) + while(length + chunk_len >= multipart_body_size) { - REALLOC_BUF + multipart_body_size += BUF_REALLOC_SIZE; + multipart_body->s = (char*)pkg_realloc(multipart_body->s, multipart_body_size); + if(multipart_body->s == NULL) + { + ERR_MEM("constr_multipart_body"); + } } + buf = multipart_body->s; length+= sprintf(buf+ length, "--%.*s\r\n", boundary_len, boundary_string); @@ -604,6 +613,8 @@ void constr_multipart_body(str *multipart_body, const str *const content_type, c length+= sprintf(buf+length,"%.*s\r\n\r\n", body->len, body->s); + multipart_body->len = length; + error: return; diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 978e01d..379b587 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -349,7 +349,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut if(cid.s) { - if(buf_len + chunk_len >= size) + while(buf_len + chunk_len >= size) { REALLOC_BUF }

13 years

git:3.2: modules_k/rls: removed unnecessary waitn_time <= 0 check

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: eba84d8c55bb6f8bcafe7d70f31ab7decb1425e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eba84d8… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:47:54 2011 +0000 modules_k/rls: removed unnecessary waitn_time <= 0 check - This was checked twice one immediately after the other. The second check would never fail. (cherry picked from commit 0b6f0aec4b39e777ce11004917d77008cad225da) --- modules_k/rls/rls.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 41d845b..0cf7f8b 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -381,9 +381,6 @@ static int mod_init(void) if(waitn_time<= 0) waitn_time= 5; - - if(waitn_time<= 0) - waitn_time= 100; /* bind libxml wrapper functions */

13 years

git:master: modules_k/xcap_server: Changed the XCAP server so that existing documents are updated instead of deleted and inserted

by Peter Dunkley

Module: sip-router Branch: master Commit: 80b8e30b8a8de950354c1e8b510a03ad9ed98992 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80b8e30… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:23:12 2011 +0000 modules_k/xcap_server: Changed the XCAP server so that existing documents are updated instead of deleted and inserted - Affects XCAP PUT and XCAP partial DELETE - Some RLS clients send multiple HTTP updates in very close succession. One client has even been observed to upload an identical document several times in a row. - I use rls_update_subs() when any resource-list related document is uploaded. With Kamailio being multi-process and the client re-uploading an indentical document several times with no time between I was frequently hitting the window where rls_update_subs() was called after the DB delete for the second upload but before the insert happened. - Now the DB put operation checks for the presence of a document and does an insert only if the document does not exist. It does an update if the document does exist. --- modules_k/xcap_server/xcap_server.c | 134 +++++++++++++++++++++------------- 1 files changed, 83 insertions(+), 51 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 66dac1f..9580e53 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -88,6 +88,7 @@ static str xcaps_buf = {0, 8192}; #define XCAPS_ETAG_SIZE 128 static char xcaps_etag_buf[XCAPS_ETAG_SIZE]; +static str str_id_col = str_init("id"); static str str_source_col = str_init("source"); static str str_doc_col = str_init("doc"); static str str_etag_col = str_init("etag"); @@ -331,9 +332,10 @@ int xcaps_xpath_hack(str *buf, int type) static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, str* doc) { - db_key_t qcols[9]; - db_val_t qvals[9]; - int ncols = 0; + db_key_t qcols[9], rcols[2], ucols[5]; + db_val_t qvals[9], uvals[5]; + db1_res_t *res = NULL; + int ncols = 0, num_ucols = 0, nrows = 0; if(xcaps_check_doc_validity(doc)<0) { @@ -341,7 +343,6 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, goto error; } - /* insert in xcap table*/ qcols[ncols] = &str_username_col; qvals[ncols].type = DB1_STR; qvals[ncols].nul = 0; @@ -360,35 +361,13 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, qvals[ncols].val.int_val= xuri->type; ncols++; - qcols[ncols] = &str_doc_col; - qvals[ncols].type = DB1_BLOB; - qvals[ncols].nul = 0; - qvals[ncols].val.str_val= *doc; - ncols++; - - qcols[ncols] = &str_etag_col; - qvals[ncols].type = DB1_STR; - qvals[ncols].nul = 0; - qvals[ncols].val.str_val= *etag; - ncols++; - - qcols[ncols] = &str_source_col; - qvals[ncols].type = DB1_INT; - qvals[ncols].nul = 0; - qvals[ncols].val.int_val = 0; - ncols++; - qcols[ncols] = &str_doc_uri_col; qvals[ncols].type = DB1_STR; qvals[ncols].nul = 0; qvals[ncols].val.str_val= xuri->adoc; ncols++; - qcols[ncols] = &str_port_col; - qvals[ncols].type = DB1_INT; - qvals[ncols].nul = 0; - qvals[ncols].val.int_val= 0; - ncols++; + rcols[0] = &str_id_col; if (xcaps_dbf.use_table(xcaps_db, &xcaps_db_table) < 0) { @@ -396,10 +375,83 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, xcaps_db_table.s); goto error; } - - if(xcaps_dbf.insert(xcaps_db, qcols, qvals, ncols)< 0) + + if (xcaps_dbf.query(xcaps_db, qcols, 0, qvals, rcols, ncols, 1, 0, &res) < 0) + { + LM_ERR("in sql query\n"); + goto error; + } + + nrows = RES_ROW_N(res); + xcaps_dbf.free_result(xcaps_db, res); + + if (nrows == 0) + { + qcols[ncols] = &str_doc_col; + qvals[ncols].type = DB1_BLOB; + qvals[ncols].nul = 0; + qvals[ncols].val.str_val= *doc; + ncols++; + + qcols[ncols] = &str_etag_col; + qvals[ncols].type = DB1_STR; + qvals[ncols].nul = 0; + qvals[ncols].val.str_val= *etag; + ncols++; + + qcols[ncols] = &str_source_col; + qvals[ncols].type = DB1_INT; + qvals[ncols].nul = 0; + qvals[ncols].val.int_val = 0; + ncols++; + + qcols[ncols] = &str_port_col; + qvals[ncols].type = DB1_INT; + qvals[ncols].nul = 0; + qvals[ncols].val.int_val = 0; + ncols++; + + if(xcaps_dbf.insert(xcaps_db, qcols, qvals, ncols)< 0) + { + LM_ERR("in sql insert\n"); + goto error; + } + } + else if (nrows == 1) + { + ucols[num_ucols] = &str_doc_col; + uvals[num_ucols].type = DB1_BLOB; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.str_val= *doc; + num_ucols++; + + ucols[num_ucols] = &str_etag_col; + uvals[num_ucols].type = DB1_STR; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.str_val= *etag; + num_ucols++; + + ucols[num_ucols] = &str_source_col; + uvals[num_ucols].type = DB1_INT; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.int_val = 0; + num_ucols++; + + ucols[num_ucols] = &str_port_col; + uvals[num_ucols].type = DB1_INT; + uvals[num_ucols].nul = 0; + uvals[num_ucols].val.int_val = 0; + num_ucols++; + + if (xcaps_dbf.update(xcaps_db, qcols, 0, qvals, ucols, uvals, ncols, num_ucols) < 0) + { + LM_ERR("in sql update\n"); + goto error; + } + } + else { - LM_ERR("in sql insert\n"); + LM_ERR("found %d copies of the same document in XCAP Server\n", nrows); goto error; } @@ -518,18 +570,8 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, return -2; } - if(xuri.nss==NULL || xuri.node.len<=0) + if(xuri.nss!=NULL && xuri.node.len>0) { - /* full document upload - * - fetch and then delete is too expensive if record in db - * - just try to delete - */ - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } - } else { /* partial document upload * - fetch, update, delete and store */ @@ -560,11 +602,6 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, LM_ERR("could not hack xcap document\n"); goto error; } - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } } if(xcaps_generate_etag_hdr(&etag_hdr)<0) @@ -1077,11 +1114,6 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not hack xcap document\n"); goto error; } - if(xcaps_del_db(&turi.user, &turi.host, &xuri)<0) - { - LM_ERR("could not delete document\n"); - goto error; - } if(xcaps_generate_etag_hdr(&etag_hdr)<0) { LM_ERR("could not generate etag\n");

13 years

[tracker] Task closed: Update Dialog / Seg Fault

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#188 - Update Dialog / Seg Fault User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Reporter asked to be closed as it was self induced. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=188 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.

13 years

[tracker] Task opened: Update Dialog / Seg Fault

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Brandon Armstead (CRYY2010) Attached to Project - sip-router Summary - Update Dialog / Seg Fault Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Critical Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - *** I am frequently crashing with the following backtrace *** *** I am also frequently seeing 'lost connection during query' in syslog (dialog queries) not sure if this is related or not *** #0 0x0000000000003c66 in ?? () #1 0x00007feea044c2f7 in use_dialog_table () at dlg_db_handler.c:198 #2 0x00007feea044d0e4 in update_dialog_dbinfo_unsafe (cell=0x7fee8aa29828) at dlg_db_handler.c:701 #3 0x00007feea0450bdc in update_dialog_dbinfo (cell=0x7fee8aa29828) at dlg_db_handler.c:809 #4 0x00007feea045643d in dlg_onroute (req=0x7feea2b8af88, route_params=<value optimized out>, param=<value optimized out>) at dlg_handlers.c:1191 #5 0x00007fee9fa01fbd in run_rr_callbacks (req=0x7feea2b8af88, rr_param=0x7fee9fc05b30) at rr_cb.c:98 #6 0x00007fee9f9fd310 in after_loose (_m=0x7feea2b8af88, preloaded=0) at loose.c:823 #7 0x0000000000416caa in do_action (h=0x7fffc9ebed80, a=0x7feea26cedc0, msg=0x7feea2b8af88) at action.c:1116 #8 0x000000000041e299 in run_actions (h=0x7fffc9ebed80, a=0x7feea26cedc0, msg=0x7feea2b8af88) at action.c:1610 #9 0x000000000041e5f7 in run_actions_safe (h=0x7fffc9ebf970, a=0x7feea067d9f0, msg=0x0) at action.c:1662 #10 0x00000000004b5bb4 in rval_get_int (h=0x7fffc9ebf970, msg=<value optimized out>, i=0x7fffc9ebf458, rv=0x0, cache=0x0) at rvalue.c:920 #11 0x00000000004b96e4 in rval_expr_eval_int (h=0x7fffc9ebf970, msg=0x7feea2b8af88, res=0x7fffc9ebf458, rve=0x7feea26cef00) at rvalue.c:1914 #12 0x000000000041751b in do_action (h=0x7fffc9ebf970, a=0x7feea26f2e88, msg=0x7feea2b8af88) at action.c:1092 #13 0x000000000041e299 in run_actions (h=0x7fffc9ebf970, a=0x7feea26f2e88, msg=0x7feea2b8af88) at action.c:1610 #14 0x0000000000417575 in do_action (h=0x7fffc9ebf970, a=0x7feea26f31e8, msg=0x7feea2b8af88) at action.c:1111 #15 0x000000000041e299 in run_actions (h=0x7fffc9ebf970, a=0x7feea2672c90, msg=0x7feea2b8af88) at action.c:1610 #16 0x000000000041e583 in run_top_route (a=0x7feea2672c90, msg=0x7feea2b8af88, c=<value optimized out>) at action.c:1683 #17 0x0000000000499355 in receive_msg ( buf=0x8bf2c0 "INVITE sip:PHONE_NUMBER@IP:5079;nat=yes SIP/2.0\r\nVia: SIP/2.0/UDP IP:5060;branch=z9hG4bK3r03pn3060vgibh4j650.1\r\nCall-ID: 39bf9a8f-5315c00f(a)192.168.XXX.XXX\r\nFrom: <sip:PHONE_NUMBER@sip-"..., len=<value optimized out>, rcv_info=0x7fffc9ebfbe0) at receive.c:207 #18 0x0000000000525083 in udp_rcv_loop () at udp_server.c:544 #19 0x0000000000466f6d in main_loop () at main.c:1585 #20 0x000000000046ac24 in main (argc=<value optimized out>, argv=0x7fffc9ebfed8) at main.c:2475 #0 0x0000000000003c66 in ?? () No symbol table info available. #1 0x00007feea044c2f7 in use_dialog_table () at dlg_db_handler.c:198 No locals. #2 0x00007feea044d0e4 in update_dialog_dbinfo_unsafe (cell=0x7fee8aa29828) at dlg_db_handler.c:701 var = 0x7fee8a82fca4 values = {{type = 236, nul = 0, free = 5454289, val = {int_val = -1570108288, ll_val = 140662903803008, double_val = 6.9496708413338282e-310, time_val = 140662903803008, string_val = 0x7feea26a0c80 "\a", str_val = { s = 0x7feea26a0c80 "\a", len = -907287336}, blob_val = {s = 0x7feea26a0c80 "\a", len = -907287336}, bitmap_val = 2724859008}}, {type = 2730012552, nul = 32750, free = -907287344, val = {int_val = -907287280, ll_val = 140736581068048, double_val = 6.9533109818874086e-310, time_val = 140736581068048, string_val = 0x7fffc9ebe510 "��\213", str_val = {s = 0x7fffc9ebe510 "��\213", len = -1570083688}, blob_val = { s = 0x7fffc9ebe510 "��\213", len = -1570083688}, bitmap_val = 3387680016}}, {type = 2724883608, nul = 32750, free = 0, val = {int_val = -1570083688, ll_val = 140662903827608, double_val = 6.9496708425492297e-310, time_val = 140662903827608, string_val = 0x7feea26a6c98 "�", str_val = {s = 0x7feea26a6c98 "�", len = -907282064}, blob_val = {s = 0x7feea26a6c98 "�", len = -907282064}, bitmap_val = 2724883608}}, {type = 2730012552, nul = 32750, free = 4954982, val = {int_val = -1570097544, ll_val = 140662903813752, double_val = 6.9496708418646523e-310, time_val = 140662903813752, string_val = 0x7feea26a3678 "\002", str_val = { s = 0x7feea26a3678 "\002", len = 0}, blob_val = {s = 0x7feea26a3678 "\002", len = 0}, bitmap_val = 2724869752}}, {type = 2730012552, nul = 32750, free = 944, val = {int_val = -1568481680, ll_val = 140662905429616, double_val = 6.9496709216989414e-310, time_val = 140662905429616, string_val = 0x7feea282de70 "\002", str_val = {s = 0x7feea282de70 "\002", len = 4948523}, blob_val = {s = 0x7feea282de70 "\002", len = 4948523}, bitmap_val = 2726485616}}, {type = 2691160728, nul = 32750, free = -1603806048, val = {int_val = -1971087328, ll_val = 140662502823968, double_val = 6.9496510303369916e-310, time_val = 140662502823968, string_val = 0x7fee8a839820 "\001", str_val = {s = 0x7fee8a839820 "\001", len = -1606075903}, blob_val = {s = 0x7fee8a839820 "\001", len = -1606075903}, bitmap_val = 2323879968}}, {type = 3387679336, nul = 32767, free = -1564747680, val = {int_val = 236, ll_val = 236, double_val = 1.1659949241853418e-321, time_val = 236, string_val = 0xec <Address 0xec out of bounds>, str_val = {s = 0xec <Address 0xec out of bounds>, len = -1568481728}, blob_val = {s = 0xec <Address 0xec out of bounds>, len = -1568481728}, bitmap_val = 236}}, {type = 6020897, nul = 0, free = -1614746643, val = {int_val = 236, ll_val = 236, double_val = 1.1659949241853418e-321, time_val = 236, string_val = 0xec <Address 0xec out of bounds>, str_val = {s = 0xec <Address 0xec out of bounds>, len = 5454289}, blob_val = {s = 0xec <Address 0xec out of bounds>, len = 5454289}, bitmap_val = 236}}, {type = 2724938888, nul = 32750, free = -907287096, val = {int_val = -1564954744, ll_val = 140662908956552, double_val = 6.9496710959527327e-310, time_val = 140662908956552, string_val = 0x7feea2b8af88 "�\002", str_val = {s = 0x7feea2b8af88 "�\002", len = -907287104}, blob_val = {s = 0x7feea2b8af88 "�\002", len = -907287104}, bitmap_val = 2730012552}}, {type = 3387680256, nul = 32767, free = 4758625, val = {int_val = -1570028416, ll_val = 140662903882880, double_val = 6.9496708452800293e-310, time_val = 140662903882880, string_val = 0x7feea26b4480 "\a", str_val = {s = 0x7feea26b4480 "\a", len = -907287096}, blob_val = {s = 0x7feea26b4480 "\a", len = -907287096}, bitmap_val = 2724938880}}, {type = 216, nul = 0, free = 6026563, val = {int_val = -1570083688, ll_val = 140662903827608, double_val = 6.9496708425492297e-310, time_val = 140662903827608, string_val = 0x7feea26a6c98 "�", str_val = {s = 0x7feea26a6c98 "�", len = 944}, blob_val = {s = 0x7feea26a6c98 "�", len = 944}, bitmap_val = 2724883608}}, { type = DB1_DOUBLE, nul = 0, free = -907287104, val = {int_val = -1570031080, ll_val = 140662903880216, double_val = 6.9496708451484103e-310, time_val = 140662903880216, string_val = 0x7feea26b3a18 "\002", str_val = { s = 0x7feea26b3a18 "\002", len = 944}, blob_val = {s = 0x7feea26b3a18 "\002", len = 944}, bitmap_val = 2724936216}}, {type = 2726485616, nul = 32750, free = 4948523, val = {int_val = -1564954744, ll_val = 140662908956552, double_val = 6.9496710959527327e-310, time_val = 140662908956552, string_val = 0x7feea2b8af88 "�\002", str_val = {s = 0x7feea2b8af88 "�\002", len = -1570084008}, blob_val = { s = 0x7feea2b8af88 "�\002", len = -1570084008}, bitmap_val = 2730012552}}, {type = 3387685232, nul = 32767, free = -907282064, val = {int_val = 0, ll_val = 0, double_val = 0, time_val = 0, string_val = 0x0, str_val = { s = 0x0, len = 4289909}, blob_val = {s = 0x0, len = 4289909}, bitmap_val = 0}}, {type = DB1_INT, nul = 0, free = 0, val = {int_val = 0, ll_val = 0, double_val = 0, time_val = 0, string_val = 0x0, str_val = {s = 0x0, len = -1553373108}, blob_val = {s = 0x0, len = -1553373108}, bitmap_val = 0}}, {type = 497, nul = 0, free = -1969183112, val = {int_val = -907287632, ll_val = 140736581067696, double_val = 6.9533109818700175e-310, time_val = 140736581067696, string_val = 0x7fffc9ebe3b0 "��g��\177", str_val = {s = 0x7fffc9ebe3b0 "��g��\177", len = -1570302817}, blob_val = {s = 0x7fffc9ebe3b0 "��g��\177", len = -1570302817}, bitmap_val = 3387679664}}, {type = 3387621421, nul = 32767, free = 5420456, val = {int_val = 26954528, ll_val = 26954528, double_val = 1.3317306284665964e-316, time_val = 26954528, string_val = 0x19b4b20 "\230�\227��\177", str_val = {s = 0x19b4b20 "\230�\227��\177", len = -1603805504}, blob_val = {s = 0x19b4b20 "\230�\227��\177", len = -1603805504}, bitmap_val = 26954528}}, {type = 3387679856, nul = 32767, free = -1564954744, val = {int_val = -1564954744, ll_val = 140662908956552, double_val = 6.9496710959527327e-310, time_val = 140662908956552, string_val = 0x7feea2b8af88 "�\002", str_val = { s = 0x7feea2b8af88 "�\002", len = -1603805480}, blob_val = {s = 0x7feea2b8af88 "�\002", len = -1603805480}, bitmap_val = 2730012552}}, {type = 2325911592, nul = 32750, free = 5421086, val = {int_val = 1, ll_val = 4294967297, double_val = 2.121995791459338e-314, time_val = 4294967297, string_val = 0x100000001 <Address 0x100000001 out of bounds>, str_val = {s = 0x100000001 <Address 0x100000001 out of bounds>, len = -1570302817}, blob_val = {s = 0x100000001 <Address 0x100000001 out of bounds>, len = -1570302817}, bitmap_val = 1}}, {type = 14, nul = 0, free = -1603862528, val = {int_val = -1570302817, ll_val = 140662903608479, double_val = 6.9496708317228186e-310, time_val = 140662903608479, string_val = 0x7feea267149f "dialog-timeout)", str_val = {s = 0x7feea267149f "dialog-timeout)", len = 14}, blob_val = { s = 0x7feea267149f "dialog-timeout)", len = 14}, bitmap_val = 2724664479}}, {type = DB1_BIGINT, nul = 1, free = -1570302817, val = {int_val = 14, ll_val = 14, double_val = 6.9169190417774516e-323, time_val = 14, string_val = 0xe <Address 0xe out of bounds>, str_val = {s = 0xe <Address 0xe out of bounds>, len = -1603862528}, blob_val = {s = 0xe <Address 0xe out of bounds>, len = -1603862528}, bitmap_val = 14}}} insert_keys = {0x7feea067d900, 0x7feea067d8f0, 0x7feea067d8a0, 0x7feea067d8b0, 0x7feea067d8c0, 0x7feea067d8d0, 0x7feea067d8e0, 0x7feea067d9b0, 0x7feea067d9a0, 0x7feea067d920, 0x7feea067d910, 0x7feea067d930, 0x7feea067d950, 0x7feea067d940, 0x7feea067d970, 0x7feea067d960, 0x7feea067d990, 0x7feea067d980, 0x7feea067d9c0, 0x7feea067d9d0, 0x7feea067d9e0} #3 0x00007feea0450bdc in update_dialog_dbinfo (cell=0x7fee8aa29828) at dlg_db_handler.c:809 No locals. #4 0x00007feea045643d in dlg_onroute (req=0x7feea2b8af88, route_params=<value optimized out>, param=<value optimized out>) at dlg_handlers.c:1191 dlg = 0x7fee8aa29828 iuid = <value optimized out> val = { s = 0x8bf507 "9c5.8002a6d5>\r\nRoute: <sip:IP:5079;lr=on;ftag=bc79d88fae709a0fo1>\r\n\r\nv=0\r\no=- 3532375806 3532375971 IN IP4 IP\r\ns=-\r\nt=0 0\r\nm=image 13864 udptl t38\r\nc=IN IP4 IP\r\na=T38Fa"..., len = 12} callid = { s = 0x8bf34c "39bf9a8f-5315c00f(a)192.168.XXX.XXX\r\nFrom: <sip:PHONE_NUMBER@KAMAILIO_PROXY:5079>;tag=SDsq77699-14c034a8+1+edcd0001+47fb6ff7\r\nTo: <sip:PHONE_NUMBER@KAMAILIO_PROXY:5079>;tag=bc79"..., len = 31} ftag = { s = 0x8bf3ac "SDsq77699-14c034a8+1+edcd0001+47fb6ff7\r\nTo: <sip:PHONE_NUMBER@KAMAILIO_PROXY:5079>;tag=bc79d88fae709a0fo1\r\nCSeq: 208057730 INVITE\r\nExpires: 120\r\nMax-Forwards: 68\r\nContact: <sip:5592753443"..Quit More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=188 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.

13 years

[tracker] Assignee added: Update Dialog / Seg Fault

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#188 - Update Dialog / Seg Fault User who did this - Brandon Armstead (CRYY2010) http://sip-router.org/tracker/index.php?do=details&task_id=188 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.

13 years

git:master: modules_k/pua: Fixed some dialog output levels

by Peter Dunkley

Module: sip-router Branch: master Commit: 2780fa74515612a3698a73b81d76c8ddd8a39fe4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2780fa7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:55:35 2011 +0000 modules_k/pua: Fixed some dialog output levels --- modules_k/pua/pua_db.c | 15 +++++++++------ modules_k/pua/pua_db.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index b753217..e81cf3f 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -739,14 +739,14 @@ int is_dialog_puadb(ua_pres_t *pres) if (nr_rows == 0) { /* no match */ - LM_ERR("No rows found.\n"); + LM_DBG("No rows found.\n"); return(-1); } if (nr_rows != 1) { - LM_ERR("Too many rows found (%d)\n", nr_rows); - return(-1); + LM_WARN("Too many rows found (%d)\n", nr_rows); + /* no need to return here - drop thro */ } return(0); @@ -1430,7 +1430,7 @@ void update_puadb(ua_pres_t* pres, time_t desired_expires, /******************************************************************************/ -void insert_puadb(ua_pres_t* pres) +int insert_puadb(ua_pres_t* pres) { db_key_t db_cols[20]; @@ -1440,7 +1440,7 @@ void insert_puadb(ua_pres_t* pres) if (pres==NULL) { LM_ERR("called with NULL param\n"); - return; + return(-1); } if (pres->pres_uri) @@ -1599,13 +1599,16 @@ void insert_puadb(ua_pres_t* pres) if(pua_db == NULL) { LM_ERR("null database connection\n"); - return; + return(-1); } if(pua_dbf.insert(pua_db, db_cols, db_vals, n_cols) < 0) { LM_ERR("DB insert failed\n"); + return(-1); } + + return(0); } /******************************************************************************/ diff --git a/modules_k/pua/pua_db.h b/modules_k/pua/pua_db.h index fb2793d..7466511 100644 --- a/modules_k/pua/pua_db.h +++ b/modules_k/pua/pua_db.h @@ -58,7 +58,7 @@ int update_version_puadb(ua_pres_t *pres, int version ); int update_contact_puadb(ua_pres_t *pres, str *contact); void update_puadb(ua_pres_t* pres, time_t desired_expires, int expires, str* etag, str *contact); -void insert_puadb(ua_pres_t* pres); +int insert_puadb(ua_pres_t* pres); #endif

13 years

git:master: modules_k/pua: Temporary dialogs did not contain all of the required fields.

by Peter Dunkley

Module: sip-router Branch: master Commit: 464d6a353f1de7d7ca38cd856320b973f3341679 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=464d6a3… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 22:03:35 2011 +0000 modules_k/pua: Temporary dialogs did not contain all of the required fields. - Temporary dialogs are created when a SUBSCRIBE is sent to handle the timing issue that means that NOTIFYs can be processed before 200 OKs (the real dialog is created on 200 OK). - Not every required field was filled in for the temporary dialogs so dialog searches were failing and duplicate dialogs created. --- modules_k/pua/send_subscribe.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 1406ee4..50560db 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -1053,8 +1053,12 @@ insert: presentity->id.len = subs->id.len; size += subs->id.len; + presentity->event = pres.event; + presentity->flag = pres.flag; + /* Set the temporary record expiry for 2 * 64T1 seconds from now */ presentity->expires= (int)time(NULL) + 64; + presentity->desired_expires= presentity->expires; if (dbmode==PUA_DB_ONLY) {

13 years

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011