* check_tcl_chon/of was being called wrong

svn: 584

src/botnet.c

@@ -1392,7 +1392,7 @@ static void cont_tandem_relay(int idx, char *buf, register int i)
     check_tcl_chpt(botnetnick, dcc[uidx].nick, dcc[uidx].sock,
 		   dcc[uidx].u.chat->channel);
   }
-  check_tcl_chof(dcc[uidx].nick, dcc[uidx].sock);
+  check_tcl_chof(dcc[uidx].nick, uidx);
   dcc[uidx].type = &DCC_RELAYING;
   dcc[uidx].u.relay = ri;
 }
@@ -1427,7 +1427,7 @@ static void eof_dcc_relay(int idx)
     if (dcc[j].u.chat->channel < GLOBAL_CHANS)
       botnet_send_join_idx(j, -1);
   }
-  check_tcl_chon(dcc[j].nick, dcc[j].sock);
+  check_tcl_chon(dcc[j].nick, j);
   check_tcl_chjn(botnetnick, dcc[j].nick, dcc[j].u.chat->channel,
 		 geticon(j), dcc[j].sock, dcc[j].host);
   killsock(dcc[idx].sock);
@@ -1522,7 +1522,7 @@ static void dcc_relaying(int idx, char *buf, int j)
   nfree(dcc[idx].u.relay);
   dcc[idx].u.chat = ci;
   dcc[idx].type = &DCC_CHAT;
-  check_tcl_chon(dcc[idx].nick, dcc[idx].sock);
+  check_tcl_chon(dcc[idx].nick, idx);
   if (dcc[idx].u.chat->channel >= 0)
     check_tcl_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
 		   geticon(idx), dcc[idx].sock, dcc[idx].host);
@@ -1737,7 +1737,7 @@ void restart_chons()
   /* Dump party line members */
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type == &DCC_CHAT) {
-      check_tcl_chon(dcc[i].nick, dcc[i].sock);
+      check_tcl_chon(dcc[i].nick, i);
       check_tcl_chjn(botnetnick, dcc[i].nick, dcc[i].u.chat->channel,
 		     geticon(i), dcc[i].sock, dcc[i].host);
     }

src/cmds.c

@@ -4044,7 +4044,7 @@ static void cmd_quit(struct userrec *u, int idx, char *text)
 	if (dcc[idx].u.chat->channel >= 0 && dcc[idx].u.chat->channel < GLOBAL_CHANS) {
 		check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock, dcc[idx].u.chat->channel);
 	}
-	check_tcl_chof(dcc[idx].nick, dcc[idx].sock);
+	check_tcl_chof(dcc[idx].nick, idx);
 	dprintf(idx, "*** See you later cowboy!\n\n");
 	flush_lines(idx, dcc[idx].u.chat);
 	putlog(LOG_MISC, "*", "DCC connection closed (%s!%s)", dcc[idx].nick, dcc[idx].host);

src/dcc.c

@@ -985,7 +985,7 @@ static void eof_dcc_chat(int idx)
     check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
 		   dcc[idx].u.chat->channel);
   }
-  check_tcl_chof(dcc[idx].nick, dcc[idx].sock);
+  check_tcl_chof(dcc[idx].nick, idx);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }

src/dccutil.c

@@ -288,7 +288,7 @@ void dcc_chatter(int idx)
 
   j = dcc[idx].sock;
   strcpy(dcc[idx].u.chat->con_chan, "***");
-  check_tcl_chon(dcc[idx].nick, dcc[idx].sock);
+  check_tcl_chon(dcc[idx].nick, idx);
   dcc[idx].u.chat->channel = 234567;
   /* Still there? */
 
@@ -586,7 +586,7 @@ int detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
 	if (chat->channel < GLOBAL_CHANS)
 	  botnet_send_part_idx(idx, x);
       }
-      check_tcl_chof(dcc[idx].nick, dcc[idx].sock);
+      check_tcl_chof(dcc[idx].nick, idx);
       if ((dcc[idx].sock != STDOUT) || backgrd) {
 	killsock(dcc[idx].sock);
 	lostdcc(idx);
@@ -622,7 +622,7 @@ void do_boot(int idx, char *by, char *reason)
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(idx, x);
   }
-  check_tcl_chof(dcc[idx].nick, dcc[idx].sock);
+  check_tcl_chof(dcc[idx].nick, idx);
   if ((dcc[idx].sock != STDOUT) || backgrd) {
     killsock(dcc[idx].sock);
     lostdcc(idx);

src/tcldcc.c

@@ -102,7 +102,7 @@ static int tcl_killdcc STDVAR
 	(dcc[idx].u.chat->channel < GLOBAL_CHANS))
       check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
 		     dcc[idx].u.chat->channel);
-    check_tcl_chof(dcc[idx].nick, dcc[idx].sock);
+    check_tcl_chof(dcc[idx].nick, idx);
     /* Notice is sent to the party line, the script can add a reason. */
   }
   killsock(dcc[idx].sock);