}
strcpy(chan->name, name);
chan->user = NULL;
+ chan->usercount = 0;
chan->chanbot = NULL;
chan->topic[0] = 0;
chan->flags = 0;
char name[CHANNELLEN+1];
char topic[TOPICLEN+1];
struct ChanUser *user;
+ unsigned int usercount;
unsigned char flags;
unsigned int modes;
char **mode_str_args;
chanuser->next_user = chan->user;
chan->user = chanuser;
+ chan->usercount++;
chanuser->next_chan = user->channel;
user->channel = chanuser;
last = NULL;
for(cchanuser = chanuser->chan->user; cchanuser; cchanuser = cchanuser->next_user) {
if(cchanuser == chanuser) {
+ chanuser->chan->usercount--;
if(last)
last->next_user = chanuser->next_user;
else
last = NULL;
for(cchanuser = chanuser->chan->user; cchanuser; cchanuser = cchanuser->next_user) {
if(cchanuser == chanuser) {
+ chanuser->chan->usercount--;
if(last)
last->next_user = chanuser->next_user;
else
write_socket(client, sendBuf, pos+1);
}
+char* merge_argv(char **argv, int start, int end) {
+ int i;
+ char *p = NULL;
+ for(i = start; i < end; i++) {
+ p = argv[i];
+ while(*p) p++;
+ *p = ' ';
+ }
+ if(p) *p = '\0';
+ return argv[start];
+}
void init_parser();
void free_parser();
void reply(struct ClientSocket *client, struct UserNode *user, const char *text, ...);
+char* merge_argv(char **argv, int start, int end);
#endif
\ No newline at end of file
return NULL;
}
+int countUsersWithHost(char *host) {
+ int i, count = 0;
+ struct UserNode *user;
+ for(i = 0; i < VALID_NICK_CHARS_FIRST_LEN+1; i++) {
+ for(user = userList[i]; user; user = user->next) {
+ if(!strcmp(user->host, host)) {
+ count++;
+ }
+ }
+ }
+ return count;
+}
+
struct UserNode* addUser(const char *nick) {
int userListIndex = get_nicklist_entry(*nick);
if(userListIndex == -1 || !is_valid_nick(nick))
int is_valid_nick(const char *nick);
struct UserNode* getUserByNick(const char *nick);
struct UserNode* getUserByMask(const char *mask);
+int countUsersWithHost(char *host);
struct UserNode* searchUserByNick(const char *nick);
struct UserNode* addUser(const char *nick);
struct UserNode* addUserMask(const char *mask);
{"NS_VOICEALL_DONE", "Voiced \002%d\002 users in %s."},
{"NS_DEOPALL_DONE", "Deopped \002%d\002 users in %s."},
{"NS_DEVOICEALL_DONE", "Devoiced \002%d\002 users in %s."},
+ {"NS_KICK_DONE", "Kicked \002%d\002 users from %s"},
+ {"NS_KICK_FAIL", "\002%s\002 could not kick some of the nicks you provided."},
+ {"NS_KICKBAN_DONE", "KickBanned \002%d\002 users from %s"},
+ {"NS_KICKBAN_FAIL", "\002%s\002 could not kickban some of the nicks you provided."},
+ {"NS_LAME_MASK", "\002%s\002 is a little too general. Try making it more specific."},
{NULL, NULL}
};
#include "cmd_neonserv_devoice.c"
#include "cmd_neonserv_devoiceall.c"
//#include "cmd_neonserv_uset.c"
-//#include "cmd_neonserv_kick.c"
-//#include "cmd_neonserv_kickban.c"
+#include "cmd_neonserv_kick.c"
+#include "cmd_neonserv_kickban.c"
//#include "cmd_neonserv_ban.c"
//#include "cmd_neonserv_unban.c"
//#include "cmd_neonserv_unbanall.c"
register_command(BOTID, "voiceall", neonserv_cmd_voiceall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_canvoice", 0);
register_command(BOTID, "devoiceall", neonserv_cmd_devoiceall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_canvoice", 0);
register_command(BOTID, "set", neonserv_cmd_set, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_setters", 0);
+ register_command(BOTID, "kick", neonserv_cmd_kick, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_cankick", 0);
+ register_command(BOTID, "kickban", neonserv_cmd_kickban, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_cankick,#channel_canban", 0);
start_bots();
bind_bot_ready(neonserv_bot_ready);
}
static USERLIST_CALLBACK(neonserv_cmd_deop_userlist_lookup) {
- struct neonserv_cmd_kick_cache *cache = data;
+ struct neonserv_cmd_deop_cache *cache = data;
neonserv_cmd_deop_async1(cache->client, cache->textclient, cache->user, chan, cache->argv, cache->argc);
int i;
for(i = 0; i < cache->argc; i++) {
}
static USERLIST_CALLBACK(neonserv_cmd_deopall_userlist_lookup) {
- struct neonserv_cmd_kick_cache *cache = data;
+ struct neonserv_cmd_deopall_cache *cache = data;
neonserv_cmd_deopall_async1(cache->client, cache->textclient, cache->user, chan, cache->argv, cache->argc);
int i;
for(i = 0; i < cache->argc; i++) {
--- /dev/null
+
+/*
+* argv[0] nick[,*auth[,*!*@mask[...]]]
+* argv[1-*] reason
+*/
+static USERLIST_CALLBACK(neonserv_cmd_kick_userlist_lookup);
+static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason);
+
+struct neonserv_cmd_kick_cache {
+ struct ClientSocket *client, *textclient;
+ struct UserNode *user;
+ char *nicks;
+ char *reason;
+};
+
+static CMD_BIND(neonserv_cmd_kick) {
+ struct neonserv_cmd_kick_cache *cache = malloc(sizeof(*cache));
+ if (!cache) {
+ perror("malloc() failed");
+ return;
+ }
+ cache->client = client;
+ cache->textclient = getTextBot();
+ cache->user = user;
+ cache->nicks = strdup(argv[0]);
+ if(argc > 1) {
+ cache->reason = strdup(merge_argv(argv, 1, argc));
+ } else
+ cache->reason = NULL;
+ get_userlist(chan, neonserv_cmd_kick_userlist_lookup, cache);
+}
+
+static USERLIST_CALLBACK(neonserv_cmd_kick_userlist_lookup) {
+ struct neonserv_cmd_kick_cache *cache = data;
+ neonserv_cmd_kick_async1(cache->client, cache->textclient, cache->user, chan, cache->nicks, (cache->reason ? cache->reason : "Bye."));
+ free(cache->nicks);
+ if(cache->reason)
+ free(cache->reason);
+ free(cache);
+}
+
+static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason) {
+ int i, kicked_users = 0, provided_nicks = 0;
+ char *nick, *nextnick;
+ struct UserNode *cuser;
+ struct ChanUser *chanuser;
+ nextnick = nicks;
+ check_mysql();
+ while((nick = nextnick)) {
+ nextnick = strstr(nick, ",");
+ if(nextnick) {
+ *nextnick = '\0';
+ nextnick++;
+ }
+ if(!*nick) continue;
+ if(is_ircmask(nick)) {
+ //KICK HOSTMASK
+ char usermask[NICKLEN+USERLEN+HOSTLEN+3];
+ struct ChanUser *kick_chanuser[chan->usercount];
+ int kick_chanuser_pos = 0;
+ for(chanuser = getChannelUsers(chan, NULL); NULL; chanuser = getChannelUsers(chan, chanuser)) {
+ cuser = chanuser->user;
+ sprintf(usermask, "%s!%s@%s", cuser->nick, cuser->ident, cuser->host);
+ if(!match(nick, usermask)) {
+ provided_nicks++;
+ if(isNetworkService(chanuser->user)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", chanuser->user->nick);
+ continue;
+ }
+ if(isUserProtected(chan, cuser, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
+ continue;
+ }
+ kick_chanuser[kick_chanuser_pos++] = chanuser;
+ if(kick_chanuser_pos > 4 && (kick_chanuser_pos * 3) > chan->usercount && !isGodMode(user)) {
+ kick_chanuser_pos = 0;
+ reply(textclient, user, "NS_LAME_MASK", nick);
+ break;
+ }
+ }
+ }
+ for(i = 0; i < kick_chanuser_pos; i++) {
+ kicked_users++;
+ putsock(client, "KICK %s %s :%s", chan->name, kick_chanuser[i]->user->nick, reason);
+ }
+ } else if(*nick == '*') {
+ //KICK AUTH
+ nick++;
+ cuser = NULL;
+ for(chanuser = getChannelUsers(chan, NULL); NULL; chanuser = getChannelUsers(chan, chanuser)) {
+ if((chanuser->user->flags & USERFLAG_ISAUTHED) && !stricmp(chanuser->user->auth, nick)) {
+ provided_nicks++;
+ if(isNetworkService(chanuser->user)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", chanuser->user->nick);
+ continue;
+ }
+ if(!cuser) {
+ //check if the user is protected
+ if(isUserProtected(chan, chanuser->user, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", chanuser->user->nick);
+ break; //all other users are also protected...
+ }
+ cuser = chanuser->user;
+ }
+ kicked_users++;
+ putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+ }
+ }
+ } else {
+ provided_nicks++;
+ cuser = searchUserByNick(nick);
+ if(!cuser) continue;
+ chanuser = getChanUser(cuser, chan);
+ if(!chanuser) continue;
+ if(isNetworkService(cuser)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", cuser->nick);
+ continue;
+ }
+ if(isUserProtected(chan, cuser, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
+ continue;
+ }
+ kicked_users++;
+ putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+ }
+ }
+ if(kicked_users == provided_nicks)
+ reply(getTextBot(), user, "NS_KICK_DONE", kicked_users, chan->name);
+ else
+ reply(getTextBot(), user, "NS_KICK_FAIL", client->user->nick);
+}
--- /dev/null
+
+/*
+* argv[0] nick[,*auth[,*!*@mask[...]]]
+* argv[1-*] reason
+*/
+static USERLIST_CALLBACK(neonserv_cmd_kickban_userlist_lookup);
+static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason);
+
+struct neonserv_cmd_kickban_cache {
+ struct ClientSocket *client, *textclient;
+ struct UserNode *user;
+ char *nicks;
+ char *reason;
+};
+
+static CMD_BIND(neonserv_cmd_kickban) {
+ struct neonserv_cmd_kickban_cache *cache = malloc(sizeof(*cache));
+ if (!cache) {
+ perror("malloc() failed");
+ return;
+ }
+ cache->client = client;
+ cache->textclient = getTextBot();
+ cache->user = user;
+ cache->nicks = strdup(argv[0]);
+ if(argc > 1) {
+ cache->reason = strdup(merge_argv(argv, 1, argc));
+ } else
+ cache->reason = NULL;
+ get_userlist(chan, neonserv_cmd_kickban_userlist_lookup, cache);
+}
+
+static USERLIST_CALLBACK(neonserv_cmd_kickban_userlist_lookup) {
+ struct neonserv_cmd_kickban_cache *cache = data;
+ neonserv_cmd_kickban_async1(cache->client, cache->textclient, cache->user, chan, cache->nicks, (cache->reason ? cache->reason : "Bye."));
+ free(cache->nicks);
+ if(cache->reason)
+ free(cache->reason);
+ free(cache);
+}
+
+static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason) {
+ int i, kicked_users = 0, provided_nicks = 0;
+ char *nick, *nextnick;
+ struct UserNode *cuser;
+ struct ChanUser *chanuser;
+ char usermask[NICKLEN+USERLEN+HOSTLEN+3];
+ nextnick = nicks;
+ check_mysql();
+ while((nick = nextnick)) {
+ nextnick = strstr(nick, ",");
+ if(nextnick) {
+ *nextnick = '\0';
+ nextnick++;
+ }
+ if(!*nick) continue;
+ if(is_ircmask(nick)) {
+ //KICK HOSTMASK
+ struct ChanUser *kickban_chanuser[chan->usercount];
+ int kick_chanuser_pos = 0;
+ for(chanuser = getChannelUsers(chan, NULL); NULL; chanuser = getChannelUsers(chan, chanuser)) {
+ cuser = chanuser->user;
+ sprintf(usermask, "%s!%s@%s", cuser->nick, cuser->ident, cuser->host);
+ if(!match(nick, usermask)) {
+ provided_nicks++;
+ if(isNetworkService(chanuser->user)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", chanuser->user->nick);
+ continue;
+ }
+ if(isUserProtected(chan, cuser, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
+ continue;
+ }
+ kickban_chanuser[kick_chanuser_pos++] = chanuser;
+ if(kick_chanuser_pos > 4 && (kick_chanuser_pos * 3) > chan->usercount && !isGodMode(user)) {
+ kick_chanuser_pos = 0;
+ reply(textclient, user, "NS_LAME_MASK", nick);
+ break;
+ }
+ }
+ }
+ for(i = 0; i < kick_chanuser_pos; i++) {
+ if(i == 0) {
+ putsock(client, "MODE %s +b %s", chan->name, nick);
+ }
+ kicked_users++;
+ putsock(client, "KICK %s %s :%s", chan->name, kickban_chanuser[i]->user->nick, reason);
+ }
+ } else if(*nick == '*') {
+ //KICK AUTH
+ nick++;
+ cuser = NULL;
+ for(chanuser = getChannelUsers(chan, NULL); NULL; chanuser = getChannelUsers(chan, chanuser)) {
+ if((chanuser->user->flags & USERFLAG_ISAUTHED) && !stricmp(chanuser->user->auth, nick)) {
+ provided_nicks++;
+ if(isNetworkService(chanuser->user)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", chanuser->user->nick);
+ continue;
+ }
+ if(!cuser) {
+ //check if the user is protected
+ if(isUserProtected(chan, chanuser->user, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", chanuser->user->nick);
+ break; //all other users are also protected...
+ }
+ cuser = chanuser->user;
+ }
+ kicked_users++;
+ putsock(client, "MODE %s +b %s", chan->name, generate_banmask(cuser, usermask));
+ putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+ }
+ }
+ } else {
+ provided_nicks++;
+ cuser = searchUserByNick(nick);
+ if(!cuser) continue;
+ chanuser = getChanUser(cuser, chan);
+ if(!chanuser) continue;
+ if(isNetworkService(cuser)) {
+ reply(textclient, user, "NS_SERVICE_IMMUNE", cuser->nick);
+ continue;
+ }
+ if(isUserProtected(chan, cuser, user)) {
+ reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
+ continue;
+ }
+ kicked_users++;
+ putsock(client, "MODE %s +b %s", chan->name, generate_banmask(cuser, usermask));
+ putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+ }
+ }
+ if(kicked_users == provided_nicks)
+ reply(getTextBot(), user, "NS_KICKBAN_DONE", kicked_users, chan->name);
+ else
+ reply(getTextBot(), user, "NS_KICKBAN_FAIL", client->user->nick);
+}
free(modeBuf);
}
+int is_ircmask(const char *text) {
+ while (*text && (isalnum((char)*text) || strchr("-_[]|\\`^{}?*", *text)))
+ text++;
+ if (*text++ != '!')
+ return 0;
+ while (*text && *text != '@' && !isspace((char)*text))
+ text++;
+ if (*text++ != '@')
+ return 0;
+ while (*text && !isspace((char)*text))
+ text++;
+ return !*text;
+}
+
+char* generate_banmask(struct UserNode *user, char *buffer) {
+ char *userhost = user->host;
+ char *p1, *p2 = userhost;
+
+ //find the last dot to identify if the hostmask is a hidden host
+ while((p1 = strstr(userhost, "."))) {
+ p2 = p1;
+ }
+ //TLD database: http://www.iana.org/domains/root/db/
+ //the longest TLD i found was 6 chars long (ignoring the stange exotic ones :D)
+ //but we even ignore '.museum' and '.travel' so we can say that the TLD of our mask needs to be less than 4 chars to be a real domain
+ if(strlen(p2+1) > 4) {
+ sprintf(buffer, "*!*@%s", userhost);
+ return buffer;
+ }
+
+ //check if the hostname has more than 4 connections (trusted host)
+ if(countUsersWithHost(userhost) > 4) {
+ sprintf(buffer, "*!%s@%s", user->ident, userhost);
+ return buffer;
+ } else {
+ sprintf(buffer, "*!*@%s", userhost);
+ return buffer;
+ }
+}
+
void init_tools() {
register_default_language_table(msgtab);
}
#define modeBufferDeop(MODEBUF,USER) modeBufferSet(MODEBUF, 0, 'o', USER)
#define modeBufferVoice(MODEBUF,USER) modeBufferSet(MODEBUF, 1, 'v', USER)
#define modeBufferDevoice(MODEBUF,USER) modeBufferSet(MODEBUF, 0, 'v', USER)
+#define modeBufferBan(MODEBUF,MASK) modeBufferSet(MODEBUF, 1, 'b', MASK)
void modeBufferSet(struct ModeBuffer *modeBuf, int add, char mode, char *param);
void flushModeBuffer(struct ModeBuffer *modeBuf);
void freeModeBuffer(struct ModeBuffer *modeBuf);
+int is_ircmask(const char *text);
+
+char* generate_banmask(struct UserNode *user, char *buffer);
+
void init_tools();
#endif
\ No newline at end of file
projects / NeonServV5.git / commitdiff