X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=include%2Fs_misc.h;h=1fb82b0e97cb4c2de855364055bee28dbfdc34d8;hb=refs%2Fheads%2Fupstream;hp=7c82b170fdbf026e6478bc72e274b494e05977de;hpb=ae91ef6320f611af74e70a0db2620c338fbaa7d5;p=ircu2.10.12-pk.git

diff --git a/include/s_misc.h b/include/s_misc.h
index 7c82b17..1fb82b0 100644
--- a/include/s_misc.h
+++ b/include/s_misc.h
@@ -1,7 +1,6 @@
-/*
- * s_misc.h
- *
- * $Id$
+/** @file s_misc.h
+ * @brief Miscellaneous support functions and declarations.
+ * @version $Id$
  */
 #ifndef INCLUDED_s_misc_h
 #define INCLUDED_s_misc_h
@@ -16,45 +15,59 @@
 
 
 struct Client;
+struct StatDesc;
 struct ConfItem;
 
 /*-----------------------------------------------------------------------------
  * Macros
  */
 
+/** Return value from various functions to indicate the source has
+ * been disconnected. */
 #define CPTR_KILLED     -2
 
 /*
  * Structures
  */
 
+#ifdef HAVE_INTTYPES_H
+# ifndef INCLUDED_inttypes_h
+#  include <inttypes.h>
+#  define INCLUDED_inttypes_h
+# endif
+#else
+# ifdef HAVE_STDINT_H
+#  ifndef INCLUDED_stdint_h
+#   include <stdint.h>
+#   define INCLUDED_stdint_h
+#  endif
+# endif
+#endif
+
+/** Structure used to count many server-wide statistics. */
 struct ServerStatistics {
-  unsigned int is_cl;           /* number of client connections */
-  unsigned int is_sv;           /* number of server connections */
-  unsigned int is_ni;           /* connection but no idea who it was */
-  unsigned short int is_cbs;    /* bytes sent to clients */
-  unsigned short int is_cbr;    /* bytes received to clients */
-  unsigned short int is_sbs;    /* bytes sent to servers */
-  unsigned short int is_sbr;    /* bytes received to servers */
-  unsigned int is_cks;          /* k-bytes sent to clients */
-  unsigned int is_ckr;          /* k-bytes received to clients */
-  unsigned int is_sks;          /* k-bytes sent to servers */
-  unsigned int is_skr;          /* k-bytes received to servers */
-  time_t is_cti;                /* time spent connected by clients */
-  time_t is_sti;                /* time spent connected by servers */
-  unsigned int is_ac;           /* connections accepted */
-  unsigned int is_ref;          /* accepts refused */
-  unsigned int is_unco;         /* unknown commands */
-  unsigned int is_wrdi;         /* command going in wrong direction */
-  unsigned int is_unpf;         /* unknown prefix */
-  unsigned int is_empt;         /* empty message */
-  unsigned int is_num;          /* numeric message */
-  unsigned int is_kill;         /* number of kills generated on collisions */
-  unsigned int is_fake;         /* MODE 'fakes' */
-  unsigned int is_asuc;         /* successful auth requests */
-  unsigned int is_abad;         /* bad auth requests */
-  unsigned int is_loc;          /* local connections made */
-  unsigned int uping_recv;      /* UDP Pings received */
+  unsigned int is_cl;           /**< number of client connections */
+  unsigned int is_sv;           /**< number of server connections */
+  unsigned int is_ni;           /**< connection but no idea who it was */
+  uint64_t is_cbs;              /**< bytes sent to clients */
+  uint64_t is_cbr;              /**< bytes received to clients */
+  uint64_t is_sbs;              /**< bytes sent to servers */
+  uint64_t is_sbr;              /**< bytes received to servers */
+  uint64_t is_cti;              /**< time spent connected by clients */
+  uint64_t is_sti;              /**< time spent connected by servers */
+  unsigned int is_ac;           /**< connections accepted */
+  unsigned int is_ref;          /**< accepts refused */
+  unsigned int is_unco;         /**< unknown commands */
+  unsigned int is_wrdi;         /**< command going in wrong direction */
+  unsigned int is_unpf;         /**< unknown prefix */
+  unsigned int is_empt;         /**< empty message */
+  unsigned int is_num;          /**< numeric message */
+  unsigned int is_kill;         /**< number of kills generated on collisions */
+  unsigned int is_fake;         /**< MODE 'fakes' */
+  unsigned int is_asuc;         /**< successful auth requests */
+  unsigned int is_abad;         /**< bad auth requests */
+  unsigned int is_loc;          /**< local connections made */
+  unsigned int uping_recv;      /**< UDP Pings received */
 };
 
 /*
@@ -64,17 +77,16 @@ struct ServerStatistics {
 extern int check_registered(struct Client *sptr);
 extern int check_registered_user(struct Client *sptr);
 extern int exit_client(struct Client *cptr, struct Client *bcptr,
-    struct Client *sptr, char *comment);
+    struct Client *sptr, const char *comment);
 extern char *myctime(time_t value);
 extern int exit_client_msg(struct Client *cptr, struct Client *bcptr,
-                           struct Client *sptr, char *pattern, ...);
+                           struct Client *sptr, const char *pattern, ...);
 extern void initstats(void);
 extern char *date(time_t clock);
-extern const char* get_client_host(const struct Client *cptr);
-extern void get_sockhost(struct Client *cptr, char *host);
 extern int vexit_client_msg(struct Client *cptr, struct Client *bcptr,
-    struct Client *sptr, char *pattern, va_list vl);
-extern void tstats(struct Client *cptr, char *name);
+    struct Client *sptr, const char *pattern, va_list vl);
+extern void tstats(struct Client *cptr, const struct StatDesc *sd,
+                   char *param);
 
 extern struct ServerStatistics* ServerStats;