Index: vapigen/valagidlparser.vala =================================================================== --- vapigen/valagidlparser.vala (revision 587) +++ vapigen/valagidlparser.vala (working copy) @@ -143,18 +143,42 @@ } private string! fix_type_name (string! type_name, Namespace! ns) { + stderr.printf("type_name %s - namespace %s", type_name, ns.name); if (type_name.has_prefix (ns.name)) { + stderr.printf("\n"); return type_name.offset (ns.name.len ()); } else if (ns.name == "GLib" && type_name.has_prefix ("G")) { + stderr.printf("\n"); return type_name.offset (1); } else { + + var attributes = get_attributes (type_name); + if (attributes != null) { + foreach (string attr in attributes) { + var nv = attr.split ("=", 2); + if (nv[0] == "name") { + stderr.printf(" name ovverride : %s\n", nv[1]); + return eval(nv[1]); + } + } + } + + string best_match = null; foreach (string name in ns.get_cprefixes ()) { if (type_name.has_prefix (name)) { - return type_name.offset (name.len ()); + if (best_match == null || name.len() > best_match.len()) + best_match = name; } } + + if (best_match != null) + { + stderr.printf(" result: %s\n", best_match); + return type_name.offset (best_match.len ());; + } } + stderr.printf("\n"); return type_name; } @@ -293,6 +317,7 @@ if (!is_reference_type (node.name)) { var st = ns.scope.lookup (name) as Struct; + if (st == null) { st = new Struct (name, current_source_reference); st.access = SymbolAccessibility.PUBLIC; Index: vapi/packages/gnet-2.0/gnet-2.0-custom.vala =================================================================== --- vapi/packages/gnet-2.0/gnet-2.0-custom.vala (revision 587) +++ vapi/packages/gnet-2.0/gnet-2.0-custom.vala (working copy) @@ -14,4 +14,7 @@ INVAL, UNKNOWN } + + [Import] + public void init(); } Index: vapi/packages/gnet-2.0/gnet-2.0.metadata =================================================================== --- vapi/packages/gnet-2.0/gnet-2.0.metadata (revision 587) +++ vapi/packages/gnet-2.0/gnet-2.0.metadata (working copy) @@ -2,4 +2,6 @@ gnet_conn_new_inetaddr name="from_inetaddr" gnet_conn_new_socket name="from_socket" +GnetInetaddr name="InetAddr" + G* cprefix="G" Index: vapi/gnet-2.0.vala =================================================================== --- vapi/gnet-2.0.vala (revision 587) +++ vapi/gnet-2.0.vala (working copy) @@ -84,7 +84,7 @@ [CCode (cheader_filename = "gnet-2.0-custom.h")] public class TcpSocketNewAsyncID { } - [CCode (cheader_filename = "gnet-2.0.h")] + [CCode (ref_function = "gnet_conn_ref", unref_function = "gnet_conn_unref", cheader_filename = "gnet-2.0.h")] public class Conn { public weak string hostname; public int port; @@ -110,6 +110,36 @@ public uint timer; public GNet.ConnFunc func; public pointer user_data; + public void connect (); + public void delete (); + public void disconnect (); + public static void http_cancel (GNet.ConnHttp conn); + public static void http_delete (GNet.ConnHttp conn); + public static weak GNet.ConnHttp http_new (); + public static bool http_run (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data); + public static void http_run_async (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data); + public static bool http_set_header (GNet.ConnHttp conn, string field, string value, GNet.ConnHttpHeaderFlags flags); + public static void http_set_max_redirects (GNet.ConnHttp conn, uint num); + public static bool http_set_method (GNet.ConnHttp conn, GNet.ConnHttpMethod method, string post_data, ulong post_data_len); + public static void http_set_timeout (GNet.ConnHttp conn, uint timeout); + public static bool http_set_uri (GNet.ConnHttp conn, string uri); + public static bool http_set_user_agent (GNet.ConnHttp conn, string agent); + public static bool http_steal_buffer (GNet.ConnHttp conn, string buffer, ulong length); + public bool is_connected (); + public Conn (string hostname, int port, GNet.ConnFunc func, pointer user_data); + [CCode (cname = "gnet_conn_new_inetaddr")] + public Conn.from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func, pointer user_data); + [CCode (cname = "gnet_conn_new_socket")] + public Conn.from_socket (GNet.TcpSocket socket, GNet.ConnFunc func, pointer user_data); + public void read (); + public void readline (); + public void readn (int length); + public void set_callback (GNet.ConnFunc func, pointer user_data); + public void set_watch_error (bool enable); + public void set_watch_readable (bool enable); + public void set_watch_writable (bool enable); + public void timeout (uint timeout); + public void write (string buffer, int length); } [CCode (cheader_filename = "gnet-2.0.h")] public class ConnEvent { @@ -153,419 +183,251 @@ public weak string header_fields; public weak string header_values; } - [CCode (cheader_filename = "gnet-2.0.h")] - public class InetAddr { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class MD5 { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class McastSocket { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class SHA { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class Server { - public weak GNet.InetAddr iface; - public int port; - public weak GNet.TcpSocket socket; - public uint ref_count; - public GNet.ServerFunc func; - public pointer user_data; - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class TcpSocket { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class URI { - public weak string scheme; - public weak string userinfo; - public weak string hostname; - public int port; - public weak string path; - public weak string query; - public weak string fragment; - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class UdpSocket { - } - [CCode (cheader_filename = "gnet-2.0.h")] - public class UnixSocket { - } - [CCode (ref_function = "gnet_conn_ref", unref_function = "gnet_conn_unref", cheader_filename = "gnet-2.0.h")] - public class netConn { - [CCode (cname = "gnet_conn_connect")] - public static void connect (GNet.Conn conn); - [CCode (cname = "gnet_conn_delete")] - public static void delete (GNet.Conn conn); - [CCode (cname = "gnet_conn_disconnect")] - public static void disconnect (GNet.Conn conn); - [CCode (cname = "gnet_conn_http_cancel")] - public static void http_cancel (GNet.ConnHttp conn); - [CCode (cname = "gnet_conn_http_delete")] - public static void http_delete (GNet.ConnHttp conn); - [CCode (cname = "gnet_conn_http_new")] - public static weak GNet.ConnHttp http_new (); - [CCode (cname = "gnet_conn_http_run")] - public static bool http_run (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data); - [CCode (cname = "gnet_conn_http_run_async")] - public static void http_run_async (GNet.ConnHttp conn, GNet.ConnHttpFunc func, pointer user_data); - [CCode (cname = "gnet_conn_http_set_header")] - public static bool http_set_header (GNet.ConnHttp conn, string field, string value, GNet.ConnHttpHeaderFlags flags); - [CCode (cname = "gnet_conn_http_set_max_redirects")] - public static void http_set_max_redirects (GNet.ConnHttp conn, uint num); - [CCode (cname = "gnet_conn_http_set_method")] - public static bool http_set_method (GNet.ConnHttp conn, GNet.ConnHttpMethod method, string post_data, ulong post_data_len); - [CCode (cname = "gnet_conn_http_set_timeout")] - public static void http_set_timeout (GNet.ConnHttp conn, uint timeout); - [CCode (cname = "gnet_conn_http_set_uri")] - public static bool http_set_uri (GNet.ConnHttp conn, string uri); - [CCode (cname = "gnet_conn_http_set_user_agent")] - public static bool http_set_user_agent (GNet.ConnHttp conn, string agent); - [CCode (cname = "gnet_conn_http_steal_buffer")] - public static bool http_steal_buffer (GNet.ConnHttp conn, string buffer, ulong length); - [CCode (cname = "gnet_conn_is_connected")] - public static bool is_connected (GNet.Conn conn); - [CCode (cname = "gnet_conn_new")] - public netConn (string hostname, int port, GNet.ConnFunc func, pointer user_data); - [CCode (cname = "gnet_conn_new_inetaddr")] - public netConn.from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func, pointer user_data); - [CCode (cname = "gnet_conn_new_socket")] - public netConn.from_socket (GNet.TcpSocket socket, GNet.ConnFunc func, pointer user_data); - [CCode (cname = "gnet_conn_read")] - public static void read (GNet.Conn conn); - [CCode (cname = "gnet_conn_readline")] - public static void readline (GNet.Conn conn); - [CCode (cname = "gnet_conn_readn")] - public static void readn (GNet.Conn conn, int length); - [CCode (cname = "gnet_conn_set_callback")] - public static void set_callback (GNet.Conn conn, GNet.ConnFunc func, pointer user_data); - [CCode (cname = "gnet_conn_set_watch_error")] - public static void set_watch_error (GNet.Conn conn, bool enable); - [CCode (cname = "gnet_conn_set_watch_readable")] - public static void set_watch_readable (GNet.Conn conn, bool enable); - [CCode (cname = "gnet_conn_set_watch_writable")] - public static void set_watch_writable (GNet.Conn conn, bool enable); - [CCode (cname = "gnet_conn_timeout")] - public static void timeout (GNet.Conn conn, uint timeout); - [CCode (cname = "gnet_conn_write")] - public static void write (GNet.Conn conn, string buffer, int length); - } [CCode (ref_function = "gnet_inetaddr_ref", unref_function = "gnet_inetaddr_unref", cheader_filename = "gnet-2.0.h")] - public class netInetaddr { + public class InetAddr { [CCode (cname = "gnet_inetaddr_autodetect_internet_interface")] public static weak GNet.InetAddr autodetect_internet_interface (); [CCode (cname = "gnet_inetaddr_clone")] - public static weak GNet.InetAddr clone (GNet.InetAddr inetaddr); + public weak GNet.InetAddr clone (); [CCode (cname = "gnet_inetaddr_delete")] - public static void delete (GNet.InetAddr inetaddr); + public void delete (); [CCode (cname = "gnet_inetaddr_delete_list")] public static void delete_list (GLib.List list); [CCode (cname = "gnet_inetaddr_equal")] public static bool equal (pointer p1, pointer p2); [CCode (cname = "gnet_inetaddr_get_bytes")] - public static void get_bytes (GNet.InetAddr inetaddr, string buffer); + public void get_bytes (string buffer); [CCode (cname = "gnet_inetaddr_get_canonical_name")] - public static weak string get_canonical_name (GNet.InetAddr inetaddr); + public weak string get_canonical_name (); [CCode (cname = "gnet_inetaddr_get_host_addr")] public static weak GNet.InetAddr get_host_addr (); [CCode (cname = "gnet_inetaddr_get_host_name")] public static weak string get_host_name (); [CCode (cname = "gnet_inetaddr_get_interface_to")] - public static weak GNet.InetAddr get_interface_to (GNet.InetAddr inetaddr); + public weak GNet.InetAddr get_interface_to (); [CCode (cname = "gnet_inetaddr_get_internet_interface")] public static weak GNet.InetAddr get_internet_interface (); [CCode (cname = "gnet_inetaddr_get_length")] - public static int get_length (GNet.InetAddr inetaddr); + public int get_length (); [CCode (cname = "gnet_inetaddr_get_name")] - public static weak string get_name (GNet.InetAddr inetaddr); + public weak string get_name (); [CCode (cname = "gnet_inetaddr_get_name_async")] - public static weak GNet.InetAddrGetNameAsyncID get_name_async (GNet.InetAddr inetaddr, GNet.InetAddrGetNameAsyncFunc func, pointer data); + public weak GNet.InetAddrGetNameAsyncID get_name_async (GNet.InetAddrGetNameAsyncFunc func, pointer data); [CCode (cname = "gnet_inetaddr_get_name_async_cancel")] public static void get_name_async_cancel (GNet.InetAddrGetNameAsyncID id); [CCode (cname = "gnet_inetaddr_get_name_nonblock")] - public static weak string get_name_nonblock (GNet.InetAddr inetaddr); + public weak string get_name_nonblock (); [CCode (cname = "gnet_inetaddr_get_port")] - public static int get_port (GNet.InetAddr inetaddr); + public int get_port (); [CCode (cname = "gnet_inetaddr_hash")] public static uint hash (pointer p); [CCode (cname = "gnet_inetaddr_is_broadcast")] - public static bool is_broadcast (GNet.InetAddr inetaddr); + public bool is_broadcast (); [CCode (cname = "gnet_inetaddr_is_canonical")] public static bool is_canonical (string hostname); [CCode (cname = "gnet_inetaddr_is_internet")] - public static bool is_internet (GNet.InetAddr inetaddr); + public bool is_internet (); [CCode (cname = "gnet_inetaddr_is_internet_domainname")] public static bool is_internet_domainname (string name); [CCode (cname = "gnet_inetaddr_is_ipv4")] - public static bool is_ipv4 (GNet.InetAddr inetaddr); + public bool is_ipv4 (); [CCode (cname = "gnet_inetaddr_is_ipv6")] - public static bool is_ipv6 (GNet.InetAddr inetaddr); + public bool is_ipv6 (); [CCode (cname = "gnet_inetaddr_is_loopback")] - public static bool is_loopback (GNet.InetAddr inetaddr); + public bool is_loopback (); [CCode (cname = "gnet_inetaddr_is_multicast")] - public static bool is_multicast (GNet.InetAddr inetaddr); + public bool is_multicast (); [CCode (cname = "gnet_inetaddr_is_private")] - public static bool is_private (GNet.InetAddr inetaddr); + public bool is_private (); [CCode (cname = "gnet_inetaddr_is_reserved")] - public static bool is_reserved (GNet.InetAddr inetaddr); + public bool is_reserved (); [CCode (cname = "gnet_inetaddr_list_interfaces")] public static weak GLib.List list_interfaces (); [CCode (cname = "gnet_inetaddr_new")] - public netInetaddr (string hostname, int port); + public InetAddr (string hostname, int port); [CCode (cname = "gnet_inetaddr_new_async")] - public netInetaddr.async (string hostname, int port, GNet.InetAddrNewAsyncFunc func, pointer data); + public InetAddr.async (string hostname, int port, GNet.InetAddrNewAsyncFunc func, pointer data); [CCode (cname = "gnet_inetaddr_new_async_cancel")] - public netInetaddr.async_cancel (GNet.InetAddrNewAsyncID id); + public InetAddr.async_cancel (GNet.InetAddrNewAsyncID id); [CCode (cname = "gnet_inetaddr_new_bytes")] - public netInetaddr.bytes (string bytes, uint length); + public InetAddr.bytes (string bytes, uint length); [CCode (cname = "gnet_inetaddr_new_list")] - public netInetaddr.list (string hostname, int port); + public InetAddr.list (string hostname, int port); [CCode (cname = "gnet_inetaddr_new_list_async")] - public netInetaddr.list_async (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, pointer data); + public InetAddr.list_async (string hostname, int port, GNet.InetAddrNewListAsyncFunc func, pointer data); [CCode (cname = "gnet_inetaddr_new_list_async_cancel")] - public netInetaddr.list_async_cancel (GNet.InetAddrNewListAsyncID id); + public InetAddr.list_async_cancel (GNet.InetAddrNewListAsyncID id); [CCode (cname = "gnet_inetaddr_new_nonblock")] - public netInetaddr.nonblock (string hostname, int port); + public InetAddr.nonblock (string hostname, int port); [CCode (cname = "gnet_inetaddr_noport_equal")] public static bool noport_equal (pointer p1, pointer p2); [CCode (cname = "gnet_inetaddr_set_bytes")] - public static void set_bytes (GNet.InetAddr inetaddr, string bytes, int length); + public void set_bytes (string bytes, int length); [CCode (cname = "gnet_inetaddr_set_port")] - public static void set_port (GNet.InetAddr inetaddr, int port); + public void set_port (int port); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netIo { - [CCode (cname = "gnet_io_channel_readline")] + public class MD5 { + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class McastSocket { + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class SHA { + } + [CCode (ref_function = "gnet_server_ref", unref_function = "gnet_server_unref", cheader_filename = "gnet-2.0.h")] + public class Server { + public weak GNet.InetAddr iface; + public int port; + public weak GNet.TcpSocket socket; + public uint ref_count; + public GNet.ServerFunc func; + public pointer user_data; + public void delete (); + public Server (GNet.InetAddr iface, int port, GNet.ServerFunc func, pointer user_data); + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class TcpSocket { + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class URI { + public weak string scheme; + public weak string userinfo; + public weak string hostname; + public int port; + public weak string path; + public weak string query; + public weak string fragment; + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class UdpSocket { + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class UnixSocket { + } + [CCode (cheader_filename = "gnet-2.0.h")] + public class Io { public static GNet.IOError channel_readline (GLib.IOChannel channel, string buffer, ulong length, ulong bytes_readp); - [CCode (cname = "gnet_io_channel_readline_strdup")] public static GNet.IOError channel_readline_strdup (GLib.IOChannel channel, string bufferp, ulong bytes_readp); - [CCode (cname = "gnet_io_channel_readn")] public static GNet.IOError channel_readn (GLib.IOChannel channel, pointer buffer, ulong length, ulong bytes_readp); - [CCode (cname = "gnet_io_channel_writen")] public static GNet.IOError channel_writen (GLib.IOChannel channel, pointer buffer, ulong length, ulong bytes_writtenp); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netMcast { - [CCode (cname = "gnet_mcast_socket_delete")] + public class Mcast { public static void socket_delete (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_get_io_channel")] public static weak GLib.IOChannel socket_get_io_channel (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_get_local_inetaddr")] public static weak GNet.InetAddr socket_get_local_inetaddr (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_get_ttl")] public static int socket_get_ttl (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_has_packet")] public static bool socket_has_packet (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_is_loopback")] public static int socket_is_loopback (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_join_group")] public static int socket_join_group (GNet.McastSocket socket, GNet.InetAddr inetaddr); - [CCode (cname = "gnet_mcast_socket_leave_group")] public static int socket_leave_group (GNet.McastSocket socket, GNet.InetAddr inetaddr); - [CCode (cname = "gnet_mcast_socket_new")] public static weak GNet.McastSocket socket_new (); - [CCode (cname = "gnet_mcast_socket_new_full")] public static weak GNet.McastSocket socket_new_full (GNet.InetAddr iface, int port); - [CCode (cname = "gnet_mcast_socket_new_with_port")] public static weak GNet.McastSocket socket_new_with_port (int port); - [CCode (cname = "gnet_mcast_socket_receive")] public static int socket_receive (GNet.McastSocket socket, string buffer, int length, GNet.InetAddr src); - [CCode (cname = "gnet_mcast_socket_ref")] public static void socket_ref (GNet.McastSocket socket); - [CCode (cname = "gnet_mcast_socket_send")] public static int socket_send (GNet.McastSocket socket, string buffer, int length, GNet.InetAddr dst); - [CCode (cname = "gnet_mcast_socket_set_loopback")] public static int socket_set_loopback (GNet.McastSocket socket, bool enable); - [CCode (cname = "gnet_mcast_socket_set_ttl")] public static int socket_set_ttl (GNet.McastSocket socket, int ttl); - [CCode (cname = "gnet_mcast_socket_unref")] public static void socket_unref (GNet.McastSocket socket); } - [CCode (ref_function = "gnet_server_ref", unref_function = "gnet_server_unref", cheader_filename = "gnet-2.0.h")] - public class netServer { - [CCode (cname = "gnet_server_delete")] - public static void delete (GNet.Server server); - [CCode (cname = "gnet_server_new")] - public netServer (GNet.InetAddr iface, int port, GNet.ServerFunc func, pointer user_data); - } [CCode (cheader_filename = "gnet-2.0.h")] - public class netSha { - [CCode (cname = "gnet_sha_clone")] + public class Sha { public static weak GNet.SHA clone (GNet.SHA sha); - [CCode (cname = "gnet_sha_copy_string")] public static void copy_string (GNet.SHA sha, string buffer); - [CCode (cname = "gnet_sha_delete")] public static void delete (GNet.SHA sha); - [CCode (cname = "gnet_sha_equal")] public static bool equal (pointer p1, pointer p2); - [CCode (cname = "gnet_sha_final")] public static void final (GNet.SHA sha); - [CCode (cname = "gnet_sha_get_digest")] public static weak string get_digest (GNet.SHA sha); - [CCode (cname = "gnet_sha_get_string")] public static weak string get_string (GNet.SHA sha); - [CCode (cname = "gnet_sha_hash")] public static uint hash (pointer p); - [CCode (cname = "gnet_sha_new")] - public netSha (string buffer, uint length); - [CCode (cname = "gnet_sha_new_incremental")] - public netSha.incremental (); - [CCode (cname = "gnet_sha_new_string")] - public netSha.string (string str); - [CCode (cname = "gnet_sha_update")] + public Sha (string buffer, uint length); + public Sha.incremental (); + public Sha.string (string str); public static void update (GNet.SHA sha, string buffer, uint length); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netSocks { - [CCode (cname = "gnet_socks_get_enabled")] + public class Socks { public static bool get_enabled (); - [CCode (cname = "gnet_socks_get_server")] public static weak GNet.InetAddr get_server (); - [CCode (cname = "gnet_socks_get_version")] public static int get_version (); - [CCode (cname = "gnet_socks_set_enabled")] public static void set_enabled (bool enabled); - [CCode (cname = "gnet_socks_set_server")] public static void set_server (GNet.InetAddr inetaddr); - [CCode (cname = "gnet_socks_set_version")] public static void set_version (int version); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netTcp { - [CCode (cname = "gnet_tcp_socket_connect")] + public class Tcp { public static weak GNet.TcpSocket socket_connect (string hostname, int port); - [CCode (cname = "gnet_tcp_socket_connect_async")] public static weak GNet.TcpSocketConnectAsyncID socket_connect_async (string hostname, int port, GNet.TcpSocketConnectAsyncFunc func, pointer data); - [CCode (cname = "gnet_tcp_socket_connect_async_cancel")] public static void socket_connect_async_cancel (GNet.TcpSocketConnectAsyncID id); - [CCode (cname = "gnet_tcp_socket_delete")] public static void socket_delete (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_get_io_channel")] public static weak GLib.IOChannel socket_get_io_channel (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_get_local_inetaddr")] public static weak GNet.InetAddr socket_get_local_inetaddr (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_get_port")] public static int socket_get_port (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_get_remote_inetaddr")] public static weak GNet.InetAddr socket_get_remote_inetaddr (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_new")] public static weak GNet.TcpSocket socket_new (GNet.InetAddr addr); - [CCode (cname = "gnet_tcp_socket_new_async")] public static weak GNet.TcpSocketNewAsyncID socket_new_async (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data); - [CCode (cname = "gnet_tcp_socket_new_async_cancel")] public static void socket_new_async_cancel (GNet.TcpSocketNewAsyncID id); - [CCode (cname = "gnet_tcp_socket_new_async_direct")] public static weak GNet.TcpSocketNewAsyncID socket_new_async_direct (GNet.InetAddr addr, GNet.TcpSocketNewAsyncFunc func, pointer data); - [CCode (cname = "gnet_tcp_socket_new_direct")] public static weak GNet.TcpSocket socket_new_direct (GNet.InetAddr addr); - [CCode (cname = "gnet_tcp_socket_ref")] public static void socket_ref (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_server_accept")] public static weak GNet.TcpSocket socket_server_accept (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_server_accept_async")] public static void socket_server_accept_async (GNet.TcpSocket socket, GNet.TcpSocketAcceptFunc accept_func, pointer user_data); - [CCode (cname = "gnet_tcp_socket_server_accept_async_cancel")] public static void socket_server_accept_async_cancel (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_server_accept_nonblock")] public static weak GNet.TcpSocket socket_server_accept_nonblock (GNet.TcpSocket socket); - [CCode (cname = "gnet_tcp_socket_server_new")] public static weak GNet.TcpSocket socket_server_new (); - [CCode (cname = "gnet_tcp_socket_server_new_full")] public static weak GNet.TcpSocket socket_server_new_full (GNet.InetAddr iface, int port); - [CCode (cname = "gnet_tcp_socket_server_new_with_port")] public static weak GNet.TcpSocket socket_server_new_with_port (int port); - [CCode (cname = "gnet_tcp_socket_set_tos")] public static void socket_set_tos (GNet.TcpSocket socket, GNet.NetTOS tos); - [CCode (cname = "gnet_tcp_socket_unref")] public static void socket_unref (GNet.TcpSocket socket); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netUdp { - [CCode (cname = "gnet_udp_socket_delete")] + public class Udp { public static void socket_delete (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_get_io_channel")] public static weak GLib.IOChannel socket_get_io_channel (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_get_local_inetaddr")] public static weak GNet.InetAddr socket_get_local_inetaddr (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_get_ttl")] public static int socket_get_ttl (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_has_packet")] public static bool socket_has_packet (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_new")] public static weak GNet.UdpSocket socket_new (); - [CCode (cname = "gnet_udp_socket_new_full")] public static weak GNet.UdpSocket socket_new_full (GNet.InetAddr iface, int port); - [CCode (cname = "gnet_udp_socket_new_with_port")] public static weak GNet.UdpSocket socket_new_with_port (int port); - [CCode (cname = "gnet_udp_socket_receive")] public static int socket_receive (GNet.UdpSocket socket, string buffer, int length, GNet.InetAddr src); - [CCode (cname = "gnet_udp_socket_ref")] public static void socket_ref (GNet.UdpSocket socket); - [CCode (cname = "gnet_udp_socket_send")] public static int socket_send (GNet.UdpSocket socket, string buffer, int length, GNet.InetAddr dst); - [CCode (cname = "gnet_udp_socket_set_ttl")] public static int socket_set_ttl (GNet.UdpSocket socket, int ttl); - [CCode (cname = "gnet_udp_socket_unref")] public static void socket_unref (GNet.UdpSocket socket); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netUnix { - [CCode (cname = "gnet_unix_socket_delete")] + public class Unix { public static void socket_delete (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_get_io_channel")] public static weak GLib.IOChannel socket_get_io_channel (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_get_path")] public static weak string socket_get_path (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_new")] public static weak GNet.UnixSocket socket_new (string path); - [CCode (cname = "gnet_unix_socket_ref")] public static void socket_ref (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_server_accept")] public static weak GNet.UnixSocket socket_server_accept (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_server_accept_nonblock")] public static weak GNet.UnixSocket socket_server_accept_nonblock (GNet.UnixSocket socket); - [CCode (cname = "gnet_unix_socket_server_new")] public static weak GNet.UnixSocket socket_server_new (string path); - [CCode (cname = "gnet_unix_socket_unref")] public static void socket_unref (GNet.UnixSocket socket); } [CCode (cheader_filename = "gnet-2.0.h")] - public class netUri { - [CCode (cname = "gnet_uri_clone")] + public class Uri { public static weak GNet.URI clone (GNet.URI uri); - [CCode (cname = "gnet_uri_delete")] public static void delete (GNet.URI uri); - [CCode (cname = "gnet_uri_equal")] public static bool equal (pointer p1, pointer p2); - [CCode (cname = "gnet_uri_escape")] public static void escape (GNet.URI uri); - [CCode (cname = "gnet_uri_get_string")] public static weak string get_string (GNet.URI uri); - [CCode (cname = "gnet_uri_hash")] public static uint hash (pointer p); - [CCode (cname = "gnet_uri_new")] - public netUri (string uri); - [CCode (cname = "gnet_uri_new_fields")] - public netUri.fields (string scheme, string hostname, int port, string path); - [CCode (cname = "gnet_uri_new_fields_all")] - public netUri.fields_all (string scheme, string userinfo, string hostname, int port, string path, string query, string fragment); - [CCode (cname = "gnet_uri_set_fragment")] + public Uri (string uri); + public Uri.fields (string scheme, string hostname, int port, string path); + public Uri.fields_all (string scheme, string userinfo, string hostname, int port, string path, string query, string fragment); public static void set_fragment (GNet.URI uri, string fragment); - [CCode (cname = "gnet_uri_set_hostname")] public static void set_hostname (GNet.URI uri, string hostname); - [CCode (cname = "gnet_uri_set_path")] public static void set_path (GNet.URI uri, string path); - [CCode (cname = "gnet_uri_set_port")] public static void set_port (GNet.URI uri, int port); - [CCode (cname = "gnet_uri_set_query")] public static void set_query (GNet.URI uri, string query); - [CCode (cname = "gnet_uri_set_scheme")] public static void set_scheme (GNet.URI uri, string scheme); - [CCode (cname = "gnet_uri_set_userinfo")] public static void set_userinfo (GNet.URI uri, string userinfo); - [CCode (cname = "gnet_uri_unescape")] public static void unescape (GNet.URI uri); } public static delegate void ConnFunc (GNet.Conn conn, GNet.ConnEvent event, pointer user_data); @@ -577,6 +439,7 @@ public static delegate void TcpSocketAcceptFunc (GNet.TcpSocket server, GNet.TcpSocket client, pointer data); public static delegate void TcpSocketConnectAsyncFunc (GNet.TcpSocket socket, GNet.TcpSocketConnectAsyncStatus status, pointer data); public static delegate void TcpSocketNewAsyncFunc (GNet.TcpSocket socket, pointer data); + public static void init (); public static bool http_get (string url, string buffer, ulong length, uint response); public static int pack_strdup (string format, string bufferp); }