luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'allow_guid_key_in_dbus_addresses' into 'master'

Browse Source 
Allow guid key in dbus addresses

Closes #1018

See merge request GNOME/glib!995
This commit is contained in:
Simon McVittie 2019-07-23 13:01:09 +00:00
commit 3f1a79a4fa
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdbusaddress.c
View File

@ -150,7 +150,7 @@ is_valid_unix (const gchar *address_entry,
tmpdir = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "abstract") == 0)
abstract = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@ -224,7 +224,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
family = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "noncefile") == 0)
nonce_file = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@ -305,7 +305,7 @@ is_valid_tcp (const gchar *address_entry,
port = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "family") == 0)
family = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,

6
gio/tests/gdbus-addresses.c
View File

@ -108,7 +108,9 @@ test_unix_address (void)
g_test_skip ("unix transport is not supported on non-Unix platforms");
#else
assert_is_supported_address ("unix:path=/tmp/dbus-test");
assert_is_supported_address ("unix:path=/tmp/dbus-test,guid=0");
assert_is_supported_address ("unix:abstract=/tmp/dbus-another-test");
assert_is_supported_address ("unix:abstract=/tmp/dbus-another-test,guid=1000");
assert_not_supported_address ("unix:foo=bar");
g_assert_false (g_dbus_is_address ("unix:path=/foo;abstract=/bar"));
assert_is_supported_address ("unix:path=/tmp/concrete;unix:abstract=/tmp/abstract");
@ -128,9 +130,11 @@ static void
test_nonce_tcp_address (void)
{
assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar");
assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,guid=0");
assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv6");
assert_is_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=ipv4");
assert_is_supported_address ("nonce-tcp:host=localhost");
assert_is_supported_address ("nonce-tcp:host=localhost,guid=1000");
assert_not_supported_address ("nonce-tcp:host=localhost,port=42,noncefile=/foo/bar,family=blah");
assert_not_supported_address ("nonce-tcp:host=localhost,port=420000,noncefile=/foo/bar,family=ipv4");
@ -148,8 +152,10 @@ static void
test_tcp_address (void)
{
assert_is_supported_address ("tcp:host=localhost");
assert_is_supported_address ("tcp:host=localhost,guid=1000");
assert_not_supported_address ("tcp:host=localhost,noncefile=/tmp/foo");
assert_is_supported_address ("tcp:host=localhost,port=42");
assert_is_supported_address ("tcp:host=localhost,port=42,guid=1000");
assert_not_supported_address ("tcp:host=localhost,port=-1");
assert_not_supported_address ("tcp:host=localhost,port=420000");
assert_not_supported_address ("tcp:host=localhost,port=42x");