[Layout] Added os/net.[ch]. They will include wrappers for missing IPv6

         capabilities and should hide common networking related differences
         between OSs

[Port] Implement IPv4-only version of inet_ntop for OSs which doesn't have it


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3369 3789f03b-4d11-0410-bbf8-ca57d06f2519

3 files changed, 108 insertions, 2 deletions

diff --git a/common/os/Makefile.am b/common/os/Makefile.am
index 23e4dfb2..3d892609 100644
--- a/common/os/Makefile.am
+++ b/common/os/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LTLIBRARIES = libos.la
 
-HDRS = print.h
+HDRS = net.h print.h
 
-libos_la_SOURCES = $(HDRS) print.c
+libos_la_SOURCES = $(HDRS) print.c net.c
diff --git a/common/os/net.c b/common/os/net.c
new file mode 100644
index 00000000..50ce8687
--- /dev/null
+++ b/common/os/net.c
@@ -0,0 +1,52 @@
+/* Copyright (C) 2008 TightVNC Team.  All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This software 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef WIN32
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#include <os/net.h>
+
+
+#ifndef HAVE_INET_NTOP
+const char *tight_inet_ntop(int af, const void *src, char *dst,
+			    socklen_t size) {
+	char *tempstr;
+
+	/* Catch bugs - we should not use IPv6 if we don't have inet_ntop */
+	if (af != AF_INET)
+		abort();
+
+	/* inet_ntoa never fails */
+	tempstr = inet_ntoa(*(struct in_addr *)(src));
+	memcpy(dst, tempstr, strlen(tempstr) + 1);
+
+	return dst;
+}
+#endif
diff --git a/common/os/net.h b/common/os/net.h
new file mode 100644
index 00000000..72471032
--- /dev/null
+++ b/common/os/net.h
@@ -0,0 +1,54 @@
+/* Copyright (C) 2008 TightVNC Team.  All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This software 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#ifndef OS_NET_H
+#define OS_NET_H
+
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
+#ifdef WIN32
+#include <common-config.win.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
+/* IPv6 support on server side - we have to have all those functions */
+#if defined(HAVE_INET_NTOP)
+#define HAVE_IPV6
+#endif
+
+/* IPv4-only stub implementation */
+#ifndef HAVE_INET_NTOP
+const char *tight_inet_ntop(int af, const void *restrict src,
+			    char *restrict dst, socklen_t size);
+#define inet_ntop tight_inet_ntop
+#endif
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* OS_NET_H */