Auth PING: Fix our information text for manual sending of "PONG"

[ngircd-alex.git] / src / ngircd / irc-login.c

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index b7fe5feda3339b9659012f7352563a8c2af3b8cf..98ac0e7f5e07ead740eed5297eb8b45802b59b8d 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,15 +16,14 @@
  * Login and logout
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <time.h>
 
 #include "conn-func.h"
-#include "class.h"
 #include "conf.h"
 #include "channel.h"
 #include "log.h"
@@ -32,11 +31,9 @@
 #include "messages.h"
 #include "parse.h"
 #include "irc.h"
-#include "irc-info.h"
 #include "irc-macros.h"
 #include "irc-write.h"
 
-#include "exp.h"
 #include "irc-login.h"
 
 static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick,
@@ -246,7 +243,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 #else
                                Conn_SetAuthPing(Client_Conn(Client), rand());
 #endif
-                               IRC_WriteStrClient(Client, "PING :%ld",
+                               Conn_WriteStr(Client_Conn(Client), "PING :%ld",
                                        Conn_GetAuthPing(Client_Conn(Client)));
                                LogDebug("Connection %d: sent AUTH PING %ld ...",
                                        Client_Conn(Client),
@@ -835,14 +832,14 @@ IRC_PONG(CLIENT *Client, REQUEST *Req)
        if (auth_ping) {
                LogDebug("AUTH PONG: waiting for token \"%ld\", got \"%s\" ...",
                         auth_ping, Req->argv[0]);
-               if (auth_ping == atoi(Req->argv[0])) {
+               if (auth_ping == atol(Req->argv[0])) {
                        Conn_SetAuthPing(conn, 0);
                        if (Client_Type(Client) == CLIENT_WAITAUTHPING)
                                Login_User(Client);
                } else
                        if (!IRC_WriteStrClient(Client,
-                                       "To connect, type /QUOTE PONG %ld",
-                                       auth_ping))
+                                       "NOTICE %s :To connect, type /QUOTE PONG %ld",
+                                       Client_ID(Client), auth_ping))
                                return DISCONNECTED;
        }
 #endif