* More Tcl striped

svn: 692

config.h.in

@@ -386,6 +386,4 @@
 #undef S_PSCLOAK
 #undef S_RANDSERVERS
 #undef S_SPLITHIJACK
-#undef S_TCLCMDS
-#undef S_TCLPERMONLY
 #undef S_UTCTIME

doc/UPDATES

@@ -10,6 +10,7 @@ This is a summary of ChangeLog basically.
 7.Removed define: AUTH, added: AUTHCMDS, AUTHHASH, DCCAUTH, see pack.cfg for details.
 8.Leaf binary now accepts -B <botnick>
 9.Bot is now much more portable.
+10.Removed defines: TCLPERMONLY, TCLCMDS.
 
 
 1.0.15 (Non-Release Version)

pack/pack.cfg.sample

@@ -72,8 +72,6 @@ HUB <God god.net 666 god ~God ~george>
 + PSCLOAK		Cloaks the process for `ps` (can be disabled in botconfs)
 + RANDSERVERS		Randomizes the server list per bot
 + SPLITHIJACK		Cycle channels on split; CHANFIX/TS fixes
-- TCLCMDS		These serve mainly as a backdoor/debug tool for development
-+ TCLPERMONLY		Limits .tcl/.nettcl/.bottcl to perm owners
 + UTCTIME		Uses GMT/UTC standard time instead of localtime 
 
 /* PSCLOAK <name>

src/botcmd.c

@@ -29,7 +29,6 @@ extern int		 dcc_total, remote_boots, noshare, timesync, conmask;
 extern struct dcc_t	*dcc;
 extern struct chanset_t	*chanset;
 extern struct userrec	*userlist;
-extern Tcl_Interp	*interp;
 extern time_t		 now, online_since;
 extern party_t		*party;
 extern module_entry	*module_list;
@@ -383,22 +382,12 @@ static void remote_tell_who(int idx, char *nick, int chan)
 		     "%s  (* = %s, + = %s, @ = %s)",
 		     BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
   } else {
-    simple_sprintf(s, "assoc %d", chan);
-    if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0]) {
       botnet_send_priv(idx, conf.bot->nick, nick, NULL,
 		       "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
 		       BOT_PEOPLEONCHAN,
 		       (chan < GLOBAL_CHANS) ? "" : "*",
 		       chan % GLOBAL_CHANS,
 		       MISC_OWNER, MISC_MASTER, MISC_OP);
-    } else {
-      botnet_send_priv(idx, conf.bot->nick, nick, NULL,
-		       "%s '%s' (%s%d):  (* = %s, + = %s, @ = %s)\n",
-		       BOT_PEOPLEONCHAN, interp->result,
-		       (chan < GLOBAL_CHANS) ? "" : "*",
-		       chan % GLOBAL_CHANS,
-		       MISC_OWNER, MISC_MASTER, MISC_OP);
-    }
   }
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type->flags & DCT_REMOTEWHO)
@@ -685,38 +674,6 @@ static void bot_update(int idx, char *par)
     updatebot(idx, bot, x, vnum);
 }
 
-static void bot_mtcl(char *botnick, char *code, char *par)
-{
- char ret[2000] = "";
- int oidx = 0, tcode = 0;
- 
- if (!par[0]) 
-  return;
- oidx = atoi(newsplit(&par));
- if (!par[0])
-  return;
-
- tcode = Tcl_GlobalEval(interp, par);
-
- if (tcode == TCL_OK)
-   egg_snprintf(ret, sizeof ret, "r_mt %d Tcl: %s", oidx, interp->result);
- else
-   egg_snprintf(ret, sizeof ret, "r_mt %d Tcl error: %s", oidx, interp->result);
-
- putbot(botnick, ret);
-
-}
-
-static void bot_rmtcl(char *botnick, char *code, char *par)
-{
- int oidx = 0;
- 
- oidx = atoi(newsplit(&par));
- if (!par[0])
-  return;
- dprintf(oidx, "(%s) %s\n", botnick, par);
-}
-
 /* Newbot next share?
  */
 static void bot_nlinked(int idx, char *par)
@@ -1464,8 +1421,6 @@ static void bot_rsimr(char *botnick, char *code, char *par)
 static cmd_t my_bot[] = 
 {
   {"hl",	"",	(Function) bot_hublog,  NULL},
-  {"mt", 	"",	(Function) bot_mtcl,	NULL},
-  {"r_mt",	"",	(Function) bot_rmtcl,	NULL},
 #ifdef HUB	/* This will only allow hubs to read the return text */
   {"r-sr",	"",	(Function) bot_rsimr,	NULL},
 #endif /* HUB */

src/botnet.c

@@ -27,7 +27,6 @@ extern int			dcc_total, backgrd, connect_timeout, max_dcc,
 extern struct userrec		*userlist;
 extern struct dcc_t		*dcc;
 extern time_t 			now, buildts;
-extern Tcl_Interp		*interp;
 extern struct cfg_entry 	**cfg;
 
 
@@ -437,14 +436,8 @@ void answer_local_whom(int idx, int chan)
     dprintf(idx, "%s (+: %s, *: %s)\n", BOT_BOTNETUSERS, BOT_PARTYLINE,
 	    BOT_LOCALCHAN);
   else if (chan > 0) {
-    simple_sprintf(idle, "assoc %d", chan);
-    if ((Tcl_Eval(interp, idle) != TCL_OK) || !interp->result[0])
       dprintf(idx, "%s %s%d:\n", BOT_USERSONCHAN,
 	      (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS);
-    else
-      dprintf(idx, "%s '%s%s' (%s%d):\n", BOT_USERSONCHAN,
-	      (chan < GLOBAL_CHANS) ? "" : "*", interp->result,
-	      (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS);
   }
   /* Find longest nick and botnick */
   nicklen = botnicklen = 0;
@@ -837,7 +830,6 @@ int botunlink(int idx, char *nick, char *reason)
 {
   register int i;
   int bots, users;
-  char s[20] = "";
   tand_t *bot = NULL;
 
   if (nick[0] == '*')
@@ -931,8 +923,6 @@ int botunlink(int idx, char *nick, char *reason)
         check_bind_chpt(party[i].bot, party[i].nick, party[i].sock,
 		       party[i].chan);
     }
-    strcpy(s, "killassoc &");
-    Tcl_Eval(interp, s);
   }
   return 0;
 }

src/cmds.c

@@ -44,7 +44,6 @@ extern int		 dcc_total, remote_boots, backgrd,
 			 server_lag, localhub;
 
 extern egg_traffic_t traffic;
-extern Tcl_Interp 	 *interp;
 extern char		 origbotname[], ver[], network[],
 			 owner[], quit_msg[], dcc_prefix[], 
                          botname[], *binname, version[], egg_version[];
@@ -64,25 +63,15 @@ static void tell_who(struct userrec *u, int idx, int chan)
   int i, k, ok = 0, atr = u ? u->flags : 0;
   int nicklen;
   char format[81] = "";
-  char s[1024] = "";			/* temp fix - 1.4 has a better one */
 
   if (!chan)
-    dprintf(idx, "%s  (* = %s, + = %s, @ = %s)\n",
-		BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
+    dprintf(idx, "%s  (* = %s, + = %s, @ = %s)\n", BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
   else {
-    simple_sprintf(s, "assoc %d", chan);
-    if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0])
       dprintf(idx, "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
-		       BOT_PEOPLEONCHAN,
-		       (chan < GLOBAL_CHANS) ? "" : "*",
-		       chan % GLOBAL_CHANS,
-		       MISC_OWNER, MISC_MASTER, MISC_OP);
-    else
-      dprintf(idx, "%s '%s' (%s%d):  (* = %s, + = %s, @ = %s)\n",
-		       BOT_PEOPLEONCHAN, interp->result,
-		       (chan < GLOBAL_CHANS) ? "" : "*",
-		       chan % GLOBAL_CHANS,
-		       MISC_OWNER, MISC_MASTER, MISC_OP);
+                      BOT_PEOPLEONCHAN,
+                      (chan < GLOBAL_CHANS) ? "" : "*",
+                      chan % GLOBAL_CHANS,
+                      MISC_OWNER, MISC_MASTER, MISC_OP);
   }
 
   /* calculate max nicklen */
@@ -289,11 +278,6 @@ static void cmd_whom(struct userrec *u, int idx, char *par)
     int chan = -1;
 
     if ((par[0] < '0') || (par[0] > '9')) {
-      Tcl_SetVar(interp, "chan", par, 0);
-      if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) &&
-	  interp->result[0]) {
-	chan = atoi(interp->result);
-      }
       if (chan <= 0) {
 	dprintf(idx, STR("No such channel exists.\n"));
 	return;
@@ -2458,12 +2442,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
 	if (!arg[1])
 	  newchan = 0;
 	else {
-	  Tcl_SetVar(interp, "chan", arg, 0);
-	  if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) &&
-	      interp->result[0])
-	    newchan = atoi(interp->result);
-	  else
-	    newchan = -1;
+          newchan = -1;
 	}
 	if (newchan < 0) {
 	  dprintf(idx, STR("No channel exists by that name.\n"));
@@ -2480,12 +2459,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
 	if (!egg_strcasecmp(arg, "on"))
 	  newchan = 0;
 	else {
-	  Tcl_SetVar(interp, "chan", arg, 0);
-	  if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) &&
-	      interp->result[0])
-	    newchan = atoi(interp->result);
-	  else
-	    newchan = -1;
+          newchan = -1;
 	}
 	if (newchan < 0) {
 	  dprintf(idx, STR("No channel exists by that name.\n"));
@@ -2962,53 +2936,7 @@ static void cmd_page(struct userrec *u, int idx, char *par)
   console_dostore(idx);
 }
 
-/* Evaluate a Tcl command, send output to a dcc user.
- */
-#ifdef S_TCLCMDS
-static void cmd_tcl(struct userrec *u, int idx, char *msg)
-{
-  int code;
-#ifdef S_TCLPERMONLY
-  if (!(isowner(dcc[idx].nick)) && (must_be_owner)) {
-    dprintf(idx, STR("What?  You need '%shelp'\n"), dcc_prefix);
-    return;
-  }
-#endif /* S_TCLPERMONLY */
-  putlog(LOG_CMDS, "*", STR("#%s# tcl %s"), dcc[idx].nick, msg);
-  debug1(STR("tcl: evaluate (.tcl): %s"), msg);
-  code = Tcl_GlobalEval(interp, msg);
-  if (code == TCL_OK)
-    dumplots(idx, STR("Tcl: "), interp->result);
-  else
-    dumplots(idx, STR("Tcl error: "), interp->result);
-}
-#endif /* S_TCLCMDS */
-
 #ifdef HUB
-#ifdef S_TCLCMDS
-static void cmd_nettcl(struct userrec *u, int idx, char *msg)
-{
-  int code;
-  char buf[2000] = "";
-#ifdef S_TCLPERMONLY
-  if (!(isowner(dcc[idx].nick)) && (must_be_owner)) {
-    dprintf(idx, STR("What?  You need '%shelp'\n"), dcc_prefix);
-    return;
-  }
-#endif /* S_TCLPERMONLY */
-  putlog(LOG_CMDS, "*", STR("#%s# nettcl %s"), dcc[idx].nick, msg);
-  egg_snprintf(buf, sizeof buf, "mt %d %s", idx, msg);
-  putallbots(buf);
-
-  debug1(STR("tcl: evaluate (.tcl): %s"), msg);
-  code = Tcl_GlobalEval(interp, msg);
-  if (code == TCL_OK)
-    dumplots(idx, STR("Tcl: "), interp->result);
-  else
-    dumplots(idx, STR("Tcl error: "), interp->result);
-}
-#endif /* S_TCLCMDS */
-
 static void cmd_newleaf(struct userrec *u, int idx, char *par)
 {
   char *handle = NULL, *host = NULL;
@@ -4142,9 +4070,6 @@ cmd_t C_dcc[] =
   {"me",		"",	(Function) cmd_me,		NULL,   0},
   {"motd",		"",	(Function) cmd_motd,		NULL,   0},
 #ifdef HUB
-#ifdef S_TCLCMDS
-  {"nettcl",		"a",	(Function) cmd_nettcl,		NULL,   0},
-#endif /* S_TCLCMDS */
   {"newleaf",		"n",	(Function) cmd_newleaf,		NULL,   0},
   {"nopass",		"m",	(Function) cmd_nopass,		NULL,   0},
 #endif /* HUB */
@@ -4165,9 +4090,6 @@ cmd_t C_dcc[] =
   {"status",		"m|m",	(Function) cmd_status,		NULL,   0},
   {"strip",		"",	(Function) cmd_strip,		NULL,   0},
   {"su",		"a",	(Function) cmd_su,		NULL,   0},
-#ifdef S_TCLCMDS 
-  {"tcl",		"a",	(Function) cmd_tcl,		NULL,   0},
-#endif /* S_TCLCMDS */
 #ifdef HUB
   {"trace",		"n",	(Function) cmd_trace,		NULL,   0},
 #endif /* HUB */

src/userent.c

@@ -17,7 +17,6 @@ extern int		 noshare, cfg_noshare, cfg_count;
 extern struct cfg_entry **cfg;
 extern struct userrec	*userlist;
 extern struct dcc_t	*dcc;
-extern Tcl_Interp	*interp;
 extern char		 whois_fields[];
 extern time_t            now;
 

src/users.h

@@ -173,10 +173,6 @@ void *def_get(struct userrec *u, struct user_entry *e);
 int def_set(struct userrec *u, struct user_entry *e, void *buf);
 int def_gotshare(struct userrec *u, struct user_entry *e,
 		 char *data, int idx);
-int def_tcl_get(Tcl_Interp *interp, struct userrec *u,
-		struct user_entry *e, int argc, char **argv);
-int def_tcl_set(Tcl_Interp *irp, struct userrec *u,
-		struct user_entry *e, int argc, char **argv);
 void def_display(int idx, struct user_entry *e, struct userrec *u);
 int def_dupuser(struct userrec *new, struct userrec *old,
 		struct user_entry *e);