Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / utils / networking.h

diff --git a/mono/utils/networking.h b/mono/utils/networking.h
index 8c2e930b254751cf0b41ec7bcb7624b92d039192..f9c5f63dbc0218b516796349925b4edbd3fade03 100644 (file)
--- a/mono/utils/networking.h
+++ b/mono/utils/networking.h
@@ -1,5 +1,6 @@
-/*
- * networking.h: Portable networking functions
+/**
+ * \file
+ * Portable networking functions
  *
  * Author:
  *     Rodrigo Kumpera (kumpera@gmail.com)
@@ -11,9 +12,29 @@
 #ifndef __MONO_NETWORKING_H__
 #define __MONO_NETWORKING_H__
 
+#include <config.h>
+#include <glib.h>
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HOST_WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
 #include <mono/utils/mono-compiler.h>
 
 typedef enum {
@@ -50,21 +71,37 @@ typedef union {
        struct sockaddr addr;
 } MonoSocketAddress;
 
+typedef struct {
+       int family;
+       union {
+               struct in_addr v4;
+               struct in6_addr v6;
+       } addr;
+} MonoAddress;
+
 /* This only supports IPV4 / IPV6 and tcp */
-int mono_get_address_info (const char *hostname, int port, int flags, MonoAddressInfo **res) MONO_INTERNAL;
+int mono_get_address_info (const char *hostname, int port, int flags, MonoAddressInfo **res);
 
-void mono_free_address_info (MonoAddressInfo *ai) MONO_INTERNAL;
+void mono_free_address_info (MonoAddressInfo *ai);
 
-void mono_socket_address_init (MonoSocketAddress *sa, socklen_t *len, int family, const void *address, int port) MONO_INTERNAL;
+void mono_socket_address_init (MonoSocketAddress *sa, socklen_t *len, int family, const void *address, int port);
 
-void *mono_get_local_interfaces (int family, int *interface_count) MONO_INTERNAL;
+void *mono_get_local_interfaces (int family, int *interface_count);
 
 #ifndef HAVE_INET_PTON
-int inet_pton (int family, const char *address, void *inaddrp) MONO_INTERNAL;
+int inet_pton (int family, const char *address, void *inaddrp);
 #endif
 
-int mono_networking_get_tcp_protocol (void) MONO_INTERNAL;
-int mono_networking_get_ip_protocol (void) MONO_INTERNAL;
-int mono_networking_get_ipv6_protocol (void) MONO_INTERNAL;
+void mono_address_init (MonoAddress *out_addr, int family, void *in_addr);
+int mono_address_size_for_family (int family);
+gboolean mono_networking_addr_to_str (MonoAddress *address, char *buffer, socklen_t buflen);
+
+int mono_networking_get_tcp_protocol (void);
+int mono_networking_get_ip_protocol (void);
+int mono_networking_get_ipv6_protocol (void);
+
+void mono_networking_init (void);
+void mono_networking_shutdown (void);
+
 
 #endif