diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2018-04-13 10:45:09 +0200 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2018-04-24 09:05:50 -0700 |
commit | a785ba5495567bac5a51ee76c25b52223ec69835 (patch) | |
tree | e6e004fab98ab5e4ac3363cfaad6676e4500a6dd /src/lib/ecore_con | |
parent | 566a36dc99039ec6d7334fac658d8286d144fe82 (diff) |
Efl.Net.Dialer_* (from Efl.Net.Dialer.*)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer.eo | 6 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_http.eo | 20 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_simple.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_ssl.eo | 4 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_tcp.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_udp.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_unix.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_websocket.eo | 26 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_dialer_windows.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_net_socket_ssl.eo | 2 |
10 files changed, 34 insertions, 34 deletions
diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo index 08cf8434da..756643ed07 100644 --- a/src/lib/ecore_con/efl_net_dialer.eo +++ b/src/lib/ecore_con/efl_net_dialer.eo | |||
@@ -1,6 +1,6 @@ | |||
1 | var Efl.Net.Dialer.Error.COULDNT_CONNECT: Eina.Error; [[The dialer could not connect to the remote]] | 1 | var Efl.Net.Dialer_Error.COULDNT_CONNECT: Eina.Error; [[The dialer could not connect to the remote]] |
2 | var Efl.Net.Dialer.Error.COULDNT_RESOLVE_PROXY: Eina.Error; [[The dialer could not resolve the given proxy server]] | 2 | var Efl.Net.Dialer_Error.COULDNT_RESOLVE_PROXY: Eina.Error; [[The dialer could not resolve the given proxy server]] |
3 | var Efl.Net.Dialer.Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; [[The dialer failed to authenticate against the proxy server]] | 3 | var Efl.Net.Dialer_Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; [[The dialer failed to authenticate against the proxy server]] |
4 | 4 | ||
5 | interface Efl.Net.Dialer (Efl.Net.Socket) { | 5 | interface Efl.Net.Dialer (Efl.Net.Socket) { |
6 | [[Creates a client socket to reach a remote peer. | 6 | [[Creates a client socket to reach a remote peer. |
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo index ab6ad36620..faecaebd35 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.eo +++ b/src/lib/ecore_con/efl_net_dialer_http.eo | |||
@@ -1,13 +1,13 @@ | |||
1 | import efl_net_http_types; | 1 | import efl_net_http_types; |
2 | 2 | ||
3 | enum Efl.Net.Dialer.Http_Primary_Mode { | 3 | enum Efl.Net.Dialer_Http_Primary_Mode { |
4 | [[Primary HTTP mode]] | 4 | [[Primary HTTP mode]] |
5 | auto, [[HTTP auto mode]] | 5 | auto, [[HTTP auto mode]] |
6 | download, [[HTTP download mode]] | 6 | download, [[HTTP download mode]] |
7 | upload, [[HTTP upload mode]] | 7 | upload, [[HTTP upload mode]] |
8 | } | 8 | } |
9 | 9 | ||
10 | class Efl.Net.Dialer.Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) { | 10 | class Efl.Net.Dialer_Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) { |
11 | [[HTTP Dialer (Client). | 11 | [[HTTP Dialer (Client). |
12 | 12 | ||
13 | The effective URL in use, if @.allow_redirects is $true will be | 13 | The effective URL in use, if @.allow_redirects is $true will be |
@@ -71,20 +71,20 @@ class Efl.Net.Dialer.Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) { | |||
71 | 71 | ||
72 | This property will change the behavior of @Efl.Io.Sizer: | 72 | This property will change the behavior of @Efl.Io.Sizer: |
73 | 73 | ||
74 | - If @Efl.Net.Dialer.Http_Primary_Mode.auto, then | 74 | - If @Efl.Net.Dialer_Http_Primary_Mode.auto, then |
75 | @Efl.Net.Dialer.Http_Primary_Mode.download or | 75 | @Efl.Net.Dialer_Http_Primary_Mode.download or |
76 | @Efl.Net.Dialer.Http_Primary_Mode.upload will be | 76 | @Efl.Net.Dialer_Http_Primary_Mode.upload will be |
77 | choosen based on the @.method: if "PUT", then it's | 77 | choosen based on the @.method: if "PUT", then it's |
78 | upload, otherwise it's download. | 78 | upload, otherwise it's download. |
79 | 79 | ||
80 | - If @Efl.Net.Dialer.Http_Primary_Mode.upload, applying | 80 | - If @Efl.Net.Dialer_Http_Primary_Mode.upload, applying |
81 | a new size with @Efl.Io.Sizer.resize or | 81 | a new size with @Efl.Io.Sizer.resize or |
82 | @Efl.Io.Sizer.size.set will specify the | 82 | @Efl.Io.Sizer.size.set will specify the |
83 | "Content-Length" to upload. If no size is previously | 83 | "Content-Length" to upload. If no size is previously |
84 | set, then the upload will happen in | 84 | set, then the upload will happen in |
85 | "Transfer-encoding: chunked". | 85 | "Transfer-encoding: chunked". |
86 | 86 | ||
87 | - If @Efl.Net.Dialer.Http_Primary_Mode.download, then | 87 | - If @Efl.Net.Dialer_Http_Primary_Mode.download, then |
88 | @Efl.Io.Sizer.size.get will report the | 88 | @Efl.Io.Sizer.size.get will report the |
89 | "Content-Length" provided by the server, if any. | 89 | "Content-Length" provided by the server, if any. |
90 | 90 | ||
@@ -99,15 +99,15 @@ class Efl.Net.Dialer.Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) { | |||
99 | [[The effective primary mode. | 99 | [[The effective primary mode. |
100 | 100 | ||
101 | This will return one of | 101 | This will return one of |
102 | @Efl.Net.Dialer.Http_Primary_Mode.download or | 102 | @Efl.Net.Dialer_Http_Primary_Mode.download or |
103 | @Efl.Net.Dialer.Http_Primary_Mode.upload. If "auto" | 103 | @Efl.Net.Dialer_Http_Primary_Mode.upload. If "auto" |
104 | was set (the default), then it will pick the best | 104 | was set (the default), then it will pick the best |
105 | based on the @.method in use. | 105 | based on the @.method in use. |
106 | ]] | 106 | ]] |
107 | } | 107 | } |
108 | set { } | 108 | set { } |
109 | values { | 109 | values { |
110 | primary_mode: Efl.Net.Dialer.Http_Primary_Mode; [[Primary HTTP mode]] | 110 | primary_mode: Efl.Net.Dialer_Http_Primary_Mode; [[Primary HTTP mode]] |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
diff --git a/src/lib/ecore_con/efl_net_dialer_simple.eo b/src/lib/ecore_con/efl_net_dialer_simple.eo index ceeca6c64d..58a40f2191 100644 --- a/src/lib/ecore_con/efl_net_dialer_simple.eo +++ b/src/lib/ecore_con/efl_net_dialer_simple.eo | |||
@@ -1,4 +1,4 @@ | |||
1 | class Efl.Net.Dialer.Simple (Efl.Net.Socket.Simple, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Simple (Efl.Net.Socket.Simple, Efl.Net.Dialer) { |
2 | [[Connects to a remote server offering an easy to use, buffered I/O. | 2 | [[Connects to a remote server offering an easy to use, buffered I/O. |
3 | 3 | ||
4 | The simple dialer is based on @Efl.Net.Socket.Simple, which | 4 | The simple dialer is based on @Efl.Net.Socket.Simple, which |
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.eo b/src/lib/ecore_con/efl_net_dialer_ssl.eo index c923f2f790..c92c4e8ec6 100644 --- a/src/lib/ecore_con/efl_net_dialer_ssl.eo +++ b/src/lib/ecore_con/efl_net_dialer_ssl.eo | |||
@@ -1,7 +1,7 @@ | |||
1 | class Efl.Net.Dialer.Ssl (Efl.Net.Socket.Ssl, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Ssl (Efl.Net.Socket.Ssl, Efl.Net.Dialer) { |
2 | [[Connects to a remote SSL server using TCP. | 2 | [[Connects to a remote SSL server using TCP. |
3 | 3 | ||
4 | This creates an internal @Efl.Net.Dialer.Tcp and once connected | 4 | This creates an internal @Efl.Net.Dialer_Tcp and once connected |
5 | it will start the SSL handshake. | 5 | it will start the SSL handshake. |
6 | 6 | ||
7 | If the proxy is NULL (default), then the system proxy will be | 7 | If the proxy is NULL (default), then the system proxy will be |
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.eo b/src/lib/ecore_con/efl_net_dialer_tcp.eo index fd504fb2fc..9500a56bcd 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 @@ | |||
1 | class Efl.Net.Dialer.Tcp (Efl.Net.Socket.Tcp, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Tcp (Efl.Net.Socket.Tcp, Efl.Net.Dialer) { |
2 | [[Connects to a remote TCP server. | 2 | [[Connects to a remote TCP server. |
3 | 3 | ||
4 | If the proxy is NULL (default), then the system proxy will be | 4 | 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 9faf6b9f8c..76c3dcf133 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 @@ | |||
1 | class Efl.Net.Dialer.Udp (Efl.Net.Socket.Udp, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Udp (Efl.Net.Socket.Udp, Efl.Net.Dialer) { |
2 | [[Connects to a remote UDP server. | 2 | [[Connects to a remote UDP server. |
3 | 3 | ||
4 | UDP proxies are not supported, not even using SOCKSv5. | 4 | UDP proxies are not supported, not even using SOCKSv5. |
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.eo b/src/lib/ecore_con/efl_net_dialer_unix.eo index 36319d4d61..d672d61495 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 @@ | |||
1 | class Efl.Net.Dialer.Unix (Efl.Net.Socket.Unix, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Unix (Efl.Net.Socket.Unix, Efl.Net.Dialer) { |
2 | [[Connects to a local AF_UNIX server. | 2 | [[Connects to a local AF_UNIX server. |
3 | 3 | ||
4 | The dial address is a file system path (portable) or | 4 | The dial address is a file system path (portable) or |
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo index cd2f453acc..f38016cc4e 100644 --- a/src/lib/ecore_con/efl_net_dialer_websocket.eo +++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo | |||
@@ -1,17 +1,17 @@ | |||
1 | import eina_types; | 1 | import eina_types; |
2 | import efl_net_http_types; | 2 | import efl_net_http_types; |
3 | 3 | ||
4 | enum Efl.Net.Dialer.Websocket_Streaming_Mode { | 4 | enum Efl.Net.Dialer_Websocket_Streaming_Mode { |
5 | [[How to map WebSocket to EFL I/O Interfaces. | 5 | [[How to map WebSocket to EFL I/O Interfaces. |
6 | 6 | ||
7 | @since 1.19 | 7 | @since 1.19 |
8 | ]] | 8 | ]] |
9 | disabled, [[@Efl.Io.Writer.write and @Efl.Io.Reader.read will fail by returning ENOSTR]] | 9 | disabled, [[@Efl.Io.Writer.write and @Efl.Io.Reader.read will fail by returning ENOSTR]] |
10 | binary, [[@Efl.Io.Writer.write will result in @Efl.Net.Dialer.Websocket.binary_send]] | 10 | binary, [[@Efl.Io.Writer.write will result in @Efl.Net.Dialer_Websocket.binary_send]] |
11 | text, [[@Efl.Io.Writer.write will result in @Efl.Net.Dialer.Websocket.text_send]] | 11 | text, [[@Efl.Io.Writer.write will result in @Efl.Net.Dialer_Websocket.text_send]] |
12 | } | 12 | } |
13 | 13 | ||
14 | enum Efl.Net.Dialer.Websocket_Close_Reason { | 14 | enum Efl.Net.Dialer_Websocket_Close_Reason { |
15 | [[Registered reasons for the CLOSE (opcode=0x8). | 15 | [[Registered reasons for the CLOSE (opcode=0x8). |
16 | 16 | ||
17 | These are the well known reasons, with some ranges being defined | 17 | These are the well known reasons, with some ranges being defined |
@@ -38,16 +38,16 @@ enum Efl.Net.Dialer.Websocket_Close_Reason { | |||
38 | private_end = 4999, [[Applications can use range 4000-4999]] | 38 | private_end = 4999, [[Applications can use range 4000-4999]] |
39 | } | 39 | } |
40 | 40 | ||
41 | struct Efl.Net.Dialer.Websocket_Closed_Reason { | 41 | struct Efl.Net.Dialer_Websocket_Closed_Reason { |
42 | [[Close reason event payload. | 42 | [[Close reason event payload. |
43 | 43 | ||
44 | @since 1.19 | 44 | @since 1.19 |
45 | ]] | 45 | ]] |
46 | reason: Efl.Net.Dialer.Websocket_Close_Reason; [[Closing reason]] | 46 | reason: Efl.Net.Dialer_Websocket_Close_Reason; [[Closing reason]] |
47 | message: string; [[Textual closing reason message]] | 47 | message: string; [[Textual closing reason message]] |
48 | } | 48 | } |
49 | 49 | ||
50 | class Efl.Net.Dialer.Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { | 50 | class Efl.Net.Dialer_Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { |
51 | [[WebSocket Dialer (Client). | 51 | [[WebSocket Dialer (Client). |
52 | 52 | ||
53 | The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is | 53 | The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is |
@@ -135,7 +135,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { | |||
135 | close message, which will be reported as "closed,reason". | 135 | close message, which will be reported as "closed,reason". |
136 | ]] | 136 | ]] |
137 | params { | 137 | params { |
138 | reason: Efl.Net.Dialer.Websocket_Close_Reason; [[Reason for closing]] | 138 | reason: Efl.Net.Dialer_Websocket_Close_Reason; [[Reason for closing]] |
139 | message: string @optional; [[Additional closing message]] | 139 | message: string @optional; [[Additional closing message]] |
140 | } | 140 | } |
141 | } | 141 | } |
@@ -174,9 +174,9 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { | |||
174 | However this class can operate in streaming mode, | 174 | However this class can operate in streaming mode, |
175 | mapping each @Efl.Io.Writer.write to a @.binary_send if | 175 | mapping each @Efl.Io.Writer.write to a @.binary_send if |
176 | streaming_mode is set to | 176 | streaming_mode is set to |
177 | @Efl.Net.Dialer.Websocket_Streaming_Mode.binary, of | 177 | @Efl.Net.Dialer_Websocket_Streaming_Mode.binary, of |
178 | @.text_send if | 178 | @.text_send if |
179 | @Efl.Net.Dialer.Websocket_Streaming_Mode.text | 179 | @Efl.Net.Dialer_Websocket_Streaming_Mode.text |
180 | 180 | ||
181 | @Efl.Io.Reader.read may consume less then the whole | 181 | @Efl.Io.Reader.read may consume less then the whole |
182 | received message, in this case the rest of the message | 182 | received message, in this case the rest of the message |
@@ -184,12 +184,12 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { | |||
184 | SOCK_SEQPACKET + read(2)). | 184 | SOCK_SEQPACKET + read(2)). |
185 | 185 | ||
186 | By default, streaming is disabled | 186 | By default, streaming is disabled |
187 | (@Efl.Net.Dialer.Websocket_Streaming_Mode.disabled). | 187 | (@Efl.Net.Dialer_Websocket_Streaming_Mode.disabled). |
188 | ]] | 188 | ]] |
189 | get { } | 189 | get { } |
190 | set { } | 190 | set { } |
191 | values { | 191 | values { |
192 | streaming_mode: Efl.Net.Dialer.Websocket_Streaming_Mode; [[Streaming mode]] | 192 | streaming_mode: Efl.Net.Dialer_Websocket_Streaming_Mode; [[Streaming mode]] |
193 | } | 193 | } |
194 | } | 194 | } |
195 | 195 | ||
@@ -309,7 +309,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) { | |||
309 | message,text: string; [[Received a text string message (opcode=0x1)]] | 309 | message,text: string; [[Received a text string message (opcode=0x1)]] |
310 | message,binary: ptr(const(Eina.Slice)); [[Received a binary message (opcode=0x2)]] | 310 | message,binary: ptr(const(Eina.Slice)); [[Received a binary message (opcode=0x2)]] |
311 | pong: string; [[Received a pong (opcode=0xA) with optional message/reason]] | 311 | pong: string; [[Received a pong (opcode=0xA) with optional message/reason]] |
312 | closed,reason: Efl.Net.Dialer.Websocket_Closed_Reason; [[Received a request to close the connection. It may be a reply/confirmation from a local request, see @.close_request, or some server-generated reason. After this point, no more messages are allowed to be sent and no more will be received. @Efl.Io.Closer.close will be called.]] | 312 | closed,reason: Efl.Net.Dialer_Websocket_Closed_Reason; [[Received a request to close the connection. It may be a reply/confirmation from a local request, see @.close_request, or some server-generated reason. After this point, no more messages are allowed to be sent and no more will be received. @Efl.Io.Closer.close will be called.]] |
313 | } | 313 | } |
314 | 314 | ||
315 | implements { | 315 | implements { |
diff --git a/src/lib/ecore_con/efl_net_dialer_windows.eo b/src/lib/ecore_con/efl_net_dialer_windows.eo index 50a38b89b5..a13dcaeac9 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 @@ | |||
1 | class Efl.Net.Dialer.Windows (Efl.Net.Socket.Windows, Efl.Net.Dialer) { | 1 | class Efl.Net.Dialer_Windows (Efl.Net.Socket.Windows, Efl.Net.Dialer) { |
2 | [[Connects to a Windows NamedPipe server. | 2 | [[Connects to a Windows NamedPipe server. |
3 | 3 | ||
4 | The dial address will have "\\\\.\\pipe\\" prepended as required by | 4 | The dial address will have "\\\\.\\pipe\\" prepended as required by |
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo index b59f8787db..512ff1b4c5 100644 --- a/src/lib/ecore_con/efl_net_socket_ssl.eo +++ b/src/lib/ecore_con/efl_net_socket_ssl.eo | |||
@@ -6,7 +6,7 @@ class Efl.Net.Socket.Ssl (Efl.Loop_Consumer, Efl.Net.Socket) { | |||
6 | 6 | ||
7 | Use this wrapper around an existing socket for secure | 7 | Use this wrapper around an existing socket for secure |
8 | communication. One common use is to apply it to TCP sockets | 8 | communication. One common use is to apply it to TCP sockets |
9 | created with @Efl.Net.Dialer.Tcp or @Efl.Net.Server.Tcp created | 9 | created with @Efl.Net.Dialer_Tcp or @Efl.Net.Server.Tcp created |
10 | with "client,add" event. | 10 | with "client,add" event. |
11 | 11 | ||
12 | @since 1.19 | 12 | @since 1.19 |