*
* $Id$
*/
+#include "config.h"
+
#include "class.h"
#include "client.h"
#include "ircd.h"
+#include "ircd_alloc.h"
+#include "ircd_features.h"
#include "ircd_reply.h"
+#include "ircd_string.h"
#include "list.h"
#include "numeric.h"
#include "s_conf.h"
#include "s_debug.h"
#include "send.h"
-#include "struct.h"
#include <assert.h>
#define BAD_PING ((unsigned int)-2)
#define BAD_CLIENT_CLASS ((unsigned int)-3)
-struct ConfClass *classes;
+static struct ConnectionClass* connClassList = 0;
+static unsigned int connClassAllocCount;
+
+const struct ConnectionClass* get_class_list(void)
+{
+ return connClassList;
+}
+
+struct ConnectionClass* make_class(void)
+{
+ struct ConnectionClass *tmp;
+
+ tmp = (struct ConnectionClass*) MyMalloc(sizeof(struct ConnectionClass));
+ assert(0 != tmp);
+ ++connClassAllocCount;
+ return tmp;
+}
+
+void free_class(struct ConnectionClass* p)
+{
+ if (p) {
+ assert(0 == p->valid);
+ if (p->cc_name)
+ MyFree(p->cc_name);
+ MyFree(p);
+ --connClassAllocCount;
+ }
+}
+
+/*
+ * init_class - initialize the class list
+ */
+void init_class(void)
+{
+ if (!connClassList)
+ connClassList = (struct ConnectionClass*) make_class();
+
+ /* We had better not try and free this... */
+ ConClass(connClassList) = "default";
+ PingFreq(connClassList) = feature_int(FEAT_PINGFREQUENCY);
+ ConFreq(connClassList) = feature_int(FEAT_CONNECTFREQUENCY);
+ MaxLinks(connClassList) = feature_int(FEAT_MAXIMUM_LINKS);
+ MaxSendq(connClassList) = feature_int(FEAT_DEFAULTMAXSENDQLENGTH);
+ connClassList->valid = 1;
+ Links(connClassList) = 0;
+ connClassList->next = 0;
+}
+
+/*
+ * class_mark_delete - mark classes for delete
+ * We don't delete the class table, rather mark all entries
+ * for deletion. The table is cleaned up by class_delete_marked(). - avalon
+ * XXX - This destroys data
+ */
+void class_mark_delete(void)
+{
+ struct ConnectionClass* p;
+ assert(0 != connClassList);
+
+ for (p = connClassList->next; p; p = p->next)
+ p->valid = 0;
+}
+
+/*
+ * class_delete_marked
+ * delete classes marked for deletion
+ * XXX - memory leak, no one deletes classes that become unused
+ * later
+ */
+void class_delete_marked(void)
+{
+ struct ConnectionClass* cl;
+ struct ConnectionClass* prev;
+
+ Debug((DEBUG_DEBUG, "Class check:"));
-unsigned int get_conf_class(struct ConfItem *aconf)
+ for (prev = cl = connClassList; cl; cl = prev->next) {
+ Debug((DEBUG_DEBUG, "Class %s : CF: %d PF: %d ML: %d LI: %d SQ: %d",
+ ConClass(cl), ConFreq(cl), PingFreq(cl), MaxLinks(cl), Links(cl), MaxSendq(cl)));
+ /*
+ * unlink marked classes, delete unreferenced ones
+ */
+ if (cl->valid)
+ prev = cl;
+ else {
+ prev->next = cl->next;
+ if (0 == cl->ref_count)
+ free_class(cl);
+ }
+ }
+}
+
+char*
+get_conf_class(const struct ConfItem* aconf)
{
- if ((aconf) && (aconf->confClass))
+ if ((aconf) && (aconf->conn_class))
return (ConfClass(aconf));
Debug((DEBUG_DEBUG, "No Class For %s", (aconf) ? aconf->name : "*No Conf*"));
- return (BAD_CONF_CLASS);
-
+ return NULL;
}
-static unsigned int get_conf_ping(struct ConfItem *aconf)
+int get_conf_ping(const struct ConfItem* aconf)
{
- if ((aconf) && (aconf->confClass))
+ assert(0 != aconf);
+ if (aconf->conn_class)
return (ConfPingFreq(aconf));
- Debug((DEBUG_DEBUG, "No Ping For %s", (aconf) ? aconf->name : "*No Conf*"));
+ Debug((DEBUG_DEBUG, "No Ping For %s", aconf->name));
- return (BAD_PING);
+ return -1;
}
-unsigned int get_client_class(struct Client *acptr)
+char*
+get_client_class(struct Client *acptr)
{
struct SLink *tmp;
- struct ConfClass *cl;
- unsigned int retc = BAD_CLIENT_CLASS;
+ struct ConnectionClass *cl;
- if (acptr && !IsMe(acptr) && (acptr->confs))
- for (tmp = acptr->confs; tmp; tmp = tmp->next)
+ /* Return the most recent(first on LL) client class... */
+ if (acptr && !IsMe(acptr) && (cli_confs(acptr)))
+ for (tmp = cli_confs(acptr); tmp; tmp = tmp->next)
{
- if (!tmp->value.aconf || !(cl = tmp->value.aconf->confClass))
- continue;
- if (ConClass(cl) > retc || retc == BAD_CLIENT_CLASS)
- retc = ConClass(cl);
+ if (tmp->value.aconf && !(cl = tmp->value.aconf->conn_class))
+ return ConClass(cl);
}
-
- Debug((DEBUG_DEBUG, "Returning Class %d For %s", retc, acptr->name));
-
- return (retc);
+ return "(null-class)";
}
unsigned int get_client_ping(struct Client *acptr)
struct ConfItem *aconf;
struct SLink *link;
- link = acptr->confs;
+ link = cli_confs(acptr);
if (link) {
while (link) {
}
}
else {
- ping = PINGFREQUENCY;
- Debug((DEBUG_DEBUG, "No Attached Confs for: %s", acptr->name));
+ ping = feature_int(FEAT_PINGFREQUENCY);
+ Debug((DEBUG_DEBUG, "No Attached Confs for: %s", cli_name(acptr)));
}
if (ping <= 0)
- ping = PINGFREQUENCY;
- Debug((DEBUG_DEBUG, "Client %s Ping %d", acptr->name, ping));
+ ping = feature_int(FEAT_PINGFREQUENCY);
+ Debug((DEBUG_DEBUG, "Client %s Ping %d", cli_name(acptr), ping));
return (ping);
}
-unsigned int get_con_freq(struct ConfClass * clptr)
+unsigned int get_con_freq(struct ConnectionClass * clptr)
{
if (clptr)
return (ConFreq(clptr));
else
- return (CONNECTFREQUENCY);
+ return feature_int(FEAT_CONNECTFREQUENCY);
}
/*
* if no present entry is found, then create a new one and add it in
* immeadiately after the first one (class 0).
*/
-void add_class(unsigned int conClass, unsigned int ping, unsigned int confreq,
- unsigned int maxli, unsigned int sendq)
+void add_class(char *name, unsigned int ping, unsigned int confreq,
+ unsigned int maxli, unsigned int sendq)
{
- struct ConfClass *t, *p;
+ struct ConnectionClass* t;
+ struct ConnectionClass* p;
- t = find_class(conClass);
- if ((t == classes) && (conClass != 0))
+ t = find_class(name);
+ if ((t == connClassList) && (name != NULL))
{
- p = (struct ConfClass *) make_class();
- NextClass(p) = NextClass(t);
- NextClass(t) = p;
+ p = (struct ConnectionClass *) make_class();
+ p->next = t->next;
+ t->next = p;
}
else
p = t;
- Debug((DEBUG_DEBUG, "Add Class %u: p %p t %p - cf: %u pf: %u ml: %u sq: %d",
- conClass, p, t, confreq, ping, maxli, sendq));
- ConClass(p) = conClass;
+ Debug((DEBUG_DEBUG, "Add Class %s: cf: %u pf: %u ml: %u sq: %d",
+ name, confreq, ping, maxli, sendq));
+ ConClass(p) = name;
ConFreq(p) = confreq;
PingFreq(p) = ping;
MaxLinks(p) = maxli;
- MaxSendq(p) = (sendq > 0) ? sendq : DEFAULTMAXSENDQLENGTH;
+ MaxSendq(p) = (sendq > 0) ?
+ sendq : feature_int(FEAT_DEFAULTMAXSENDQLENGTH);
+ p->valid = 1;
if (p != t)
Links(p) = 0;
}
-struct ConfClass *find_class(unsigned int cclass)
+struct ConnectionClass* find_class(const char *name)
{
- struct ConfClass *cltmp;
+ struct ConnectionClass *cltmp;
- for (cltmp = FirstClass(); cltmp; cltmp = NextClass(cltmp))
- if (ConClass(cltmp) == cclass)
+ for (cltmp = connClassList; cltmp; cltmp = cltmp->next) {
+ if (!ircd_strcmp(ConClass(cltmp), name))
return cltmp;
- return classes;
-}
-
-void check_class(void)
-{
- struct ConfClass *cltmp, *cltmp2;
-
- Debug((DEBUG_DEBUG, "Class check:"));
-
- for (cltmp2 = cltmp = FirstClass(); cltmp; cltmp = NextClass(cltmp2))
- {
- Debug((DEBUG_DEBUG,
- "Class %d : CF: %d PF: %d ML: %d LI: %d SQ: %d",
- ConClass(cltmp), ConFreq(cltmp), PingFreq(cltmp),
- MaxLinks(cltmp), Links(cltmp), MaxSendq(cltmp)));
- if (IsMarkedDelete(cltmp))
- {
- NextClass(cltmp2) = NextClass(cltmp);
- if (Links(cltmp) == 0)
- free_class(cltmp);
- }
- else
- cltmp2 = cltmp;
}
+ return connClassList;
}
-void initclass(void)
+void
+report_classes(struct Client *sptr)
{
- classes = (struct ConfClass *) make_class();
-
- ConClass(FirstClass()) = 0;
- ConFreq(FirstClass()) = CONNECTFREQUENCY;
- PingFreq(FirstClass()) = PINGFREQUENCY;
- MaxLinks(FirstClass()) = MAXIMUM_LINKS;
- MaxSendq(FirstClass()) = DEFAULTMAXSENDQLENGTH;
- Links(FirstClass()) = 0;
- NextClass(FirstClass()) = NULL;
-}
+ struct ConnectionClass *cltmp;
-void report_classes(struct Client *sptr)
-{
- struct ConfClass *cltmp;
-
- for (cltmp = FirstClass(); cltmp; cltmp = NextClass(cltmp))
+ for (cltmp = connClassList; cltmp; cltmp = cltmp->next)
send_reply(sptr, RPL_STATSYLINE, 'Y', ConClass(cltmp), PingFreq(cltmp),
- ConFreq(cltmp), MaxLinks(cltmp), MaxSendq(cltmp));
+ ConFreq(cltmp), MaxLinks(cltmp), MaxSendq(cltmp),
+ Links(cltmp));
}
-unsigned int get_sendq(struct Client *cptr)
+unsigned int
+get_sendq(struct Client *cptr)
{
assert(0 != cptr);
- assert(0 != cptr->local);
+ assert(0 != cli_local(cptr));
- if (cptr->max_sendq)
- return cptr->max_sendq;
+ if (cli_max_sendq(cptr))
+ return cli_max_sendq(cptr);
- else if (cptr->confs) {
+ else if (cli_confs(cptr)) {
struct SLink* tmp;
- struct ConfClass* cl;
+ struct ConnectionClass* cl;
- for (tmp = cptr->confs; tmp; tmp = tmp->next) {
- if (!tmp->value.aconf || !(cl = tmp->value.aconf->confClass))
+ for (tmp = cli_confs(cptr); tmp; tmp = tmp->next) {
+ if (!tmp->value.aconf || !(cl = tmp->value.aconf->conn_class))
continue;
- if (ConClass(cl) != BAD_CLIENT_CLASS) {
- cptr->max_sendq = MaxSendq(cl);
- return cptr->max_sendq;
+ if (ConClass(cl) != NULL) {
+ cli_max_sendq(cptr) = MaxSendq(cl);
+ return cli_max_sendq(cptr);
}
}
}
- return DEFAULTMAXSENDQLENGTH;
+ return feature_int(FEAT_DEFAULTMAXSENDQLENGTH);
+}
+
+void class_send_meminfo(struct Client* cptr)
+{
+ send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Classes: inuse: %d(%d)",
+ connClassAllocCount, connClassAllocCount * sizeof(struct ConnectionClass));
}
+
projects / ircu2.10.12-pk.git / blobdiff