projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treat G-line-related times as network times, rather than local times.
[ircu2.10.12-pk.git]
/
ircd
/
m_squit.c
diff --git
a/ircd/m_squit.c
b/ircd/m_squit.c
index c36af4ba5df2156d6e7292327485337f73d28c0c..5913cf2eae253cddce07fa9b0a00abd8005e3a18 100644
(file)
--- a/
ircd/m_squit.c
+++ b/
ircd/m_squit.c
@@
-22,19
+22,13
@@
*
* $Id$
*/
*
* $Id$
*/
+#include "config.h"
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
#include "client.h"
#include "hash.h"
#include "ircd.h"
#include "ircd_chattr.h"
#include "client.h"
#include "hash.h"
#include "ircd.h"
#include "ircd_chattr.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "numeric.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "numeric.h"
@@
-45,7
+39,7
@@
#include "s_user.h"
#include "send.h"
#include "s_user.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-67,7
+61,7
@@
int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
{
const char* server = parv[1];
struct Client *acptr;
{
const char* server = parv[1];
struct Client *acptr;
- time_t timestamp;
+ time_t timestamp
= 0
;
char *comment = 0;
if (parc < 2)
char *comment = 0;
if (parc < 2)
@@
-78,10
+72,10
@@
int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
if (BadPtr(parv[parc - 1]))
comment = cli_name(sptr);
if (BadPtr(parv[parc - 1]))
comment = cli_name(sptr);
- acptr = Find
N
Server(server);
+ acptr = FindServer(server);
if (!acptr)
if (!acptr)
- acptr = FindServer(server);
+ acptr = Find
N
Server(server);
if (!acptr) {
Debug((DEBUG_NOTICE, "Ignoring SQUIT to an unknown server"));
if (!acptr) {
Debug((DEBUG_NOTICE, "Ignoring SQUIT to an unknown server"));
@@
-89,17
+83,19
@@
int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
}
/* If they are squitting me, we reverse it */
}
/* If they are squitting me, we reverse it */
- if (IsMe(acptr)) {
- cptr = acptr;
- acptr = &me;
- }
-
- timestamp = atoi(parv[2]);
+ if (IsMe(acptr))
+ acptr = cptr; /* Bugfix by Prefect */
+
+ if (parc > 2)
+ timestamp = atoi(parv[2]);
+ else
+ protocol_violation(cptr, "SQUIT with no timestamp/reason");
/* If atoi(parv[2]) == 0 we must indeed squit !
* It will be our neighbour.
*/
/* If atoi(parv[2]) == 0 we must indeed squit !
* It will be our neighbour.
*/
- if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp) {
+ if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp)
+ {
Debug((DEBUG_NOTICE, "Ignoring SQUIT with the wrong timestamp"));
return 0;
}
Debug((DEBUG_NOTICE, "Ignoring SQUIT with the wrong timestamp"));
return 0;
}
@@
-132,7
+128,7
@@
int mo_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
server = parv[1];
/*
server = parv[1];
/*
- * The following allows wild cards in SQUIT. Only useful
l
+ * The following allows wild cards in SQUIT. Only useful
* when the command is issued by an oper.
*/
for (acptr = GlobalClientList; (acptr = next_client(acptr, server));
* when the command is issued by an oper.
*/
for (acptr = GlobalClientList; (acptr = next_client(acptr, server));
@@
-147,7
+143,7
@@
int mo_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
/*
* Look for a matching server that is closer,
/*
* Look for a matching server that is closer,
- * that way we won't accidently squit two close
+ * that way we won't accident
al
ly squit two close
* servers like davis.* and davis-r.* when typing
* /SQUIT davis*
*/
* servers like davis.* and davis-r.* when typing
* /SQUIT davis*
*/
@@
-162,5
+158,3
@@
int mo_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
return exit_client(cptr, acptr, sptr, comment);
}
return exit_client(cptr, acptr, sptr, comment);
}
-
-