new file mode 100644

@@ -0,0 +1,70 @@

+#include "del_list.h"

+#include "../../mem/mem.h"

+#include "../../dprint.h"

+#include <string.h>

+#include "../../db/db.h"

+#include "ul_mod.h"

+

+

+static struct del_itm* del_root = 0;

+

+

+int put_on_del_list(struct ucontact* _c)

+{

+	struct del_itm* p;

+

+	p = (struct del_itm*)pkg_malloc(sizeof(struct del_itm) + _c->aor->len + _c->c.len);

+	if (p == 0) {

+		LOG(L_ERR, "put_on_del_list(): No memory left");

+		return -1;

+	}

+

+	p->user_len = _c->aor->len;

+	p->cont_len = _c->c.len;

+

+	memcpy(p->tail, _c->aor->s, p->user_len);

+	memcpy(p->tail + p->user_len, _c->c.s, p->cont_len);

+

+	p->next = del_root;

+	del_root = p;

+	return 0;

+}

+

+

+int process_del_list(str* _d)

+{

+	struct del_itm* p;

+	char b[256];

+	db_key_t keys[2] = {user_col, contact_col};

+	db_val_t vals[2];

+	

+	if (del_root) {

+	     /* FIXME */

+		memcpy(b, _d->s, _d->len);

+		b[_d->len] = '\0';

+		db_use_table(db, b);

+	

+		VAL_TYPE(vals) = VAL_TYPE(vals + 1) = DB_STR;

+		VAL_NULL(vals) = VAL_NULL(vals + 1) = 0;

+	}

+

+	while(del_root) {

+		p = del_root;

+		del_root = del_root->next;

+

+		VAL_STR(vals).len = p->user_len;

+		VAL_STR(vals).s = p->tail;

+		

+		VAL_STR(vals + 1).len = p->cont_len;

+		VAL_STR(vals + 1).s = p->tail + p->user_len;

+

+		if (db_delete(db, keys, vals, 2) < 0) {

+			LOG(L_ERR, "process_del_list(): Error while deleting from database\n");

+			return -1;

+		}

+

+		pkg_free(p);

+	}

+

+	return 0;

+}

new file mode 100644

@@ -0,0 +1,21 @@

+#ifndef DEL_LIST_H

+#define DEL_LIST_H

+

+

+#include "ucontact.h"

+

+

+struct del_itm {

+	struct del_itm* next;

+	int user_len;

+	int cont_len;

+	char tail[0];

+};

+

+

+int put_on_del_list(struct ucontact* _c);

+

+int process_del_list(str* _d);

+

+

+#endif /* DEL_LIST_H */

new file mode 100644

@@ -0,0 +1,95 @@

+#include "ins_list.h"

+#include "../../mem/mem.h"

+#include <string.h>

+#include "../../dprint.h"

+#include "../../db/db.h"

+#include "ul_mod.h"

+

+

+static struct ins_itm* ins_root = 0;

+

+

+int put_on_ins_list(struct ucontact* _c)

+{

+	struct ins_itm* p;

+

+	p = (struct ins_itm*)pkg_malloc(sizeof(struct ins_itm) + _c->aor->len + _c->c.len + _c->callid.len);

+	if (p == 0) {

+		LOG(L_ERR, "put_on_ins_list(): No memory left");

+		return -1;

+	}

+

+	p->expires = _c->expires;

+	p->q = _c->q;

+	p->cseq = _c->cseq;

+

+	p->user_len = _c->aor->len;

+	p->cont_len = _c->c.len;

+	p->cid_len = _c->callid.len;

+

+	memcpy(p->tail, _c->aor->s, p->user_len);

+	memcpy(p->tail + p->user_len, _c->c.s, p->cont_len);

+	memcpy(p->tail + p->user_len + p->cont_len, _c->callid.s, p->cid_len);

+

+	p->next = ins_root;

+	ins_root = p;

+	return 0;

+}

+

+

+int process_ins_list(str* _d)

+{

+	struct ins_itm* p;

+	char b[256];

+	db_key_t keys[] = {user_col, contact_col, expires_col, q_col, callid_col, cseq_col};

+	db_val_t vals[6];

+	

+	if (ins_root) {

+	     /* FIXME */

+		memcpy(b, _d->s, _d->len);

+		b[_d->len] = '\0';

+		db_use_table(db, b);

+	

+		VAL_TYPE(vals) = DB_STR;

+		VAL_TYPE(vals + 1) = DB_STR;

+		VAL_TYPE(vals + 2) = DB_DATETIME;

+		VAL_TYPE(vals + 3) = DB_DOUBLE;

+		VAL_TYPE(vals + 4) = DB_STR;

+		VAL_TYPE(vals + 5) = DB_INT;

+

+		VAL_NULL(vals) = 0;

+		VAL_NULL(vals + 1) = 0;

+		VAL_NULL(vals + 2) = 0;

+		VAL_NULL(vals + 3) = 0;

+		VAL_NULL(vals + 4) = 0;

+		VAL_NULL(vals + 5) = 0;

+	}

+

+	while(ins_root) {

+		p = ins_root;

+		ins_root = ins_root->next;

+

+		VAL_STR(vals).len = p->user_len;

+		VAL_STR(vals).s = p->tail;

+		

+		VAL_STR(vals + 1).len = p->cont_len;

+		VAL_STR(vals + 1).s = p->tail + p->user_len;

+

+		VAL_TIME(vals + 2) = p->expires;

+		VAL_DOUBLE(vals + 3) = p->q;

+		

+		VAL_STR(vals + 4).len = p->cid_len;

+		VAL_STR(vals + 4).s = p->tail + p->user_len + p->cont_len;

+

+		VAL_INT(vals + 5) = p->cseq;

+

+		if (db_insert(db, keys, vals, 6) < 0) {

+			LOG(L_ERR, "process_ins_list(): Error while deleting from database\n");

+			return -1;

+		}

+

+		pkg_free(p);

+	}

+

+	return 0;	

+}

new file mode 100644

@@ -0,0 +1,25 @@

+#ifndef INS_LIST_H

+#define INS_LIST_H

+

+#include "ucontact.h"

+#include "../../str.h"

+

+

+struct ins_itm {

+	struct ins_itm* next;

+	time_t expires;

+	float q;

+	int cseq;

+	int user_len;

+	int cont_len;

+	int cid_len;

+	char tail[0];

+};

+

+

+int put_on_ins_list(struct ucontact* _c);

+

+int process_ins_list(str* _d);

+

+

+#endif /* INS_LIST_H */

@@ -8,6 +8,8 @@

 #include "../../dprint.h"

 #include "../../db/db.h"

 #include "ul_mod.h"            /* usrloc module parameters */

+#include "del_list.h"

+#include "ins_list.h"

 /*

@@ -241,77 +243,6 @@ int preload_udomain(udomain_t* _d)

 }

-/*

-int preload_udomain(udomain_t* _d)

-{

-	char b[256];

-	db_key_t columns[6] = {user_col, contact_col, expires_col, q_col, callid_col, cseq_col};

-	db_res_t* res;

-	db_row_t* row;

-	int i, cseq;

-	urecord_t* rec = 0;

-	const char* user, *aor = 0;

-        double q;

-	time_t expires;

-	str s, contact, callid;

-

-	memcpy(b, _d->name->s, _d->name->len);

-	b[_d->name->len] = '\0';

-	db_use_table(db, b);

-	if (db_query(db, 0, 0, columns, 0, 6, user_col, &res) < 0) {

-		LOG(L_ERR, "preload_udomain(): Error while doing db_query\n");

-		return -1;

-	}

-	

-	if (!RES_ROW_N(res)) {

-		DBG("preload_udomain(): Table is empty\n");

-		db_free_query(db, res);

-		return 0;

-	}

-	

-	for(i = 0; i < RES_ROW_N(res); i++) {

-		row = RES_ROWS(res) + i;

-		user = VAL_STRING(ROW_VALUES(row));

-		if (i == 0) aor = user;

-

-		if (strcmp(user, aor) || !i) {

-			DBG("preload_udomain(): Preloading contacts for username \'%s\'\n", user);

-			aor = user;

-

-			if (rec) release_urecord(rec);

-

-			s.s = (char*)user;

-			s.len = strlen(user);

-

-			if (insert_urecord(_d_d->name, &s, &rec) < 0) {

-				LOG(L_ERR, "preload_udomain(): Can't create new record\n");

-				db_free_query(db, res);

-				return -3;

-			}

-		}

-		

-

-		if (ins(rec, &contact, expires, q, &callid, cseq) < 0) {

-			LOG(L_ERR, "preload_udomain(): Error while adding contact\n");

-			db_free_query(db, res);

-			free_urecord(rec);

-			return -3;

-		}

-	}

-

-	if (rec && (insert_urecord(_d, rec) < 0)) {

-		LOG(L_ERR, "preload_udomain(): Error while inserting record 2\n");

-		free_urecord(rec);

-		db_free_query(db, res);

-		return -4;

-	}

-

-	db_free_query(db, res);

-	return 0;

-}

-*/

-

-

 /*

  * Insert a new record into domain

  */

@@ -372,6 +303,8 @@ int timer_udomain(udomain_t* _d)

 	}

 	unlock_udomain(_d);

+	process_del_list(_d->name);

+	process_ins_list(_d->name);

 	return 0;

 }

@@ -12,6 +12,8 @@

 #include "../../fastlock.h"

 #include "ul_mod.h"

 #include "utime.h"

+#include "del_list.h"

+#include "ins_list.h"

 /*

@@ -128,9 +130,9 @@ int mem_insert_ucontact(urecord_t* _r, str* _c, time_t _e, float _q,

 /*

- * Remove contact from the list

+ * Remove the contact from lists

  */

-void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c)

+void mem_remove_ucontact(urecord_t* _r, ucontact_t* _c)

 {

 	if (_c->prev) {

 		_c->prev->next = _c->next;

@@ -143,7 +145,16 @@ void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c)

 			_c->next->prev = 0;

 		}

 	}

-	

+}	

+

+

+

+/*

+ * Remove contact from the list and delete

+ */

+void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c)

+{

+	mem_remove_ucontact(_r, _c);

 	free_ucontact(_c);

 }

@@ -233,10 +244,17 @@ static inline int wb_timer(urecord_t* _r)

 			     /* Should we remove the contact from the database ? */

 			if (st_expired_ucontact(t) == 1) {

+				if (put_on_del_list(t) < 0) {

+					LOG(L_ERR, "wb_timer(): Can't put on delete list\n");

+				}

+

+				     /*

 				if (db_delete_ucontact(t) < 0) {

 					LOG(L_ERR, "wb_timer(): Error while deleting contact from database\n");

 				}

+				     */

 			}

+

 			if (t->expires != 0) {

 				_r->slot->d->expired++;

 			}

@@ -251,12 +269,23 @@ static inline int wb_timer(urecord_t* _r)

 				break;

 			case 1: /* insert */

+				if (put_on_ins_list(ptr) < 0) {

+					LOG(L_ERR, "wb_timer(): Error while putting on ins_list\n");

+				}

+

+				     /*

 				if (db_insert_ucontact(ptr) < 0) {

 					LOG(L_ERR, "wb_timer(): Error while inserting contact in db\n");

 				}

+				     */

 				break;

 			case 2: /* update */

+				/*

+				if (put_on_upd_list(ptr) < 0) {

+					LOG(L_ERR, "wb_timer(): Error while putting on del_list\n");

+				}

+				*/

 				if (db_update_ucontact(ptr) < 0) {

 					LOG(L_ERR, "wb_timer(): Error while updating contact in db\n");

 				}

@@ -59,8 +59,15 @@ int mem_insert_ucontact(urecord_t* _r, str* _c, time_t _e, float _q,

 			str* _cid, int _cs, struct ucontact** _con);

+

+/*

+ * Remove the contact from lists

+ */

+void mem_remove_ucontact(urecord_t* _r, ucontact_t* _c);

+

+

 /*

- * Remove contact from the list

+ * Remove contact from the list and delete 

  */

 void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c);