Almost finished Inspircd Module (NEO-333)

ChangeLog

@@ -4,6 +4,7 @@ Anything we add/remove/fix/change is in here (even our rants)
 Fish (F), Mark (M), DeadNotBuried (D)
 ===============================================================================
 * NeoStats * Version 3.0.a4-dev
+ - We should be using channel TS's when sending mode changes etc (F)
  - Inspircd requires additional params for PONG messages. Update (F)
  - Add initial inspircd support for Inspircd 1.1 only. Still WIP (F)
  - Fix Userdump using channel mode function, rather than usermode function

modules/protocol/inspircd.c

@@ -25,6 +25,7 @@
 #include "neostats.h"
 #include "protocol.h"
 #include "support.h"
+#include "services.h"
 
 /* Umodes */				
 #define UMODE_FAILOP		0x00200000
@@ -497,16 +498,15 @@ static void m_fjoin( char *origin, char **argv, int argc, int srv)
 static void m_fmode ( char *origin, char **argv, int argc, int srv)
 {
 	char **nargv;
-	int nargc;
+	int nargc =0;
 	int i, j = 0;
-return;
 	for (i = 0; i < argc; i++) {
 		if (i == 1)
 			continue;
-/* 		AddStringToList(&nargv, argv[i], &nargc); */
+ 		AddStringToList(&nargv, argv[i], &nargc); 
 		j++;
 	}
-/* 	do_mode_channel(origin, nargv, nargc);*/
+ 	do_mode_channel(origin, nargv, nargc);
 	ns_free(nargv);
 }
 /*
@@ -597,3 +597,83 @@ void send_nick( const char *nick, const unsigned long ts, const char *newmode, c
 void send_numeric(const char *source, const int numeric, const char *target, const char *buf) {
 	send_cmd( ":%s PUSH %s ::%s %d %s :%s", source, target, source, numeric, target, buf);
 }
+
+/* 
+ * DEBUG1 NeoStats - origin: penguin.omega.org.za
+ * DEBUG1 NeoStats - cmd   : FMODE
+ * DEBUG1 NeoStats - args  : #services 1196825064 +
+ */
+void send_cmode(const char *sourceserver, const char *sourceuser, const char *chan, const char *mode, const char *args, const unsigned long ts) {
+	send_cmd( ":%s FMODE %s %ld %s %s", sourceserver, chan, ts, mode, args);
+}
+
+/* 
+ * DEBUG1 NeoStats - origin: Fish
+ * DEBUG1 NeoStats - cmd   : FHOST
+ * DEBUG1 NeoStats - args  : blah.com
+ */
+void send_chghost(const char *server, const char *target, const char *vhost) {
+	send_cmd( ":%s CHGHOST %s :%s", ns_botptr->name, target, vhost);
+}
+
+/*
+ * DEBUG1 NeoStats - origin: Fish
+ * DEBUG1 NeoStats - cmd   : CHGIDENT
+ * DEBUG1 NeoStats - args  : Fish :haha
+ */
+
+void send_chgident(const char *server, const char *target, const char *ident) {
+	send_cmd( ":%s CHGIDENT %s :%s", ns_botptr->name, target, ident);
+}
+/*
+ * DEBUG1 NeoStats - origin: Fish
+ * DEBUG1 NeoStats - cmd   : CHGNAME
+ * DEBUG1 NeoStats - args  : Fish :haha
+ */
+
+void send_chgname(const char *server, const char *target, const char *name) {
+	send_cmd( ":%s CHGNAME %s :%s", ns_botptr->name, target, name);
+}
+
+static void send_addline(const char type, const char *source, const char *mask, const char *bot, const char *reason, const unsigned long length) {
+	send_cmd( ":%s ADDLINE %c %s %s %ld %ld :%s", source, type, mask, bot != NULL ? bot : me.name, me.now, length, reason);
+}
+void send_akill(const char *server, const char *host, const char *ident, const char *bot, const unsigned long length, const char *reason, const unsigned long ts) {
+	char buf[BUFSIZE];
+	snprintf(buf, BUFSIZE, "%s@%s", ident, ident);
+	send_addline('G', server, buf, bot, reason, length);
+}
+void send_sqline(const char *source, const char *mask, const char *reason) {
+	send_addline('Q', source, mask, NULL, reason, 0);
+}
+void send_zline(const char *source, const char *mask, const char *reason) {
+	send_addline('Z', source, mask, NULL, reason, 0);
+}
+void send_kline(const char *source, const char *mask, const char *reason) {
+	send_addline('G', source, mask, NULL, reason, 0);
+}
+void send_gline(const char *source, const char *mask, const char *reason) {
+	send_addline('G', source, mask, NULL, reason, 0);
+}
+
+/* :<source server> SVSJOIN <nick> <channel>
+ */
+void send_svsjoin(const char *source, const char *target, const char *chan) {
+	send_cmd( ":%s SVSJOIN %s %s", source, target, chan);
+}
+
+/* :<source server> SVSPART <nick> <channel>
+ */
+void send_svspart(const char *source, const char *target, const char *chan) {
+	send_cmd( ":%s SVSPART %s %s", source, target, chan);
+}
+
+/* :<source server> SVSNICK <old nick> <new nick> <timestamp>
+ */
+void send_svsnick(const char *source, const char *target, const char *newnick, const unsigned long ts) {
+	send_cmd( ":%s SVSNICK %s %s %ld", source, target, newnick, ts);
+}
+
+void send_svsmode(const char *source, const char *target, const char *modes) {
+	send_cmd( ":%s SVSMODE %s %s", source, target, modes);
+}

src/ircrecv.c

@@ -210,7 +210,6 @@ void _m_chatops( char *origin, char **argv, int argc, int srv )
 
 void _m_error( char *origin, char **argv, int argc, int srv )
 {
-	fprintf(stderr, "IRCD reported error: %s", argv[0] );
 	nlog (LOG_ERROR, "IRCD reported error: %s", argv[0] );
 	do_exit (NS_EXIT_ERROR, argv[0] );
 }

src/ircsend.c

@@ -1135,8 +1135,13 @@ int irc_cmode( const Bot *botptr, const char *chan, const char *mode, const char
 {
 	char **av;
 	unsigned int ac;
-
-	irc_send_cmode( me.name, botptr->u->name, chan, mode, args, ( unsigned long )me.now );
+	Channel *c;
+	
+	c = FindChannel(chan);
+	if (c) {
+		irc_send_cmode( me.name, botptr->u->name, chan, mode, args, c->creationtime );
+	} else
+		irc_send_cmode( me.name, botptr->u->name, chan, mode, args, (unsigned long)me.now);
 	ircsnprintf( ircd_buf, BUFSIZE, "%s %s %s", chan, mode, args );
 	ac = split_buf( ircd_buf, &av );
 	ChanMode( me.name, av, ac );
@@ -1151,13 +1156,18 @@ int irc_cmode( const Bot *botptr, const char *chan, const char *mode, const char
 
 int irc_chanusermode( const Bot *botptr, const char *chan, const char *mode, const char *target )
 {
+	Channel *c;
 	if( ( ircd_srv.protocol & PROTOCOL_B64NICK ) )
 	{
 		irc_send_cmode( me.name, botptr->u->name, chan, mode, nick_to_base64( target ), ( unsigned long )me.now );
 	}
 	else
 	{
-		irc_send_cmode( me.name, botptr->u->name, chan, mode, target, ( unsigned long )me.now );
+		c = FindChannel(chan);
+		if (c) 
+			irc_send_cmode( me.name, botptr->u->name, chan, mode, target, ( unsigned long )c->creationtime );
+		else
+			irc_send_cmode( me.name, botptr->u->name, chan, mode, target, ( unsigned long )me.now );
 	}
 	ChanUserMode( chan, target, 1, CmodeStringToMask( mode ) );
 	return NS_SUCCESS;