@@ -17,7 +17,7 @@

 /*

  * List of all registered domains

  */

-static dlist_t* root = 0;

+dlist_t* root = 0;

 /*

@@ -21,6 +21,8 @@ typedef struct dlist {

 } dlist_t;

+extern dlist_t* root;

+

 /*

  * Function registers a new domain with usrloc

  * if the domain exists, pointer to existing structure

@@ -110,7 +110,9 @@ int new_udomain(str* _n, int _s, udomain_t** _d)

 	(*_d)->size = _s;

 	init_lock((*_d)->lock);

-

+	(*_d)->users = 0;

+	(*_d)->expired = 0;

+	

 	return 0;

 }

@@ -326,6 +328,7 @@ int mem_insert_urecord(udomain_t* _d, str* _aor, struct urecord** _r)

 	sl = hash_func(_d, _aor->s, _aor->len);

 	slot_add(&_d->table[sl], *_r);

 	udomain_add(_d, *_r);

+	_d->users++;

 	return 0;

 }

@@ -338,6 +341,7 @@ void mem_delete_urecord(udomain_t* _d, struct urecord* _r)

 	udomain_remove(_d, _r);

 	slot_rem(_r->slot, _r);

 	free_urecord(_r);

+	_d->users--;

 }

@@ -24,6 +24,8 @@ struct urecord; /* Usrloc record */

 typedef struct udomain {

 	str* name;                     /* Domain name */

 	int size;                      /* Hash table size */

+	int users;                     /* Number of registered users */

+	int expired;                   /* Number of expired contacts */

 	struct hslot* table;           /* Hash table - array of collision slots */

 	struct {                       /* Linked list of all elements in the domain */

 		int n;                 /* Number of element in the linked list */

@@ -9,15 +9,27 @@

 #include "ul_fifo.h"

 #include <strings.h>

 #include <stdio.h>

+#include "dlist.h"

+#include "udomain.h"

 static int print_ul_stats(FILE *reply_file)

 {

+	dlist_t* ptr;

+	

+	fprintf(reply_file, "Domain Registered Expired\n");

+	

+	ptr = root;

+	while(ptr) {

+

+		fprintf(reply_file, "\'%.*s\' %d %d\n",

+			ptr->d->name->len, ptr->d->name->s,

+			ptr->d->users,

+			ptr->d->expired

+			);

+		ptr = ptr->next;

+	}

-	/* PLACEHOLDER: fill in real things here */

-	fprintf(reply_file, "registered (now): %d, "

-		"expired (since boot time): %d\n",

-		0, 0 );

 	return 1;

 }

@@ -41,6 +53,8 @@ int static ul_rm( FILE *pipe, char *response_file )

 	char user[MAX_USER];

 	int tlen, ulen;

 	FILE *reply_file;

+	dlist_t* ptr;

+	str aor, t;

 	if (!read_line(table, MAX_TABLE, pipe, &tlen) || tlen==0) {

 		LOG(L_ERR, "ERROR: ul_rm: table name expected\n");

@@ -51,15 +65,46 @@ int static ul_rm( FILE *pipe, char *response_file )

 		return -1;

 	}

 	/* PLACEHOLDER: fill in real things here */

+

+	aor.s = user;

+	aor.len = strlen(user);

+

+	t.s = table;

+	t.len = strlen(table);

+

+	ptr = root;

+	while(ptr) {

+		if ((ptr->name.len == t.len) &&

+		    !memcmp(ptr->name.s, t.s, t.len)) {

+			break;

+		}

+		ptr = ptr->next;

+	}

+

+

 	LOG(L_INFO, "INFO: deleting user-loc (%s,%s)\n",

-		table, user );

+	    table, user );

 	reply_file=open_reply_pipe(response_file);

 	if (reply_file==0) {

 		LOG(L_ERR, "ERROR: ul_rm: file not opened\n");

 		return -1;

 	}

-	fprintf(reply_file, "User (%s,%s) deletion not implemented\n",

-		table, user);

+

+	if (ptr) {

+		lock_udomain(ptr->d);

+		if (delete_urecord(ptr->d, &aor) < 0) {

+			LOG(L_ERR, "ul_rm(): Error while deleting user %s\n", user);

+			fprintf(reply_file, "Error while deleting user (%s, %s)\n", table, user);

+			unlock_udomain(ptr->d);

+			fclose(reply_file);

+			return -1;

+		}

+		unlock_udomain(ptr->d);

+		fprintf(reply_file, "User (%s, %s) deleted\n", table, user);

+	} else {

+		fprintf(reply_file, "Table (%s) not found\n", table);

+	}

+	

 	fclose(reply_file);

 	return 1;

 }

@@ -13,6 +13,7 @@

 #include "udomain.h"         /* {insert,delete,get,release}_urecord */

 #include "urecord.h"         /* {insert,delete,get}_ucontact */

 #include "ucontact.h"        /* update_ucontact */

+#include "ul_fifo.h"

 static int mod_init(void);                          /* Module initialization function */

@@ -137,7 +138,8 @@ static int mod_init(void)

 	printf("usrloc module - initializing\n");

 	register_timer(timer, NULL, timer_interval);

-	

+	init_ul_fifo();

+

 	if (db_mode != NO_DB) {

 		if (bind_dbmod() < 0) {

 			LOG(L_ERR, "mod_init(): Can't bind database module\n");

@@ -169,6 +169,7 @@ static inline int nodb_timer(urecord_t* _r)

 			ptr = ptr->next;

 			mem_delete_ucontact(_r, t);

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

 		} else {

 			ptr = ptr->next;

 		}

@@ -202,6 +203,7 @@ static inline int wt_timer(urecord_t* _r)

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

 			}

 			mem_delete_ucontact(_r, t);

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

 		} else {

 			ptr = ptr->next;

 		}

@@ -234,6 +236,7 @@ static inline int wb_timer(urecord_t* _r)

 				}

 			}

 			mem_delete_ucontact(_r, t);

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

 		} else {

 			     /* Determine the operation we have to do */

 			op = st_flush_ucontact(ptr);