diff options
author | Diego Nehab <diego.nehab@gmail.com> | 2012-04-24 00:47:30 +0800 |
---|---|---|
committer | Diego Nehab <diego.nehab@gmail.com> | 2012-04-24 00:47:30 +0800 |
commit | c2e29537f576a7082247091036c7957479d42b21 (patch) | |
tree | fb6a4da9566e8413d824522ca9a7fb94de049b61 /doc | |
parent | 1acf8188cd732de4fd5fcdc016eeab501c86a773 (diff) | |
download | luasocket-c2e29537f576a7082247091036c7957479d42b21.tar.gz luasocket-c2e29537f576a7082247091036c7957479d42b21.tar.bz2 luasocket-c2e29537f576a7082247091036c7957479d42b21.zip |
Fixed getpeername/getsockname situation
- Added IPv6 support to getsockname
- Simplified getpeername implementation
- Added family to return of getsockname and getpeername
and added modification to the manual to describe
Diffstat (limited to 'doc')
-rw-r--r-- | doc/index.html | 3 | ||||
-rw-r--r-- | doc/tcp.html | 11 | ||||
-rw-r--r-- | doc/udp.html | 18 |
3 files changed, 21 insertions, 11 deletions
diff --git a/doc/index.html b/doc/index.html index 833c9a8..56c958f 100644 --- a/doc/index.html +++ b/doc/index.html | |||
@@ -134,7 +134,8 @@ and Lua 5.2 compatibility. | |||
134 | <li> Added: IPv6 support; | 134 | <li> Added: IPv6 support; |
135 | <ul> | 135 | <ul> |
136 | <li> <tt>Socket.connect</tt> and <tt>socket.bind</tt> support IPv6 addresses; | 136 | <li> <tt>Socket.connect</tt> and <tt>socket.bind</tt> support IPv6 addresses; |
137 | <li> <tt>Getpeername</tt> and <tt>getsockname</tt> support IPv6 addresses; | 137 | <li> <tt>Getpeername</tt> and <tt>getsockname</tt> support |
138 | IPv6 addresses, and return the socket family as a third value; | ||
138 | <li> URL module updated to support IPv6 host names; | 139 | <li> URL module updated to support IPv6 host names; |
139 | <li> New <tt>socket.tcp6</tt> and <tt>socket.udp6</tt> functions; | 140 | <li> New <tt>socket.tcp6</tt> and <tt>socket.udp6</tt> functions; |
140 | <li> New <tt>socket.dns.getaddrinfo</tt> function; | 141 | <li> New <tt>socket.dns.getaddrinfo</tt> function; |
diff --git a/doc/tcp.html b/doc/tcp.html index dc1a0b6..5f39d0e 100644 --- a/doc/tcp.html +++ b/doc/tcp.html | |||
@@ -225,8 +225,9 @@ Returns information about the remote side of a connected client object. | |||
225 | </p> | 225 | </p> |
226 | 226 | ||
227 | <p class=return> | 227 | <p class=return> |
228 | Returns a string with the IP address of the peer, followed by the | 228 | Returns a string with the IP address of the peer, the |
229 | port number that peer is using for the connection. | 229 | port number that peer is using for the connection, |
230 | and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). | ||
230 | In case of error, the method returns <b><tt>nil</tt></b>. | 231 | In case of error, the method returns <b><tt>nil</tt></b>. |
231 | </p> | 232 | </p> |
232 | 233 | ||
@@ -247,8 +248,10 @@ Returns the local address information associated to the object. | |||
247 | </p> | 248 | </p> |
248 | 249 | ||
249 | <p class=return> | 250 | <p class=return> |
250 | The method returns a string with local IP address and a number with | 251 | The method returns a string with local IP address, a number with |
251 | the port. In case of error, the method returns <b><tt>nil</tt></b>. | 252 | the local port, |
253 | and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). | ||
254 | In case of error, the method returns <b><tt>nil</tt></b>. | ||
252 | </p> | 255 | </p> |
253 | 256 | ||
254 | <!-- getstats +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> | 257 | <!-- getstats +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> |
diff --git a/doc/udp.html b/doc/udp.html index 4a334b7..554fa31 100644 --- a/doc/udp.html +++ b/doc/udp.html | |||
@@ -140,8 +140,12 @@ Retrieves information about the peer | |||
140 | associated with a connected UDP object. | 140 | associated with a connected UDP object. |
141 | </p> | 141 | </p> |
142 | 142 | ||
143 | <p class="return"> | 143 | |
144 | Returns the IP address and port number of the peer. | 144 | <p class=return> |
145 | Returns a string with the IP address of the peer, the | ||
146 | port number that peer is using for the connection, | ||
147 | and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). | ||
148 | In case of error, the method returns <b><tt>nil</tt></b>. | ||
145 | </p> | 149 | </p> |
146 | 150 | ||
147 | <p class="note"> | 151 | <p class="note"> |
@@ -159,10 +163,12 @@ unconnected:<b>getsockname()</b> | |||
159 | Returns the local address information associated to the object. | 163 | Returns the local address information associated to the object. |
160 | </p> | 164 | </p> |
161 | 165 | ||
162 | <p class="return"> | 166 | |
163 | The method returns a string with local IP | 167 | <p class=return> |
164 | address and a number with the port. In case of error, the method | 168 | The method returns a string with local IP address, a number with |
165 | returns <b><tt>nil</tt></b>. | 169 | the local port, |
170 | and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). | ||
171 | In case of error, the method returns <b><tt>nil</tt></b>. | ||
166 | </p> | 172 | </p> |
167 | 173 | ||
168 | <p class="note"> | 174 | <p class="note"> |