srvx-commits

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

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27198/src

Modified Files:
	hash.c proto-bahamut.c proto-common.c proto-p10.c 
Log Message:
make dead_list a protocol-private thing
add missing newline to "Undernet-style SERVER" log message
ignore WALLOPS in ircu


Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -r1.168 -r1.169
*** hash.c	15 Dec 2002 18:41:25 -0000	1.168
--- hash.c	2 Jan 2003 23:11:34 -0000	1.169
***************
*** 1,4 ****
  /* hash.c - IRC network state database
!  * Copyright 2000-2002 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* hash.c - IRC network state database
!  * Copyright 2000-2003 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 910,915 ****
  hash_cleanup(void)
  {
-     unsigned int nn;
- 
      DelServer(self, 0, NULL);
      dict_delete(channels);
--- 910,913 ----
***************
*** 928,933 ****
      if (kf_list) free(kf_list);
      if (tf_list) free(tf_list);
- 
-     for (nn=0; nn<dead_users.used; nn++) free(dead_users.list[nn]);
-     userList_clean(&dead_users);
  }
--- 926,928 ----

Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** proto-bahamut.c	14 Nov 2002 02:22:36 -0000	1.28
--- proto-bahamut.c	2 Jan 2003 23:11:34 -0000	1.29
***************
*** 1,4 ****
  /* proto-bahamut.c - IRC protocol output
!  * Copyright 2000-2002 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* proto-bahamut.c - IRC protocol output
!  * Copyright 2000-2003 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 912,917 ****
--- 912,920 ----
  
  void parse_cleanup(void) {
+     unsigned int nn;
      if (of_list) free(of_list);
      dict_delete(irc_func_dict);
+     for (nn=0; nn<dead_users.used; nn++) free(dead_users.list[nn]);
+     userList_clean(&dead_users);
  }
  

Index: proto-common.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-common.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** proto-common.c	17 Dec 2002 19:49:13 -0000	1.24
--- proto-common.c	2 Jan 2003 23:11:34 -0000	1.25
***************
*** 1,4 ****
  /* proto.c - common IRC protocol parsing/sending support
!  * Copyright 2000-2002 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* proto.c - common IRC protocol parsing/sending support
!  * Copyright 2000-2003 srvx Development Team
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 32,36 ****
  unsigned int lines_processed;
  FILE *replay_file;
- struct userList dead_users;
  struct io_fd *socket_io_fd;
  int force_n2k;
--- 32,35 ----
***************
*** 42,45 ****
--- 41,45 ----
  static int replay_connected;
  static unsigned int nicklen = NICKLEN; /* how long do we think servers allow nicks to be? */
+ static struct userList dead_users;
  
  extern struct cManagerNode cManager;

Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** proto-p10.c	2 Jan 2003 21:38:49 -0000	1.52
--- proto-p10.c	2 Jan 2003 23:11:34 -0000	1.53
***************
*** 748,752 ****
          srv->burst = 1;
          if ((argv[7][0] == '+') && !force_n2k) {
!             log(MAIN_LOG, LOG_WARNING, "Got Undernet-style SERVER message but \"force_n2k\" not on.");
          }
          send_burst();
--- 748,752 ----
          srv->burst = 1;
          if ((argv[7][0] == '+') && !force_n2k) {
!             log(MAIN_LOG, LOG_WARNING, "Got Undernet-style SERVER message but \"force_n2k\" not on.\n");
          }
          send_burst();
***************
*** 1238,1245 ****
      if (argc < 2) return 0;
      user = GetUserH(origin);
!     if(!user) {
!         /* A KILL, QUIT, etc. probably crossed PART. */
!         return 0;
!     }
      parse_foreach(argv[1], part_helper, NULL, NULL, NULL, user);
      return 1;
--- 1238,1242 ----
      if (argc < 2) return 0;
      user = GetUserH(origin);
!     if (!user) return 0;
      parse_foreach(argv[1], part_helper, NULL, NULL, NULL, user);
      return 1;
***************
*** 1300,1311 ****
  static CMD_FUNC(cmd_away)
  {
!     struct userNode *uNode = GetUserH(origin);
!     (void)argv;
  
!     if (!uNode) {
!         /* mumble...cross... */
!         return 0;
!     }
!     
      if (argc < 2) {
          uNode->modes &= ~FLAGS_AWAY;
--- 1297,1305 ----
  static CMD_FUNC(cmd_away)
  {
!     struct userNode *uNode;
  
!     (void)argv;
!     uNode = GetUserH(origin);
!     if (!uNode) return 1;
      if (argc < 2) {
          uNode->modes &= ~FLAGS_AWAY;
***************
*** 1347,1350 ****
--- 1341,1345 ----
  parse_cleanup(void)
  {
+     unsigned int nn;
      if (of_list) free(of_list);
      free(privmsg_funcs);
***************
*** 1352,1355 ****
--- 1347,1352 ----
      free(mcf_list);
      dict_delete(irc_func_dict);
+     for (nn=0; nn<dead_users.used; nn++) free(dead_users.list[nn]);
+     userList_clean(&dead_users);
  }
  
***************
*** 1474,1477 ****
--- 1471,1477 ----
      dict_insert(irc_func_dict, CMD_WALLCHOPS, cmd_dummy);
      dict_insert(irc_func_dict, TOK_WALLCHOPS, cmd_dummy);
+     /* Ignore opers being silly. */
+     dict_insert(irc_func_dict, CMD_WALLOPS, cmd_dummy);
+     dict_insert(irc_func_dict, TOK_WALLOPS, cmd_dummy);
      /* handle topics */
      dict_insert(irc_func_dict, "331", cmd_num_topic);