2008-12-29 18:53:47 +01:00
|
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
|
|
|
|
|
/* GIO - GLib Input, Output and Streaming Library
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2008 Red Hat, Inc.
|
|
|
|
|
*
|
2022-05-18 10:12:45 +02:00
|
|
|
|
* SPDX-License-Identifier: LGPL-2.1-or-later
|
|
|
|
|
*
|
2008-12-29 18:53:47 +01:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
2017-05-27 18:21:30 +02:00
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Lesser General
|
2014-01-23 12:58:29 +01:00
|
|
|
|
* Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
#include "glibintl.h"
|
|
|
|
|
|
|
|
|
|
#include "gsrvtarget.h"
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2023-10-25 16:06:45 +02:00
|
|
|
|
* GSrvTarget:
|
|
|
|
|
*
|
|
|
|
|
* A single target host/port that a network service is running on.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* SRV (service) records are used by some network protocols to provide
|
|
|
|
|
* service-specific aliasing and load-balancing. For example, XMPP
|
|
|
|
|
* (Jabber) uses SRV records to locate the XMPP server for a domain;
|
2023-10-25 16:06:45 +02:00
|
|
|
|
* rather than connecting directly to ‘example.com’ or assuming a
|
|
|
|
|
* specific server hostname like ‘xmpp.example.com’, an XMPP client
|
|
|
|
|
* would look up the `xmpp-client` SRV record for ‘example.com’, and
|
2008-12-29 18:53:47 +01:00
|
|
|
|
* then connect to whatever host was pointed to by that record.
|
|
|
|
|
*
|
2023-10-25 16:06:45 +02:00
|
|
|
|
* You can use [method@Gio.Resolver.lookup_service] or
|
|
|
|
|
* [method@Gio.Resolver.lookup_service_async] to find the `GSrvTarget`s
|
2008-12-29 19:38:28 +01:00
|
|
|
|
* for a given service. However, if you are simply planning to connect
|
2023-10-25 16:06:45 +02:00
|
|
|
|
* to the remote service, you can use [class@Gio.NetworkService]’s
|
|
|
|
|
* [iface@Gio.SocketConnectable] interface and not need to worry about
|
|
|
|
|
* `GSrvTarget` at all.
|
2009-05-28 00:20:08 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
|
|
|
|
|
struct _GSrvTarget {
|
|
|
|
|
gchar *hostname;
|
|
|
|
|
guint16 port;
|
|
|
|
|
|
|
|
|
|
guint16 priority;
|
|
|
|
|
guint16 weight;
|
|
|
|
|
};
|
|
|
|
|
|
2008-05-24 16:08:28 +02:00
|
|
|
|
G_DEFINE_BOXED_TYPE (GSrvTarget, g_srv_target,
|
|
|
|
|
g_srv_target_copy, g_srv_target_free)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_new:
|
|
|
|
|
* @hostname: the host that the service is running on
|
|
|
|
|
* @port: the port that the service is running on
|
|
|
|
|
* @priority: the target's priority
|
|
|
|
|
* @weight: the target's weight
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #GSrvTarget with the given parameters.
|
|
|
|
|
*
|
2014-02-01 17:57:13 +01:00
|
|
|
|
* You should not need to use this; normally #GSrvTargets are
|
2008-12-29 18:53:47 +01:00
|
|
|
|
* created by #GResolver.
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: a new #GSrvTarget.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
GSrvTarget *
|
|
|
|
|
g_srv_target_new (const gchar *hostname,
|
|
|
|
|
guint16 port,
|
|
|
|
|
guint16 priority,
|
|
|
|
|
guint16 weight)
|
|
|
|
|
{
|
|
|
|
|
GSrvTarget *target = g_slice_new0 (GSrvTarget);
|
|
|
|
|
|
|
|
|
|
target->hostname = g_strdup (hostname);
|
|
|
|
|
target->port = port;
|
|
|
|
|
target->priority = priority;
|
|
|
|
|
target->weight = weight;
|
|
|
|
|
|
|
|
|
|
return target;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_copy:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Copies @target
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: a copy of @target
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
GSrvTarget *
|
|
|
|
|
g_srv_target_copy (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
return g_srv_target_new (target->hostname, target->port,
|
|
|
|
|
target->priority, target->weight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_free:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Frees @target
|
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
void
|
|
|
|
|
g_srv_target_free (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
g_free (target->hostname);
|
|
|
|
|
g_slice_free (GSrvTarget, target);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_get_hostname:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Gets @target's hostname (in ASCII form; if you are going to present
|
|
|
|
|
* this to the user, you should use g_hostname_is_ascii_encoded() to
|
|
|
|
|
* check if it contains encoded Unicode segments, and use
|
|
|
|
|
* g_hostname_to_unicode() to convert it if it does.)
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: @target's hostname
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
const gchar *
|
|
|
|
|
g_srv_target_get_hostname (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
return target->hostname;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_get_port:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Gets @target's port
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: @target's port
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
guint16
|
|
|
|
|
g_srv_target_get_port (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
return target->port;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_get_priority:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Gets @target's priority. You should not need to look at this;
|
|
|
|
|
* #GResolver already sorts the targets according to the algorithm in
|
|
|
|
|
* RFC 2782.
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: @target's priority
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
guint16
|
|
|
|
|
g_srv_target_get_priority (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
return target->priority;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* g_srv_target_get_weight:
|
|
|
|
|
* @target: a #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Gets @target's weight. You should not need to look at this;
|
|
|
|
|
* #GResolver already sorts the targets according to the algorithm in
|
|
|
|
|
* RFC 2782.
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: @target's weight
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-04 00:04:31 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
guint16
|
|
|
|
|
g_srv_target_get_weight (GSrvTarget *target)
|
|
|
|
|
{
|
|
|
|
|
return target->weight;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-17 03:24:45 +02:00
|
|
|
|
static gint
|
2008-12-29 18:53:47 +01:00
|
|
|
|
compare_target (gconstpointer a, gconstpointer b)
|
|
|
|
|
{
|
|
|
|
|
GSrvTarget *ta = (GSrvTarget *)a;
|
|
|
|
|
GSrvTarget *tb = (GSrvTarget *)b;
|
|
|
|
|
|
|
|
|
|
if (ta->priority == tb->priority)
|
|
|
|
|
{
|
|
|
|
|
/* Arrange targets of the same priority "in any order, except
|
|
|
|
|
* that all those with weight 0 are placed at the beginning of
|
|
|
|
|
* the list"
|
|
|
|
|
*/
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
return ta->weight - tb->weight;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return ta->priority - tb->priority;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2010-09-24 20:51:26 +02:00
|
|
|
|
* g_srv_target_list_sort: (skip)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
* @targets: a #GList of #GSrvTarget
|
|
|
|
|
*
|
|
|
|
|
* Sorts @targets in place according to the algorithm in RFC 2782.
|
|
|
|
|
*
|
2014-02-20 01:35:23 +01:00
|
|
|
|
* Returns: (transfer full): the head of the sorted list.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*
|
|
|
|
|
* Since: 2.22
|
2009-05-28 00:20:08 +02:00
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
GList *
|
|
|
|
|
g_srv_target_list_sort (GList *targets)
|
|
|
|
|
{
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
gint sum, num, val, priority, weight;
|
|
|
|
|
GList *t, *out, *tail;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
GSrvTarget *target;
|
|
|
|
|
|
|
|
|
|
if (!targets)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (!targets->next)
|
|
|
|
|
{
|
|
|
|
|
target = targets->data;
|
|
|
|
|
if (!strcmp (target->hostname, "."))
|
|
|
|
|
{
|
|
|
|
|
/* 'A Target of "." means that the service is decidedly not
|
|
|
|
|
* available at this domain.'
|
|
|
|
|
*/
|
|
|
|
|
g_srv_target_free (target);
|
|
|
|
|
g_list_free (targets);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
/* Sort input list by priority, and put the 0-weight targets first
|
|
|
|
|
* in each priority group. Initialize output list to %NULL.
|
|
|
|
|
*/
|
2008-12-29 18:53:47 +01:00
|
|
|
|
targets = g_list_sort (targets, compare_target);
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
out = tail = NULL;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
/* For each group of targets with the same priority, remove them
|
|
|
|
|
* from @targets and append them to @out in a valid order.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*/
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
while (targets)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
{
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
priority = ((GSrvTarget *)targets->data)->priority;
|
|
|
|
|
|
|
|
|
|
/* Count the number of targets at this priority level, and
|
|
|
|
|
* compute the sum of their weights.
|
2008-12-29 18:53:47 +01:00
|
|
|
|
*/
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
sum = num = 0;
|
|
|
|
|
for (t = targets; t; t = t->next)
|
|
|
|
|
{
|
|
|
|
|
target = (GSrvTarget *)t->data;
|
|
|
|
|
if (target->priority != priority)
|
|
|
|
|
break;
|
|
|
|
|
sum += target->weight;
|
|
|
|
|
num++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* While there are still targets at this priority level... */
|
|
|
|
|
while (num)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
{
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
/* Randomly select from the targets at this priority level,
|
|
|
|
|
* giving precedence to the ones with higher weight,
|
|
|
|
|
* according to the rules from RFC 2782.
|
|
|
|
|
*/
|
|
|
|
|
val = g_random_int_range (0, sum + 1);
|
|
|
|
|
for (t = targets; ; t = t->next)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
{
|
2024-04-10 01:08:50 +02:00
|
|
|
|
g_assert (t != NULL && t->data != NULL);
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
weight = ((GSrvTarget *)t->data)->weight;
|
|
|
|
|
if (weight >= val)
|
2008-12-29 18:53:47 +01:00
|
|
|
|
break;
|
|
|
|
|
val -= weight;
|
|
|
|
|
}
|
|
|
|
|
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
targets = g_list_remove_link (targets, t);
|
|
|
|
|
|
|
|
|
|
if (!out)
|
|
|
|
|
out = t;
|
|
|
|
|
else
|
|
|
|
|
tail->next = t;
|
|
|
|
|
tail = t;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
|
|
|
|
|
sum -= weight;
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
num--;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
|
return out;
|
2008-12-29 18:53:47 +01:00
|
|
|
|
}
|