X-Git-Url: http://git.silc.fi/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcnet.h;h=d791784e4feb9b25548e717dfd7774caa5e53dd4;hb=f19a8d863dac9415de5acf7bee0b55a15780b4b5;hp=b5bbd2d4e62845db6e049a724a1c77fa19d123ea;hpb=428202ecd8a408402803bdb77903221133bf9ce0;p=runtime.git diff --git a/lib/silcutil/silcnet.h b/lib/silcutil/silcnet.h index b5bbd2d4..d791784e 100644 --- a/lib/silcutil/silcnet.h +++ b/lib/silcutil/silcnet.h @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2006 Pekka Riikonen + Copyright (C) 1997 - 2008 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,19 +17,25 @@ */ -/****h* silcutil/SILC Net Interface +/****h* silcutil/Network Interface * * DESCRIPTION * - * SILC Net API provides various network routines for applications. It - * can be used to create TCP/IP and UDP/IP connections and listeners. - * Various utility functions for resolving various information is also - * provided. + * SILC Net API provides various network routines for applications. It can + * be used to create TCP/IP and UDP/IP connections and listeners. Various + * utility functions for resolving various information is also provided. + * The interface supports both IPv4 and IPv6. * - * On WIN32 systems the SILC Net API must initialized by calling the - * silc_net_win32_init and uninitialized when the application ends by - * calling the silc_net_win32_uninit function. The initializing must be - * done in order to assure that the SILC Net API works correctly. + * EXAMPLE + * + * // Create TCP connection to example.com at port 25 + * silc_net_tcp_connect(NULL, "example.com", 25, schedule, connected_cb, ctx); + * + * // Create UDP listener on local interface 10.2.1.7 on port 500 + * SilcStream udpstream; + * + * udpstream = silc_net_udp_connect("10.2.1.7", 500, NULL, 0, schedule); + * silc_stream_set_notifier(udpstream, schedule, receive_callback, ctx); * ***/ @@ -38,7 +44,7 @@ /* Prototypes */ -/****s* silcutil/SilcNetAPI/SilcNetListener +/****s* silcutil/SilcNetListener * * NAME * @@ -47,42 +53,17 @@ * DESCRIPTION * * The network listenr context. This context is created with the - * silc_net_create_listener function and destroyed with + * silc_net_tcp_create_listener function and destroyed with * silc_net_close_listener function. * ***/ typedef struct SilcNetListenerStruct *SilcNetListener; -/****d* silcutil/SilcNetAPI/SilcNetStatus - * - * NAME - * - * typedef enum { ... } SilcNetStatus; - * - * DESCRIPTION - * - * Status to indicate the result of the network operation creation. This - * type is returned in the SilcNetCallback callback function. - * - * SOURCE - */ -typedef enum { - SILC_NET_OK, /* Everything Ok */ - SILC_NET_UNKNOWN_IP, /* Unknown IP address */ - SILC_NET_UNKNOWN_HOST, /* Unknown hostname */ - SILC_NET_HOST_UNREACHABLE, /* Destination unreachable */ - SILC_NET_CONNECTION_REFUSED, /* Connection refused */ - SILC_NET_CONNECTION_TIMEOUT, /* Connection timedout */ - SILC_NET_NO_MEMORY, /* System out of memory */ - SILC_NET_ERROR, /* Unknown error */ -} SilcNetStatus; -/***/ - -/****f* silcutil/SilcNetAPI/SilcNetCallback +/****f* silcutil/SilcNetCallback * * SYNOPSIS * - * typedef void (*SilcNetCallback)(SilcNetStatus status, + * typedef void (*SilcNetCallback)(SilcResult status, * SilcStream stream, void *context); * * DESCRIPTION @@ -100,17 +81,17 @@ typedef enum { * the `stream'. * ***/ -typedef void (*SilcNetCallback)(SilcNetStatus status, +typedef void (*SilcNetCallback)(SilcResult status, SilcStream stream, void *context); -/****f* silcutil/SilcNetAPI/silc_net_tcp_create_listener +/****f* silcutil/silc_net_tcp_create_listener * * SYNOPSIS * * SilcNetListener * silc_net_tcp_create_listener(const char **local_ip_addr, - * SilcUInt32 local_ip_count, - * int port, SilcBool require_fqdn, + * SilcUInt32 local_ip_count, int port, + * SilcBool lookup, SilcBool require_fqdn, * SilcSchedule schedule, * SilcNetCallback callback, void *context); * @@ -118,22 +99,122 @@ typedef void (*SilcNetCallback)(SilcNetStatus status, * * This function creates TCP listener. This is used to create network * listener for incoming connections, and `callback' will be called - * everytime new connection is received. If `local_ip_addr' is NULL any + * everytime new connection is received. If `local_ip_addr' is NULL 'any' * address is used. If provided it can be used bind the listener to * `local_ip_count' many IP addresses provided in `local_ip_addr' table. * On success returns the SilcNetListener context, or NULL on error. * If `require_fqdn' is TRUE the listener will require that the incoming - * connection has FQDN to be able to connect. + * connection has FQDN to be able to connect. If the `lookup' is TRUE + * then the incoming connection hostname will be resolved. If the `port' + * is zero (0), operating system will define it automatically. + * + * The `callback' always delivers valid new stream. It is not called + * with an error status. If `schedule' is NULL this will call + * silc_schedule_get_global to try to get global scheduler. * ***/ SilcNetListener silc_net_tcp_create_listener(const char **local_ip_addr, - SilcUInt32 local_ip_count, - int port, SilcBool require_fqdn, + SilcUInt32 local_ip_count, int port, + SilcBool lookup, SilcBool require_fqdn, SilcSchedule schedule, SilcNetCallback callback, void *context); -/****f* silcutil/SilcNetAPI/silc_net_close_listener +/****f* silcutil/silc_net_tcp_create_listener2 + * + * SYNOPSIS + * + * SilcNetListener + * silc_net_tcp_create_listener2(const char *local_ip_addr, int *ports, + * SilcUInt32 port_count, + * SilcBool ignore_port_error, + * SilcBool lookup, SilcBool require_fqdn, + * SilcSchedule schedule, + * SilcNetCallback callback, void *context); + * + * DESCRIPTION + * + * This function creates TCP listener. This is used to create network + * listener for incoming connections, and `callback' will be called + * everytime new connection is received. If `local_ip_addr' is NULL 'any' + * address is used. If `ports' is NULL or it contains a zero (0) port, + * operating system will define it automatically. This function can be + * used to bind to many ports at the same time. If `ignore_port_error' + * is TRUE this won't return NULL if at least one of the ports could + * be bound. Otherwise, NULL will be returned on error. + * + * If `require_fqdn' is TRUE the listener will require that the incoming + * connection has FQDN to be able to connect. If the `lookup' is TRUE + * then the incoming connection hostname will be resolved. + * + * The `callback' always delivers valid new stream. It is not called + * with an error status. If `schedule' is NULL this will call + * silc_schedule_get_global to try to get global scheduler. + * + ***/ +SilcNetListener +silc_net_tcp_create_listener2(const char *local_ip_addr, int *ports, + SilcUInt32 port_count, + SilcBool ignore_port_error, + SilcBool lookup, SilcBool require_fqdn, + SilcSchedule schedule, + SilcNetCallback callback, void *context); + +/****f* silcutil/silc_net_listener_get_port + * + * SYNOPSIS + * + * SilcUInt16 *silc_net_listener_get_port(SilcNetListener listener, + * SilcUInt32 *port_count); + * + * DESCRIPTION + * + * Returns the ports to where the `listener' is bound. This can be used + * to get the port if none was specified in silc_net_tcp_create_listener. + * Returns an array of ports of size of `port_count'. The caller must + * free the array with silc_free. There are as many ports in the array + * as there were IP addresses provided in silc_net_tcp_create_listener, + * or as there were ports provided in silc_net_tcp_create_listener2. + * + ***/ +SilcUInt16 *silc_net_listener_get_port(SilcNetListener listener, + SilcUInt32 *port_count); + +/****f* silcutil/silc_net_listener_get_ip + * + * SYNOPSIS + * + * char **silc_net_listener_get_ip(SilcNetListener listener, + * SilcUInt32 *ip_count); + * + * DESCRIPTION + * + * Returns the IP's to where the `listener' is bound. Returns an array + * of IP addresses of size of `ip_count'. The caller must free the + * array and its strings with silc_free. + * + ***/ +char **silc_net_listener_get_ip(SilcNetListener listener, + SilcUInt32 *ip_count); + +/****f* silcutil/silc_net_listener_get_hostname + * + * SYNOPSIS + * + * char **silc_net_listener_get_hostname(SilcNetListener listener, + * SilcUInt32 *hostname_count); + * + * DESCRIPTION + * + * Returns the hostnames to where the `listener' is bound. Returns an + * array of hostnames of size of `hostname_count'. The caller must free + * the array and its strings with silc_free. + * + ***/ +char **silc_net_listener_get_hostname(SilcNetListener listener, + SilcUInt32 *hostname_count); + +/****f* silcutil/silc_net_close_listener * * SYNOPSIS * @@ -146,7 +227,7 @@ silc_net_tcp_create_listener(const char **local_ip_addr, ***/ void silc_net_close_listener(SilcNetListener listener); -/****f* silcutil/SilcNetAPI/silc_net_tcp_connect +/****f* silcutil/silc_net_tcp_connect * * SYNOPSIS * @@ -166,14 +247,15 @@ void silc_net_close_listener(SilcNetListener listener); * asynchronous call, and this function returns before the connection is * actually established. The `callback' will be called after the * connection is created to deliver the SilcStream for the created - * connection. + * connection. This function supports IPv6 if the platform supports it. * * The returned SilcAsyncOperation context can be used to control the * asynchronous connecting, such as to abort it. If it is aborted * using silc_async_abort the `callback' will not be called. If NULL - * is returned the operation cannot be aborted. + * is returned the operation cannot be aborted. If `schedule' is NULL + * this will call silc_schedule_get_global to try to get global scheduler. * - */ + ***/ SilcAsyncOperation silc_net_tcp_connect(const char *local_ip_addr, const char *remote_ip_addr, int remote_port, @@ -181,7 +263,7 @@ SilcAsyncOperation silc_net_tcp_connect(const char *local_ip_addr, SilcNetCallback callback, void *context); -/****f* silcutil/SilcNetAPI/silc_net_udp_connect +/****f* silcutil/silc_net_udp_connect * * SYNOPSIS * @@ -199,16 +281,20 @@ SilcAsyncOperation silc_net_tcp_connect(const char *local_ip_addr, * silc_stream_write function and packets may be received using * silc_stream_read function. * - * If the remote address is not provided then packets may only be received - * by using silc_net_udp_receive and sent only by using the function + * If the remote address is not provided the stream is in connectionless + * state. This means that packets can be received only by using + * silc_net_udp_receive and sent only by using the function * silc_net_udp_send. * * To receive packets the silc_stream_set_notifier must be called for the * returned SilcStream. The packets are always received in the notifier - * callback when the SILC_STREAM_CAN_READ is returned to the callback - * To read the packet use silc_stream_read if the remote address was + * callback when the SILC_STREAM_CAN_READ is returned to the callback. + * To read the packet use silc_stream_read if the `remote_ip_addr' was * provided, and silc_net_udp_receive if it was not. * + * Supports IPv6 if the platform supports it. If `schedule' is NULL this + * will call silc_schedule_get_global to try to get global scheduler. + * * EXAMPLE * * SilcStream udpstream; @@ -221,12 +307,17 @@ SilcAsyncOperation silc_net_tcp_connect(const char *local_ip_addr, * // Send packet to remote host * silc_stream_write(udpstream, data, data_len); * + * Create UDP listener: + * + * udpstream = silc_net_udp_connect("0.0.0.0", 500, NULL, 0, schedule); + * silc_stream_set_notifier(udpstream, schedule, receive_callback, context); + * ***/ SilcStream silc_net_udp_connect(const char *local_ip_addr, int local_port, const char *remote_ip_addr, int remote_port, SilcSchedule schedule); -/****f* silcutil/SilcNetAPI/silc_net_udp_receive +/****f* silcutil/silc_net_udp_receive * * SYNOPSIS * @@ -242,37 +333,44 @@ SilcStream silc_net_udp_connect(const char *local_ip_addr, int local_port, * pointer. The packet data is returned into the `ret_data' buffer. * * Returns the length of the packet, or -1 on error or 0 in case of EOF. + * In case of error the silc_errno will indicate the error. If the + * error is SILC_ERR_WOULD_BLOCK data is not currently available from the + * `stream'. * ***/ int silc_net_udp_receive(SilcStream stream, char *remote_ip_addr, SilcUInt32 remote_ip_addr_size, int *remote_port, unsigned char *ret_data, SilcUInt32 data_size); -/****f* silcutil/SilcNetAPI/silc_net_udp_send +/****f* silcutil/silc_net_udp_send * * SYNOPSIS * - * void silc_net_udp_send(SilcStream stream, - * const char *remote_ip_addr, int remote_port, - * const unsigned char *data, SilcUInt32 data_len); + * int silc_net_udp_send(SilcStream stream, + * const char *remote_ip_addr, int remote_port, + * const unsigned char *data, SilcUInt32 data_len); * * DESCRIPTION * * Sends an UDP packet to remote host `remote_ip_addr' on `remote_port'. * This may be used with UDP streams that are not connected to any - * specific remote host. With those stream silc_stream_write cannot be - * used. In those cases, this function must be used. This may also be - * used even if the stream is connected. + * specific remote host. With those streams silc_stream_write cannot be + * used. In those cases, this function must be used. However, this may + * also be used even if the stream is in connected state. * - * This function always succeeds, however there is no guarantee that the - * packet is delivered, as UDP is unreliable transport protocol. + * You can create the `stream' by calling silc_net_udp_connect. + * + * Returns the amount of data written, -1 if data could not be written + * at this moment, or -2 if error occurred. If -1 is returned the + * notifier callback will later be called with SILC_STREAM_CAN_WRITE + * status when stream is again ready for writing. * ***/ -void silc_net_udp_send(SilcStream stream, - const char *remote_ip_addr, int remote_port, - const unsigned char *data, SilcUInt32 data_len); +int silc_net_udp_send(SilcStream stream, + const char *remote_ip_addr, int remote_port, + const unsigned char *data, SilcUInt32 data_len); -/****f* silcutil/SilcNetAPI/silc_net_close_connection +/****f* silcutil/silc_net_close_connection * * SYNOPSIS * @@ -280,12 +378,13 @@ void silc_net_udp_send(SilcStream stream, * * DESCRIPTION * - * Closes the connection by closing the socket connection. + * Closes the connection by closing the socket connection. This routine + * can only be used with POSIX compliant systems. * ***/ void silc_net_close_connection(int sock); -/****f* silcutil/SilcNetAPI/silc_net_accept_connection +/****f* silcutil/silc_net_accept_connection * * SYNOPSIS * @@ -293,55 +392,60 @@ void silc_net_close_connection(int sock); * * DESCRIPTION * - * Accepts a connection from a particular socket. + * Accepts a connection from a particular socket. This routine can only + * be used with POSIX compliant systems. This call is equivalent to + * accept(2). * ***/ int silc_net_accept_connection(int sock); -/****f* silcutil/SilcNetAPI/silc_net_set_socket_nonblock +/****f* silcutil/silc_net_set_socket_opt * * SYNOPSIS * - * int silc_net_set_socket_nonblock(int sock); + * int silc_net_set_socket_opt(int sock, int level, int option, int on); * * DESCRIPTION * - * Sets the socket to non-blocking mode. + * Sets a option for a socket. This function can be used to set + * various options for the socket. Some of the options might be + * system specific. This routine can only be used with POSIX compliant + * systems. This call is equivalent to setsockopt(2); * ***/ -int silc_net_set_socket_nonblock(int sock); +int silc_net_set_socket_opt(int sock, int level, int option, int on); -/****f* silcutil/SilcNetAPI/silc_net_set_socket_opt +/****f* silcutil/silc_net_get_socket_opt * * SYNOPSIS * - * int silc_net_set_socket_opt(int sock, int level, int option, int on); + * int silc_net_get_socket_opt(int sock, int level, int option, + * void *optval, int *opt_len); * * DESCRIPTION * - * Sets a option for a socket. This function can be used to set - * various options for the socket. Some of the options might be - * system specific. + * Return socket options to the `optval' and `opt_len'. This routine + * can only be used with POSIX compliant systems. This call is + * equivalent to getsockopt(2). * ***/ -int silc_net_set_socket_opt(int sock, int level, int option, int on); +int silc_net_get_socket_opt(int sock, int level, int option, + void *optval, int *opt_len); -/****f* silcutil/SilcNetAPI/silc_net_get_socket_opt +/****f* silcutil/silc_net_set_socket_nonblock * * SYNOPSIS * - * int silc_net_get_socket_opt(int sock, int level, int option, - * void *optval, int *opt_len); + * int silc_net_set_socket_nonblock(SilcSocket sock); * * DESCRIPTION * - * Return socket options to the `optval' and `opt_len'. + * Sets the socket `sock' to non-blocking mode. * ***/ -int silc_net_get_socket_opt(int sock, int level, int option, - void *optval, int *opt_len); +int silc_net_set_socket_nonblock(SilcSocket sock); -/****f* silcutil/SilcNetAPI/silc_net_is_ip4 +/****f* silcutil/silc_net_is_ip4 * * SYNOPSIS * @@ -354,7 +458,7 @@ int silc_net_get_socket_opt(int sock, int level, int option, ***/ SilcBool silc_net_is_ip4(const char *addr); -/****f* silcutil/SilcNetAPI/silc_net_is_ip6 +/****f* silcutil/silc_net_is_ip6 * * SYNOPSIS * @@ -367,7 +471,7 @@ SilcBool silc_net_is_ip4(const char *addr); ***/ SilcBool silc_net_is_ip6(const char *addr); -/****f* silcutil/SilcNetAPI/silc_net_is_ip +/****f* silcutil/silc_net_is_ip * * SYNOPSIS * @@ -381,11 +485,12 @@ SilcBool silc_net_is_ip6(const char *addr); ***/ SilcBool silc_net_is_ip(const char *addr); -/****f* silcutil/SilcNetAPI/silc_net_addr2bin +/****f* silcutil/silc_net_addr2bin * * SYNOPSIS * - * SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len); + * SilcBool silc_net_addr2bin(const char *addr, void *bin, + * SilcUInt32 bin_len); * * DESCRIPTION * @@ -396,7 +501,23 @@ SilcBool silc_net_is_ip(const char *addr); ***/ SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len); -/****f* silcutil/SilcNetAPI/SilcNetResolveCallback +/****f* silcutil/silc_net_bin2addr + * + * SYNOPSIS + * + * SilcBool silc_net_bin2addr(const void *bin, SilcUInt32 bin_len, + * char *addr, SilcUInt32 addr_size); + * + * DESCRIPTION + * + * Converts network byte ordered IP address into a numbers-and-dots + * string notation. The `bin' address can be either IPv4 or IPv6 address. + * + ***/ +SilcBool silc_net_bin2addr(const void *bin, SilcUInt32 bin_len, + char *addr, SilcUInt32 addr_size); + +/****f* silcutil/SilcNetResolveCallback * * SYNOPSIS * @@ -412,12 +533,12 @@ SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len); ***/ typedef void (*SilcNetResolveCallback)(const char *result, void *context); -/****f* silcutil/SilcNetAPI/silc_net_gethostbyname +/****f* silcutil/silc_net_gethostbyname * * SYNOPSIS * * SilcBool silc_net_gethostbyname(const char *name, SilcBool prefer_ipv6, - * char *address, SilcUInt32 address_len); + * char *address, SilcUInt32 address_len); * * DESCRIPTION * @@ -433,7 +554,7 @@ typedef void (*SilcNetResolveCallback)(const char *result, void *context); SilcBool silc_net_gethostbyname(const char *name, SilcBool prefer_ipv6, char *address, SilcUInt32 address_len); -/****f* silcutil/SilcNetAPI/silc_net_gethostbyname_async +/****f* silcutil/silc_net_gethostbyname_async * * SYNOPSIS * @@ -448,7 +569,8 @@ SilcBool silc_net_gethostbyname(const char *name, SilcBool prefer_ipv6, * Asynchronously resolves the IP address of the hostname indicated * by the `name'. This function returns immediately, and the * `completion' callback will be called after the resolving is - * completed. + * completed. If `schedule' is NULL this will call silc_schedule_get_global + * to try to get global scheduler. * * If the `prefer_ipv6' is TRUE then this will return IPv6 address if it * finds. If FALSE if returns IPv4 address even if it found IPv6 @@ -461,12 +583,12 @@ void silc_net_gethostbyname_async(const char *name, SilcNetResolveCallback completion, void *context); -/****f* silcutil/SilcNetAPI/silc_net_gethostbyaddr +/****f* silcutil/silc_net_gethostbyaddr * * SYNOPSIS * * SilcBool silc_net_gethostbyaddr(const char *addr, char *name, - * SilcUInt32 name_len); + * SilcUInt32 name_len); * * DESCRIPTION * @@ -479,7 +601,7 @@ void silc_net_gethostbyname_async(const char *name, SilcBool silc_net_gethostbyaddr(const char *addr, char *name, SilcUInt32 name_len); -/****f* silcutil/SilcNetAPI/silc_net_gethostbyaddr_async +/****f* silcutil/silc_net_gethostbyaddr_async * * SYNOPSIS * @@ -493,7 +615,8 @@ SilcBool silc_net_gethostbyaddr(const char *addr, char *name, * Asynchronously resolves the hostname for the IP address indicated * by the `addr'. This function returns immediately, and the * `completion' callback will be called after the resolving is - * completed. + * completed. If `schedule' is NULL this will call silc_schedule_get_global + * to try to get global scheduler. * ***/ void silc_net_gethostbyaddr_async(const char *addr, @@ -501,11 +624,11 @@ void silc_net_gethostbyaddr_async(const char *addr, SilcNetResolveCallback completion, void *context); -/****f* silcutil/SilcNetAPI/silc_net_check_host_by_sock +/****f* silcutil/silc_net_check_host_by_sock * * SYNOPSIS * - * SilcBool silc_net_check_host_by_sock(int sock, char **hostname, + * SilcBool silc_net_check_host_by_sock(SilcSocket sock, char **hostname, * char **ip); * * DESCRIPTION @@ -514,13 +637,14 @@ void silc_net_gethostbyaddr_async(const char *addr, * lookup as well to verify that the IP has FQDN. * ***/ -SilcBool silc_net_check_host_by_sock(int sock, char **hostname, char **ip); +SilcBool silc_net_check_host_by_sock(SilcSocket sock, char **hostname, + char **ip); -/****f* silcutil/SilcNetAPI/silc_net_check_local_by_sock +/****f* silcutil/silc_net_check_local_by_sock * * SYNOPSIS * - * SilcBool silc_net_check_local_by_sock(int sock, char **hostname, + * SilcBool silc_net_check_local_by_sock(SilcSocket sock, char **hostname, * char **ip); * * DESCRIPTION @@ -529,35 +653,36 @@ SilcBool silc_net_check_host_by_sock(int sock, char **hostname, char **ip); * lookup as well to verify that the IP has FQDN. * ***/ -SilcBool silc_net_check_local_by_sock(int sock, char **hostname, char **ip); +SilcBool silc_net_check_local_by_sock(SilcSocket sock, char **hostname, + char **ip); -/****f* silcutil/SilcNetAPI/silc_net_get_remote_port +/****f* silcutil/silc_net_get_remote_port * * SYNOPSIS * - * SilcUInt16 silc_net_get_remote_port(int sock); + * SilcUInt16 silc_net_get_remote_port(SilcSocket sock); * * DESCRIPTION * * Return remote port by socket. * ***/ -SilcUInt16 silc_net_get_remote_port(int sock); +SilcUInt16 silc_net_get_remote_port(SilcSocket sock); -/****f* silcutil/SilcNetAPI/silc_net_get_local_port +/****f* silcutil/silc_net_get_local_port * * SYNOPSIS * - * SilcUInt16 silc_net_get_local_port(int sock); + * SilcUInt16 silc_net_get_local_port(SilcSocket sock); * * DESCRIPTION * * Return local port by socket. * ***/ -SilcUInt16 silc_net_get_local_port(int sock); +SilcUInt16 silc_net_get_local_port(SilcSocket sock); -/****f* silcutil/SilcNetAPI/silc_net_localhost +/****f* silcutil/silc_net_localhost * * SYNOPSIS * @@ -573,7 +698,7 @@ SilcUInt16 silc_net_get_local_port(int sock); ***/ char *silc_net_localhost(void); -/****f* silcutil/SilcNetAPI/silc_net_localip +/****f* silcutil/silc_net_localip * * SYNOPSIS * @@ -586,48 +711,57 @@ char *silc_net_localhost(void); ***/ char *silc_net_localip(void); -/****f* silcutil/SilcNetAPI/silc_net_win32_init +/****f* silcutil/silc_htonl * * SYNOPSIS * - * SilcBool silc_net_win32_init(void); + * SilcUInt32 silc_htonl(SilcUInt32 host); * * DESCRIPTION * - * This is WIN32 system specific function and is used to initialize - * the network. This must be called by all WIN32 applications. It - * is usually called at the application's main() or WinMain() before - * calling any other SILC routine. The application must also call - * the silc_net_win32_uninit when exiting the application. Returns - * FALSE on error. The network will not work if this function returns - * FALSE. + * Converts integer `host' from host byte order to network byte order. * - * NOTES + ***/ +SilcUInt32 silc_htonl(SilcUInt32 host); + +/****f* silcutil/silc_ntohl * - * This routines is available only on Win32 platform. + * SYNOPSIS + * + * SilcUInt32 silc_ntohl(SilcUInt32 net); + * + * DESCRIPTION + * + * Converts integer `net' from network byte order to host byte order. * ***/ -SilcBool silc_net_win32_init(void); +SilcUInt32 silc_ntohl(SilcUInt32 net); -/****f* silcutil/SilcNetAPI/silc_net_win32_uninit +/****f* silcutil/silc_htons * * SYNOPSIS * - * void silc_net_win32_init(void); + * SilcUInt16 silc_htons(SilcUInt16 host); * * DESCRIPTION * - * This is WIN32 system specific function and is used to uninitialize - * the network. This must be called by all WIN32 applications. It - * is usually called when the application is exiting. After calling - * this function the SILC Net API routines will not work anymore. + * Converts integer `host' from host byte order to network byte order. + * + ***/ +SilcUInt16 silc_htons(SilcUInt16 host); + +/****f* silcutil/silc_ntohs + * + * SYNOPSIS + * + * SilcUInt16 silc_ntohs(SilcUInt16 net); * - * NOTES + * DESCRIPTION * - * This routines is available only on Win32 platform. + * Converts integer `net' from network byte order to host byte order. * ***/ -void silc_net_win32_uninit(void); +SilcUInt16 silc_ntohs(SilcUInt16 net); #include "silcnet_i.h"