portability updates

add check if ipv6/sockaddr_in6 is availavble or not add check for poll.h and only include when available add includes for AROS
2013-04-18 19:43:36 -07:00
parent fbf58ead9f
commit 402653b9f3
13 changed files with 154 additions and 22 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,26 @@ if test x"$libiscsi_cv_NEED_SYS_FILIO_H" = x"yes"; then
    AC_DEFINE(NEED_SYS_FILIO_H,1,[Whether we need sys/filio.h])
 fi

+# check for arpa/inet.h
+dnl Check for arpa/inet.h
+AC_CHECK_HEADERS([arpa/inet.h])
+
+# check for poll.h
+dnl Check for poll.h
+AC_CHECK_HEADERS([poll.h])
+
+
+AC_CACHE_CHECK([for sockaddr_in6 support],libiscsi_cv_HAVE_SOCKADDR_IN6,[
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>],
+[struct sockaddr_in6 sock; int len = sizeof(sock);],
+libiscsi_cv_HAVE_SOCKADDR_IN6=yes,libiscsi_cv_HAVE_SOCKADDR_IN6=no)])
+if test x"$libiscsi_cv_HAVE_SOCKADDR_IN6" = x"yes"; then
+    AC_DEFINE(HAVE_SOCKADDR_IN6,1,[Whether we have IPv6 support])
+fi
+
+
 AC_MSG_CHECKING(whether libpopt is available)
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
--- a/lib/discovery.c
+++ b/lib/discovery.c
@@ -14,9 +14,15 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

-#if defined(WIN32)
-#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif

--- a/lib/iscsi-command.c
+++ b/lib/iscsi-command.c
@@ -14,11 +14,20 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif

 #if defined(WIN32)
 #include <winsock2.h>
-#else
-#include <arpa/inet.h>
 #endif

 #include <stdio.h>
--- a/lib/logging.c
+++ b/lib/logging.c
@@ -14,15 +14,24 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

-#if defined(WIN32)
-#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

 #include <stdio.h>
 #include <stdarg.h>
-#include <arpa/inet.h>
 #include "iscsi.h"
 #include "iscsi-private.h"
 #include "scsi-lowlevel.h"
--- a/lib/login.c
+++ b/lib/login.c
@@ -19,10 +19,20 @@
 #define _GNU_SOURCE
 #endif

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #if defined(WIN32)
 #include <winsock2.h>
-#else
-#include <arpa/inet.h>
 #endif

 #include <stdio.h>
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,6 +19,13 @@
 *  - Ian Jackson <ijackson@nyx.cs.du.edu>.
 * Still in the public domain.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif

 #include "md5.h"

--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -14,12 +14,22 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif

 #if defined(WIN32)
 #include <winsock2.h>
 #else
 #include <strings.h>
-#include <arpa/inet.h>
 #endif

 #include <stdio.h>
--- a/lib/scsi-lowlevel.c
+++ b/lib/scsi-lowlevel.c
@@ -21,12 +21,26 @@
 * 3, unmarshall data-in into a real structure
 * 4, marshall a real structure into a data-out blob
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef AROS
+#include "aros/aros_compat.h"
+#endif

 #if defined(WIN32)
 #include <winsock2.h>
 #else
 #include <strings.h>
-#include <arpa/inet.h>
 #endif

 #include <stdio.h>
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,6 +14,29 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef AROS
+#include "aros/aros_compat.h"
+#endif

 #if defined(WIN32)
 #include <winsock2.h>
@@ -21,15 +44,11 @@
 #define ioctl ioctlsocket
 #define close closesocket
 #else
-#include "config.h"
 #include <strings.h>
-#include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <poll.h>
 #include <sys/ioctl.h>
 #endif

@@ -217,6 +236,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
 		((struct sockaddr_in *)(ai->ai_addr))->sin_len = socksize;
 #endif
 		break;
+#ifdef HAVE_SOCKADDR_IN6
 	case AF_INET6:
 		socksize = sizeof(struct sockaddr_in6);
 		((struct sockaddr_in6 *)(ai->ai_addr))->sin6_port = htons(port);
@@ -224,6 +244,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
 		((struct sockaddr_in6 *)(ai->ai_addr))->sin6_len = socksize;
 #endif
 		break;
+#endif
 	default:
 		iscsi_set_error(iscsi, "Unknown address family :%d. "
 				"Only IPv4/IPv6 supported so far.",
--- a/lib/sync.c
+++ b/lib/sync.c
@@ -14,12 +14,17 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif

 #if defined(WIN32)
 #include <winsock2.h>
 #include "win32/win32_compat.h"
-#else
-#include <poll.h>
 #endif

 #include <stdio.h>
--- a/lib/task_mgmt.c
+++ b/lib/task_mgmt.c
@@ -14,14 +14,23 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

-#if defined(WIN32)
-#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

 #include <stdio.h>
-#include <arpa/inet.h>
 #include "iscsi.h"
 #include "iscsi-private.h"
 #include "scsi-lowlevel.h"
--- a/src/iscsi-inq.c
+++ b/src/iscsi-inq.c
@@ -14,12 +14,18 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <poll.h>
 #include <popt.h>
 #include "iscsi.h"
 #include "scsi-lowlevel.h"
--- a/src/iscsi-ls.c
+++ b/src/iscsi-ls.c
@@ -14,12 +14,18 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <poll.h>
 #include <popt.h>
 #include "iscsi.h"
 #include "scsi-lowlevel.h"