Mercurial > pidgin.yaz
changeset 8248:fabcfd9a7c1c
[gaim-migrate @ 8971]
marv, is this peachy?
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 12 Feb 2004 23:41:04 +0000 |
| parents | 4a6448907382 |
| children | b51ed4506180 |
| files | src/network.c src/network.h |
| diffstat | 2 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/network.c Thu Feb 12 21:36:58 2004 +0000 +++ b/src/network.c Thu Feb 12 23:41:04 2004 +0000 @@ -199,7 +199,7 @@ int ret = -1; if (gaim_prefs_get_bool("/core/network/ports_range_use") || - (start > end) || (start < 1024) || (end < 1024)) { + (start > end) || (start < 0) || (end < 0)) { start = gaim_prefs_get_int("/core/network/ports_range_start"); end = gaim_prefs_get_int("/core/network/ports_range_end"); }
--- a/src/network.h Thu Feb 12 21:36:58 2004 +0000 +++ b/src/network.h Thu Feb 12 23:41:04 2004 +0000 @@ -89,8 +89,10 @@ /** * Attempts to open a listening port ONLY on the specified port number. - * Can be used if MUST be listening on a certain port. You probably - * want to use gaim_network_listen_range() instead of this. + * You probably want to use gaim_network_listen_range() instead of this. + * This function is useful, for example, if you wanted to write a telnet + * server as a Gaim plugin, and you had to listen on port 23. Why anyone + * would want to do that is beyond me. * * This opens a listening port. The caller will want to set up a watcher * of type GAIM_INPUT_READ on the returned fd. It will probably call @@ -106,7 +108,12 @@ int gaim_network_listen(short port); /** - * Opens a listening port selected from a range of ports. + * Opens a listening port selected from a range of ports. The range of + * ports used is chosen in the following manner: + * If a range is specified in preferences, these values are used. + * If a non-0 values are passed to the function as parameters, these + * values are used. + * Otherwise a port is chosen at random by the kernel. * * This opens a listening port. The caller will want to set up a watcher * of type GAIM_INPUT_READ on the returned fd. It will probably call @@ -114,14 +121,10 @@ * the listening socket, and add a new watcher on the new socket accept * returned. * - * @note This function always lets the core override its args with the - * value of the user preferences. - * - * @param start The port number to bind to, or 0 to let the core decide. - * By default, the core will let the kernel pick one at random. + * @param start The port number to bind to, or 0 to pick a random port. * Users are allowed to override this arg in prefs. * @param end The highest possible port in the range of ports to listen on, - * or 0 to let the core decide Users are allowed to override this + * or 0 to pick a random port. Users are allowed to override this * arg in prefs. * @return The file descriptor of the listening socket, or -1 if * no socket could be established.