[srvx-commits] CVS: services/src messages.h,1.30,1.31 proto-bahamut.c,1.18,1.19 proto-common.c,1.10,1.11 proto-p10.c,1.26,1.27

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv22467/src

Modified Files:
	messages.h proto-bahamut.c proto-common.c proto-p10.c 
Log Message:
tweak configury so PACKAGE, VERSION, CODENAME all defined in config.h
implement /VERSION, /ADMIN commands in IRC


Index: messages.h
===================================================================
RCS file: /cvsroot/srvx/services/src/messages.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** messages.h	15 Aug 2002 03:50:09 -0000	1.30
--- messages.h	20 Aug 2002 03:24:56 -0000	1.31
***************
*** 28,32 ****
     freak. */
  
- #define CODENAME		"dust"
  #define MSG_VERSION		"$bsrvx "VERSION"$b ("CODENAME"), Built: " __DATE__ ", " __TIME__"."
  
--- 28,31 ----

Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** proto-bahamut.c	14 Aug 2002 21:55:49 -0000	1.18
--- proto-bahamut.c	20 Aug 2002 03:24:56 -0000	1.19
***************
*** 873,877 ****
      dict_set_free_data(service_msginfo_dict, free);
      irc_func_dict = dict_new();
!     dict_insert(irc_func_dict, "ADMIN", cmd_dummy);
      dict_insert(irc_func_dict, "AWAY", cmd_away);
      dict_insert(irc_func_dict, "BURST", cmd_burst);
--- 873,877 ----
      dict_set_free_data(service_msginfo_dict, free);
      irc_func_dict = dict_new();
!     dict_insert(irc_func_dict, "ADMIN", cmd_admin);
      dict_insert(irc_func_dict, "AWAY", cmd_away);
      dict_insert(irc_func_dict, "BURST", cmd_burst);
***************
*** 897,901 ****
      dict_insert(irc_func_dict, "SVINFO", cmd_svinfo);
      dict_insert(irc_func_dict, "TOPIC", cmd_topic);
!     dict_insert(irc_func_dict, "VERSION", cmd_dummy);
      dict_insert(irc_func_dict, "WHOIS", cmd_whois);
  
--- 897,901 ----
      dict_insert(irc_func_dict, "SVINFO", cmd_svinfo);
      dict_insert(irc_func_dict, "TOPIC", cmd_topic);
!     dict_insert(irc_func_dict, "VERSION", cmd_version);
      dict_insert(irc_func_dict, "WHOIS", cmd_whois);
  

Index: proto-common.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-common.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** proto-common.c	19 Aug 2002 23:38:39 -0000	1.10
--- proto-common.c	20 Aug 2002 03:24:56 -0000	1.11
***************
*** 393,396 ****
--- 393,431 ----
  }
  
+ static CMD_FUNC(cmd_version)
+ {
+     struct userNode *user;
+     (void)argc; (void)argv;
+     if (!(user = GetUserH(origin))) {
+         log(MAIN_LOG, LOG_ERROR, "Could not find VERSION origin user %s\n", origin);
+         return 0;
+     }
+     irc_numeric(user, 351, "%s.%s %s :%s", PACKAGE_TARNAME, PACKAGE_VERSION, self->name, CODENAME);
+     return 1;
+ }
+ 
+ static CMD_FUNC(cmd_admin)
+ {
+     struct userNode *user;
+     struct string_list *slist;
+ 
+     (void)argc; (void)argv;
+     if (!(user = GetUserH(origin))) {
+         log(MAIN_LOG, LOG_ERROR, "Could not find ADMIN origin user %s\n", origin);
+         return 0;
+     }
+     if ((slist = conf_get_data("server/admin", RECDB_STRING_LIST)) && slist->used) {
+         irc_numeric(user, 256, ":Administrative info about %s", self->name);
+         switch (slist->used) {
+         default: irc_numeric(user, 257, ":%s", slist->list[0]);
+         case 2:  irc_numeric(user, 258, ":%s", slist->list[1]);
+         case 1:  irc_numeric(user, 259, ":%s", slist->list[2]);
+         }
+     } else {
+         irc_numeric(user, 423, ":No administrative info available");
+     }
+     return 1;
+ }
+ 
  static void
  recalc_bursts(struct server *eob_server)

Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** proto-p10.c	14 Aug 2002 21:55:49 -0000	1.26
--- proto-p10.c	20 Aug 2002 03:24:56 -0000	1.27
***************
*** 1346,1349 ****
--- 1346,1353 ----
      dict_insert(irc_func_dict, CMD_CLEARMODE, cmd_clearmode);
      dict_insert(irc_func_dict, TOK_CLEARMODE, cmd_clearmode);
+     dict_insert(irc_func_dict, CMD_VERSION, cmd_version);
+     dict_insert(irc_func_dict, TOK_VERSION, cmd_version);
+     dict_insert(irc_func_dict, CMD_ADMIN, cmd_admin);
+     dict_insert(irc_func_dict, TOK_ADMIN, cmd_admin);
  
      /* In P10, DESTRUCT doesn't do anything except be broadcast to servers.
***************
*** 1362,1370 ****
      dict_insert(irc_func_dict, CMD_WALLCHOPS, cmd_dummy);
      dict_insert(irc_func_dict, TOK_WALLCHOPS, cmd_dummy);
-     /* TODO: parse the cmd_dummy lines here */
-     dict_insert(irc_func_dict, CMD_VERSION, cmd_dummy);
-     dict_insert(irc_func_dict, TOK_VERSION, cmd_dummy);
-     dict_insert(irc_func_dict, CMD_ADMIN, cmd_dummy);
-     dict_insert(irc_func_dict, TOK_ADMIN, cmd_dummy);
      /* handle topics */
      dict_insert(irc_func_dict, "331", cmd_num_topic);
--- 1366,1369 ----