[Msyslog-cvs] syslog/src syslogd.h,1.127,1.128 modules.h,1.57,1.58

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19098/src

Modified Files:
	syslogd.h modules.h 
Log Message:
more cleanups and reorganization. more to come.


Index: syslogd.h
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- syslogd.h	16 Jun 2003 21:42:30 -0000	1.127
+++ syslogd.h	16 Jun 2003 22:43:27 -0000	1.128
@@ -116,7 +116,6 @@
 #define MAX_PROGNAME_SIZE_STR	"31"	/* minus one, for '\0' */
 #define MAX_HOST_SIZE		48	/* max host length */
 #define MAX_HOST_SIZE_STR	"47"	/* minus one, for '\0' */
-#define MAX_PEO_LEN		40	/* XXX: EVP_MAX_MD_SIZE * 2 */
 #define STD_DATE_LEN		16	/* standard syslog date */
 
 
@@ -176,14 +175,6 @@
 #define M_FIELD_TM	0x40000
 /* beware the element count of this list should fit on fields member */
 
-/* hash and crytpo algorithms */
-#define	M_PEO_SHA1	0x001
-#define	M_PEO_RMD160	0x002
-#define	M_MAC_SHA1	0x010
-#define	M_MAC_RMD160	0x020
-#define	M_VCR_BLOWFISH	0x100
-#define	M_VCR_AES	0x200
-
 /*
  * This is the message structure.
  * It contains also the state information for a message.
@@ -199,14 +190,11 @@
 	char		 user[MAX_USERNAME_SIZE];	/* user name */
 	uint32_t	 vals[MAX_VALS];	/* integer values */
 	char		 date[STD_DATE_LEN];	/* date in chars */
-	char		 state[MAX_PEO_LEN];	/* msg protection */
 	struct tm	 tm;			/* time (also in vals) */
 	uint32_t	 mlen;			/* msg length */
 	uint32_t	 hlen;			/* host length */
 	uint32_t	 plen;			/* program (name) length */
 	uint32_t	 ulen;			/* user (name) length */
-	uint32_t	 slen;			/* user (name) length */
-	uint16_t	 algorithm;		/* protection algorithm */
 } m_msg_t;
 
 #define CLEAR_MSG(m)	{ (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \
@@ -258,6 +246,7 @@
 
 #define MLIB_MAX	10	/* max external libs per module */
 
+/* XXX: merge this w/ o_module_t */
 typedef struct omodule {
 	char	*name;
 	int	(*init) (int, char **, filed_t *, m_global_t *, void **, char **);
@@ -280,15 +269,6 @@
 #define	BACKOFF(f)	{ if (++(f)->repeatcount > MAXREPEAT) \
 				 (f)->repeatcount = MAXREPEAT; \
 			}
-
-/* values for integrity facilities */
-#define I_NONE		0
-#define I_PEO		1
-#define	I_VCR		2
-#define	I_OTS		3
-#define	I_SHA		4
-#define DEFAULT_INTEG_FACILITY	I_NONE
-
 
 #ifndef TABLE_NOPRI
 # define TABLE_NOPRI     0       /* Value to indicate no priority in pmask */

Index: modules.h
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- modules.h	16 Jun 2003 19:18:39 -0000	1.57
+++ modules.h	16 Jun 2003 22:43:27 -0000	1.58
@@ -44,7 +44,13 @@
 # define MAXLINE 2048
 #endif
 
-#define MAX_MODULE_NAME_LEN 255
+#define MAX_MODULE_NAME_LEN	255
+#define MAX_PEO_LEN		 40	/* XXX: EVP_MAX_MD_SIZE * 2 */
+
+/* hash and crytpo algorithms */
+#define	M_PEO		0x001
+#define	M_LPEO		0x002
+#define	M_VCR		0x004
 
 
 /*
@@ -52,11 +58,14 @@
  */
 
 typedef struct o_module {
-	struct	o_module *next;
-	struct	omodule *func; /* where are this puppy's functions? */
-	void	*ctx;
+	char			 state[MAX_PEO_LEN];	/* msg protection */
+	struct	o_module	*next;
+	struct	omodule		*func;			/* module functions */
+	void			*ctx;
 /* XXX: remove this */
-	char	*status;
+	char			*status;
+	uint32_t		 slen;			/* user (name) length */
+	uint16_t		 algorithm;		/* protection algorithm */
 } o_module_t;
 
 /*