From 0e82cdeadcba8a78c9bb3b508decd6eae6bafd13 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 27 Oct 2010 23:06:38 +0200
Subject: [PATCH] Moved includes from priv.h to bind.h

---
 include/libssh/bind.h | 53 +++++++++++++++++++++++++++++++++++++++++++
 include/libssh/priv.h | 27 ++--------------------
 src/bind.c            |  1 +
 src/options.c         |  1 +
 4 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 include/libssh/bind.h

diff --git a/include/libssh/bind.h b/include/libssh/bind.h
new file mode 100644
index 00000000..705d2759
--- /dev/null
+++ b/include/libssh/bind.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the SSH Library
+ *
+ * Copyright (c) 2010 by Aris Adamantiadis
+ *
+ * The SSH Library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * The SSH Library 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the SSH Library; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#ifndef BIND_H_
+#define BIND_H_
+
+#include "libssh/priv.h"
+
+struct ssh_bind_struct {
+  struct error_struct error;
+
+  ssh_callbacks callbacks; /* Callbacks to user functions */
+  struct ssh_bind_callbacks_struct *bind_callbacks;
+  void *bind_callbacks_userdata;
+
+  struct ssh_poll_handle_struct *poll;
+  /* options */
+  char *wanted_methods[10];
+  char *banner;
+  char *dsakey;
+  char *rsakey;
+  char *bindaddr;
+  socket_t bindfd;
+  unsigned int bindport;
+  unsigned int log_verbosity;
+
+  int blocking;
+  int toaccept;
+};
+
+struct ssh_poll_handle_struct *ssh_bind_get_poll(struct ssh_bind_struct
+    *sshbind);
+
+
+#endif /* BIND_H_ */
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 4d00a0cb..9d55ae7e 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -139,34 +139,9 @@ struct ssh_keys_struct {
 };
 
 struct ssh_message_struct;
-struct ssh_poll_handle_struct;
 
 /* server data */
 
-struct ssh_bind_struct {
-  struct error_struct error;
-
-  ssh_callbacks callbacks; /* Callbacks to user functions */
-  struct ssh_bind_callbacks_struct *bind_callbacks;
-  void *bind_callbacks_userdata;
-
-  struct ssh_poll_handle_struct *poll;
-  /* options */
-  char *wanted_methods[10];
-  char *banner;
-  char *dsakey;
-  char *rsakey;
-  char *bindaddr;
-  socket_t bindfd;
-  unsigned int bindport;
-  unsigned int log_verbosity;
-
-  int blocking;
-  int toaccept;
-};
-
-struct ssh_poll_handle_struct *ssh_bind_get_poll(struct ssh_bind_struct
-    *sshbind);
 
 SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback);
 SSH_PACKET_CALLBACK(ssh_packet_ignore_callback);
@@ -191,6 +166,8 @@ uint32_t packet_decrypt_len(ssh_session session,char *crypted);
 int packet_decrypt(ssh_session session, void *packet,unsigned int len);
 unsigned char *packet_encrypt(ssh_session session,void *packet,unsigned int len);
  /* it returns the hmac buffer if exists*/
+struct ssh_poll_handle_struct;
+
 int packet_hmac_verify(ssh_session session,ssh_buffer buffer,unsigned char *mac);
 
 struct ssh_socket_struct;
diff --git a/src/bind.c b/src/bind.c
index 27ad6b55..c0020354 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 
 #include "libssh/priv.h"
+#include "libssh/bind.h"
 #include "libssh/libssh.h"
 #include "libssh/server.h"
 #include "libssh/keyfiles.h"
diff --git a/src/options.c b/src/options.c
index 42c9a40a..2041f9b4 100644
--- a/src/options.c
+++ b/src/options.c
@@ -37,6 +37,7 @@
 #include "libssh/misc.h"
 #ifdef WITH_SERVER
 #include "libssh/server.h"
+#include "libssh/bind.h"
 #endif
 
 /**