X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/987ef7eb1f6c6e6bfb79fc0e7759702ff372ac7a..40c6b59b6340a6fc459020c64f5ee35a842a02c7:/src/client.c

diff --git a/src/client.c b/src/client.c
index 5d70b4d..b3f33c3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -77,7 +77,6 @@ static rb_bh *lclient_heap = NULL;
 static rb_bh *pclient_heap = NULL;
 static rb_bh *user_heap = NULL;
 static rb_bh *away_heap = NULL;
-static rb_bh *metadata_heap = NULL;
 static char current_uid[IDLEN];
 
 struct Dictionary *nd_dict = NULL;
@@ -121,7 +120,6 @@ init_client(void)
 	lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
 	pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
 	user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
-	metadata_heap = rb_bh_create(sizeof(struct MetadataEntry), USER_HEAP_SIZE, "metadata_heap");
 	away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
 
 	rb_event_addish("check_pings", check_pings, NULL, 30);
@@ -233,6 +231,7 @@ free_local_client(struct Client *client_p)
 		rb_free(client_p->localClient->passwd);
 	}
 
+	rb_free(client_p->localClient->auth_user);
 	rb_free(client_p->localClient->challenge);
 	rb_free(client_p->localClient->fullcaps);
 	rb_free(client_p->localClient->opername);
@@ -257,6 +256,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);
 }
 
@@ -587,7 +587,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;
 			}
 
@@ -1107,7 +1107,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;
 
@@ -1117,7 +1117,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));
@@ -1659,10 +1659,8 @@ make_user(struct Client *client_p)
 	{
 		user = (struct User *) rb_bh_alloc(user_heap);
 		user->refcnt = 1;
-		user->metadata = irc_dictionary_create(irccmp);
 		client_p->user = user;
 	}
-
 	return user;
 }
 
@@ -1674,14 +1672,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;
@@ -1699,8 +1697,12 @@ make_server(struct Client *client_p)
 void
 free_user(struct User *user, struct Client *client_p)
 {
+	free_away(client_p);
+
 	if(--user->refcnt <= 0)
 	{
+		if(user->away)
+			rb_free((char *) user->away);
 		/*
 		 * sanity check
 		 */
@@ -1727,51 +1729,20 @@ free_user(struct User *user, struct Client *client_p)
 	}
 }
 
-const char *
-get_metadata(struct Client *client_p, const char *key)
-{
-	struct MetadataEntry *md;
-
-	if (client_p->user != NULL)
-	{
-		md = irc_dictionary_retrieve(client_p->user->metadata, key);
-		if (md == NULL)
-			return NULL;
-
-		return md->value;
-	}
-
-	return NULL;
-}
-
 void
-set_metadata(struct Client *client_p, const char *key, const char *value)
+allocate_away(struct Client *client_p)
 {
-	struct MetadataEntry *md;
-
-	delete_metadata(client_p, key);
-	if(client_p->user != NULL)
-	{
-		md = rb_bh_alloc(metadata_heap);
-		rb_strlcpy(md->key, key, NICKLEN);
-		rb_strlcpy(md->value, value, TOPICLEN);
-
-		irc_dictionary_add(client_p->user->metadata, md->key, md);
-	}
+	if(client_p->user->away == NULL)
+		client_p->user->away = rb_bh_alloc(away_heap);	
 }
 
+
 void
-delete_metadata(struct Client *client_p, const char *key)
+free_away(struct Client *client_p)
 {
-	struct MetadataEntry *md;
-
-	if(client_p->user != NULL)
-	{
-		md = irc_dictionary_delete(client_p->user->metadata, key);
-		if (md == NULL)
-			return;
-
-		rb_free(md);
+	if(client_p->user != NULL && client_p->user->away != NULL) {
+		rb_bh_free(away_heap, client_p->user->away);
+		client_p->user->away = NULL;
 	}
 }