From c2e3b4640572a1dd82a20366ae55f9173fb8ff96 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 13 Apr 2018 10:58:29 +0200 Subject: [PATCH] Efl.Net.Socket_* (from Efl.Net.Socket.*) Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail --- src/lib/ecore_con/efl_net_dialer_simple.eo | 4 ++-- src/lib/ecore_con/efl_net_dialer_ssl.eo | 2 +- src/lib/ecore_con/efl_net_dialer_tcp.eo | 2 +- src/lib/ecore_con/efl_net_dialer_udp.eo | 10 +++++----- src/lib/ecore_con/efl_net_dialer_unix.eo | 2 +- src/lib/ecore_con/efl_net_dialer_windows.eo | 2 +- src/lib/ecore_con/efl_net_socket_fd.eo | 2 +- src/lib/ecore_con/efl_net_socket_simple.eo | 2 +- src/lib/ecore_con/efl_net_socket_ssl.eo | 8 ++++---- src/lib/ecore_con/efl_net_socket_tcp.eo | 2 +- src/lib/ecore_con/efl_net_socket_udp.eo | 2 +- src/lib/ecore_con/efl_net_socket_unix.eo | 2 +- src/lib/ecore_con/efl_net_socket_windows.eo | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/lib/ecore_con/efl_net_dialer_simple.eo b/src/lib/ecore_con/efl_net_dialer_simple.eo index 58a40f2..e1e6522 100644 --- a/src/lib/ecore_con/efl_net_dialer_simple.eo +++ b/src/lib/ecore_con/efl_net_dialer_simple.eo @@ -1,7 +1,7 @@ -class Efl.Net.Dialer_Simple (Efl.Net.Socket.Simple, Efl.Net.Dialer) { +class Efl.Net.Dialer_Simple (Efl.Net.Socket_Simple, Efl.Net.Dialer) { [[Connects to a remote server offering an easy to use, buffered I/O. - The simple dialer is based on @Efl.Net.Socket.Simple, which + The simple dialer is based on @Efl.Net.Socket_Simple, which encapsulates an actual @Efl.Net.Socket and uses it with an @Efl.Io.Buffered_Stream. This creates an input @Efl.Io.Queue, an output @Efl.Io.Queue. Both of these are linked using a receiver diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.eo b/src/lib/ecore_con/efl_net_dialer_ssl.eo index c92c4e8..ccff92d 100644 --- a/src/lib/ecore_con/efl_net_dialer_ssl.eo +++ b/src/lib/ecore_con/efl_net_dialer_ssl.eo @@ -1,4 +1,4 @@ -class Efl.Net.Dialer_Ssl (Efl.Net.Socket.Ssl, Efl.Net.Dialer) { +class Efl.Net.Dialer_Ssl (Efl.Net.Socket_Ssl, Efl.Net.Dialer) { [[Connects to a remote SSL server using TCP. This creates an internal @Efl.Net.Dialer_Tcp and once connected diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.eo b/src/lib/ecore_con/efl_net_dialer_tcp.eo index 9500a56..c46084b 100644 --- a/src/lib/ecore_con/efl_net_dialer_tcp.eo +++ b/src/lib/ecore_con/efl_net_dialer_tcp.eo @@ -1,4 +1,4 @@ -class Efl.Net.Dialer_Tcp (Efl.Net.Socket.Tcp, Efl.Net.Dialer) { +class Efl.Net.Dialer_Tcp (Efl.Net.Socket_Tcp, Efl.Net.Dialer) { [[Connects to a remote TCP server. If the proxy is NULL (default), then the system proxy will be diff --git a/src/lib/ecore_con/efl_net_dialer_udp.eo b/src/lib/ecore_con/efl_net_dialer_udp.eo index 76c3dcf..56f3441 100644 --- a/src/lib/ecore_con/efl_net_dialer_udp.eo +++ b/src/lib/ecore_con/efl_net_dialer_udp.eo @@ -1,4 +1,4 @@ -class Efl.Net.Dialer_Udp (Efl.Net.Socket.Udp, Efl.Net.Dialer) { +class Efl.Net.Dialer_Udp (Efl.Net.Socket_Udp, Efl.Net.Dialer) { [[Connects to a remote UDP server. UDP proxies are not supported, not even using SOCKSv5. @@ -15,10 +15,10 @@ class Efl.Net.Dialer_Udp (Efl.Net.Socket.Udp, Efl.Net.Dialer) { To allow finer control, see: - - @Efl.Net.Socket.Udp.bind: choose the local address to bind. - - @Efl.Net.Socket.Udp.multicast_join: join other multicast groups. - - @Efl.Net.Socket.Udp.multicast_loopback: if packets should be delivered locally or only to remote peers. - - @Efl.Net.Socket.Udp.multicast_time_to_live: how far, in number of hops, the packet should go. + - @Efl.Net.Socket_Udp.bind: choose the local address to bind. + - @Efl.Net.Socket_Udp.multicast_join: join other multicast groups. + - @Efl.Net.Socket_Udp.multicast_loopback: if packets should be delivered locally or only to remote peers. + - @Efl.Net.Socket_Udp.multicast_time_to_live: how far, in number of hops, the packet should go. I diff --git a/src/lib/ecore_con/efl_net_dialer_unix.eo b/src/lib/ecore_con/efl_net_dialer_unix.eo index d672d61..aafe27f 100644 --- a/src/lib/ecore_con/efl_net_dialer_unix.eo +++ b/src/lib/ecore_con/efl_net_dialer_unix.eo @@ -1,4 +1,4 @@ -class Efl.Net.Dialer_Unix (Efl.Net.Socket.Unix, Efl.Net.Dialer) { +class Efl.Net.Dialer_Unix (Efl.Net.Socket_Unix, Efl.Net.Dialer) { [[Connects to a local AF_UNIX server. The dial address is a file system path (portable) or diff --git a/src/lib/ecore_con/efl_net_dialer_windows.eo b/src/lib/ecore_con/efl_net_dialer_windows.eo index a13dcae..8826381 100644 --- a/src/lib/ecore_con/efl_net_dialer_windows.eo +++ b/src/lib/ecore_con/efl_net_dialer_windows.eo @@ -1,4 +1,4 @@ -class Efl.Net.Dialer_Windows (Efl.Net.Socket.Windows, Efl.Net.Dialer) { +class Efl.Net.Dialer_Windows (Efl.Net.Socket_Windows, Efl.Net.Dialer) { [[Connects to a Windows NamedPipe server. The dial address will have "\\\\.\\pipe\\" prepended as required by diff --git a/src/lib/ecore_con/efl_net_socket_fd.eo b/src/lib/ecore_con/efl_net_socket_fd.eo index 640ac34..8cce3ff3 100644 --- a/src/lib/ecore_con/efl_net_socket_fd.eo +++ b/src/lib/ecore_con/efl_net_socket_fd.eo @@ -1,4 +1,4 @@ -class Efl.Net.Socket.Fd (Efl.Loop_Fd, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket) { +class Efl.Net.Socket_Fd (Efl.Loop_Fd, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket) { [[A base implementation for sockets over filedescriptors (fd) This is the common class and takes an existing FD, usually diff --git a/src/lib/ecore_con/efl_net_socket_simple.eo b/src/lib/ecore_con/efl_net_socket_simple.eo index d233096..b204259 100644 --- a/src/lib/ecore_con/efl_net_socket_simple.eo +++ b/src/lib/ecore_con/efl_net_socket_simple.eo @@ -1,4 +1,4 @@ -class Efl.Net.Socket.Simple (Efl.Io.Buffered_Stream, Efl.Net.Socket) { +class Efl.Net.Socket_Simple (Efl.Io.Buffered_Stream, Efl.Net.Socket) { [[A wrapper socket offering an easy to use, buffered I/O. The simple socket encapsulates an actual @Efl.Net.Socket and diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo index 34ab23a..2e6ee11 100644 --- a/src/lib/ecore_con/efl_net_socket_ssl.eo +++ b/src/lib/ecore_con/efl_net_socket_ssl.eo @@ -1,7 +1,7 @@ -var Efl.Net.Socket.Ssl_Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]] -var Efl.Net.Socket.Ssl_Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]] +var Efl.Net.Socket_Ssl_Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]] +var Efl.Net.Socket_Ssl_Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]] -class Efl.Net.Socket.Ssl (Efl.Loop_Consumer, Efl.Net.Socket) { +class Efl.Net.Socket_Ssl (Efl.Loop_Consumer, Efl.Net.Socket) { [[A wrapper socket doing SSL (Secure Sockets Layer). Use this wrapper around an existing socket for secure @@ -14,7 +14,7 @@ class Efl.Net.Socket.Ssl (Efl.Loop_Consumer, Efl.Net.Socket) { events { ssl,ready; [[Notifies the SSL handshake has been performed and the socket is now able to communicate]] - ssl,error: Eina.Error; [[An error such as @Efl.Net.Socket.Ssl_Error.HANDSHAKE]] + ssl,error: Eina.Error; [[An error such as @Efl.Net.Socket_Ssl_Error.HANDSHAKE]] } methods { diff --git a/src/lib/ecore_con/efl_net_socket_tcp.eo b/src/lib/ecore_con/efl_net_socket_tcp.eo index 65c5f37..de40b1d 100644 --- a/src/lib/ecore_con/efl_net_socket_tcp.eo +++ b/src/lib/ecore_con/efl_net_socket_tcp.eo @@ -1,4 +1,4 @@ -class Efl.Net.Socket.Tcp (Efl.Net.Socket.Fd) { +class Efl.Net.Socket_Tcp (Efl.Net.Socket_Fd) { [[A base TCP socket. This is the common class and takes an existing FD, usually diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo index be5787c..9c22a0c 100644 --- a/src/lib/ecore_con/efl_net_socket_udp.eo +++ b/src/lib/ecore_con/efl_net_socket_udp.eo @@ -1,6 +1,6 @@ import efl_net_ip_address; -class Efl.Net.Socket.Udp (Efl.Net.Socket.Fd) { +class Efl.Net.Socket_Udp (Efl.Net.Socket_Fd) { [[A base UDP socket. This is the common class and takes an existing FD, usually diff --git a/src/lib/ecore_con/efl_net_socket_unix.eo b/src/lib/ecore_con/efl_net_socket_unix.eo index 6173f03..9befbea 100644 --- a/src/lib/ecore_con/efl_net_socket_unix.eo +++ b/src/lib/ecore_con/efl_net_socket_unix.eo @@ -1,4 +1,4 @@ -class Efl.Net.Socket.Unix (Efl.Net.Socket.Fd) { +class Efl.Net.Socket_Unix (Efl.Net.Socket_Fd) { [[A base UNIX socket. This is the common class and takes an existing FD, usually diff --git a/src/lib/ecore_con/efl_net_socket_windows.eo b/src/lib/ecore_con/efl_net_socket_windows.eo index 305fb66..8df3b4c 100644 --- a/src/lib/ecore_con/efl_net_socket_windows.eo +++ b/src/lib/ecore_con/efl_net_socket_windows.eo @@ -1,4 +1,4 @@ -class Efl.Net.Socket.Windows (Efl.Loop_Consumer, Efl.Net.Socket) { +class Efl.Net.Socket_Windows (Efl.Loop_Consumer, Efl.Net.Socket) { [[A base Windows NamedPipe socket. This is the common class and takes an existing file HANDLE, -- 2.7.4