static bool Hello_User PARAMS(( CLIENT *Client ));
static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
-static void Introduce_Client PARAMS(( CLIENT *From, const char *Nick,
- const int HopCount, const char *User,
- const char *Host, const int Token,
- const char *Mode, const char *Name ));
+static void Introduce_Client PARAMS((CLIENT *To, CLIENT *Client));
+static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix,
+ void *i));
/**
/* Not yet registered "unknown" connection, PASS with one
* argument: either a regular client, service, or server
* using the old RFC 1459 section 4.1.1 syntax. */
- LogDebug("Connection %d: got PASS command ...",
+ LogDebug("Connection %d: got PASS command (RFC 1459) ...",
Client_Conn(Client));
} else if ((Client_Type(Client) == CLIENT_UNKNOWN ||
Client_Type(Client) == CLIENT_UNKNOWNSERVER) &&
/* Not yet registered "unknown" connection or outgoing server
* link, PASS with three or four argument: server using the
* RFC 2813 section 4.1.1 syntax. */
- LogDebug("Connection %d: got PASS command (new server link) ...",
+ LogDebug("Connection %d: got PASS command (RFC 2813, new server link) ...",
Client_Conn(Client));
} else if (Client_Type(Client) == CLIENT_UNKNOWN ||
Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
}
Client_SetPassword(Client, Req->argv[0]);
- Client_SetType(Client, CLIENT_GOTPASS);
/* Protocol version */
if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
Req->argv[1][2] = c2;
Req->argv[1][4] = c4;
- } else
+
+ Client_SetType(Client, CLIENT_GOTPASS_2813);
+ } else {
protohigh = protolow = 0;
+ Client_SetType(Client, CLIENT_GOTPASS);
+ }
/* Protocol type, see doc/Protocol.txt */
if (Req->argc >= 2 && strlen(Req->argv[1]) > 4)
IRC_NICK( CLIENT *Client, REQUEST *Req )
{
CLIENT *intr_c, *target, *c;
- CONN_ID conn;
char *nick, *user, *hostname, *modes, *info;
int token, hops;
assert( Client != NULL );
assert( Req != NULL );
-#ifndef STRICT_RFC
/* Some IRC clients, for example BitchX, send the NICK and USER
* commands in the wrong order ... */
- if( Client_Type( Client ) == CLIENT_UNKNOWN
- || Client_Type( Client ) == CLIENT_GOTPASS
- || Client_Type( Client ) == CLIENT_GOTNICK
- || Client_Type( Client ) == CLIENT_GOTUSER
- || Client_Type( Client ) == CLIENT_USER
- || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
-#else
- if( Client_Type( Client ) == CLIENT_UNKNOWN
- || Client_Type( Client ) == CLIENT_GOTPASS
- || Client_Type( Client ) == CLIENT_GOTNICK
- || Client_Type( Client ) == CLIENT_USER
- || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+ if(Client_Type(Client) == CLIENT_UNKNOWN
+ || Client_Type(Client) == CLIENT_GOTPASS
+ || Client_Type(Client) == CLIENT_GOTNICK
+#ifndef STRICT_RFC
+ || Client_Type(Client) == CLIENT_GOTUSER
#endif
+ || Client_Type(Client) == CLIENT_USER
+ || Client_Type(Client) == CLIENT_SERVICE
+ || (Client_Type(Client) == CLIENT_SERVER && Req->argc == 1))
{
/* User registration or change of nickname */
return CONNECTED;
}
- if(( Client_Type( target ) != CLIENT_USER )
- && ( Client_Type( target ) != CLIENT_SERVER ))
- {
+ if (Client_Type(target) != CLIENT_USER &&
+ Client_Type(target) != CLIENT_SERVICE &&
+ Client_Type(target) != CLIENT_SERVER) {
/* New client */
Log( LOG_DEBUG, "Connection %d: got valid NICK command ...",
Client_Conn( Client ));
return Hello_User( Client );
else
Client_SetType( Client, CLIENT_GOTNICK );
- }
- else
- {
+ } else {
/* Nickname change */
if (Client_Conn(target) > NONE) {
/* Local client */
Log(LOG_INFO,
- "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
- Client_Mask(target), Client_Conn(target),
- Client_ID(target), Req->argv[0]);
+ "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
+ Client_TypeText(target), Client_Mask(target),
+ Client_Conn(target), Client_ID(target),
+ Req->argv[0]);
Conn_UpdateIdle(Client_Conn(target));
- }
- else
- {
+ } else {
/* Remote client */
- Log( LOG_DEBUG,
- "User \"%s\" changed nick: \"%s\" -> \"%s\".",
- Client_Mask( target ), Client_ID( target ),
- Req->argv[0] );
+ LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".",
+ Client_TypeText(target),
+ Client_Mask(target), Client_ID(target),
+ Req->argv[0]);
}
/* Inform all users and servers (which have to know)
token = atoi(Req->argv[1]);
modes = "";
info = Req->argv[0];
-
- conn = Client_Conn(Client);
- if (conn != NONE &&
- !(Conn_Options(conn) & CONN_RFC1459)) {
- Log(LOG_INFO,
- "Switching connection %d (\"%s\") to RFC 1459 compatibility mode.",
- conn, Client_ID(Client));
- Conn_SetOption(conn, CONN_RFC1459);
- }
}
/* Nick ueberpruefen */
return CONNECTED;
}
- modes = Client_Modes( c );
- if( *modes ) Log( LOG_DEBUG, "User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", Client_Mask( c ), modes, Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
- else Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
-
- /* Inform other servers about the new client */
- Introduce_Client(Client, Req->argv[0], atoi(Req->argv[1]) + 1,
- Req->argv[2], Req->argv[3],
- Client_MyToken(intr_c), Req->argv[5],
- Req->argv[6]);
+ /* RFC 2813: client is now fully registered, inform all the
+ * other servers about the new user.
+ * RFC 1459: announce the new client only after receiving the
+ * USER command, first we need more information! */
+ if (Req->argc < 7) {
+ LogDebug("Client \"%s\" is beeing registered (RFC 1459) ...",
+ Client_Mask(c));
+ Client_SetType(c, CLIENT_GOTNICK);
+ } else
+ Introduce_Client(Client, c);
return CONNECTED;
}
LogDebug("Connection %d: got valid USER command for \"%s\".",
Client_Conn(Client), Client_Mask(c));
+
+ /* RFC 1459 style user registration?
+ * Introduce client to network: */
+ if (Client_Type(c) == CLIENT_GOTNICK)
+ Introduce_Client(Client, c);
+
return CONNECTED;
} else if (Client_Type(Client) == CLIENT_USER) {
/* Already registered connection */
static bool
Hello_User(CLIENT * Client)
{
- char modes[CLIENT_MODE_LEN + 1] = "+";
-
assert(Client != NULL);
/* Check password ... */
return DISCONNECTED;
}
- Log(LOG_NOTICE, "User \"%s\" registered (connection %d).",
- Client_Mask(Client), Client_Conn(Client));
-
- /* Inform other servers */
- strlcat(modes, Client_Modes(Client), sizeof(modes));
- Introduce_Client(NULL, Client_ID(Client), 1, Client_User(Client),
- Client_Hostname(Client), 1, modes, Client_Info(Client));
+ Introduce_Client(NULL, Client);
if (!IRC_WriteStrClient
(Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client)))
if (!IRC_Send_ISUPPORT(Client))
return DISCONNECTED;
- Client_SetType(Client, CLIENT_USER);
-
if (!IRC_Send_LUSERS(Client))
return DISCONNECTED;
if (!IRC_Show_MOTD(Client))
static void
-Introduce_Client(CLIENT *From, const char *Nick, const int HopCount,
-const char *User, const char *Host, const int Token, const char *Mode,
-const char *Name)
+Introduce_Client(CLIENT *From, CLIENT *Client)
{
- IRC_WriteStrServersPrefix(From,
- From != NULL ? From : Client_ThisServer(),
- "NICK %s %d %s %s %d %s :%s",
- Nick, HopCount, User, Host, Token, Mode, Name);
+ char *type;
+
+ Client_SetType(Client, CLIENT_USER);
+
+ if (From) {
+ if (Conf_IsService(Conf_GetServer(Client_Conn(From)), Client_ID(Client))) {
+ type = "Service";
+ } else
+ type = "User";
+ LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).",
+ type, Client_Mask(Client), Client_Modes(Client),
+ Client_ID(From), Client_ID(Client_Introducer(Client)),
+ Client_Hops(Client), Client_Hops(Client) > 1 ? "s": "");
+ } else
+ Log(LOG_NOTICE, "User \"%s\" registered (connection %d).",
+ Client_Mask(Client), Client_Conn(Client));
+
+ /* Inform other servers */
+ IRC_WriteStrServersPrefixFlag_CB(From,
+ From != NULL ? From : Client_ThisServer(),
+ '\0', cb_introduceClient, (void *)Client);
} /* Introduce_Client */
+static void
+cb_introduceClient(CLIENT *To, CLIENT *Prefix, void *data)
+{
+ CLIENT *c = (CLIENT *)data;
+ CONN_ID conn;
+ char *modes, *user, *host;
+
+ modes = Client_Modes(c);
+ user = Client_User(c) ? Client_User(c) : "-";
+ host = Client_Hostname(c) ? Client_Hostname(c) : "-";
+
+ conn = Client_Conn(To);
+ if (Conn_Options(conn) & CONN_RFC1459) {
+ /* RFC 1459 mode: separate NICK and USER commands */
+ Conn_WriteStr(conn, "NICK %s :%d", Client_ID(c),
+ Client_Hops(c) + 1);
+ Conn_WriteStr(conn, ":%s USER %s %s %s :%s",
+ Client_ID(c), user, host,
+ Client_ID(Client_Introducer(c)), Client_Info(c));
+ if (modes[0])
+ Conn_WriteStr(conn, ":%s MODE %s +%s",
+ Client_ID(c), Client_ID(c), modes);
+ } else {
+ /* RFC 2813 mode: one combined NICK command */
+ IRC_WriteStrClientPrefix(To, Prefix,
+ "NICK %s %d %s %s %d +%s :%s",
+ Client_ID(c), Client_Hops(c) + 1,
+ user, host,
+ Client_MyToken(Client_Introducer(c)),
+ modes, Client_Info(c));
+ }
+} /* cb_introduceClient */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff