Remove network listener code.

* Remove network listener code.
* Inline `purple_network_get_port_from_fd` to its one caller.

Testing Done:
Compile only; all callers have been switched to gio already.

Reviewed at https://reviews.imfreedom.org/r/293/

1 files changed, 0 insertions, 119 deletions

diff --git a/libpurple/network.h b/libpurple/network.h
index 3533bc60cc..c3fcfbd6fc 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -46,10 +46,6 @@ G_BEGIN_DECLS
 /* Network API                                                            */
 /**************************************************************************/
 
-typedef struct _PurpleNetworkListenData PurpleNetworkListenData;
-
-typedef void (*PurpleNetworkListenCallback) (int listenfd, gpointer data);
-
 /**
  * purple_network_set_public_ip:
  * @ip: The local IP address.
@@ -124,121 +120,6 @@ const gchar *purple_network_get_my_ip(void);
 gchar *purple_network_get_my_ip_from_gio(GSocketConnection *sockconn);
 
 /**
- * purple_network_listen:
- * @port: The port number to bind to.  Must be greater than 0.
- * @socket_family: The protocol family of the socket.  This should be
- *                 AF_INET for IPv4 or AF_INET6 for IPv6.  IPv6 sockets
- *                 may or may not be able to accept IPv4 connections
- *                 based on the system configuration (use
- *                 purple_socket_speaks_ipv4 to check).  If an IPv6
- *                 socket doesn't accept V4-mapped addresses, you will
- *                 need a second listener to support both v4 and v6.
- * @socket_type: The type of socket to open for listening.
- *               This will be either SOCK_STREAM for TCP or SOCK_DGRAM for UDP.
- * @map_external: Should the open port be mapped externally using
- *                NAT-PNP or UPnP?  (default should be %TRUE)
- * @cb: (scope call): The callback to be invoked when the port to listen on is
- *      available. The file descriptor of the listening socket will be
- *      specified in this callback, or -1 if no socket could be established.
- * @cb_data: extra data to be returned when cb is called
- *
- * Attempts to open a listening port ONLY on the specified port number.
- * You probably want to use purple_network_listen_range() instead of this.
- * This function is useful, for example, if you wanted to write a telnet
- * server as a Purple 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 PURPLE_INPUT_READ on the fd returned in cb. It will probably call
- * accept in the watcher callback, and then possibly remove the watcher and
- * close the listening socket, and add a new watcher on the new socket accept
- * returned.
- *
- * Libpurple does not currently do any port mapping (stateful firewall hole
- * poking) for IPv6-only listeners (if an IPv6 socket supports v4-mapped
- * addresses, a mapping is done).
- *
- * Returns: (transfer full): A pointer to a data structure that can be used to cancel
- *          the pending listener, or %NULL if unable to obtain a local
- *          socket to listen on.
- */
-PurpleNetworkListenData *purple_network_listen(unsigned short port,
-	int socket_family, int socket_type, gboolean map_external,
-	PurpleNetworkListenCallback cb, gpointer cb_data);
-
-/**
- * purple_network_listen_range:
- * @start: The port number to bind to, or 0 to pick a random port.
- *         Users are allowed to override this arg in prefs.
- * @end: The highest possible port in the range of ports to listen on,
- *       or 0 to pick a random port.  Users are allowed to override this
- *       arg in prefs.
- * @socket_family: The protocol family of the socket.  This should be
- *                 AF_INET for IPv4 or AF_INET6 for IPv6.  IPv6 sockets
- *                 may or may not be able to accept IPv4 connections
- *                 based on the system configuration (use
- *                 purple_socket_speaks_ipv4 to check).  If an IPv6
- *                 socket doesn't accept V4-mapped addresses, you will
- *                 need a second listener to support both v4 and v6.
- * @socket_type: The type of socket to open for listening.
- *               This will be either SOCK_STREAM for TCP or SOCK_DGRAM for UDP.
- * @map_external: Should the open port be mapped externally using
- *                NAT-PNP or UPnP?  (default should be %TRUE)
- * @cb: (scope call): The callback to be invoked when the port to listen on is
- *      available. The file descriptor of the listening socket will be
- *      specified in this callback, or -1 if no socket could be established.
- * @cb_data: extra data to be returned when cb is called
- *
- * 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 operating system.
- *
- * This opens a listening port. The caller will want to set up a watcher
- * of type PURPLE_INPUT_READ on the fd returned in cb. It will probably call
- * accept in the watcher callback, and then possibly remove the watcher and close
- * the listening socket, and add a new watcher on the new socket accept
- * returned.
- *
- * Libpurple does not currently do any port mapping (stateful firewall hole
- * poking) for IPv6-only listeners (if an IPv6 socket supports v4-mapped
- * addresses, a mapping is done).
- *
- * Returns: (transfer full): A pointer to a data structure that can be used to cancel
- *          the pending listener, or %NULL if unable to obtain a local
- *          socket to listen on.
- */
-PurpleNetworkListenData *purple_network_listen_range(
-	unsigned short start, unsigned short end, int socket_family,
-	int socket_type, gboolean map_external,
-	PurpleNetworkListenCallback cb, gpointer cb_data);
-
-/**
- * purple_network_listen_cancel:
- * @listen_data: This listener attempt will be cancelled and
- *        the struct will be freed.
- *
- * This can be used to cancel any in-progress listener connection
- * by passing in the return value from either purple_network_listen()
- * or purple_network_listen_range().
- */
-void purple_network_listen_cancel(PurpleNetworkListenData *listen_data);
-
-/**
- * purple_network_get_port_from_fd:
- * @fd: The file descriptor. This should be a tcp socket. The current
- *           implementation probably dies on anything but IPv4. Perhaps this
- *           possible bug will inspire new and valuable contributors to Purple.
- *
- * Gets a port number from a file descriptor.
- *
- * Returns: The port number, in host byte order.
- */
-unsigned short purple_network_get_port_from_fd(int fd);
-
-/**
  * purple_network_is_available:
  *
  * Detects if there is an available network connection.