Thread: [srvx-commits] CVS: services/src chanserv.c,1.281,1.282 helpserv.c,1.33,1.34 helpserv.help,1.9,1.10

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	chanserv.c helpserv.c helpserv.help opserv.c 
Log Message:
cleanups (helpserv) and ?rehash memory leak fixes (chanserv, opserv)

Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -C2 -r1.281 -r1.282
*** chanserv.c	9 Sep 2002 19:13:50 -0000	1.281
--- chanserv.c	11 Sep 2002 01:50:04 -0000	1.282
***************
*** 445,450 ****
      unsigned char       trigger_char;

!     char                *ctcp_short_ban_duration;
!     char                *ctcp_long_ban_duration;
  } chanserv_conf;

--- 445,450 ----
      unsigned char       trigger_char;

!     const char          *ctcp_short_ban_duration;
!     const char          *ctcp_long_ban_duration;
  } chanserv_conf;

***************
*** 703,711 ****
      case 't':
          eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
!         argv[argc++] = chanserv_conf.ctcp_short_ban_duration;
          break;
      case 'T':
          eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
!         argv[argc++] = chanserv_conf.ctcp_long_ban_duration;
          break;
      }
--- 703,711 ----
      case 't':
          eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
!         argv[argc++] = (unsigned char*)chanserv_conf.ctcp_short_ban_duration;
          break;
      case 'T':
          eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
!         argv[argc++] = (unsigned char*)chanserv_conf.ctcp_long_ban_duration;
          break;
      }
***************
*** 6276,6284 ****
      chanserv_conf.refresh_period = str ? ParseInterval(str) : 3*60*60;
      str = database_get_data(conf_node, KEY_CTCP_SHORT_BAN_DURATION, RECDB_QSTRING);
!     chanserv_conf.ctcp_short_ban_duration = str ? strdup(str) : strdup("3m");
      str = database_get_data(conf_node, KEY_CTCP_LONG_BAN_DURATION, RECDB_QSTRING);
!     chanserv_conf.ctcp_long_ban_duration = str ? strdup(str) : strdup("1h");
      str = database_get_data(conf_node, KEY_MAX_OWNED, RECDB_QSTRING);
      chanserv_conf.max_owned = str ? atoi(str) : 5;
      strlist = database_get_data(conf_node, KEY_8BALL_RESPONSES, RECDB_STRING_LIST);
      if(strlist) {
--- 6276,6285 ----
      chanserv_conf.refresh_period = str ? ParseInterval(str) : 3*60*60;
      str = database_get_data(conf_node, KEY_CTCP_SHORT_BAN_DURATION, RECDB_QSTRING);
!     chanserv_conf.ctcp_short_ban_duration = str ? str : "3m";
      str = database_get_data(conf_node, KEY_CTCP_LONG_BAN_DURATION, RECDB_QSTRING);
!     chanserv_conf.ctcp_long_ban_duration = str ? str : "1h";
      str = database_get_data(conf_node, KEY_MAX_OWNED, RECDB_QSTRING);
      chanserv_conf.max_owned = str ? atoi(str) : 5;
+     free_string_list(chanserv_conf.eightball);
      strlist = database_get_data(conf_node, KEY_8BALL_RESPONSES, RECDB_STRING_LIST);
      if(strlist) {
***************
*** 6878,6883 ****
      dict_delete(mask_dnrs);
      dict_delete(note_types);
-     free(chanserv_conf.ctcp_short_ban_duration);
-     free(chanserv_conf.ctcp_long_ban_duration);
      if(chanserv_conf.eightball) free_string_list(chanserv_conf.eightball);
  }
--- 6879,6882 ----

Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** helpserv.c	5 Sep 2002 23:22:27 -0000	1.33
--- helpserv.c	11 Sep 2002 01:50:06 -0000	1.34
***************
*** 342,346 ****

  static const char *persistence_type_names[] = {
!     "RequestPersist",
      "HelperPersist",
      NULL
--- 342,346 ----

  static const char *persistence_type_names[] = {
!     "ReqPersist",
      "HelperPersist",
      NULL

Index: helpserv.help
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.help,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** helpserv.help	5 Sep 2002 23:22:27 -0000	1.9
--- helpserv.help	11 Sep 2002 01:50:07 -0000	1.10
***************
*** 12,15 ****
--- 12,16 ----
          "  CLOSE       Close out a request",
          "  SHOW        Show detailed information on a request",
+         "  ADDNOTE     Add a note to a request",
          "  PAGE        Try to wake up other helpers",
          "  STATS       Get statistics on time and requests handled",

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -r1.272 -r1.273
*** opserv.c	7 Sep 2002 03:22:12 -0000	1.272
--- opserv.c	11 Sep 2002 01:50:07 -0000	1.273
***************
*** 3838,3847 ****
      opserv_conf.block_gline_duration = str ? ParseInterval(str) : 3600;

!     opserv_conf.join_policer_params = policer_params_new();
      if ((child = database_get_data(conf_node, KEY_JOIN_POLICER, RECDB_OBJECT))) {
  	dict_foreach(child, set_policer_param, opserv_conf.join_policer_params);
-     } else {
- 	policer_params_set(opserv_conf.join_policer_params, "size", "20");
- 	policer_params_set(opserv_conf.join_policer_params, "drain-rate", "1");
      }

--- 3838,3848 ----
      opserv_conf.block_gline_duration = str ? ParseInterval(str) : 3600;

!     if (!opserv_conf.join_policer_params) {
!         opserv_conf.join_policer_params = policer_params_new();
!     }
!     policer_params_set(opserv_conf.join_policer_params, "size", "20");
!     policer_params_set(opserv_conf.join_policer_params, "drain-rate", "1");
      if ((child = database_get_data(conf_node, KEY_JOIN_POLICER, RECDB_OBJECT))) {
  	dict_foreach(child, set_policer_param, opserv_conf.join_policer_params);
      }

***************
*** 3853,3864 ****
      }

!     pp = policer_params_new();
      if ((child = database_get_data(conf_node, KEY_NEW_USER_POLICER, RECDB_OBJECT))) {
  	dict_foreach(child, set_policer_param, pp);
-     } else {
- 	policer_params_set(pp, "size", "200");
- 	policer_params_set(pp, "drain-rate", "3");
      }
-     opserv_conf.new_user_policer = policer_new(pp, now);
  }

--- 3854,3868 ----
      }

!     if (opserv_conf.new_user_policer) {
!         pp = policer_get_params(opserv_conf.new_user_policer);
!     } else {
!         pp = policer_params_new();
!         opserv_conf.new_user_policer = policer_new(pp, now);
!     }
!     policer_params_set(pp, "size", "200");
!     policer_params_set(pp, "drain-rate", "3");
      if ((child = database_get_data(conf_node, KEY_NEW_USER_POLICER, RECDB_OBJECT))) {
  	dict_foreach(child, set_policer_param, pp);
      }
  }