X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/dd7eb3ffaaa47d8d3203457fe7e857e88a6f9a4b..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/src/client.c

diff --git a/src/client.c b/src/client.c
index b372e88..1cc32b4 100644
--- a/src/client.c
+++ b/src/client.c
@@ -231,6 +231,13 @@ free_local_client(struct Client *client_p)
 		rb_free(client_p->localClient->passwd);
 	}
 
+	rb_free(client_p->localClient->auth_user);
+
+	if(client_p->localClient->override_timeout_event)
+	{
+		rb_event_delete(client_p->localClient->override_timeout_event);
+	}
+
 	rb_free(client_p->localClient->challenge);
 	rb_free(client_p->localClient->fullcaps);
 	rb_free(client_p->localClient->opername);
@@ -255,6 +262,7 @@ free_client(struct Client *client_p)
 	s_assert(&me != client_p);
 	free_local_client(client_p);
 	free_pre_client(client_p);
+	rb_free(client_p->certfp);
 	rb_bh_free(client_heap, client_p);
 }
 
@@ -585,7 +593,7 @@ check_xlines(void)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						     "XLINE over-ruled for %s, client is kline_exempt [%s]",
 						     get_client_name(client_p, HIDE_IP),
-						     aconf->name);
+						     aconf->host);
 				continue;
 			}
 
@@ -1105,7 +1113,7 @@ exit_aborted_clients(void *unused)
  *
  */
 void
-dead_link(struct Client *client_p)
+dead_link(struct Client *client_p, int sendqex)
 {
 	struct abort_client *abt;
 
@@ -1115,7 +1123,7 @@ dead_link(struct Client *client_p)
 
 	abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
-	if(client_p->flags & FLAGS_SENDQEX)
+	if(sendqex)
 		rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
 	else
 		rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
@@ -1138,6 +1146,9 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
 	if(IsOper(source_p))
 		rb_dlinkFindDestroy(source_p, &oper_list);
 
+	/* get rid of any metadata the user may have */
+	user_metadata_clear(source_p);
+
 	sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
 				     source_p->name,
 				     source_p->username, source_p->host, comment);
@@ -1651,16 +1662,18 @@ struct User *
 make_user(struct Client *client_p)
 {
 	struct User *user;
+	struct Dictionary *metadata;
 
 	user = client_p->user;
 	if(!user)
 	{
 		user = (struct User *) rb_bh_alloc(user_heap);
 		user->refcnt = 1;
-		user->metadata = irc_dictionary_create(irccmp);
 		client_p->user = user;
-	}
 
+		metadata = irc_dictionary_create(irccmp);
+		client_p->user->metadata = metadata;
+	}
 	return user;
 }
 
@@ -1672,14 +1685,14 @@ make_user(struct Client *client_p)
  * side effects - add's an Server information block to a client
  *                if it was not previously allocated.
  */
-server_t *
+struct Server *
 make_server(struct Client *client_p)
 {
-	server_t *serv = client_p->serv;
+	struct Server *serv = client_p->serv;
 
 	if(!serv)
 	{
-		serv = (server_t *) rb_malloc(sizeof(server_t));
+		serv = (struct Server *) rb_malloc(sizeof(struct Server));
 		client_p->serv = serv;
 	}
 	return client_p->serv;
@@ -1703,6 +1716,7 @@ free_user(struct User *user, struct Client *client_p)
 	{
 		if(user->away)
 			rb_free((char *) user->away);
+		
 		/*
 		 * sanity check
 		 */
@@ -1918,3 +1932,96 @@ error_exit_client(struct Client *client_p, int error)
 
 	exit_client(client_p, client_p, &me, errmsg);
 }
+
+/*
+ * user_metadata_add
+ * 
+ * inputs	- pointer to client struct
+ *		- name of metadata item you wish to add
+ *		- value of metadata item
+ *		- 1 if metadata should be propegated, 0 if not
+ * output	- none
+ * side effects - metadata is added to the user in question
+ *		- metadata is propegated if propegate is set.
+ */
+struct Metadata *
+user_metadata_add(struct Client *target, const char *name, const char *value, int propegate)
+{
+	struct Metadata *md;
+
+	md = rb_malloc(sizeof(struct Metadata));
+	md->name = rb_strdup(name);
+	md->value = rb_strdup(value);
+
+	irc_dictionary_add(target->user->metadata, md->name, md);
+	
+	if(propegate)
+		sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s",
+				target->id, name, value);
+
+	return md;
+}
+
+/*
+ * user_metadata_delete
+ * 
+ * inputs	- pointer to client struct
+ *		- name of metadata item you wish to delete
+ * output	- none
+ * side effects - metadata is deleted from the user in question
+ * 		- deletion is propegated if propegate is set
+ */
+void
+user_metadata_delete(struct Client *target, const char *name, int propegate)
+{
+	struct Metadata *md = user_metadata_find(target, name);
+
+	if(!md)
+		return;
+
+	irc_dictionary_delete(target->user->metadata, md->name);
+
+	rb_free(md);
+
+	if(propegate)
+		sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA DELETE %s %s",
+				target->id, name);
+}
+
+/*
+ * user_metadata_find
+ * 
+ * inputs	- pointer to client struct
+ *		- name of metadata item you wish to read
+ * output	- the requested metadata, if it exists, elsewise null.
+ * side effects - 
+ */
+struct Metadata *
+user_metadata_find(struct Client *target, const char *name)
+{
+	if(!target->user)
+		return NULL;
+
+	if(!target->user->metadata)
+		return NULL;
+
+	return irc_dictionary_retrieve(target->user->metadata, name);
+}
+/*
+ * user_metadata_clear
+ * 
+ * inputs	- pointer to user struct
+ * output	- none
+ * side effects - metadata is cleared from the user in question
+ */
+void
+user_metadata_clear(struct Client *target)
+{
+	struct Metadata *md;
+	struct DictionaryIter iter;
+	
+	DICTIONARY_FOREACH(md, &iter, target->user->metadata)
+	{
+		user_metadata_delete(target, md->name, 0);
+	}
+}