partial move to KNF. More to come. This has happened because there

are a raft of source code auditors who are willing to help improve this
code only if this is done, and hey, isakmpd does need our standard
auditing process.  ok ho hshoexer

1 files changed, 44 insertions, 44 deletions

diff --git a/sbin/isakmpd/doi.h b/sbin/isakmpd/doi.h
index bf5b4b69b2c..adf7ddeef58 100644
--- a/sbin/isakmpd/doi.h
+++ b/sbin/isakmpd/doi.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: doi.h,v 1.12 2004/03/10 23:08:48 hshoexer Exp $	*/
-/*	$EOM: doi.h,v 1.29 2000/07/02 18:47:15 provos Exp $	*/
+/* $OpenBSD: doi.h,v 1.13 2004/04/15 18:39:25 deraadt Exp $	 */
+/* $EOM: doi.h,v 1.29 2000/07/02 18:47:15 provos Exp $	 */
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -44,54 +44,54 @@ struct sa;
 
 /* XXX This structure needs per-field commenting.  */
 struct doi {
-  LIST_ENTRY (doi) link;
-  u_int8_t id;
+	LIST_ENTRY(doi) link;
+	u_int8_t        id;
 
-  /* Size of DOI-specific exchange data.  */
-  size_t exchange_size;
+	/* Size of DOI-specific exchange data.  */
+	size_t          exchange_size;
 
-  /* Size of DOI-specific security association data.  */
-  size_t sa_size;
+	/* Size of DOI-specific security association data.  */
+	size_t          sa_size;
 
-  /* Size of DOI-specific protocol data.  */
-  size_t proto_size;
+	/* Size of DOI-specific protocol data.  */
+	size_t          proto_size;
 
 #ifdef USE_DEBUG
-  int (*debug_attribute) (u_int16_t, u_int8_t *, u_int16_t, void *);
+	int             (*debug_attribute) (u_int16_t, u_int8_t *, u_int16_t, void *);
 #endif
-  void (*delete_spi) (struct sa *, struct proto *, int);
-  int16_t *(*exchange_script) (u_int8_t);
-  void (*finalize_exchange) (struct message *);
-  void (*free_exchange_data) (void *);
-  void (*free_proto_data) (void *);
-  void (*free_sa_data) (void *);
-  struct keystate *(*get_keystate) (struct message *);
-  u_int8_t *(*get_spi) (size_t *, u_int8_t, struct message *);
-  int (*handle_leftover_payload) (struct message *, u_int8_t,
-				  struct payload *);
-  int (*informational_post_hook) (struct message *);
-  int (*informational_pre_hook) (struct message *);
-  int (*is_attribute_incompatible) (u_int16_t, u_int8_t *, u_int16_t, void *);
-  void (*proto_init) (struct proto *, char *);
-  void (*setup_situation) (u_int8_t *);
-  size_t (*situation_size) (void);
-  u_int8_t (*spi_size) (u_int8_t);
-  int (*validate_attribute) (u_int16_t, u_int8_t *, u_int16_t, void *);
-  int (*validate_exchange) (u_int8_t);
-  int (*validate_id_information) (u_int8_t, u_int8_t *, u_int8_t *, size_t,
-				  struct exchange *);
-  int (*validate_key_information) (u_int8_t *, size_t);
-  int (*validate_notification) (u_int16_t);
-  int (*validate_proto) (u_int8_t);
-  int (*validate_situation) (u_int8_t *, size_t *, size_t);
-  int (*validate_transform_id) (u_int8_t, u_int8_t);
-  int (*initiator) (struct message *msg);
-  int (*responder) (struct message *msg);
-  char *(*decode_ids) (char *, u_int8_t *, size_t, u_int8_t *, size_t, int);
+	void            (*delete_spi) (struct sa *, struct proto *, int);
+	int16_t        *(*exchange_script) (u_int8_t);
+	void            (*finalize_exchange) (struct message *);
+	void            (*free_exchange_data) (void *);
+	void            (*free_proto_data) (void *);
+	void            (*free_sa_data) (void *);
+	struct keystate *(*get_keystate) (struct message *);
+	u_int8_t       *(*get_spi) (size_t *, u_int8_t, struct message *);
+	int             (*handle_leftover_payload) (struct message *, u_int8_t,
+					                  struct payload *);
+	int             (*informational_post_hook) (struct message *);
+	int             (*informational_pre_hook) (struct message *);
+	int             (*is_attribute_incompatible) (u_int16_t, u_int8_t *, u_int16_t, void *);
+	void            (*proto_init) (struct proto *, char *);
+	void            (*setup_situation) (u_int8_t *);
+	                size_t(*situation_size) (void);
+	                u_int8_t(*spi_size) (u_int8_t);
+	int             (*validate_attribute) (u_int16_t, u_int8_t *, u_int16_t, void *);
+	int             (*validate_exchange) (u_int8_t);
+	int             (*validate_id_information) (u_int8_t, u_int8_t *, u_int8_t *, size_t,
+					                 struct exchange *);
+	int             (*validate_key_information) (u_int8_t *, size_t);
+	int             (*validate_notification) (u_int16_t);
+	int             (*validate_proto) (u_int8_t);
+	int             (*validate_situation) (u_int8_t *, size_t *, size_t);
+	int             (*validate_transform_id) (u_int8_t, u_int8_t);
+	int             (*initiator) (struct message * msg);
+	int             (*responder) (struct message * msg);
+	char           *(*decode_ids) (char *, u_int8_t *, size_t, u_int8_t *, size_t, int);
 };
 
-extern void doi_init (void);
-extern struct doi *doi_lookup (u_int8_t);
-extern void doi_register (struct doi *);
+extern void     doi_init(void);
+extern struct doi *doi_lookup(u_int8_t);
+extern void     doi_register(struct doi *);
 
-#endif /* _DOI_H_ */
+#endif				/* _DOI_H_ */