* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * Handlers for IRC numerics sent to the server
*/
#include "portab.h"
+/**
+ * @file
+ * Handlers for IRC numerics sent to the server
+ */
+
#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include "conf.h"
#include "conn.h"
#include "conn-func.h"
-#include "client.h"
#include "channel.h"
+#include "class.h"
#include "irc-write.h"
#include "lists.h"
#include "log.h"
CL2CHAN *cl2chan;
CLIENT *cl;
char str[LINE_LEN], *ptr;
- bool njoin;
+ bool njoin, xop;
- if (Conn_Options(Client_Conn(Client)) & CONN_RFC1459)
- njoin = false;
- else
- njoin = true;
+ /* Check features of remote server */
+ njoin = Conn_Options(Client_Conn(Client)) & CONN_RFC1459 ? false : true;
+ xop = strchr(Client_Flags(Client), 'X') ? true : false;
/* Get all the members of this channel */
cl2chan = Channel_FirstMember(Chan);
assert(cl != NULL);
if (njoin) {
- /* RFC 2813: send NJOIN with nick names and modes
+ /* RFC 2813: send NJOIN with nicknames and modes
* (if user is channel operator or has voice) */
if (str[strlen(str) - 1] != ':')
strlcat(str, ",", sizeof(str));
- if (strchr(Channel_UserModes(Chan, cl), 'v'))
- strlcat(str, "+", sizeof(str));
+
+ /* Prepare user prefix (ChanOp, voiced, ...) */
+ if (xop && strchr(Channel_UserModes(Chan, cl), 'q'))
+ strlcat(str, "~", sizeof(str));
+ if (xop && strchr(Channel_UserModes(Chan, cl), 'a'))
+ strlcat(str, "&", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'o'))
strlcat(str, "@", sizeof(str));
+ if (xop && strchr(Channel_UserModes(Chan, cl), 'h'))
+ strlcat(str, "%", sizeof(str));
+ if (strchr(Channel_UserModes(Chan, cl), 'v'))
+ strlcat(str, "+", sizeof(str));
+
strlcat(str, Client_ID(cl), sizeof(str));
/* Send the data if the buffer is "full" */
Client_ID(User), Client_ID(User),
modes);
}
- return CONNECTED;
} else {
/* RFC 2813 mode: one combined NICK or SERVICE command */
if (Client_Type(User) == CLIENT_SERVICE
- && strchr(Client_Flags(Client), 'S'))
- return IRC_WriteStrClient(Client,
- "SERVICE %s %d * +%s %d :%s", Client_Mask(User),
- Client_MyToken(Client_Introducer(User)),
- Client_Modes(User), Client_Hops(User) + 1,
- Client_Info(User));
- else
- return IRC_WriteStrClient(Client,
- "NICK %s %d %s %s %d +%s :%s",
- Client_ID(User), Client_Hops(User) + 1,
- Client_User(User), Client_Hostname(User),
- Client_MyToken(Client_Introducer(User)),
- Client_Modes(User), Client_Info(User));
+ && strchr(Client_Flags(Client), 'S')) {
+ if (!IRC_WriteStrClient(Client,
+ "SERVICE %s %d * +%s %d :%s",
+ Client_Mask(User),
+ Client_MyToken(Client_Introducer(User)),
+ Client_Modes(User), Client_Hops(User) + 1,
+ Client_Info(User)))
+ return DISCONNECTED;
+ } else {
+ if (!IRC_WriteStrClient(Client,
+ "NICK %s %d %s %s %d +%s :%s",
+ Client_ID(User), Client_Hops(User) + 1,
+ Client_User(User), Client_Hostname(User),
+ Client_MyToken(Client_Introducer(User)),
+ Client_Modes(User), Client_Info(User)))
+ return DISCONNECTED;
+ }
+ }
+
+ if (strchr(Client_Flags(Client), 'M')) {
+ /* Synchronize metadata */
+ if (Client_HostnameCloaked(User)) {
+ if (!IRC_WriteStrClient(Client,
+ "METADATA %s cloakhost :%s",
+ Client_ID(User),
+ Client_HostnameCloaked(User)))
+ return DISCONNECTED;
+ }
+ }
+
+ if (Conn_GetFingerprint(conn)) {
+ if (!IRC_WriteStrClient(Client,
+ "METADATA %s certfp :%s",
+ Client_ID(User),
+ Conn_GetFingerprint(conn)))
+ return DISCONNECTED;
}
+
+ return CONNECTED;
} /* Announce_User */
#ifdef IRCPLUS
/**
- * Synchronize invite and ban lists between servers
- * @param Client New server
+ * Synchronize invite, ban, G- and K-Line lists between servers.
+ *
+ * @param Client New server.
+ * @return CONNECTED or DISCONNECTED.
*/
static bool
Synchronize_Lists(CLIENT * Client)
assert(Client != NULL);
+ /* g-lines */
+ head = Class_GetList(CLASS_GLINE);
+ elem = Lists_GetFirst(head);
+ while (elem) {
+ if (!IRC_WriteStrClient(Client, "GLINE %s %ld :%s",
+ Lists_GetMask(elem),
+ Lists_GetValidity(elem) - time(NULL),
+ Lists_GetReason(elem)))
+ return DISCONNECTED;
+ elem = Lists_GetNext(elem);
+ }
+
c = Channel_First();
while (c) {
/* ban list */
}
#endif
+ if (!IRC_WriteStrClient(Client, "PING :%s",
+ Client_ID(Client_ThisServer())))
+ return DISCONNECTED;
+
return CONNECTED;
} /* IRC_Num_ENDOFMOTD */
if ((unsigned int)atol(value) == Conf_MaxNickLength - 1)
continue;
- /* Nick name length settings are different! */
+ /* Nickname length settings are different! */
Log(LOG_ERR,
- "Peer uses incompatible nick name length (%d/%d)! Disconnecting ...",
+ "Peer uses incompatible nickname length (%d/%d)! Disconnecting ...",
Conf_MaxNickLength - 1, atoi(value));
Conn_Close(Client_Conn(Client),
- "Incompatible nick name length",
+ "Incompatible nickname length",
NULL, false);
return DISCONNECTED;
}