Changeset 642

Timestamp:

07/25/05 21:37:17 (3 years ago)

Author:

jajcus

Message:

- registration/unregistration fixes

Files:

• trunk/src/register.c (modified) (5 diffs)
• trunk/src/sessions.c (modified) (1 diff)
• trunk/src/users.c (modified) (2 diffs)
• trunk/src/users.h (modified) (1 diff)

trunk/src/register.c

@@ -454 +454 @@
-xmlnode query;
-xmlnode instr;
-
+ser
-
-        node=xmlnode_get_firstchild(q);
@@ -462 +462 @@
-                return;
-        }
+
+        user=user_get_by_jid(from);
+        if (user && user->deleted) {
+                jabber_iq_send_error(s,from,to,id,503,_("User still in use, try later."));
+                return;
+        }
+        
-        iq=xmlnode_new_tag("iq");
-        xmlnode_put_attrib(iq,"type","result");
@@ -489 +496 @@
-        xmlnode_insert_cdata(instr,register_instructions,-1);
-
-
-
-
+
+
-        else
-
+ser
-
-        stream_write(s,iq);
@@ -528 +534 @@
-                        ujid=jid_build(c->uin);
-                        presence_send_unsubscribed(s,ujid,u->jid);
+                        presence_send_unsubscribe(s,ujid,u->jid);
-                        g_free(ujid);
-                }
@@ -561 +568 @@
-
-        user=user_get_by_jid(from);
+        if (user && user->deleted) {
+                jabber_iq_send_error(s,from,to,id,503,_("User still in use, try later."));
+                return;
+        }
-
-        node=xmlnode_get_firstchild(q);

trunk/src/sessions.c

@@ -789 +789 @@
-
-        g_assert(user!=NULL);
+
+        if (user->deleted){
+                g_message(L_("User deleted: '%s'"),user->jid);
+                return NULL;
+        }
+        
-        s=g_new0(Session,1);
-        s->user=user;

trunk/src/users.c

@@ -496 +496 @@
-        u->invisible=0;
-        u->friends_only=1;
-        g_assert(users_jid!=NULL);
-        g_hash_table_insert(users_jid,(gpointer)njid,(gpointer)u);
-        u->refcount=0;
+        u->deleted=FALSE;
-        return u;
-}
@@ -660 +660 @@
-        g_free(njid);
-
+        u->deleted=TRUE;
+
-        users_gc();
-

trunk/src/users.h

@@ -65 +65 @@
-        int confirmed;
-        int refcount;
+        gboolean deleted;
-        GList *contacts;
-}User;