solidircd-cvs Mailing List for Solid IRCd (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26449/include

Modified Files:
	memcount.h 
Log Message:
update.

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16555/include

Modified Files:
	config.h 
Log Message:
configuration update and documentation update.

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.h	9 Jul 2005 01:22:49 -0000	1.6
--- config.h	9 Jul 2005 01:50:41 -0000	1.7
***************
*** 159,163 ****

! #define STRICT_HOSTMASK

--- 159,163 ----

! #undef STRICT_HOSTMASK

Update of /cvsroot/solidircd/solidircd-stable/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16555/doc

Modified Files:
	template.conf 
Log Message:
configuration update and documentation update.

Index: template.conf
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/doc/template.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** template.conf	9 Jul 2005 01:22:49 -0000	1.2
--- template.conf	9 Jul 2005 01:50:41 -0000	1.3
***************
*** 99,102 ****
--- 99,103 ----
     auto_umode_R;                                     # Only registered users can query other users.
     auto_umode_v;                                     # Will automaticly set the hostmaskin mode for users.
+    bot_class        bot;                             # ircbot class

***************
*** 327,331 ****
   /* connection class for  bots */
  class {
!     name        bot_class;    # Class name
      maxusers    100;        # Maximum connections
      pingfreq    90;         # Check idle connections every N seconds
--- 328,332 ----
   /* connection class for  bots */
  class {
!     name        bot;    # Class name
      maxusers    100;        # Maximum connections
      pingfreq    90;         # Check idle connections every N seconds
***************
*** 336,340 ****
  allow {
      host    *@atte.netsplit.de;     # Allows this host to get our channel list
!     class   bot_class;                 # This is the class used for bots.
  };

--- 337,341 ----
  allow {
      host    *@atte.netsplit.de;     # Allows this host to get our channel list
!     class   bot;                 # This is the class used for bots.
  };

***************
*** 342,346 ****
  allow {
      host    *@data.searchirc.org;     # Allows this host to get our channel list
!     class   bot_class;                 # This is the class used for bots.
  };

--- 343,347 ----
  allow {
      host    *@data.searchirc.org;     # Allows this host to get our channel list
!     class   bot;                 # This is the class used for bots.
  };

Update of /cvsroot/solidircd/solidircd-stable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16555

Modified Files:
	CHANGES README 
Log Message:
configuration update and documentation update.

Index: README
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	5 Jul 2005 02:47:28 -0000	1.2
--- README	9 Jul 2005 01:50:41 -0000	1.3
***************
*** 9,16 ****
  -------------------------

! Features
  -------------------------

! need to put here things we added, that stock bahamut doesn't have -Sheik

--- 9,43 ----
  -------------------------

! Features that stock bahamut dosen't have that we added.
  -------------------------
+ * Client side SSL support.
+ * OpenSSL encryption for server<->server connections
+ * Clients and Operators host masking support.
+ * WHATMODES reports what user mode a client currently has on /WHOIS
+ * MAP shows a graphic map of all servers connected
+ * +H will hide the IRC operator oper status of an operator, when normal clients perform a /WHOIS on a operator with +H set.
+ * +C allows the operator to receive Global Connections/Exits.
+ * SHUN this will freeze a user for the certain amount of time seconds.
+ * AUTO UMODE R this feature will allow you to automatically set +R on connecting users, so that unregistered users will not be able to privmsg them,
+ this prevents privmsg spams.
+ * Anope HostServ Support & vident support.
+ * +D Channel mode that prevents unresolved clients from joining a channel.  Only Resolved Clients can set this mode & Opers.
+ *+S Channel mode, allows only Secure Connection to enter the channel. Only SSL Clients can set this mode & Opers.
+ * HalfOps Support.
+ * +N Channel mode that prevent users from changing their nickname.
+ * /WHOIS Notification notice merged with +y (spy notices)
+ * STRICT LIST (can be disabled.) only allows registered users and ircops do /list, unregistered users are noticed about this restriction and 
+ are told to use /qlist instead, theres also a special bot_class to use for exception for search bots such as netsplit.de & searchirc.com.
+ * IRCOP LIST this feature will list all available ircops on the server, if they have +H set they will not be shown on the list. /IRCOPS
+ * +c blocks all control codes
+ * Option to disable DCCALLOW
+ * STATS P this feature allows the opers to see what ports (also shows ssl ports if any) are available on the server this can be made accessible for users.
+ * bsd jail support. 

+ -----------------
+ Recommendations
+ -----------------

! This is a our first  stable release  it is different than solid3.4.6 so please review template.conf and include/config.h  carefully alot
! of things have changed.

Index: CHANGES
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES	5 Jul 2005 02:47:28 -0000	1.4
--- CHANGES	9 Jul 2005 01:50:41 -0000	1.5
***************
*** 30,39 ****
  4/7/2005   - removed rquit the code needs to be reviewed and will be delayed for 3.4.8
  4/7/2005   - rework memory accounting,add MEMTRACE for debugging, minor memroy leak fix.
- 26/06/2005 - Added Channel mode +E this mode will block notices from users.
  26/06/2005 - Fixed a bug were users real host would show on watch when they connected.
  30/05/2005 - Fixed some typos in s_user.c
  30/05/2005 - Added Deaf Mode, This mode will prevent user with said mode from receiving channel messages.   
      This mode can be applied by the user or an oper. It can decrese bandwidth usage.
- 22/05/2005 - Added new oper mode +W this mode will hide what channels the oper is in, useful for does who don't like to be stalked.
  21/05/2005 -  Applied  a hostmask tweak from Crako thnx.
  21/05/2005 - Fixed a minor bug, when user was kicked, it would show on their whois that they were still there. thanks to Crako for reporting this.
--- 30,37 ----

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2402/src

Modified Files:
	channel.c memcount.c modules.c s_conf.c s_user.c struct.c 
	whowas.c 
Log Message:
counter fix error.

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** channel.c	5 Jul 2005 21:53:41 -0000	1.5
--- channel.c	9 Jul 2005 01:22:50 -0000	1.6
***************
*** 5141,5144 ****
--- 5141,5147 ----
      chanMember  *cm;

+ #ifdef FLUD
+     struct fludbot *fb;
+ #endif
      mc->file = __FILE__;

***************
*** 5174,5177 ****
--- 5177,5184 ----
          for (cm = chptr->members; cm; cm = cm->next)
              mc->e_chanmembers++;
+ #ifdef FLUD
+         for (fb = chptr->fluders; fb; fb = fb->next)
+             mc->e_fludbots++;
+ #endif

          mc->e_inv_links += mc_links(chptr->invites);

Index: modules.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/modules.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** modules.c	5 Jul 2005 21:53:41 -0000	1.4
--- modules.c	9 Jul 2005 01:22:50 -0000	1.5
***************
*** 875,879 ****
  {
  #ifdef USE_HOOKMODULES
!     int    c;
  #endif

--- 875,881 ----
  {
  #ifdef USE_HOOKMODULES
!     int      c;
!     DLink   *dl;
!     aModule *m;
  #endif

***************
*** 881,888 ****

  #ifdef USE_HOOKMODULES
!     c = mc_dlinks(module_list);
!     mc->modules.c = c;
!     mc->modules.m = c * sizeof(aModule);
!     mc->e_dlinks += c;

      c = mc_dlinks(all_hooks);
--- 883,899 ----

  #ifdef USE_HOOKMODULES
!     for (dl = module_list; dl; dl = dl->next)
!     {
!         mc->e_dlinks++;
!         m = (aModule *)dl->value.cp;
!         mc->modules.c++;
!         mc->modules.m += sizeof(*m);
!         if (m->name)
!             mc->modules.m += strlen(m->name) + 1;
!         if (m->version)
!             mc->modules.m += strlen(m->version) + 1;
!         if (m->description)
!             mc->modules.m += strlen(m->description) + 1;
!     }

      c = mc_dlinks(all_hooks);
***************
*** 911,912 ****
--- 922,924 ----
  #endif
  }
+ 

Index: s_conf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** s_conf.c	5 Jul 2005 21:53:42 -0000	1.5
--- s_conf.c	9 Jul 2005 01:22:50 -0000	1.6
***************
*** 2486,2497 ****
          mc->allows.c++;
          mc->allows.m += sizeof(*allow);
!         if (allows->ipmask)
!             mc->allows.m += strlen(allows->ipmask) + 1;
!         if (allows->passwd)
!             mc->allows.m += strlen(allows->passwd) + 1;
!         if (allows->hostmask)
!             mc->allows.m += strlen(allows->hostmask) + 1;
!         if (allows->class_name)
!             mc->allows.m += strlen(allows->class_name) + 1;
      }
      mc->total.c += mc->allows.c;
--- 2486,2497 ----
          mc->allows.c++;
          mc->allows.m += sizeof(*allow);
!         if (allow->ipmask)
!             mc->allows.m += strlen(allow->ipmask) + 1;
!         if (allow->passwd)
!             mc->allows.m += strlen(allow->passwd) + 1;
!         if (allow->hostmask)
!             mc->allows.m += strlen(allow->hostmask) + 1;
!         if (allow->class_name)
!             mc->allows.m += strlen(allow->class_name) + 1;
      }
      mc->total.c += mc->allows.c;

Index: whowas.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/whowas.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** whowas.c	5 Jul 2005 03:17:54 -0000	1.3
--- whowas.c	9 Jul 2005 01:22:50 -0000	1.4
***************
*** 239,241 ****

      return 0;
! }
\ No newline at end of file
--- 239,241 ----

      return 0;
! }

Index: memcount.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/memcount.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** memcount.c	5 Jul 2005 03:17:53 -0000	1.2
--- memcount.c	9 Jul 2005 01:22:50 -0000	1.3
***************
*** 340,348 ****
                     mc_s_user.e_channel_links * mcbh_links.objsize);
      subtotal += mc_s_user.e_channel_links * mcbh_links.objsize;
-     if (detail && mc_s_user.e_watch_links)
-         sendto_one(cptr, "%s    watch links: %d (%lu bytes)", pfxbuf,
-                    mc_s_user.e_watch_links,
-                    mc_s_user.e_watch_links * mcbh_links.objsize);
-     subtotal += mc_s_user.e_watch_links * mcbh_links.objsize;
      if (detail && mc_s_user.e_invite_links)
          sendto_one(cptr, "%s    invite links: %d (%lu bytes)", pfxbuf,
--- 340,343 ----
***************
*** 360,363 ****
--- 355,367 ----
                     mc_s_user.e_dccallow_links * mcbh_links.objsize);
      subtotal += mc_s_user.e_dccallow_links * mcbh_links.objsize;
+     if (detail && mc_s_user.e_watch_links)
+         sendto_one(cptr, "%s    client-watch links: %d (%lu bytes)", pfxbuf,
+                    mc_s_user.e_watch_links,
+                    mc_s_user.e_watch_links * mcbh_links.objsize);
+     subtotal += mc_s_user.e_watch_links * mcbh_links.objsize;
+     if (detail && mc_hash.e_links)
+         sendto_one(cptr, "%s    watch-client links: %d (%lu bytes)", pfxbuf,
+                    mc_hash.e_links, mc_hash.e_links * mcbh_links.objsize);
+     subtotal += mc_hash.e_links * mcbh_links.objsize;
      if (detail && mc_clientlist.e_oper_dlinks)
          sendto_one(cptr, "%s    operlist dlinks: %d (%lu bytes)", pfxbuf,
***************
*** 385,392 ****
  #endif
      mcbh_links.knownobjs += mc_s_user.e_channel_links;
-     mcbh_links.knownobjs += mc_s_user.e_watch_links;
      mcbh_links.knownobjs += mc_s_user.e_invite_links;
      mcbh_links.knownobjs += mc_s_user.e_silence_links;
      mcbh_links.knownobjs += mc_s_user.e_dccallow_links;
      mcbh_dlinks.knownobjs += mc_clientlist.e_oper_dlinks;
      mcbh_dlinks.knownobjs += mc_clientlist.e_recvq_dlinks;
--- 389,397 ----
  #endif
      mcbh_links.knownobjs += mc_s_user.e_channel_links;
      mcbh_links.knownobjs += mc_s_user.e_invite_links;
      mcbh_links.knownobjs += mc_s_user.e_silence_links;
      mcbh_links.knownobjs += mc_s_user.e_dccallow_links;
+     mcbh_links.knownobjs += mc_s_user.e_watch_links;
+     mcbh_links.knownobjs += mc_hash.e_links;
      mcbh_dlinks.knownobjs += mc_clientlist.e_oper_dlinks;
      mcbh_dlinks.knownobjs += mc_clientlist.e_recvq_dlinks;
***************
*** 476,479 ****
--- 481,491 ----
                     mc_channel.e_chanmembers * mcbh_chanmembers.objsize);
      subtotal += mc_channel.e_chanmembers * mcbh_chanmembers.objsize;
+ #ifdef FLUD
+     if (detail && mc_channel.e_fludbots)
+         sendto_one(cptr, "%s    fludbots: %d (%lu bytes)", pfxbuf,
+                    mc_channel.e_fludbots,
+                    mc_channel.e_fludbots * mcbh_fludbots.objsize);
+     subtotal += mc_channel.e_fludbots * mcbh_fludbots.objsize;
+ #endif
      if (detail && mc_channel.e_inv_links)
          sendto_one(cptr, "%s    invite links: %d (%lu bytes)", pfxbuf,
***************
*** 500,503 ****
--- 512,518 ----
      mcbh_channels.knownobjs += mc_channel.e_channels;
      mcbh_chanmembers.knownobjs += mc_channel.e_chanmembers;
+ #ifdef FLUD
+     mcbh_fludbots.knownobjs += mc_channel.e_fludbots;
+ #endif
      mcbh_links.knownobjs += mc_channel.e_inv_links;
      mcbh_links.knownobjs += mc_channel.e_lopt_links;
***************
*** 1067,1071 ****
      {
          sendto_one(cptr, "%sUNREPORTED: %ld bytes", pfxbuf,
!                    use_total - rep_total);
      }

--- 1082,1086 ----
      {
          sendto_one(cptr, "%sUNREPORTED: %ld bytes", pfxbuf,
!                    alloc_total - rep_total);
      }

***************
*** 1425,1426 ****
--- 1440,1442 ----
                 (u_int) sbrk((size_t) 0) - (u_int) sbrk0);    
  }
+ 

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** s_user.c	5 Jul 2005 21:53:42 -0000	1.8
--- s_user.c	9 Jul 2005 01:22:50 -0000	1.9
***************
*** 4309,4320 ****
                  mc->e_silence_links++;
              }
!             for (lp = acptr->user->channel; lp; lp = lp->next)
!                 mc->e_channel_links++;
!             for (lp = acptr->user->invited; lp; lp = lp->next)
!                 mc->e_invite_links++;
  #ifdef DCCALLOW
!             for (lp = acptr->user->dccallow; lp; lp = lp->next)
!                 mc->e_dccallow_links++;
  #endif
  #if (RIDICULOUS_PARANOIA_LEVEL>=1)
              if (acptr->user->real_oper_host)
--- 4309,4318 ----
                  mc->e_silence_links++;
              }
!             mc->e_channel_links += mc_links(acptr->user->channel);
!             mc->e_invite_links += mc_links(acptr->user->invited);
  #ifdef DCCALLOW
!             mc->e_dccallow_links += mc_links(acptr->user->dccallow);
  #endif
+ 
  #if (RIDICULOUS_PARANOIA_LEVEL>=1)
              if (acptr->user->real_oper_host)
***************
*** 4345,4354 ****
          }

!         for (lp = acptr->watch; lp; lp = lp->next)
!             mc->e_watch_links++;

  #ifdef FLUD
!         for (lp = acptr->fludees; lp; lp = lp->next)
!             mc->e_flud_links++;

          if (acptr->from == acptr)   /* local client */
--- 4343,4350 ----
          }

!         mc->e_watch_links += mc_links(acptr->watch);

  #ifdef FLUD
!         mc->e_flud_links += mc_links(acptr->fludees);

          if (acptr->from == acptr)   /* local client */

Index: struct.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/struct.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** struct.c	5 Jul 2005 03:17:54 -0000	1.2
--- struct.c	9 Jul 2005 01:22:50 -0000	1.3
***************
*** 494,496 ****
  {
      return chptr->join_count;
! }
\ No newline at end of file
--- 494,496 ----
  {
      return chptr->join_count;
! }

Update of /cvsroot/solidircd/solidircd-stable/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2402/doc

Modified Files:
	reference.conf template.conf 
Log Message:
counter fix error.

Index: template.conf
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/doc/template.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** template.conf	27 Jun 2005 03:02:57 -0000	1.1.1.1
--- template.conf	9 Jul 2005 01:22:49 -0000	1.2
***************
*** 327,331 ****
   /* connection class for  bots */
  class {
!     name        bots;    # Class name
      maxusers    100;        # Maximum connections
      pingfreq    90;         # Check idle connections every N seconds
--- 327,331 ----
   /* connection class for  bots */
  class {
!     name        bot_class;    # Class name
      maxusers    100;        # Maximum connections
      pingfreq    90;         # Check idle connections every N seconds
***************
*** 336,340 ****
  allow {
      host    *@atte.netsplit.de;     # Allows this host to get our channel list
!     class   bots;                 # This is the class used for bots.
  };

--- 336,340 ----
  allow {
      host    *@atte.netsplit.de;     # Allows this host to get our channel list
!     class   bot_class;                 # This is the class used for bots.
  };

***************
*** 342,346 ****
  allow {
      host    *@data.searchirc.org;     # Allows this host to get our channel list
!     class   bots;                 # This is the class used for bots.
  };

--- 342,346 ----
  allow {
      host    *@data.searchirc.org;     # Allows this host to get our channel list
!     class   bot_class;                 # This is the class used for bots.
  };

Index: reference.conf
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/doc/reference.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** reference.conf	27 Jun 2005 03:03:00 -0000	1.1.1.1
--- reference.conf	9 Jul 2005 01:22:49 -0000	1.2
***************
*** 1,323 ****
  /*
!  * Bahamut IRCd, doc/reference.conf
!  *
!  * Originally written by Trevor Talbot (Quension) in April 2004.
!  * $Id$
   * 
!  * The configuration format consists of blocks, each containing name-value
!  * pairs, tags, or string data.  It is designed to be easily readable by
!  * both human and ircd.
   * 
[...1449 lines suppressed...]
!  * However, be aware that traffic between public servers on a network is exchanged over plain, open unencrypted lines. 
!  * This means that if you want to be sure that your communication is secure, you and the person with whom you want to 
!  * communicate securely should both connect to the same SSL-capable server, and communicate via a query window. 
!  * If talking on a channel, be aware that everyone on the channel must be on a secure connection. 
!  * If one person on the channel is not on a secure connection, your communications on that channel will not be secure.
!  *
!  * To create your SSL certificate run the /makecert.sh  file in ircd/ssl/.
!  */
!  
! 
! 
! /* uncomment this  if ssl is enable.
!  * ssl {
!  *   certificate "ssl/vgc.pem";    # Server Certificate
!  *   keyfile  "ssl/vgckey.pem";    # Keys for the server
!  *   allow_umodez;                 # Allow SSL users to change UMODE_z
!  * };
!  *
!  */
\ No newline at end of file

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2402/include

Modified Files:
	config.h memcount.h 
Log Message:
counter fix error.

Index: memcount.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/memcount.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** memcount.h	5 Jul 2005 03:17:53 -0000	1.2
--- memcount.h	9 Jul 2005 01:22:49 -0000	1.3
***************
*** 103,106 ****
--- 103,109 ----
      int e_lopt_links;
      int e_dlinks;
+ #ifdef FLUD
+     int e_fludbots;
+ #endif
  } MCchannel;

***************
*** 497,499 ****
--- 500,504 ----
  u_long memcount_whowas(MCwhowas *);
  u_long memcount_zlink(MCzlink *);
+ 
+ 
  #endif  /* MEMCOUNT_H */

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.h	5 Jul 2005 02:40:01 -0000	1.5
--- config.h	9 Jul 2005 01:22:49 -0000	1.6
***************
*** 225,229 ****
   * Enable this at your own risk currently elmer is  not working but silly works. - Sheik 1/7/2005
   */
! #define TOYS

  /* File names
--- 225,229 ----
   * Enable this at your own risk currently elmer is  not working but silly works. - Sheik 1/7/2005
   */
! #undef TOYS

  /* File names
***************
*** 374,378 ****
   * remove flood control for opers
   */
! #define NO_OPER_FLOOD

--- 374,378 ----
   * remove flood control for opers
   */
! #undef NO_OPER_FLOOD

***************
*** 384,388 ****
   * a small net it might be an advantage to undefine it.
   */
! #undef	SHOW_INVISIBLE_LUSERS

  /*
--- 384,388 ----
   * a small net it might be an advantage to undefine it.
   */
! #define	SHOW_INVISIBLE_LUSERS

  /*
***************
*** 926,930 ****
  /* Debugging configs */

! #undef DNS_DEBUG

  /*
--- 926,930 ----
  /* Debugging configs */

! #define DNS_DEBUG

  /*

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20559/src

Modified Files:
	channel.c dh.c hide.c ircd.c list.c m_services.c modules.c 
	parse.c s_bsd.c s_conf.c s_misc.c s_serv.c s_user.c send.c 
	support.c throttle.c userban.c 
Log Message:
clean up.

Index: dh.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/dh.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dh.c	5 Jul 2005 03:17:53 -0000	1.3
--- dh.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 359,361 ****

      return 0;
! }
\ No newline at end of file
--- 359,361 ----

      return 0;
! }

Index: modules.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/modules.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modules.c	5 Jul 2005 03:17:53 -0000	1.3
--- modules.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 910,912 ****
      return 0;
  #endif
! }
\ No newline at end of file
--- 910,912 ----
      return 0;
  #endif
! }

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** channel.c	5 Jul 2005 03:17:53 -0000	1.4
--- channel.c	5 Jul 2005 21:53:41 -0000	1.5
***************
*** 5218,5220 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 5218,5220 ----

      return mc->total.m;
! }

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** s_misc.c	5 Jul 2005 03:17:53 -0000	1.5
--- s_misc.c	5 Jul 2005 21:53:42 -0000	1.6
***************
*** 873,875 ****

     return pbuf;
! }
\ No newline at end of file
--- 873,875 ----

     return pbuf;
! }

Index: s_conf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_conf.c	5 Jul 2005 03:17:53 -0000	1.4
--- s_conf.c	5 Jul 2005 21:53:42 -0000	1.5
***************
*** 2581,2583 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 2581,2583 ----

      return mc->total.m;
! }

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** s_user.c	5 Jul 2005 03:17:53 -0000	1.7
--- s_user.c	5 Jul 2005 21:53:42 -0000	1.8
***************
*** 4366,4368 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 4366,4368 ----

      return mc->total.m;
! }

Index: parse.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/parse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** parse.c	5 Jul 2005 03:17:53 -0000	1.3
--- parse.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 653,655 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 653,655 ----

      return mc->total.m;
! }

Index: hide.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/hide.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hide.c	5 Jul 2005 03:17:53 -0000	1.3
--- hide.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 366,368 ****

      return mc->fakelinks.m;
! }
\ No newline at end of file
--- 366,368 ----

      return mc->fakelinks.m;
! }

Index: list.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** list.c	5 Jul 2005 03:17:53 -0000	1.3
--- list.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 619,621 ****

      return 0;
! }
\ No newline at end of file
--- 619,621 ----

      return 0;
! }

Index: s_serv.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_serv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** s_serv.c	5 Jul 2005 03:17:53 -0000	1.3
--- s_serv.c	5 Jul 2005 21:53:42 -0000	1.4
***************
*** 4174,4176 ****
  */
      return mc->total.m;
! }
\ No newline at end of file
--- 4174,4176 ----
  */
      return mc->total.m;
! }

Index: support.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/support.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** support.c	5 Jul 2005 03:17:54 -0000	1.3
--- support.c	5 Jul 2005 21:53:42 -0000	1.4
***************
*** 454,456 ****
  	*tail = '\0';
      }
! }
\ No newline at end of file
--- 454,456 ----
  	*tail = '\0';
      }
! }

Index: send.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/send.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** send.c	5 Jul 2005 03:17:54 -0000	1.3
--- send.c	5 Jul 2005 21:53:42 -0000	1.4
***************
*** 2066,2068 ****

      return 0;
! }
\ No newline at end of file
--- 2066,2068 ----

      return 0;
! }

Index: throttle.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/throttle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** throttle.c	5 Jul 2005 03:17:54 -0000	1.3
--- throttle.c	5 Jul 2005 21:53:42 -0000	1.4
***************
*** 632,634 ****
  }

! /* vi:set ts=8 sts=4 sw=4 tw=79: */
\ No newline at end of file
--- 632,634 ----
  }

! /* vi:set ts=8 sts=4 sw=4 tw=79: */

Index: userban.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/userban.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** userban.c	5 Jul 2005 03:17:54 -0000	1.3
--- userban.c	5 Jul 2005 21:53:42 -0000	1.4
***************
*** 1748,1750 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 1748,1750 ----

      return mc->total.m;
! }

Index: ircd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/ircd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ircd.c	5 Jul 2005 03:17:53 -0000	1.3
--- ircd.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 1353,1355 ****

      return 0;
! }
\ No newline at end of file
--- 1353,1355 ----

      return 0;
! }

Index: m_services.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_services.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** m_services.c	5 Jul 2005 03:17:53 -0000	1.3
--- m_services.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 574,576 ****

      return 0;
! }
\ No newline at end of file
--- 574,576 ----

      return 0;
! }

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_bsd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** s_bsd.c	5 Jul 2005 03:17:53 -0000	1.3
--- s_bsd.c	5 Jul 2005 21:53:41 -0000	1.4
***************
*** 2106,2108 ****

      return mc->total.m;
! }
\ No newline at end of file
--- 2106,2108 ----

      return mc->total.m;
! }

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21449/src

Modified Files:
	channel.c clientlist.c clones.c dh.c fds.c hash.c hide.c 
	ircd.c list.c m_server.c m_services.c m_stats.c memcount.c 
	modules.c parse.c probability.c rc4.c s_bsd.c s_conf.c 
	s_misc.c s_serv.c s_user.c sbuf.c scache.c send.c 
	socketengine_epoll.c struct.c support.c throttle.c userban.c 
	whowas.c zlink.c 
Log Message:
fixed userban.c, still need to go back and clean up some files to get rid of the new line error, not a big deal but it makes it look messy when compilin....

Index: m_services.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_services.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** m_services.c	5 Jul 2005 02:40:02 -0000	1.2
--- m_services.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 574,576 ****

      return 0;
! }
--- 574,576 ----

      return 0;
! }
\ No newline at end of file

Index: fds.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/fds.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fds.c	5 Jul 2005 02:40:01 -0000	1.2
--- fds.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 264,266 ****
      return 0;
  }
- 
--- 264,265 ----

Index: clientlist.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/clientlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** clientlist.c	5 Jul 2005 02:40:01 -0000	1.2
--- clientlist.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 86,88 ****
      return 0;
  }
- 
--- 86,87 ----

Index: socketengine_epoll.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/socketengine_epoll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** socketengine_epoll.c	5 Jul 2005 02:40:02 -0000	1.2
--- socketengine_epoll.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 190,192 ****
      return 0;
  }
- 
--- 190,191 ----

Index: whowas.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/whowas.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** whowas.c	5 Jul 2005 02:40:02 -0000	1.2
--- whowas.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 239,241 ****

      return 0;
! }
--- 239,241 ----

      return 0;
! }
\ No newline at end of file

Index: throttle.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/throttle.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** throttle.c	5 Jul 2005 02:40:02 -0000	1.2
--- throttle.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 632,634 ****
  }

! /* vi:set ts=8 sts=4 sw=4 tw=79: */
--- 632,634 ----
  }

! /* vi:set ts=8 sts=4 sw=4 tw=79: */
\ No newline at end of file

Index: dh.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/dh.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dh.c	5 Jul 2005 02:40:01 -0000	1.2
--- dh.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 359,362 ****

      return 0;
! }
! 
--- 359,361 ----

      return 0;
! }
\ No newline at end of file

Index: m_server.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_server.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** m_server.c	5 Jul 2005 02:40:02 -0000	1.2
--- m_server.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 900,902 ****
      return 0;
  }
- 
--- 900,901 ----

Index: hide.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/hide.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hide.c	5 Jul 2005 02:40:01 -0000	1.2
--- hide.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 366,369 ****

      return mc->fakelinks.m;
! }
! 
--- 366,368 ----

      return mc->fakelinks.m;
! }
\ No newline at end of file

Index: support.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/support.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** support.c	5 Jul 2005 02:40:02 -0000	1.2
--- support.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 454,456 ****
  	*tail = '\0';
      }
! }
--- 454,456 ----
  	*tail = '\0';
      }
! }
\ No newline at end of file

Index: sbuf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/sbuf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sbuf.c	5 Jul 2005 02:40:02 -0000	1.2
--- sbuf.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 563,565 ****
      return mc->total.m;
  }
- 
--- 563,564 ----

Index: parse.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/parse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** parse.c	5 Jul 2005 02:40:02 -0000	1.2
--- parse.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 653,655 ****

      return mc->total.m;
! }
--- 653,655 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: userban.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/userban.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** userban.c	5 Jul 2005 02:40:02 -0000	1.2
--- userban.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 471,475 ****
--- 471,477 ----
  {
     uBanEnt *bln;
+    aClient *acptr;
     struct userBan *ban;
+    int i;

     while(bl)
***************
*** 1746,1749 ****

      return mc->total.m;
! }
! 
--- 1748,1750 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: hash.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/hash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hash.c	5 Jul 2005 02:40:01 -0000	1.2
--- hash.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 673,675 ****
      return mc->total.m;
  }
- 
--- 673,674 ----

Index: zlink.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/zlink.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zlink.c	5 Jul 2005 02:40:02 -0000	1.2
--- zlink.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 293,295 ****
      return 0;
  }
- 
--- 293,294 ----

Index: struct.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/struct.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** struct.c	27 Jun 2005 03:02:16 -0000	1.1.1.1
--- struct.c	5 Jul 2005 03:17:54 -0000	1.2
***************
*** 494,496 ****
  {
      return chptr->join_count;
! }
--- 494,496 ----
  {
      return chptr->join_count;
! }
\ No newline at end of file

Index: ircd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/ircd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ircd.c	5 Jul 2005 02:40:02 -0000	1.2
--- ircd.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 1353,1355 ****

      return 0;
! }
--- 1353,1355 ----

      return 0;
! }
\ No newline at end of file

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** channel.c	5 Jul 2005 02:40:01 -0000	1.3
--- channel.c	5 Jul 2005 03:17:53 -0000	1.4
***************
*** 5218,5220 ****

      return mc->total.m;
! }
--- 5218,5220 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: modules.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/modules.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules.c	5 Jul 2005 02:40:02 -0000	1.2
--- modules.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 910,913 ****
      return 0;
  #endif
! }
! 
--- 910,912 ----
      return 0;
  #endif
! }
\ No newline at end of file

Index: s_conf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** s_conf.c	5 Jul 2005 02:40:02 -0000	1.3
--- s_conf.c	5 Jul 2005 03:17:53 -0000	1.4
***************
*** 2581,2583 ****

      return mc->total.m;
! }
--- 2581,2583 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** s_user.c	5 Jul 2005 02:40:02 -0000	1.6
--- s_user.c	5 Jul 2005 03:17:53 -0000	1.7
***************
*** 4366,4368 ****

      return mc->total.m;
! }
--- 4366,4368 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: rc4.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/rc4.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rc4.c	5 Jul 2005 02:40:02 -0000	1.2
--- rc4.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 140,142 ****
      return 0;
  }
- 
--- 140,141 ----

Index: list.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/list.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** list.c	5 Jul 2005 02:40:02 -0000	1.2
--- list.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 619,621 ****

      return 0;
! }
--- 619,621 ----

      return 0;
! }
\ No newline at end of file

Index: s_serv.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_serv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** s_serv.c	5 Jul 2005 02:40:02 -0000	1.2
--- s_serv.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 4174,4176 ****
  */
      return mc->total.m;
! }
--- 4174,4176 ----
  */
      return mc->total.m;
! }
\ No newline at end of file

Index: m_stats.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_stats.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** m_stats.c	5 Jul 2005 02:40:02 -0000	1.2
--- m_stats.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 990,992 ****
      return 0;
  }
- 
--- 990,991 ----

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_bsd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** s_bsd.c	5 Jul 2005 02:40:02 -0000	1.2
--- s_bsd.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 2106,2108 ****

      return mc->total.m;
! }
--- 2106,2108 ----

      return mc->total.m;
! }
\ No newline at end of file

Index: clones.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/clones.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** clones.c	5 Jul 2005 02:40:01 -0000	1.2
--- clones.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 425,427 ****
      return 0;
  }
- 
--- 425,426 ----

Index: memcount.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/memcount.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** memcount.c	5 Jul 2005 02:41:48 -0000	1.1
--- memcount.c	5 Jul 2005 03:17:53 -0000	1.2
***************
*** 1,1427 ****
! /*
!  *   memcount.c - Memory usage/accounting
!  *   Copyright (C) 2005 Trevor Talbot and
!  *                      the DALnet coding team
!  *
!  *   See file AUTHORS in IRC package for additional names of
!  *   the programmers.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
[...2824 lines suppressed...]
!     subtotal += tc_scache.management.m;
!     subtotal += tc_throttle.management.m;
!     subtotal += tc_userban.management.m;
!     subtotal += tc_zlink.management.m;
! #ifdef HAVE_ENCRYPTION_ON
!     subtotal += tc_dh.management.m;
!     subtotal += tc_rc4.management.m;
! #endif
!     subtotal += tc_unverified.management.m;
! 
!     sendto_one(cptr, "%sTraced %lu bytes (%ld leaked)", pfxbuf,
!                traced_total, traced_total - alloc_total);
!     sendto_one(cptr, "%sTracer overhead is %lu bytes", pfxbuf, subtotal);
! 
!     memtrace_reset();
! #endif  /* MEMTRACE */
! 
!     sendto_one(cptr, "%ssbrk(0)-etext: %u", pfxbuf,
!                (u_int) sbrk((size_t) 0) - (u_int) sbrk0);    
! }

Index: send.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/send.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** send.c	5 Jul 2005 02:40:02 -0000	1.2
--- send.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 2066,2069 ****

      return 0;
! }
! 
--- 2066,2068 ----

      return 0;
! }
\ No newline at end of file

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_misc.c	5 Jul 2005 02:40:02 -0000	1.4
--- s_misc.c	5 Jul 2005 03:17:53 -0000	1.5
***************
*** 873,875 ****

     return pbuf;
! }
--- 873,875 ----

     return pbuf;
! }
\ No newline at end of file

Index: scache.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/scache.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scache.c	5 Jul 2005 02:40:02 -0000	1.2
--- scache.c	5 Jul 2005 03:17:54 -0000	1.3
***************
*** 134,136 ****
      return mc->total.m;
  }
- 
--- 134,135 ----

Index: probability.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/probability.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** probability.c	5 Jul 2005 02:40:02 -0000	1.2
--- probability.c	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 499,501 ****

  #endif  /* RWHO_PROBABILITY */
- 
--- 499,500 ----

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21449/include

Modified Files:
	h.h memcount.h 
Log Message:
fixed userban.c, still need to go back and clean up some files to get rid of the new line error, not a big deal but it makes it look messy when compilin....

Index: memcount.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/memcount.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** memcount.h	5 Jul 2005 02:41:48 -0000	1.1
--- memcount.h	5 Jul 2005 03:17:53 -0000	1.2
***************
*** 1,501 ****
! #ifndef MEMCOUNT_H
! #define MEMCOUNT_H
! /*
!  *   memcount.h - Memory usage/accounting
!  *   Copyright (C) 2005 Trevor Talbot and
!  *                      the DALnet coding team
!  *
!  *   See file AUTHORS in IRC package for additional names of
!  *   the programmers.
!  *
[...971 lines suppressed...]
! u_long memcount_parse(MCparse *);
! #ifdef RWHO_PROBABILITY
! u_long memcount_probability(MCprobability *);
! #endif
! #ifdef HAVE_ENCRYPTION_ON
! u_long memcount_rc4(MCrc4 *);
! #endif
! u_long memcount_res(MCres *);
! u_long memcount_s_bsd(MCs_bsd *);
! u_long memcount_s_conf(MCs_conf *);
! u_long memcount_s_serv(MCs_serv *);
! u_long memcount_s_user(MCs_user *);
! u_long memcount_sbuf(MCsbuf *);
! u_long memcount_scache(MCscache *);
! u_long memcount_send(MCsend *);
! u_long memcount_throttle(MCthrottle *);
! u_long memcount_userban(MCuserban *);
! u_long memcount_whowas(MCwhowas *);
! u_long memcount_zlink(MCzlink *);
! #endif  /* MEMCOUNT_H */

Index: h.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/h.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** h.h	5 Jul 2005 02:40:01 -0000	1.2
--- h.h	5 Jul 2005 03:17:53 -0000	1.3
***************
*** 439,444 ****
  void get_probabilities(aClient *, int *, int *, int *);

- 
  #include "find.h"

! #endif  /* H_H */
\ No newline at end of file
--- 439,443 ----
  void get_probabilities(aClient *, int *, int *, int *);

  #include "find.h"

! #endif  /* H_H */

Update of /cvsroot/solidircd/solidircd-stable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085

Modified Files:
	CHANGES README 
Log Message:
update.

Index: README
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	27 Jun 2005 03:01:54 -0000	1.1.1.1
--- README	5 Jul 2005 02:47:28 -0000	1.2
***************
*** 1,4 ****
! Welcome to  soldi3.4.7(stable)
  ----------------------

- READ INSTALL!
\ No newline at end of file
--- 1,16 ----
! Introduction
  ----------------------
+ solid-ircd 3.4.7  is an Internet Relay Chat Daemon based on bahamut 1.8.4
+ developed by the bahamut team. Our main goal is to provide users with a stable server, 
+ and at the same time, a more secure server, while having all the features of bahamut and more. 
+ Feel free to drop by our irc channel at irc.vidgamechat.net #Solid
+ 
+ 
+ -------------------------
+ 
+ Features
+ -------------------------
+ 
+ 
+ need to put here things we added, that stock bahamut doesn't have -Sheik

Index: CHANGES
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGES	3 Jul 2005 02:26:58 -0000	1.3
--- CHANGES	5 Jul 2005 02:47:28 -0000	1.4
***************
*** 28,31 ****
--- 28,33 ----
   Changes from Sheik
  -------------------------
+ 4/7/2005   - removed rquit the code needs to be reviewed and will be delayed for 3.4.8
+ 4/7/2005   - rework memory accounting,add MEMTRACE for debugging, minor memroy leak fix.
  26/06/2005 - Added Channel mode +E this mode will block notices from users.
  26/06/2005 - Fixed a bug were users real host would show on watch when they connected.

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3357/src

Added Files:
	memcount.c 
Log Message:
Initial Import.

--- NEW FILE: memcount.c ---
/*
 *   memcount.c - Memory usage/accounting
 *   Copyright (C) 2005 Trevor Talbot and
 *                      the DALnet coding team
 *
 *   See file AUTHORS in IRC package for additional names of
 *   the programmers.
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 1, or (at your option)
 *   any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more detail.
 *
 *   You should have received a copy of the GNU General Public License
[...1388 lines suppressed...]
    subtotal += tc_throttle.management.m;
    subtotal += tc_userban.management.m;
    subtotal += tc_zlink.management.m;
#ifdef HAVE_ENCRYPTION_ON
    subtotal += tc_dh.management.m;
    subtotal += tc_rc4.management.m;
#endif
    subtotal += tc_unverified.management.m;

    sendto_one(cptr, "%sTraced %lu bytes (%ld leaked)", pfxbuf,
               traced_total, traced_total - alloc_total);
    sendto_one(cptr, "%sTracer overhead is %lu bytes", pfxbuf, subtotal);

    memtrace_reset();
#endif  /* MEMTRACE */

    sendto_one(cptr, "%ssbrk(0)-etext: %u", pfxbuf,
               (u_int) sbrk((size_t) 0) - (u_int) sbrk0);    
}

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3357/include

Added Files:
	memcount.h 
Log Message:
Initial Import.

--- NEW FILE: memcount.h ---
#ifndef MEMCOUNT_H
#define MEMCOUNT_H
/*
 *   memcount.h - Memory usage/accounting
 *   Copyright (C) 2005 Trevor Talbot and
 *                      the DALnet coding team
 *
 *   See file AUTHORS in IRC package for additional names of
 *   the programmers.
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 1, or (at your option)
 *   any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

/* $Id: memcount.h,v 1.1 2005/07/05 02:41:48 sheik Exp $ */

#include "struct.h"
#include "h.h"
#include "blalloc.h"
#include "throttle.h"

typedef struct {
    int     c;
    u_long  m;
} MemCount;

#ifdef MEMTRACE
typedef struct {
    int dummy; /* fucking gcc */
    MemCount allocated;
    MemCount management;
} TracedCount;
#endif

/* BlockHeap */
typedef struct {
    const char *file;

    MemCount blocks;
    MemCount objects;
    MemCount pool;
    MemCount management;
    MemCount total;

    u_long objsize;
    int knownobjs;  /* used during reporting */
} MCBlockHeap;

/* GenericHash */
typedef struct {
    const char *file;

    MemCount hashtable;
    MemCount buckets;
    MemCount total;

    int e_hashents;
} MCGenericHash;

/* blalloc.c */
typedef struct {
    const char *file;

    /* MEMTRACE: block heap allocator */
} MCblalloc;

/* channel.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount bans;
#ifdef EXEMPT_LISTS
    MemCount exempts;
#endif
#ifdef INVITE_LISTS
    MemCount invites;
#endif
    MemCount lopts;
    MemCount total;

    /* static resources */
    MemCount s_scratch;

    /* external resources */
    int e_channels;
    int e_chanmembers;
    int e_inv_links;
    int e_lopt_links;
    int e_dlinks;
} MCchannel;

/* clientlist.c */
typedef struct {
    const char *file;

    /* external resources */
    int e_server_dlinks;
    int e_oper_dlinks;
    int e_recvq_dlinks;
} MCclientlist;

/* clones.c */
typedef struct {
    const char *file;

    /* external resources */
    int        e_cloneents;
    BlockHeap *e_heap;
    void      *e_hash;
} MCclones;

#ifdef HAVE_ENCRYPTION_ON
/* dh.c */
typedef struct {
    const char *file;

    /* referenced externally */
    u_long m_dhsession_size;
} MCdh;
#endif

/* fds.c */
typedef struct {
    const char *file;

    /* static resources */
    MemCount s_fdlist;
} MCfds;

/* hash.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount watches;
    MemCount total;

    /* static resources */
    MemCount s_clienthash;
    MemCount s_channelhash;
    MemCount s_watchhash;

    /* external resources */
    int e_links;
} MChash;

/* hide.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount fakelinks;
    MemCount total;

    /* external resources */
    int e_links;
} MChide;

/* ircd.c */
typedef struct {
    const char *file;

    /* static resources */
    MemCount s_confbuf;
} MCircd;

/* list.c */
typedef struct {
    const char *file;

    /* external resources */
    BlockHeap *e_localclients_heap;
    BlockHeap *e_remoteclients_heap;
    BlockHeap *e_links_heap;
    BlockHeap *e_dlinks_heap;
    BlockHeap *e_chanmembers_heap;
    BlockHeap *e_users_heap;
    BlockHeap *e_channels_heap;
#ifdef FLUD
    BlockHeap *e_fludbots_heap;
#endif

    /* MEMTRACE: allocates servers, classes, opers, connects, allows, ports,
       and conf_me */
} MClist;

/* m_services.c */
typedef struct {
    const char *file;

    /* MEMTRACE: allocates simban reasons */
} MCm_services;

/* modules.c */
typedef struct {
    const char *file;

#ifdef USE_HOOKMODULES
    MemCount modules;
    MemCount hooks;
    MemCount total;

    int e_dlinks;

    /* MEMTRACE: module allocator interface */
#endif
} MCmodules;

/* parse.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount msgnodes;
    MemCount total;

    /* static resources */
    MemCount s_bufs;
    MemCount s_msgtab;
} MCparse;

#ifdef RWHO_PROBABILITY
/* probability.c */
typedef struct {
    const char *file;

    /* static resources */
    MemCount s_prob;
} MCprobability;
#endif

#ifdef HAVE_ENCRYPTION_ON
/* rc4.c */
typedef struct {
    const char *file;

    /* referenced externally */
    u_long m_rc4state_size;
} MCrc4;
#endif

/* res.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount cached;
    MemCount requests;
    MemCount total;

    /* static resources */
    MemCount s_cachehash;
    MemCount s_requesthash;
} MCres;

/* s_bsd.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount listeners;
    MemCount total;

    /* static resources */
    MemCount s_readbuf;
    MemCount s_local;
} MCs_bsd;

/* s_conf.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount connects;
    MemCount allows;
    MemCount me;
    MemCount opers;
    MemCount ports;
    MemCount classes;
    MemCount uservers;
    MemCount modules;
    MemCount total;

    /* MEMTRACE: subtract resources from list.c
       allocates simban/userban reasons */
} MCs_conf;

/* s_serv.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount motd;
    MemCount shortmotd;
    MemCount help;
    MemCount total;

    /* MEMTRACE: allocates simban and userban reasons */
} MCs_serv;

/* s_user.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount aways;
    MemCount silences;
#if (RIDICULOUS_PARANOIA_LEVEL>=1)
    MemCount opermasks;
#endif
    MemCount servers;
    MemCount total;

    /* external resources */
    int e_local_clients;
    int e_remote_clients;
    int e_users;
#ifdef FLUD
    int e_fludbots;
    int e_flud_links;
#endif
    int e_channel_links;
    int e_watch_links;
    int e_invite_links;
    int e_silence_links;
    int e_dccallow_links;
#ifdef HAVE_ENCRYPTION_ON
    int e_dh_sessions;
    int e_rc4states;
#endif
    int e_zipin_sessions;
    int e_zipout_sessions;

    /* MEMTRACE: subtract resources from list.c */
} MCs_user;

/* sbuf.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount smallbufpool;
    MemCount smallbufs;
    MemCount largebufpool;
    MemCount largebufs;
    MemCount userpool;
    MemCount users;
    MemCount bufblocks;
    MemCount userblocks;
    MemCount bufheaders;
    MemCount management;
    MemCount total;
} MCsbuf;

/* scache.c */
typedef struct {
    const char *file;

    /* file local */
    MemCount cached;
    MemCount total;

    /* static resources */
    MemCount s_hash;
} MCscache;

/* send.c */
typedef struct {
    const char *file;

    /* local resources */
    MemCount s_bufs;
} MCsend;

/* throttle.c */
typedef struct {
    const char *file;

    /* external resources */
    BlockHeap *e_hashent_heap;
#ifdef THROTTLE_ENABLE
    BlockHeap *e_throttle_heap;
    void      *e_throttle_hash;
    int        e_throttles;
#endif

    /* MEMTRACE: generic hash allocator */
} MCthrottle;

/* userban.c */
typedef struct {
    const char *file;

    /* local resources */
    MemCount lists;
    MemCount entries;
    MemCount cidr4big_userbans;
    MemCount cidr4_userbans;
    MemCount hosthash_userbans;
    MemCount hostwild_userbans;
    MemCount iphash_userbans;
    MemCount ipwild_userbans;
    MemCount userbans;
    MemCount nickhash_simbans;
    MemCount nickwild_simbans;
    MemCount chanhash_simbans;
    MemCount chanwild_simbans;
    MemCount gcoshash_simbans;
    MemCount gcoswild_simbans;
    MemCount simbans;
    MemCount total;
} MCuserban;

/* whowas.c */
typedef struct {
    const char *file;

    /* static resources */
    MemCount s_whowas;
    MemCount s_hash;
} MCwhowas;

/* zlink.c */
typedef struct {
    const char *file;

    /* static resources */
    MemCount s_bufs;

    /* referenced externally */
    u_long m_insession_size;
    u_long m_outsession_size;
} MCzlink;

#ifdef MEMTRACE
/* implemented in support.c */
u_long memtrace_count(TracedCount *, const char *);
void memtrace_report(aClient *, const char *);
void memtrace_reset(void);
#endif

void report_memory_usage(aClient *, int);

int mc_links(Link *);
int mc_dlinks(DLink *);

u_long memcount_BlockHeap(BlockHeap *, MCBlockHeap *);
u_long memcount_GenericHash(hash_table *, MCGenericHash *);

u_long memcount_blalloc(MCblalloc *);
u_long memcount_channel(MCchannel *);
u_long memcount_clientlist(MCclientlist *);
u_long memcount_clones(MCclones *);
#ifdef HAVE_ENCRYPTION_ON
u_long memcount_dh(MCdh *);
#endif
u_long memcount_fds(MCfds *);
u_long memcount_hash(MChash *);
u_long memcount_hide(MChide *);
u_long memcount_ircd(MCircd *);
u_long memcount_list(MClist *);
u_long memcount_m_services(MCm_services *);
u_long memcount_modules(MCmodules *);
u_long memcount_parse(MCparse *);
#ifdef RWHO_PROBABILITY
u_long memcount_probability(MCprobability *);
#endif
#ifdef HAVE_ENCRYPTION_ON
u_long memcount_rc4(MCrc4 *);
#endif
u_long memcount_res(MCres *);
u_long memcount_s_bsd(MCs_bsd *);
u_long memcount_s_conf(MCs_conf *);
u_long memcount_s_serv(MCs_serv *);
u_long memcount_s_user(MCs_user *);
u_long memcount_sbuf(MCsbuf *);
u_long memcount_scache(MCscache *);
u_long memcount_send(MCsend *);
u_long memcount_throttle(MCthrottle *);
u_long memcount_userban(MCuserban *);
u_long memcount_whowas(MCwhowas *);
u_long memcount_zlink(MCzlink *);

#endif  /* MEMCOUNT_H */

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958/src

Modified Files:
	Makefile.in blalloc.c channel.c clientlist.c clones.c dh.c 
	fds.c hash.c hide.c ircd.c list.c m_server.c m_services.c 
	m_stats.c modules.c parse.c probability.c rc4.c res.c s_bsd.c 
	s_conf.c s_misc.c s_serv.c s_user.c sbuf.c scache.c send.c 
	socketengine_epoll.c support.c throttle.c userban.c whowas.c 
	zlink.c 
Log Message:
rework memory accounting
add MEMTRACE for debugging,minor memory leak fix, I need to go back and fix userban.c and clean up this files that I just modified when I get some time.

Index: dh.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/dh.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dh.c	27 Jun 2005 03:02:04 -0000	1.1.1.1
--- dh.c	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 38,41 ****
--- 38,43 ----
  #include <openssl/dh.h>

+ #include "memcount.h"
+ 
  #define DH_HEADER
  #include "dh.h"
***************
*** 273,277 ****
      struct session_info *si;

!     si = (struct session_info *) malloc(sizeof(struct session_info));
      if(!si) 
          abort();
--- 275,279 ----
      struct session_info *si;

!     si = (struct session_info *) MyMalloc(sizeof(struct session_info));
      if(!si) 
          abort();
***************
*** 286,290 ****
      {
          DH_free(si->dh);
!         free(si);
          return NULL;
      }
--- 288,292 ----
      {
          DH_free(si->dh);
!         MyFree(si);
          return NULL;
      }
***************
*** 310,314 ****
      }

!     free(si);
  }

--- 312,316 ----
      }

!     MyFree(si);
  }

***************
*** 348,349 ****
--- 350,362 ----
      return 1;
  }
+ 
+ u_long
+ memcount_dh(MCdh *mc)
+ {
+     mc->file = __FILE__;
+ 
+     mc->m_dhsession_size = sizeof(struct session_info);
+ 
+     return 0;
+ }
+ 

Index: fds.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/fds.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fds.c	27 Jun 2005 03:02:01 -0000	1.1.1.1
--- fds.c	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  #include "fds.h"
  #include "numeric.h"
+ #include "memcount.h"

  void engine_add_fd(int);
***************
*** 252,253 ****
--- 253,266 ----
     set_fd_flags(cptr->fd, FDF_WANTREAD);
  }
+ 
+ u_long
+ memcount_fds(MCfds *mc)
+ {
+     mc->file = __FILE__;
+ 
+     mc->s_fdlist.c = sizeof(fd_list)/sizeof(fd_list[0]);
+     mc->s_fdlist.m = sizeof(fd_list);
+ 
+     return 0;
+ }
+ 

Index: sbuf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/sbuf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sbuf.c	27 Jun 2005 03:02:23 -0000	1.1.1.1
--- sbuf.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  #include "sys.h"
  #include "h.h"
+ #include "memcount.h"

  #include <stdio.h>
***************
*** 74,102 ****
  #define SBUF_SMALL_TOTAL        (SBUF_BASE + SBUF_SMALL_BUFFER)

- void sbuf_count(int* userUsed, int* userTotal, int* userSize,
-                 int* smallUsed, int* smallTotal, int* smallSize,
-                 int* largeUsed, int* largeTotal, int* largeSize,
-                 int* blockUsed, int* blockSize, int* userblockUsed, int* userblockSize)
- {
-     *userUsed = sbufuser_used;
-     *userTotal = sbufuser_total;
-     *userSize = sizeof(SBufUser);
-     
-     *smallUsed = sbufsmall_used;
-     *smallTotal = sbufsmall_total;
-     *smallSize = SBUF_SMALL_TOTAL;
-     
-     *largeUsed = sbuflarge_used;
-     *largeTotal = sbuflarge_total;
-     *largeSize = SBUF_LARGE_TOTAL;
-     
-     *blockUsed = sbufblock_used;
-     *blockSize = sizeof(SBufBlock);
-     
-     *userblockUsed = sbufuserblock_used;
-     *userblockSize = sizeof(SBufUserBlock);
- }
- 
- 
  int sbuf_allocblock_general(int theMemorySize, int num, SBuffer** thePool)
  {
--- 75,78 ----
***************
*** 105,113 ****
      int           i;

!     block = (SBufBlock*)malloc(sizeof(SBufBlock));
      if (!block)
          outofmemory();

!     block->bufs = (SBuffer*)malloc(theMemorySize * num);
      if (!block->bufs)
          outofmemory();
--- 81,89 ----
      int           i;

!     block = (SBufBlock*)MyMalloc(sizeof(SBufBlock));
      if (!block)
          outofmemory();

!     block->bufs = (SBuffer*)MyMalloc(theMemorySize * num);
      if (!block->bufs)
          outofmemory();
***************
*** 158,166 ****
      int            i;

!     block = (SBufUserBlock*)malloc(sizeof(SBufUserBlock));
      if (!block)
          outofmemory();

!     block->users = (SBufUser*)malloc(sizeof(SBufUser) * theCount);
      if (!block->users)
          outofmemory();
--- 134,142 ----
      int            i;

!     block = (SBufUserBlock*)MyMalloc(sizeof(SBufUserBlock));
      if (!block)
          outofmemory();

!     block->users = (SBufUser*)MyMalloc(sizeof(SBufUser) * theCount);
      if (!block->users)
          outofmemory();
***************
*** 548,551 ****
      return copied;
  }
!         
!         
--- 524,565 ----
      return copied;
  }
! 
! u_long
! memcount_sbuf(MCsbuf *mc)
! {
!     mc->file = __FILE__;
! 
!     mc->smallbufpool.c = sbufsmall_total;
!     mc->smallbufpool.m = sbufsmall_total * SBUF_SMALL_BUFFER;
!     mc->smallbufs.c = sbufsmall_used;
!     mc->smallbufs.m = sbufsmall_used * SBUF_SMALL_BUFFER;
! 
!     mc->largebufpool.c = sbuflarge_total;
!     mc->largebufpool.m = sbuflarge_total * SBUF_LARGE_BUFFER;
!     mc->largebufs.c = sbuflarge_used;
!     mc->largebufs.m = sbuflarge_used * SBUF_LARGE_BUFFER;
! 
!     mc->userpool.c = sbufuser_total;
!     mc->userpool.m = sbufuser_total * sizeof(SBufUser);
!     mc->users.c = sbufuser_used;
!     mc->users.m = sbufuser_used * sizeof(SBufUser);
! 
!     mc->bufblocks.c = sbufblock_used;
!     mc->bufblocks.m = sbufblock_used * sizeof(SBufBlock);
!     mc->userblocks.c = sbufuserblock_used;
!     mc->userblocks.m = sbufuserblock_used * sizeof(SBufUserBlock);
! 
!     mc->bufheaders.c = mc->smallbufpool.c + mc->largebufpool.c;
!     mc->bufheaders.m = mc->bufheaders.c * SBUF_BASE;
! 
!     mc->management.c = mc->bufheaders.c + mc->bufblocks.c;
!     mc->management.m = mc->bufheaders.m + mc->bufblocks.m;
!     mc->management.c += mc->userpool.c + mc->userblocks.c;
!     mc->management.m += mc->userpool.m + mc->userblocks.m;
! 
!     mc->total.c = mc->smallbufpool.c + mc->largebufpool.c + mc->management.c;
!     mc->total.m = mc->smallbufpool.m + mc->largebufpool.m + mc->management.m;
! 
!     return mc->total.m;
! }
! 

Index: socketengine_epoll.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/socketengine_epoll.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** socketengine_epoll.c	27 Jun 2005 03:02:32 -0000	1.1.1.1
--- socketengine_epoll.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 140,145 ****
              if (epfd->fd != -1)
              {
!                 int rr = (epfd->events & pevent->events) & (EPOLLIN|EPOLLHUP|EPOLLERR);
!                 int rw = (epfd->events & pevent->events) & EPOLLOUT;

                  get_fd_info(epfd->fd, &fdtype, &fdflags, &fdvalue);
--- 140,145 ----
              if (epfd->fd != -1)
              {
!                 int rr = pevent->events & (EPOLLIN|EPOLLHUP|EPOLLERR);
!                 int rw = pevent->events & EPOLLOUT;

                  get_fd_info(epfd->fd, &fdtype, &fdflags, &fdvalue);

Index: Makefile.in
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	27 Jun 2005 03:02:01 -0000	1.1.1.1
--- Makefile.in	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 3,8 ****
  MV=@MV@
  IRCDLIBS=@LIBS@ ../zlib/libz.a
  OPENSSLINC=@SSL_INCLUDES@
- INCLUDEDIR=-I../include $(OPENSSLINC)
  ENGINE=@SENGINE@
  CRYPTO=@ENCRYPT_SRC@
--- 3,8 ----
  MV=@MV@
  IRCDLIBS=@LIBS@ ../zlib/libz.a
+ INCLUDEDIR=-I../include
  OPENSSLINC=@SSL_INCLUDES@
  ENGINE=@SENGINE@
  CRYPTO=@ENCRYPT_SRC@
***************
*** 20,27 ****
            fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c list.c \
            m_shun.c m_nick.c m_rwho.c m_server.c m_services.c m_stats.c m_who.c match.c \
!           modules.c  packet.c parse.c pcre.c probability.c res.c s_auth.c \
!           s_bsd.c s_conf.c s_debug.c s_err.c s_misc.c s_numeric.c s_serv.c \
!           s_user.c sbuf.c scache.c send.c ssl.c struct.c support.c throttle.c \
!           toys.c userban.c whowas.c zlink.c \
            $(ENGINE) $(CRYPTO)

--- 20,27 ----
            fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c list.c \
            m_shun.c m_nick.c m_rwho.c m_server.c m_services.c m_stats.c m_who.c match.c \
!           memcount.c modules.c packet.c parse.c pcre.c probability.c res.c \
!           s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c s_misc.c s_numeric.c \
!           s_serv.c s_user.c sbuf.c scache.c send.c  ssl.c struct.c support.c \
!           toys.c throttle.c userban.c whowas.c zlink.c \
            $(ENGINE) $(CRYPTO)

***************
*** 64,203 ****

  blalloc.o: blalloc.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/numeric.h ../include/blalloc.h
  bsd.o: bsd.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/fds.h
  channel.o: channel.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/channel.h ../include/msg.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/userban.h
  clientlist.o: clientlist.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/numeric.h ../include/blalloc.h
  clones.o: clones.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/blalloc.h ../include/numeric.h \
!   ../include/channel.h ../include/msg.h ../include/throttle.h \
    ../include/queue.h ../include/clones.h
  confparse.o: confparse.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/userban.h ../include/confparse.h
  fdlist.o: fdlist.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h
  fds.o: fds.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/fds.h ../include/numeric.h
  hash.o: hash.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  hide.o: hide.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/fds.h ../include/numeric.h
  inet_addr.o: inet_addr.c ../include/setup.h ../include/struct.h \
!   ../include/config.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
    ../include/nameser.h ../include/resolv.h
  ircd.o: ircd.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/numeric.h \
!   ../include/msg.h ../include/inet.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/patchlevel.h ../include/dh.h ../include/throttle.h \
!   ../include/queue.h ../include/userban.h ../include/clones.h \
!   ../include/hooks.h ../include/fds.h
  ircsprintf.o: ircsprintf.c ../include/ircsprintf.h ../include/setup.h
  list.o: list.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/numeric.h ../include/blalloc.h ../include/dh.h \
!   ../include/zlink.h
  m_shun.o: m_shun.c ../include/struct.h ../include/config.h \
    ../include/setup.h ../include/defs.h ../include/hash.h \
    ../include/h.h ../include/send.h ../include/common.h \
    ../include/ircsprintf.h ../include/msg.h ../include/sys.h \
!   ../include/userban.h ../include/common.h
  m_nick.o: m_nick.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/userban.h
  m_rwho.o: m_rwho.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/numeric.h ../include/channel.h \
!   ../include/msg.h ../include/inet.h ../include/pcre.h
! m_server.o: m_server.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/dh.h ../include/userban.h ../include/zlink.h \
!   ../include/throttle.h ../include/queue.h ../include/clones.h
! m_services.o: m_services.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/userban.h \
!   ../include/clones.h
  m_stats.o: m_stats.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/zlink.h \
!   ../include/userban.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h ../include/whowas.h ../include/res.h
  m_who.o: m_who.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/inet.h ../include/msg.h \
!   ../include/channel.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  match.o: match.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h
! modules.o: modules.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
!   ../include/throttle.h ../include/queue.h ../include/h.h \
    ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/hooks.h
  packet.o: packet.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/msg.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/dh.h \
!   ../include/zlink.h
  parse.o: parse.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/msg.h ../include/sys.h \
!   ../include/numeric.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  pcre.o: pcre.c ../include/pcre_internal.h ../include/pcre_config.h \
    ../include/setup.h ../include/pcre.h pcre_chartables.c
--- 64,217 ----

  blalloc.o: blalloc.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/numeric.h ../include/blalloc.h ../include/memcount.h \
!   ../include/throttle.h ../include/queue.h
  bsd.o: bsd.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/fds.h
  channel.o: channel.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/channel.h ../include/msg.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  clientlist.o: clientlist.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/numeric.h ../include/blalloc.h ../include/memcount.h \
!   ../include/throttle.h ../include/queue.h
  clones.o: clones.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/blalloc.h ../include/numeric.h ../include/channel.h \
!   ../include/msg.h ../include/memcount.h ../include/throttle.h \
    ../include/queue.h ../include/clones.h
  confparse.o: confparse.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h ../include/confparse.h
  fdlist.o: fdlist.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  fds.o: fds.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/fds.h ../include/numeric.h ../include/memcount.h \
!   ../include/blalloc.h ../include/throttle.h ../include/queue.h
  hash.o: hash.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/numeric.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  hide.o: hide.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/fds.h ../include/numeric.h ../include/memcount.h \
!   ../include/blalloc.h ../include/throttle.h ../include/queue.h
  inet_addr.o: inet_addr.c ../include/setup.h ../include/struct.h \
!   ../include/config.h ../include/defs.h ../include/sys.h \
!   ../include/hash.h ../include/sbuf.h ../include/common.h \
    ../include/nameser.h ../include/resolv.h
  ircd.o: ircd.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/numeric.h ../include/msg.h \
!   ../include/inet.h ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/patchlevel.h \
!   ../include/dh.h ../include/throttle.h ../include/queue.h \
!   ../include/userban.h ../include/clones.h ../include/hooks.h \
!   ../include/fds.h ../include/memcount.h ../include/blalloc.h
  ircsprintf.o: ircsprintf.c ../include/ircsprintf.h ../include/setup.h
  list.o: list.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/numeric.h ../include/blalloc.h ../include/dh.h \
!   ../include/zlink.h ../include/memcount.h ../include/throttle.h \
!   ../include/queue.h
  m_shun.o: m_shun.c ../include/struct.h ../include/config.h \
    ../include/setup.h ../include/defs.h ../include/hash.h \
    ../include/h.h ../include/send.h ../include/common.h \
    ../include/ircsprintf.h ../include/msg.h ../include/sys.h \
!   ../include/userban.h  ../include/common.h
  m_nick.o: m_nick.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h
  m_rwho.o: m_rwho.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/numeric.h ../include/channel.h ../include/msg.h \
!   ../include/inet.h ../include/clones.h ../include/pcre.h
! m_server.o: m_server.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/dh.h \
!   ../include/userban.h ../include/zlink.h ../include/throttle.h \
!   ../include/queue.h ../include/clones.h
! m_services.o: m_services.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h ../include/clones.h ../include/memcount.h \
!   ../include/blalloc.h ../include/throttle.h ../include/queue.h
  m_stats.o: m_stats.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/zlink.h ../include/userban.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h ../include/whowas.h \
!   ../include/res.h ../include/clones.h ../include/memcount.h
  m_who.o: m_who.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/inet.h ../include/msg.h ../include/channel.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h
  match.o: match.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h
! memcount.o: memcount.c ../include/memcount.h ../include/struct.h \
!   ../include/config.h ../include/setup.h ../include/defs.h \
!   ../include/sys.h ../include/hash.h ../include/sbuf.h ../include/h.h \
    ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h ../include/numeric.h
! modules.o: modules.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/throttle.h \
!   ../include/queue.h ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/hooks.h \
!   ../include/memcount.h ../include/blalloc.h
  packet.o: packet.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/msg.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/dh.h ../include/zlink.h
  parse.o: parse.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/msg.h \
!   ../include/memcount.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h
  pcre.o: pcre.c ../include/pcre_internal.h ../include/pcre_config.h \
    ../include/setup.h ../include/pcre.h pcre_chartables.c
***************
*** 205,290 ****
    ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
    ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
-   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
- res.o: res.c ../include/struct.h ../include/config.h ../include/setup.h \
-   ../include/defs.h ../include/hash.h ../include/sbuf.h \
-   ../include/common.h ../include/sys.h ../include/res.h \
-   ../include/numeric.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/fds.h ../include/nameser.h ../include/resolv.h \
    ../include/inet.h
  s_auth.o: s_auth.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/res.h \
    ../include/numeric.h ../include/patchlevel.h ../include/sock.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
    ../include/ircsprintf.h ../include/find.h ../include/fds.h
  s_bsd.o: s_bsd.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/res.h \
    ../include/numeric.h ../include/patchlevel.h ../include/zlink.h \
    ../include/throttle.h ../include/queue.h ../include/userban.h \
-   ../include/clones.h ../include/h.h ../include/send.h \
-   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/inet.h ../include/hooks.h ../include/nameser.h \
!   ../include/resolv.h ../include/fds.h
  s_conf.o: s_conf.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/inet.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h ../include/confparse.h
  s_debug.o: s_debug.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/patchlevel.h ../include/numeric.h \
!   ../include/channel.h ../include/msg.h
  s_err.o: s_err.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
    ../include/sbuf.h ../include/numeric.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  s_misc.o: s_misc.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/zlink.h ../include/hooks.h \
!   ../include/clones.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
! s_numeric.o: s_numeric.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/channel.h ../include/msg.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
    ../include/ircsprintf.h ../include/find.h
  s_serv.o: s_serv.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
!   ../include/nameser.h ../include/resolv.h ../include/dh.h \
!   ../include/zlink.h ../include/userban.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/throttle.h ../include/queue.h
! s_user.o: s_user.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
    ../include/throttle.h ../include/queue.h ../include/clones.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/blalloc.h \
!   ../include/userban.h ../include/hooks.h
  sbuf.o: sbuf.c ../include/sbuf.h ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  scache.o: scache.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  send.o: send.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/sys.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/numeric.h ../include/dh.h ../include/zlink.h \
!   ../include/fds.h
  ssl.o: ssl.c ../include/struct.h ../include/config.h ../include/setup.h \
    ../include/defs.h ../include/hash.h ../include/sbuf.h \
--- 219,312 ----
    ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
    ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/memcount.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h
! res.o: res.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/res.h ../include/numeric.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/fds.h \
!   ../include/memcount.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h ../include/nameser.h ../include/resolv.h \
    ../include/inet.h
  s_auth.o: s_auth.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/res.h \
    ../include/numeric.h ../include/patchlevel.h ../include/sock.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
    ../include/ircsprintf.h ../include/find.h ../include/fds.h
  s_bsd.o: s_bsd.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/res.h \
    ../include/numeric.h ../include/patchlevel.h ../include/zlink.h \
    ../include/throttle.h ../include/queue.h ../include/userban.h \
    ../include/inet.h ../include/hooks.h ../include/nameser.h \
!   ../include/resolv.h ../include/memcount.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/blalloc.h ../include/fds.h
  s_conf.o: s_conf.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/inet.h ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/userban.h \
!   ../include/confparse.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  s_debug.o: s_debug.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/patchlevel.h ../include/numeric.h ../include/channel.h \
!   ../include/msg.h
  s_err.o: s_err.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
    ../include/sbuf.h ../include/numeric.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  s_misc.o: s_misc.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/zlink.h ../include/hooks.h ../include/clones.h \
    ../include/h.h ../include/send.h ../include/fdlist.h \
    ../include/ircsprintf.h ../include/find.h
+ s_numeric.o: s_numeric.c ../include/struct.h ../include/config.h \
+   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
+   ../include/sbuf.h ../include/common.h ../include/numeric.h \
+   ../include/channel.h ../include/msg.h ../include/h.h ../include/send.h \
+   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h
  s_serv.o: s_serv.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/nameser.h \
!   ../include/resolv.h ../include/dh.h ../include/zlink.h \
!   ../include/userban.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/throttle.h ../include/queue.h ../include/clones.h \
!   ../include/memcount.h ../include/blalloc.h
! s_user.o: s_user.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/throttle.h \
!   ../include/queue.h ../include/clones.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/blalloc.h ../include/userban.h ../include/hooks.h \
!   ../include/memcount.h
  sbuf.o: sbuf.c ../include/sbuf.h ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/memcount.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h
  scache.o: scache.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/memcount.h \
!   ../include/blalloc.h ../include/throttle.h ../include/queue.h
  send.o: send.c ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/common.h ../include/h.h ../include/send.h \
    ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
    ../include/numeric.h ../include/dh.h ../include/zlink.h \
!   ../include/fds.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  ssl.o: ssl.c ../include/struct.h ../include/config.h ../include/setup.h \
    ../include/defs.h ../include/hash.h ../include/sbuf.h \
***************
*** 294,312 ****
    ../include/fds.h
  struct.o: struct.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/msg.h ../include/channel.h \
!   ../include/throttle.h ../include/queue.h ../include/structfunc.h
  support.o: support.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h
  throttle.o: throttle.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h ../include/res.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/numeric.h \
!   ../include/blalloc.h ../include/queue.h ../include/throttle.h
  toys.o: toys.c ../include/struct.h ../include/config.h \
    ../include/setup.h ../include/defs.h ../include/hash.h \
--- 316,335 ----
    ../include/fds.h
  struct.o: struct.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/msg.h ../include/channel.h ../include/throttle.h \
!   ../include/queue.h ../include/structfunc.h
  support.o: support.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/numeric.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  throttle.o: throttle.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/res.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/numeric.h ../include/blalloc.h \
!   ../include/memcount.h ../include/throttle.h ../include/queue.h
  toys.o: toys.c ../include/struct.h ../include/config.h \
    ../include/setup.h ../include/defs.h ../include/hash.h \
***************
*** 317,340 ****
     ../include/userban.h
  userban.o: userban.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/inet.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \
!   ../include/userban.h ../include/queue.h
  version.o: version.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
    ../include/sbuf.h ../include/patchlevel.h
  whowas.o: whowas.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/sys.h \
!   ../include/numeric.h ../include/h.h ../include/send.h \
!   ../include/fdlist.h ../include/ircsprintf.h ../include/find.h

! dh.o: dh.c \
!  ../include/patchlevel.h
  	$(CC) $(CFLAGS) $(OPENSSLINC) $(INCLUDEDIR) -c $<
! rc4.o: rc4.c \
!  ../include/patchlevel.h
! zlink.o: zlink.c ../zlib/zlib.h ../zlib/zconf.h
  	$(CC) $(CFLAGS) $(INCLUDEDIR) -I../zlib -c $<

--- 340,377 ----
     ../include/userban.h
  userban.o: userban.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/inet.h ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/userban.h \
!   ../include/queue.h ../include/memcount.h ../include/blalloc.h \
!   ../include/throttle.h
  version.o: version.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
    ../include/sbuf.h ../include/patchlevel.h
  whowas.o: whowas.c ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/common.h ../include/numeric.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/memcount.h \
!   ../include/blalloc.h ../include/throttle.h ../include/queue.h

! dh.o: dh.c ../include/memcount.h ../include/struct.h ../include/config.h \
!   ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \
!   ../include/sbuf.h ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h ../include/dh.h
  	$(CC) $(CFLAGS) $(OPENSSLINC) $(INCLUDEDIR) -c $<
! rc4.o: rc4.c ../include/memcount.h ../include/struct.h \
!   ../include/config.h ../include/setup.h ../include/defs.h \
!   ../include/sys.h ../include/hash.h ../include/sbuf.h ../include/h.h \
!   ../include/send.h ../include/fdlist.h ../include/ircsprintf.h \
!   ../include/find.h ../include/blalloc.h ../include/throttle.h \
!   ../include/queue.h
! zlink.o: zlink.c ../zlib/zlib.h ../zlib/zconf.h ../include/memcount.h \
!   ../include/struct.h ../include/config.h ../include/setup.h \
!   ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \
!   ../include/h.h ../include/send.h ../include/fdlist.h \
!   ../include/ircsprintf.h ../include/find.h ../include/blalloc.h \
!   ../include/throttle.h ../include/queue.h
  	$(CC) $(CFLAGS) $(INCLUDEDIR) -I../zlib -c $<

Index: whowas.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/whowas.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** whowas.c	27 Jun 2005 03:02:04 -0000	1.1.1.1
--- whowas.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  #include "numeric.h"
  #include "h.h"
+ #include "memcount.h"

  /* externally defined functions */
***************
*** 226,227 ****
--- 227,241 ----
  	whowas->next->prev = whowas->prev;
  }
+ 
+ u_long
+ memcount_whowas(MCwhowas *mc)
+ {
+     mc->file = __FILE__;
+ 
+     mc->s_whowas.c = sizeof(WHOWAS)/sizeof(WHOWAS[0]);
+     mc->s_whowas.m = sizeof(WHOWAS);
+     mc->s_hash.c = sizeof(WHOWASHASH)/sizeof(WHOWASHASH[0]);
+     mc->s_hash.m = sizeof(WHOWASHASH);
+ 
+     return 0;
+ }

Index: throttle.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/throttle.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** throttle.c	27 Jun 2005 03:02:32 -0000	1.1.1.1
--- throttle.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 39,42 ****
--- 39,43 ----
  #include "numeric.h"
  #include "blalloc.h"
+ #include "memcount.h"

  #include <sys/types.h>
***************
*** 69,73 ****
                    int (*cmpfunc)(void *, void *)) 
  {
!     hash_table *htp = malloc(sizeof(hash_table));

      htp->size = elems;
--- 70,74 ----
                    int (*cmpfunc)(void *, void *)) 
  {
!     hash_table *htp = MyMalloc(sizeof(hash_table));

      htp->size = elems;
***************
*** 77,81 ****
      htp->cmpfunc = cmpfunc;

!     htp->table = malloc(sizeof(hashent_list) * htp->size);
      memset(htp->table, 0, sizeof(hashent_list) * htp->size);

--- 78,82 ----
      htp->cmpfunc = cmpfunc;

!     htp->table = MyMalloc(sizeof(hashent_list) * htp->size);
      memset(htp->table, 0, sizeof(hashent_list) * htp->size);

***************
*** 118,122 ****
      oldsize = table->size;
      table->size = elems;
!     table->table = malloc(sizeof(hashent_list) * table->size);
      memset(table->table, 0, sizeof(hashent_list) * table->size);

--- 119,123 ----
      oldsize = table->size;
      table->size = elems;
!     table->table = MyMalloc(sizeof(hashent_list) * table->size);
      memset(table->table, 0, sizeof(hashent_list) * table->size);

***************
*** 578,580 ****
--- 579,634 ----
  void throttle_force(char *host) {}
  #endif
+ 
+ u_long
+ memcount_GenericHash(hash_table *ht, MCGenericHash *mc)
+ {
+     hashent *hep;
+     int      i;
+ 
+     mc->file = __FILE__;
+ 
+     mc->hashtable.c = 1;
+     mc->hashtable.m = sizeof(*ht);
+ 
+     mc->buckets.c = ht->size;
+     mc->buckets.m = sizeof(hashent_list) * ht->size;
+ 
+     for (i = 0; i < ht->size; i++)
+     {
+         SLIST_FOREACH(hep, &ht->table[i], lp)
+         {
+             mc->e_hashents++;
+         }
+     }
+ 
+     mc->total.c += mc->hashtable.c + mc->buckets.c;
+     mc->total.m += mc->hashtable.m + mc->buckets.m;
+ 
+     return mc->total.m;
+ }
+ 
+ u_long
+ memcount_throttle(MCthrottle *mc)
+ {
+ #ifdef THROTTLE_ENABLE
+     throttle *tp;
+ #endif
+ 
+     mc->file = __FILE__;
+ 
+ #ifdef THROTTLE_ENABLE
+     LIST_FOREACH(tp, &throttles, lp)
+     {
+         mc->e_throttles++;
+     }
+ 
+     mc->e_throttle_heap = throttle_freelist;
+     mc->e_throttle_hash = throttle_hash;
+ #endif
+ 
+     mc->e_hashent_heap = hashent_freelist;
+ 
+     return 0;
+ }
+ 
  /* vi:set ts=8 sts=4 sw=4 tw=79: */

Index: m_server.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_server.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** m_server.c	27 Jun 2005 03:02:10 -0000	1.1.1.1
--- m_server.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 351,354 ****
--- 351,364 ----
      memset(cptr->passwd, '\0', sizeof(cptr->passwd));

+ 	if (find_client(host, NULL))
+     {
+         sendto_gnotice("from %s: Link %s dropped, server already exists",
+                        me.name, inpath);
+         sendto_serv_butone(cptr, ":%s GNOTICE :Link %s dropped, server already"
+                            " exists", me.name, inpath);
+         return exit_client(cptr, cptr, cptr, "Server Exists");
+     }
+ 
+ 
      if(!(confopts & FLAGS_HUB))
      {

Index: hide.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/hide.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hide.c	27 Jun 2005 03:02:37 -0000	1.1.1.1
--- hide.c	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  #include "fds.h"
  #include "numeric.h"
+ #include "memcount.h"

  /* This is how we maintain a 'fake' list of servers */
***************
*** 143,147 ****
        char *servername = parv[2];
        aClient *acptr = find_server(servername, NULL);
!       char *desc = (parc > 3) ? parv[3] : HiddenServDesc;

        if(strchr(servername, '.') == NULL)
--- 144,148 ----
        char *servername = parv[2];
        aClient *acptr = find_server(servername, NULL);
!       char *desc = (parc > 3) ? parv[3] : HIDDEN_SERVER_DESC;

        if(strchr(servername, '.') == NULL)
***************
*** 343,344 ****
--- 344,369 ----
        sendto_one(sptr, ":%s LUSERSLOCK UNTIL %d", (int) luserslock_expiretime);
  }
+ 
+ u_long
+ memcount_hide(MChide *mc)
+ {
+     Link                    *lp;
+     struct fakelinkserver   *ls;
+ 
+     mc->file = __FILE__;
+ 
+     for (lp = lserver_list; lp; lp = lp->next)
+     {
+         ls = (struct fakelinkserver *)lp->value.cp;
+         mc->fakelinks.c++;
+         mc->fakelinks.m += sizeof(struct fakelinkserver);
+         mc->fakelinks.m += strlen(ls->name) + 1;
+         mc->fakelinks.m += strlen(ls->description) + 1;
+         mc->e_links++;
+     }
+     mc->total.c += mc->fakelinks.c;
+     mc->total.m += mc->fakelinks.m;
+ 
+     return mc->fakelinks.m;
+ }
+ 

Index: support.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/support.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** support.c	27 Jun 2005 03:02:03 -0000	1.1.1.1
--- support.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 1,3 ****
- 
  /************************************************************************
   *   IRC - Internet Relay Chat, src/support.c
--- 1,2 ----
***************
*** 25,28 ****
--- 24,29 ----
  #include "sys.h"
  #include "h.h"
+ #include "numeric.h"
+ #include "memcount.h"

  #define FOREVER for(;;)
***************
*** 149,152 ****
--- 150,315 ----
  #endif /* !HAVE_INET_NETOF */

+ #ifdef MEMTRACE
+ 
+ typedef struct {
+     MemTracer   *tracer;
+     size_t       length;
+ } MemTag;
+ 
+ static MemTracer *mtrace_list;
+ 
+ u_long
+ memtrace_count(TracedCount *mc, const char *file)
+ {
+     MemTracer *mt;
+ 
+     if (file)
+     {
+         for (mt = mtrace_list; mt; mt = mt->next)
+         {
+             if (strcmp(mt->file, file))
+                 continue;
+ 
+             mc->allocated.c += mt->objects;
+             mc->allocated.m += mt->allocated;
+             mc->management.c += mt->objects;
+             mc->management.m += mt->objects * sizeof(MemTag);
+ 
+             mt->initialized = 2;    /* mark as counted */
+         }
+ 
+         return mc->allocated.m;
+     }
+ 
+     /* no file, so count unmarked ones */
+     for (mt = mtrace_list; mt; mt = mt->next)
+     {
+         if (mt->initialized == 1)
+         {
+             mc->allocated.c += mt->objects;
+             mc->allocated.m += mt->allocated;
+             mc->management.c += mt->objects;
+             mc->management.m += mt->objects * sizeof(MemTag);
+         }
+     }
+ 
+     return mc->allocated.m;
+ }
+ 
+ void
+ memtrace_report(aClient *cptr, const char *file)
+ {
+     MemTracer   *mt;
+ 
+     /* display unmarked tracers */
+     if (!file)
+     {
+         for (mt = mtrace_list; mt; mt = mt->next)
+         {
+             if (mt->initialized == 1 && mt->allocated)
+                 sendto_one(cptr, ":%s %d %s :    %s:%d objects: %d  bytes: %lu",
+                            me.name, RPL_STATSDEBUG, cptr->name, mt->file,
+                            mt->line, mt->objects, mt->allocated);
+         }
+ 
+         return;
+     }
+ 
+     /* display for one file */
+     for (mt = mtrace_list; mt; mt = mt->next)
+     {
+         if (strcmp(mt->file, file))
+             continue;
+         if (!mt->allocated)
+             continue;
+         sendto_one(cptr, ":%s %d %s :    %s:%d objects: %d  bytes: %lu",
+                    me.name, RPL_STATSDEBUG, cptr->name, mt->file, mt->line,
+                    mt->objects, mt->allocated);
+     }
+ }
+ 
+ void
+ memtrace_reset(void)
+ {
+     MemTracer *mt;
+ 
+     /* reset counted mark */
+     for (mt = mtrace_list; mt; mt = mt->next)
+         mt->initialized = 1;
+ }
+ 
+ 
+ void *MyMalloc_impl(MemTracer *mt, size_t mlen)
+ {
+     MemTag *tag;
+ 
+     if (!mt->initialized)
+     {
+         mt->next = mtrace_list;
+         mtrace_list = mt;
+         mt->initialized = 1;
+     }
+ 
+     tag = malloc(mlen + sizeof(MemTag));
+ 
+     if (!tag)
+         outofmemory();
+ 
+     tag->tracer = mt;
+     tag->length = mlen;
+     mt->objects++;
+     mt->allocated += mlen;
+ 
+     return tag + 1;
+ }
+ 
+ void MyFree_impl(void *obj)
+ {
+     MemTag *tag;
+ 
+     if (!obj)
+         return;
+ 
+     tag = (MemTag *)obj - 1;
+     tag->tracer->objects--;
+     tag->tracer->allocated -= tag->length;
+ 
+     free(tag);
+ }
+ 
+ void *MyRealloc_impl(MemTracer *mt, void *obj, size_t mlen)
+ {
+     MemTag *tag;
+ 
+     if (!mt->initialized)
+     {
+         mt->next = mtrace_list;
+         mtrace_list = mt;
+         mt->initialized = 1;
+     }
+ 
+     if (obj)
+     {
+         tag = (MemTag *)obj - 1;
+         tag->tracer->objects--;
+         tag->tracer->allocated -= tag->length;
+         obj = tag; /* subtle */
+     }
+ 
+     tag = realloc(obj, mlen + sizeof(MemTag));
+ 
+     if (!tag)
+         outofmemory();
+ 
+     tag->tracer = mt;
+     tag->length = mlen;
+     mt->objects++;
+     mt->allocated += mlen;
+ 
+     return tag + 1;
+ }
+ 
+ #else   /* MEMTRACE */
+ 
  void *MyMalloc(size_t x)
  {
***************
*** 171,174 ****
--- 334,339 ----
  }

+ #endif /* MEMTRACE */
+ 
  /*
   * read a string terminated by \r or \n in from a fd

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** s_misc.c	3 Jul 2005 02:26:58 -0000	1.3
--- s_misc.c	5 Jul 2005 02:40:02 -0000	1.4
***************
*** 616,619 ****
--- 616,620 ----
                  {
                      next = lp->next;
+ 					MyFree(lp->value.cp);
                      free_link(lp);
                  }
***************
*** 621,624 ****
--- 622,626 ----
                  {
                      next = lp->next;
+ 					MyFree(lp->value.cp);
                      free_link(lp);
                  }

Index: res.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/res.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** res.c	27 Jun 2005 03:02:29 -0000	1.1.1.1
--- res.c	5 Jul 2005 02:40:02 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  #include "h.h"
  #include "fds.h"
+ #include "memcount.h"

  #include <signal.h>
***************
*** 48,52 ****

  #define PROCANSWER_STRANGE   -2 /* invalid answer or query, try again */
! #define PROCANSWER_MALICIOUS -3 /* obviously malicious reply, 
  				                 * don't do DNS on this ip. */

--- 49,53 ----

  #define PROCANSWER_STRANGE   -2 /* invalid answer or query, try again */
! #define PROCANSWER_MALICIOUS -3 /* obviously malicious reply, \
  				                 * don't do DNS on this ip. */

***************
*** 145,158 ****
      {
  	int         on = 0;
- 	struct sockaddr_in sa;

  	ret = resfd = socket(AF_INET, SOCK_DGRAM, 0);
  	(void) setsockopt(ret, SOL_SOCKET, SO_BROADCAST,
  			  (char *) &on, sizeof(on));
- 	bzero(&sa, sizeof(sa));
- 	sa.sin_family = AF_INET;
- 	sa.sin_port = 0;
- 	sa.sin_addr.s_addr = INADDR_ANY;
- 	(void) bind(resfd, (struct sockaddr *) &sa, sizeof(sa));
      }
  #ifdef DEBUG
--- 146,153 ----
***************
*** 1543,1547 ****
  	 s = rptr->he.h_aliases[i++])
      {
! 	for (j = 0, t = (char *)cp->he.h_name; t && j < IRC_MAXALIASES;
  	     t = cp->he.h_aliases[j++])
  	    if (!mycmp(t, s))
--- 1538,1542 ----
  	 s = rptr->he.h_aliases[i++])
      {
! 	for (j = 0, t = cp->he.h_name; t && j < IRC_MAXALIASES;
  	     t = cp->he.h_aliases[j++])
  	    if (!mycmp(t, s))
***************
*** 1976,1977 ****
--- 1971,2043 ----
      return 0;
  }
+ 
+ u_long
+ memcount_res(MCres *mc)
+ {
+     ResRQ *rq;
+     aCache *ce;
+     int i;
+ 
+     mc->file = __FILE__;
+ 
+     for (rq = first; rq; rq = rq->next)
+     {
+         mc->requests.c++;
+         mc->requests.m += sizeof(*rq);
+ 
+         if (rq->name)
+             mc->requests.m += strlen(rq->name) + 1;
+ 
+         if (rq->he.h_name)
+             mc->requests.m += strlen(rq->he.h_name) + 1;
+ 
+         for (i = 0; rq->he.h_aliases[i]; i++)
+             mc->requests.m += strlen(rq->he.h_aliases[i]) + 1;
+ 
+         if (rq->he_rev.h_name)
+             mc->requests.m += strlen(rq->he_rev.h_name) + 1;
+ 
+         for (i = 0; rq->he_rev.h_aliases[i]; i++)
+             mc->requests.m += strlen(rq->he_rev.h_aliases[i]) + 1;
+     }
+ 
+     for (ce = cachetop; ce; ce = ce->list_next)
+     {
+         mc->cached.c++;
+         mc->cached.m += sizeof(*ce);
+ 
+         if (ce->he.h_name)
+             mc->cached.m += strlen(ce->he.h_name) + 1;
+ 
+         if (ce->he.h_aliases)
+         {
+             for (i = 0; ce->he.h_aliases[i]; i++)
+             {
+                 mc->cached.m += sizeof(char *);
+                 mc->cached.m += strlen(ce->he.h_aliases[i]) + 1;
+             }
+             mc->cached.m += sizeof(char *);
+         }
+ 
+         if (ce->he.h_addr_list)
+         {
+             for (i = 0; ce->he.h_addr_list[i]; i++)
+             {
+                 mc->cached.m += sizeof(char *);
+                 mc->cached.m += ce->he.h_length;
+             }
+             mc->cached.m += sizeof(char *);
+         }
+     }
+...

[truncated message content]
Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958/include

Modified Files:
	config.h h.h sbuf.h sys.h userban.h 
Log Message:
rework memory accounting
add MEMTRACE for debugging,minor memory leak fix, I need to go back and fix userban.c and clean up this files that I just modified when I get some time.

Index: sys.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/sys.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sys.h	27 Jun 2005 03:02:55 -0000	1.1.1.1
--- sys.h	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 76,80 ****
  #endif

! #define MyFree(x)       do { if (x) free(x); (x) = NULL; } while(0)

  extern void dummy();
--- 76,80 ----
  #endif

! 

  extern void dummy();

Index: h.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/h.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** h.h	27 Jun 2005 03:02:53 -0000	1.1.1.1
--- h.h	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 28,31 ****
--- 28,35 ----
  /* $Id$ */

+ 
+ #ifndef H_H
+ #define H_H
+ 
  #include "send.h"
  #include "ircsprintf.h"
***************
*** 174,186 ****
  extern void 	  clear_scache_hash_table(void);
  extern char 	 *find_or_add(char *);
- extern void 	  count_scache(int *, u_long *);
  extern void 	  list_scache(aClient *, aClient *, int, char **);

  extern void 	 *MyMalloc(size_t);
  extern void 	 *MyRealloc(void *, size_t);

! /* MyFree is defined as a macro in sys.h 
!  * extern  void     MyFree (void *); 
!  */

  extern char 	 *debugmode, configfile[], *sbrk0;
--- 178,232 ----
  extern void 	  clear_scache_hash_table(void);
  extern char 	 *find_or_add(char *);
  extern void 	  list_scache(aClient *, aClient *, int, char **);

+ 
+ #ifdef MEMTRACE
+ 
+ typedef struct MemTracer MemTracer;
+ struct MemTracer {
+     const char  *file;
+     const int    line;
+     int          initialized;
+     int          objects;
+     size_t       allocated;
+     MemTracer   *next;
+ };
+ 
+ extern void 	 *MyMalloc_impl(MemTracer *, size_t);
+ extern void 	 *MyRealloc_impl(MemTracer *, void *, size_t);
+ extern void 	 MyFree_impl(void *);
+ 
+ /* uses GNU C extension for statements in expressions */
+ #define MyMalloc(s) ({ \
+     static MemTracer mt = { __FILE__, __LINE__ }; \
+     MyMalloc_impl(&mt, s); \
+ })
+ 
+ #define MyRealloc(x, s) ({ \
+     static MemTracer mt = { __FILE__, __LINE__ }; \
+     MyRealloc_impl(&mt, x, s); \
+ })
+ 
+ #define MyFree(x)       do { MyFree_impl(x); (x) = NULL; } while(0)
+ 
+ #else
+ 
+ 
+ 
+ 
  extern void 	 *MyMalloc(size_t);
  extern void 	 *MyRealloc(void *, size_t);

! 
! 
! #define MyFree(x)       do { if (x) free(x); (x) = NULL; } while(0)
! 
! #endif  /* MEMTRACE */
! 
! extern u_long 	 channel_memreport(aClient *);
! extern u_long 	 hash_memreport(aClient *);
! extern u_long 	 hide_memreport(aClient *);
! extern u_long 	 parse_memreport(aClient *);
! extern u_long 	 s_bsd_memreport(aClient *);

  extern char 	 *debugmode, configfile[], *sbrk0;
***************
*** 372,376 ****

  #define MAXKILLS 20
! extern void 	  count_watch_memory(int *, u_long *);
  extern void    	  clear_watch_hash_table(void);
  extern int     	  add_to_watch_hash_table(char *, aClient *);
--- 418,422 ----

  #define MAXKILLS 20
! 
  extern void    	  clear_watch_hash_table(void);
  extern int     	  add_to_watch_hash_table(char *, aClient *);
***************
*** 383,387 ****
  DLink *add_to_list(DLink **, void *);
  void remove_from_list(DLink **, void *, DLink *);
! void print_list_memory(aClient *);

  void probability_add(aClient *);
--- 429,433 ----
  DLink *add_to_list(DLink **, void *);
  void remove_from_list(DLink **, void *, DLink *);
! 

  void probability_add(aClient *);
***************
*** 395,396 ****
--- 441,444 ----

  #include "find.h"
+ 
+ #endif  /* H_H */
\ No newline at end of file

Index: userban.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/userban.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** userban.h	27 Jun 2005 03:02:55 -0000	1.1.1.1
--- userban.h	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 97,101 ****
  char *get_userban_host(struct userBan *, char *, int);

! int count_userbans(aClient *cptr);

  /* Simban Calls */
--- 97,101 ----
  char *get_userban_host(struct userBan *, char *, int);

! 

  /* Simban Calls */
***************
*** 114,117 ****
  void expire_simbans();
  void send_simbans(aClient *, unsigned int);
- int count_simbans(aClient *);
  void remove_simban(struct simBan *);
--- 114,116 ----

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.h	3 Jul 2005 17:37:42 -0000	1.4
--- config.h	5 Jul 2005 02:40:01 -0000	1.5
***************
*** 939,942 ****
--- 939,951 ----
  #undef DUMP_DEBUG

+ 
+ /*
+  * MEMTRACE enables additional memory accounting for display in STATS Z.
+  * Requires GNU C extensions for expression blocks.
+  */
+ #undef MEMTRACE
+ 
+ 
+ 
  /* DONT_CHECK_QLINE_REMOTE
   * Don't check for Q:lines on remote clients.  We can't do anything

Index: sbuf.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/sbuf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sbuf.h	27 Jun 2005 03:02:53 -0000	1.1.1.1
--- sbuf.h	5 Jul 2005 02:40:01 -0000	1.2
***************
*** 54,61 ****
  extern int          sbuf_getmsg(SBuf* theBuf, char* theData, int theLength);
  extern int          sbuf_get(SBuf* theBuf, char* theData, int theLength);
- extern void         sbuf_count(int* userUsed, int* userTotal, int* userSize,
-                                int* smallUsed, int* smallTotal, int* smallSize,
-                                int* largeUsed, int* largeTotal, int* largeSize,
-                                int* blockUsed, int* blockSize, int* userblockUsed, int* userblockSize);

  #ifdef WRITEV_IOV
--- 54,57 ----

Update of /cvsroot/solidircd/solidircd-stable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958

Modified Files:
	TODO 
Log Message:
rework memory accounting
add MEMTRACE for debugging,minor memory leak fix, I need to go back and fix userban.c and clean up this files that I just modified when I get some time.

Index: TODO
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TODO	27 Jun 2005 03:01:55 -0000	1.1.1.1
--- TODO	5 Jul 2005 02:39:59 -0000	1.2
***************
*** 47,50 ****
--- 47,54 ----

+ [] Clean up last modified files, fix and error in userban.c
+    Being worked on by:Sheik
+    Progress:
+    Description:

Update of /cvsroot/solidircd/solidircd-stable/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958/tools

Modified Files:
	convert_conf.c 
Log Message:
rework memory accounting
add MEMTRACE for debugging,minor memory leak fix, I need to go back and fix userban.c and clean up this files that I just modified when I get some time.

Index: convert_conf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/tools/convert_conf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** convert_conf.c	27 Jun 2005 03:02:56 -0000	1.1.1.1
--- convert_conf.c	5 Jul 2005 02:40:05 -0000	1.2
***************
*** 32,35 ****
--- 32,36 ----

  #define MyMalloc(x) malloc(x)
+ #define MyFree(x) free(x)
  #define SBAN_LOCAL     0x001
  #define SBAN_NETWORK   0x002

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17088/src

Modified Files:
	s_user.c 
Log Message:
fixed some typos.

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_user.c	28 Jun 2005 03:08:13 -0000	1.4
--- s_user.c	3 Jul 2005 17:37:42 -0000	1.5
***************
*** 2257,2263 ****

  		 if (IsSAdmin(acptr))
!                 strcat(buf, "a \2IRC Operator - Services Administrator\2");
           else if (IsAdmin(acptr))
!                 strcat(buf, "a \2IRC Operator -Server Administrator\2");
           else if (IsOper(acptr))
                  strcat(buf, "an \2IRC Operator\2");
--- 2257,2263 ----

  		 if (IsSAdmin(acptr))
!                 strcat(buf, "an \2IRC Operator - Services Administrator\2");
           else if (IsAdmin(acptr))
!                 strcat(buf, "an \2IRC Operator - Server Administrator\2");
           else if (IsOper(acptr))
                  strcat(buf, "an \2IRC Operator\2");
***************
*** 3420,3424 ****
  			{
              sptr->umode &= ~UMODE_Y;
! 		    sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer marked as deaf and will recieve channel messages and notices as normal..",
                             me.name, sptr->name);
                 }
--- 3420,3424 ----
  			{
              sptr->umode &= ~UMODE_Y;
! 		    sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer marked as deaf and will receive channel messages and notices as normal..",
                             me.name, sptr->name);
                 }
***************
*** 3426,3430 ****
  			{
             sptr->umode |= UMODE_Y;
! 		 sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You have marked yourself as deaf and will no longer recieve channel messages or notices from any channel.",
                             me.name, sptr->name);
  		      }
--- 3426,3430 ----
  			{
             sptr->umode |= UMODE_Y;
! 		 sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You have marked yourself as deaf and will no longer receive channel messages or notices from any channel.",
                             me.name, sptr->name);
  		      }

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17088/include

Modified Files:
	config.h 
Log Message:
fixed some typos.

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.h	3 Jul 2005 02:26:58 -0000	1.3
--- config.h	3 Jul 2005 17:37:42 -0000	1.4
***************
*** 225,229 ****
   * Enable this at your own risk currently elmer is  not working but silly works. - Sheik 1/7/2005
   */
! #undef TOYS

  /* File names
--- 225,229 ----
   * Enable this at your own risk currently elmer is  not working but silly works. - Sheik 1/7/2005
   */
! #define TOYS

  /* File names

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9799/include

Modified Files:
	config.h 
Log Message:
added tux's conops fix.

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h	2 Jul 2005 23:35:21 -0000	1.2
--- config.h	3 Jul 2005 02:26:58 -0000	1.3
***************
*** 223,227 ****
   *
   * We created this toys to make fun of does annoying users you know what I mean ;) -Sheik 16/04/2005
!  *
   */
  #undef TOYS
--- 223,227 ----
   *
   * We created this toys to make fun of does annoying users you know what I mean ;) -Sheik 16/04/2005
!  * Enable this at your own risk currently elmer is  not working but silly works. - Sheik 1/7/2005
   */
  #undef TOYS

Update of /cvsroot/solidircd/solidircd-stable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9799

Modified Files:
	CHANGES 
Log Message:
added tux's conops fix.

Index: CHANGES
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGES	28 Jun 2005 02:23:59 -0000	1.2
--- CHANGES	3 Jul 2005 02:26:58 -0000	1.3
***************
*** 15,19 ****
  Changes from Tux
  ---------------
! 

  -----------------
--- 15,19 ----
  Changes from Tux
  ---------------
! 02/07/2005 - Added conops notice on client exit.

  -----------------

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9799/src

Modified Files:
	s_misc.c 
Log Message:
added tux's conops fix.

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** s_misc.c	2 Jul 2005 23:35:21 -0000	1.2
--- s_misc.c	3 Jul 2005 02:26:58 -0000	1.3
***************
*** 634,637 ****
--- 634,643 ----
                                 "Client Quit" : comment,
                                 sptr->hostip);
+ 
+ 			sendto_serv_butone(NULL, ":%s CONOPS :Client exiting: %s (%s@%s) [%s] [%s]",
+   	                                me.name, sptr->name, sptr->user->username,
+   	                               sptr->user->host, (sptr->flags & FLAGS_NORMALEX) ? "Client Quit" :
+   	                               comment, sptr->hostip);
+ 
          }
  #ifdef FNAME_USERLOG

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20207/src

Modified Files:
	s_misc.c 
Log Message:
dccallow fix.

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** s_misc.c	27 Jun 2005 03:02:26 -0000	1.1.1.1
--- s_misc.c	2 Jul 2005 23:35:21 -0000	1.2
***************
*** 321,324 ****
--- 321,326 ----
  }

+ #ifdef DCCALLOW
+ 
  int remove_dcc_references(aClient *sptr)
  {  
***************
*** 365,368 ****
--- 367,372 ----
  }  

+ #endif
+ 
  /*
   * NOQUIT
***************
*** 411,417 ****
      probability_remove(cptr);
  #endif
! 
      remove_dcc_references(cptr);
! 
      del_from_client_hash_table(cptr->name, cptr); 

--- 415,421 ----
      probability_remove(cptr);
  #endif
! #ifdef DCCALLOW
      remove_dcc_references(cptr);
! #endif
      del_from_client_hash_table(cptr->name, cptr); 

***************
*** 812,816 ****
--- 816,822 ----
              while ((lp = sptr->user->silence)) 
                  del_silence(sptr, lp->value.cp);
+ #ifdef DCCALLOW
              remove_dcc_references(sptr);
+ #endif
              /* again, this is all that is needed */
          }

Update of /cvsroot/solidircd/solidircd-stable/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20207/include

Modified Files:
	config.h 
Log Message:
dccallow fix.

Index: config.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.h	27 Jun 2005 03:02:51 -0000	1.1.1.1
--- config.h	2 Jul 2005 23:35:21 -0000	1.2
***************
*** 676,680 ****
   * disable it! :)
   */
! #define DCCALLOW

--- 676,680 ----
   * disable it! :)
   */
! #undef DCCALLOW

Update of /cvsroot/solidircd/solidircd-dev/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10997/src

Modified Files:
	s_misc.c 
Log Message:
ConOps

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-dev/src/s_misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_misc.c	29 May 2005 19:55:08 -0000	1.4
--- s_misc.c	2 Jul 2005 20:18:28 -0000	1.5
***************
*** 634,637 ****
--- 634,643 ----
                                 "Client Quit" : comment,
                                 sptr->hostip);
+ 
+            sendto_serv_butone(NULL, ":%s CONOPS :Client exiting: %s (%s@%s) [%s] [%s]",
+                                me.name, sptr->name, sptr->user->username,
+                               sptr->user->host, (sptr->flags & FLAGS_NORMALEX) ? "Client Quit" :
+                               comment, sptr->hostip);
+ 
          }
  #ifdef FNAME_USERLOG

2004	Jan	Feb	Mar	Apr	May	Jun	Jul (16)	Aug (7)	Sep (4)	Oct (94)	Nov (11)	Dec (2)
2005	Jan (2)	Feb	Mar	Apr	May (128)	Jun (22)	Jul (46)	Aug	Sep (15)	Oct	Nov	Dec (32)
2006	Jan (11)	Feb (2)	Mar (74)	Apr (3)	May	Jun (11)	Jul	Aug	Sep	Oct (11)	Nov	Dec
2007	Jan	Feb	Mar	Apr (23)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

solidircd-cvs Mailing List for Solid IRCd (Page 9)

solidircd-cvs — CVS