--- a/ChangeLog.API Fri Dec 18 04:40:41 2020 -0600
+++ b/ChangeLog.API Fri Dec 18 04:55:34 2020 -0600
@@ -192,14 +192,6 @@
descriptor as first parameter
* purple_network_get_my_ip no longer takes a file descriptor
- * purple_network_listen now takes the protocol family as the second- * purple_network_listen now takes a boolean indicating external port- mapping as the fourth parameter- * purple_network_listen_range now takes a boolean indicating external- port mapping as the fifth parameter- * purple_network_listen_range now takes the protocol family as the * PurpleNotifyMsgType renamed to PurpleNotifyMessageType
* purple_notify_user_info_add_pair renamed to
purple_notify_user_info_add_pair_html
@@ -403,11 +395,16 @@
* purple_network_convert_idn_to_ascii. Use g_hostname_to_ascii,
* purple_network_get_all_local_system_ips. Use libnice instead.
- * purple_network_listen_family. Use purple_network_listen, instead.+ * purple_network_get_port_from_fd + * purple_network_ip_atoi + * PurpleNetworkListenData + * PurpleNetworkListenCallback + * purple_network_listen + * purple_network_listen_cancel + * purple_network_listen_family * purple_network_listen_map_external
- * purple_network_listen_range_family. Use purple_network_listen,- * purple_network_ip_atoi+ * purple_network_listen_range + * purple_network_listen_range_family * purple_notify_searchresults_column_get_title
* purple_notify_searchresults_get_columns_count
* purple_notify_searchresults_get_rows_count
--- a/libpurple/network.c Fri Dec 18 04:40:41 2020 -0600
+++ b/libpurple/network.c Fri Dec 18 04:55:34 2020 -0600
@@ -60,25 +60,6 @@
# define HX_SIZE_OF_IFREQ(a) sizeof(a)
- struct sockaddr_in6 in6;- struct sockaddr_storage storage;-struct _PurpleNetworkListenData {- PurpleNetworkListenCallback cb;- PurpleUPnPMappingAddRemove *mapping_data; static gboolean force_online = FALSE;
/* Cached IP addresses for STUN and TURN servers (set globally in prefs) */
@@ -272,269 +253,6 @@
return purple_network_get_local_system_ip_from_gio(sockconn);
-purple_network_set_upnp_port_mapping_cb(gboolean success, gpointer data)- PurpleNetworkListenData *listen_data;- /* TODO: Once we're keeping track of upnp requests... */- /* listen_data->pnp_data = NULL; */- purple_debug_warning("network", "Couldn't create UPnP mapping\n");- if (listen_data->retry) {- listen_data->retry = FALSE;- listen_data->adding = FALSE;- listen_data->mapping_data = purple_upnp_remove_port_mapping(- purple_network_get_port_from_fd(listen_data->listenfd),- (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",- purple_network_set_upnp_port_mapping_cb, listen_data);- } else if (!listen_data->adding) {- /* We've tried successfully to remove the port mapping.- * Try to add it again */- listen_data->adding = TRUE;- listen_data->mapping_data = purple_upnp_set_port_mapping(- purple_network_get_port_from_fd(listen_data->listenfd),- (listen_data->socket_type == SOCK_STREAM) ? "TCP" : "UDP",- purple_network_set_upnp_port_mapping_cb, listen_data);- /* add port mapping to hash table */- gint key = purple_network_get_port_from_fd(listen_data->listenfd);- gint value = listen_data->socket_type;- g_hash_table_insert(upnp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value));- listen_data->cb(listen_data->listenfd, listen_data->cb_data);- /* Clear the UPnP mapping data, since it's complete and purple_network_listen_cancel() will try to cancel- listen_data->mapping_data = NULL;- purple_network_listen_cancel(listen_data);-purple_network_finish_pmp_map_cb(gpointer data)- PurpleNetworkListenData *listen_data;- listen_data->timer = 0;- /* add port mapping to hash table */- key = purple_network_get_port_from_fd(listen_data->listenfd);- value = listen_data->socket_type;- g_hash_table_insert(nat_pmp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value));- listen_data->cb(listen_data->listenfd, listen_data->cb_data);- purple_network_listen_cancel(listen_data);-static PurpleNetworkListenData *-purple_network_do_listen(unsigned short port, int socket_family, int socket_type, gboolean map_external,- PurpleNetworkListenCallback cb, gpointer cb_data)- PurpleNetworkListenData *listen_data;- unsigned short actual_port;- struct addrinfo hints, *res, *next;- * Get a list of addresses on this machine.- g_snprintf(serv, sizeof(serv), "%hu", port);- memset(&hints, 0, sizeof(struct addrinfo));- hints.ai_flags = AI_PASSIVE;- hints.ai_family = socket_family;- hints.ai_socktype = socket_type;- errnum = getaddrinfo(NULL /* any IP */, serv, &hints, &res);- purple_debug_warning("network", "getaddrinfo: %s\n", purple_gai_strerror(errnum));- if (errnum == EAI_SYSTEM)- purple_debug_warning("network", "getaddrinfo: system error: %s\n", g_strerror(errno));- purple_debug_warning("network", "getaddrinfo: Error Code = %d\n", errnum);- * Go through the list of addresses and attempt to listen on- * XXX - Try IPv6 addresses first?- for (next = res; next != NULL; next = next->ai_next) {- listenfd = socket(next->ai_family, next->ai_socktype, next->ai_protocol);- if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)- purple_debug_warning("network", "setsockopt(SO_REUSEADDR): %s\n", g_strerror(errno));- if (bind(listenfd, next->ai_addr, next->ai_addrlen) == 0)- /* XXX - It is unclear to me (datallah) whether we need to be- using a new socket each time */- struct sockaddr_in sockin;- if (socket_family != AF_INET && socket_family != AF_UNSPEC) {- purple_debug_warning("network", "Address family %d only "- "supported when built with getaddrinfo() "- "support\n", socket_family);- if ((listenfd = socket(AF_INET, socket_type, 0)) < 0) {- purple_debug_warning("network", "socket: %s\n", g_strerror(errno));- if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)- purple_debug_warning("network", "setsockopt: %s\n", g_strerror(errno));- memset(&sockin, 0, sizeof(struct sockaddr_in));- sockin.sin_family = PF_INET;- sockin.sin_port = g_htons(port);- if (bind(listenfd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) {- purple_debug_warning("network", "bind: %s\n", g_strerror(errno));- if (socket_type == SOCK_STREAM && listen(listenfd, 4) != 0) {- purple_debug_warning("network", "listen: %s\n", g_strerror(errno));- _purple_network_set_common_socket_flags(listenfd);- actual_port = purple_network_get_port_from_fd(listenfd);- purple_debug_info("network", "Listening on port: %hu\n", actual_port);- listen_data = g_new0(PurpleNetworkListenData, 1);- listen_data->listenfd = listenfd;- listen_data->adding = TRUE;- listen_data->retry = TRUE;- listen_data->cb_data = cb_data;- listen_data->socket_type = socket_type;- if (!purple_socket_speaks_ipv4(listenfd) || !map_external ||- !purple_prefs_get_bool("/purple/network/map_ports"))- purple_debug_info("network", "Skipping external port mapping.\n");- /* The pmp_map_cb does what we want to do */- listen_data->timer = g_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);- /* Attempt a NAT-PMP Mapping, which will return immediately */- else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),- actual_port, actual_port, PURPLE_PMP_LIFETIME))- purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port);- /* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */- listen_data->timer = g_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);- /* Attempt a UPnP Mapping */- listen_data->mapping_data = purple_upnp_set_port_mapping(- (socket_type == SOCK_STREAM) ? "TCP" : "UDP",- purple_network_set_upnp_port_mapping_cb, listen_data);-PurpleNetworkListenData *-purple_network_listen(unsigned short port, int socket_family, int socket_type,- gboolean map_external, PurpleNetworkListenCallback cb,- g_return_val_if_fail(port != 0, NULL);- return purple_network_do_listen(port, socket_family, socket_type, map_external,-PurpleNetworkListenData *-purple_network_listen_range(unsigned short start, unsigned short end,- int socket_family, int socket_type, gboolean map_external,- PurpleNetworkListenCallback cb,- PurpleNetworkListenData *ret = NULL;- if (purple_prefs_get_bool("/purple/network/ports_range_use")) {- start = purple_prefs_get_int("/purple/network/ports_range_start");- end = purple_prefs_get_int("/purple/network/ports_range_end");- for (; start <= end; start++) {- ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, map_external, cb, cb_data);-void purple_network_listen_cancel(PurpleNetworkListenData *listen_data)- if (listen_data->mapping_data != NULL)- purple_upnp_cancel_port_mapping(listen_data->mapping_data);- if (listen_data->timer > 0)- g_source_remove(listen_data->timer);-purple_network_get_port_from_fd(int fd)- struct sockaddr_in addr;- g_return_val_if_fail(fd >= 0, 0);- if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) {- purple_debug_warning("network", "getsockname: %s\n", g_strerror(errno));- return g_ntohs(addr.sin_port); purple_network_is_available(void)
@@ -680,9 +398,21 @@
purple_network_remove_port_mapping(gint fd)
- int port = purple_network_get_port_from_fd(fd);- gint protocol = GPOINTER_TO_INT(g_hash_table_lookup(upnp_port_mappings, GINT_TO_POINTER(port)));+ struct sockaddr_in addr; + g_return_if_fail(fd >= 0); + if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) { + purple_debug_warning("network", "getsockname: %s", g_strerror(errno)); + port = g_ntohs(addr.sin_port); + protocol = GPOINTER_TO_INT(g_hash_table_lookup(upnp_port_mappings, GINT_TO_POINTER(port))); purple_network_upnp_mapping_remove(GINT_TO_POINTER(port), GINT_TO_POINTER(protocol), NULL);
--- a/libpurple/network.h Fri Dec 18 04:40:41 2020 -0600
+++ b/libpurple/network.h Fri Dec 18 04:55:34 2020 -0600
@@ -46,10 +46,6 @@
/**************************************************************************/
-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 @@
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- * 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-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- * @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- * 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- * 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-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.
