The proto API is a general purpose API, so don't use 'hast' in structures or

function names. It can now be used outside of HAST.

MFC after:	1 week

1 files changed, 30 insertions, 30 deletions

diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h
index 37df4f4..d62f26f 100644
--- a/sbin/hastd/proto_impl.h
+++ b/sbin/hastd/proto_impl.h
@@ -39,39 +39,39 @@
 
 #define	__constructor	__attribute__((constructor))
 
-typedef int hp_client_t(const char *, const char *, void **);
-typedef int hp_connect_t(void *, int);
-typedef int hp_connect_wait_t(void *, int);
-typedef int hp_server_t(const char *, void **);
-typedef int hp_accept_t(void *, void **);
-typedef int hp_wrap_t(int, bool, void **);
-typedef int hp_send_t(void *, const unsigned char *, size_t, int);
-typedef int hp_recv_t(void *, unsigned char *, size_t, int *);
-typedef int hp_descriptor_t(const void *);
-typedef bool hp_address_match_t(const void *, const char *);
-typedef void hp_local_address_t(const void *, char *, size_t);
-typedef void hp_remote_address_t(const void *, char *, size_t);
-typedef void hp_close_t(void *);
+typedef int prt_client_t(const char *, const char *, void **);
+typedef int prt_connect_t(void *, int);
+typedef int prt_connect_wait_t(void *, int);
+typedef int prt_server_t(const char *, void **);
+typedef int prt_accept_t(void *, void **);
+typedef int prt_wrap_t(int, bool, void **);
+typedef int prt_send_t(void *, const unsigned char *, size_t, int);
+typedef int prt_recv_t(void *, unsigned char *, size_t, int *);
+typedef int prt_descriptor_t(const void *);
+typedef bool prt_address_match_t(const void *, const char *);
+typedef void prt_local_address_t(const void *, char *, size_t);
+typedef void prt_remote_address_t(const void *, char *, size_t);
+typedef void prt_close_t(void *);
 
-struct hast_proto {
-	const char		*hp_name;
-	hp_client_t		*hp_client;
-	hp_connect_t		*hp_connect;
-	hp_connect_wait_t	*hp_connect_wait;
-	hp_server_t		*hp_server;
-	hp_accept_t		*hp_accept;
-	hp_wrap_t		*hp_wrap;
-	hp_send_t		*hp_send;
-	hp_recv_t		*hp_recv;
-	hp_descriptor_t		*hp_descriptor;
-	hp_address_match_t	*hp_address_match;
-	hp_local_address_t	*hp_local_address;
-	hp_remote_address_t	*hp_remote_address;
-	hp_close_t		*hp_close;
-	TAILQ_ENTRY(hast_proto)	 hp_next;
+struct proto {
+	const char		*prt_name;
+	prt_client_t		*prt_client;
+	prt_connect_t		*prt_connect;
+	prt_connect_wait_t	*prt_connect_wait;
+	prt_server_t		*prt_server;
+	prt_accept_t		*prt_accept;
+	prt_wrap_t		*prt_wrap;
+	prt_send_t		*prt_send;
+	prt_recv_t		*prt_recv;
+	prt_descriptor_t	*prt_descriptor;
+	prt_address_match_t	*prt_address_match;
+	prt_local_address_t	*prt_local_address;
+	prt_remote_address_t	*prt_remote_address;
+	prt_close_t		*prt_close;
+	TAILQ_ENTRY(proto)	 prt_next;
 };
 
-void proto_register(struct hast_proto *proto, bool isdefault);
+void proto_register(struct proto *proto, bool isdefault);
 
 int proto_common_send(int sock, const unsigned char *data, size_t size, int fd);
 int proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp);