projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'refs/remotes/IOMultiplexer.git/master' into development
[NeonServV5.git]
/
src
/
ChanNode.h
diff --git
a/src/ChanNode.h
b/src/ChanNode.h
index 4d7a348465e9b7f26e70774a60da6694606b5b4e..fe3a4de80962a3c09600e284626389a296903021 100644
(file)
--- a/
src/ChanNode.h
+++ b/
src/ChanNode.h
@@
-1,4
+1,4
@@
-/* ChanNode.h - NeonServ v5.
4
+/* ChanNode.h - NeonServ v5.
6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@
-22,6
+22,7
@@
struct ChanUser;
struct trigger_cache;
struct ModeNode;
struct NeonSpamSettings;
struct trigger_cache;
struct ModeNode;
struct NeonSpamSettings;
+struct timeq_entry;
#define CHANFLAG_RECEIVED_USERLIST 0x01
#define CHANFLAG_REQUESTED_CHANINFO 0x02
#define CHANFLAG_RECEIVED_USERLIST 0x01
#define CHANFLAG_REQUESTED_CHANINFO 0x02
@@
-36,6
+37,7
@@
struct ChanNode {
char topic[TOPICLEN+1];
struct ChanUser *user;
unsigned int usercount;
char topic[TOPICLEN+1];
struct ChanUser *user;
unsigned int usercount;
+ unsigned int botcount;
unsigned char flags;
struct ModeNode *modes;
struct BanNode *bans;
unsigned char flags;
struct ModeNode *modes;
struct BanNode *bans;
@@
-45,7
+47,8
@@
struct ChanNode {
struct NeonSpamSettings *spam_settings;
struct NeonSpamSettings *spam_settings;
- void *rejoin_array;
+ void *rejoin_bots;
+ struct timeq_entry *rejoin_timeout;
struct ChanNode *next;
};
struct ChanNode *next;
};