diff options
| author | Robert Love <rml@novell.com> | 2006-02-02 18:05:19 +0000 |
|---|---|---|
| committer | Robert Love <rlove@rlove.org> | 2006-02-02 18:05:19 +0000 |
| commit | 2f71e13495151e2b819fca9d6bad8ae7bb9b8b0a (patch) | |
| tree | cba873ac61c17822b9f1364d907afd677de9d2a7 /test | |
| parent | ecd009cc7dbf4300500ab2663030492ef98ab4fa (diff) | |
| download | NetworkManager-2f71e13495151e2b819fca9d6bad8ae7bb9b8b0a.tar.gz | |
2006-02-02 Robert Love <rml@novell.com>
* src/NetworkManagerAP.c: Add 'broadcast' property to the NMAccessPoint
structure, which denotes whether or not the AP is hidden. This is a
superset of 'artificial' -- we need 'broadcast' because a hidden AP
can show up in the scan list. Add nm_ap_get_broadcast() and
nm_ap_set_broadcast() accessor interfaces.
* src/NetworkManagerAP.h: Add prototypes for nm_ap_get_broadcast() and
nm_ap_set_broadcast().
* src/nm-dbus-net.c: Add new argument, boolean broadcast, to the
"getProperties" method, which denotes whether or not the given
network is hidden.
* src/nm-device-802-11-wireless.c: Set broadcast to FALSE when creating
an artificial network. Set broadcast to TRUE when scanning returns
an ESSID and FALSE when not.
* gnome/applet/applet-dbus-devices.c: Retrieve 'broadcast' argument
from "getProperties" method on a network. Possible TODO is to
somehow display this.
* test/nm-tool.c: Display "Hidden" if the AP does not broadcast.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1429 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'test')
| -rw-r--r-- | test/nm-tool.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/test/nm-tool.c b/test/nm-tool.c index 87874d44c9..82d339256a 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -122,6 +122,7 @@ static void detail_network (DBusConnection *connection, const char *path, const dbus_int32_t rate = 0; dbus_int32_t capabilities = NM_802_11_CAP_NONE; dbus_uint32_t mode = 0; + gboolean broadcast = TRUE; g_return_if_fail (connection != NULL); g_return_if_fail (path != NULL); @@ -141,13 +142,14 @@ static void detail_network (DBusConnection *connection, const char *path, const } if (dbus_message_get_args (reply, NULL, DBUS_TYPE_OBJECT_PATH, &op, - DBUS_TYPE_STRING, &essid, - DBUS_TYPE_STRING, &hw_addr, - DBUS_TYPE_INT32, &strength, - DBUS_TYPE_DOUBLE, &freq, - DBUS_TYPE_INT32, &rate, - DBUS_TYPE_INT32, &mode, - DBUS_TYPE_INT32, &capabilities, + DBUS_TYPE_STRING, &essid, + DBUS_TYPE_STRING, &hw_addr, + DBUS_TYPE_INT32, &strength, + DBUS_TYPE_DOUBLE, &freq, + DBUS_TYPE_INT32, &rate, + DBUS_TYPE_INT32, &mode, + DBUS_TYPE_INT32, &capabilities, + DBUS_TYPE_BOOLEAN, &broadcast, DBUS_TYPE_INVALID)) { char *temp = NULL; @@ -176,8 +178,8 @@ static void detail_network (DBusConnection *connection, const char *path, const enc_string = g_string_append (enc_string, ")"); } - temp = g_strdup_printf ("%s Mode, Freq %.3f MHz, Strength %d%%%s", (mode == IW_MODE_INFRA) ? "Infrastructure" : "Ad-Hoc", - flt_freq, strength, (enc_string && strlen (enc_string->str)) ? enc_string->str : ""); + temp = g_strdup_printf ("%s Mode, Freq %.3f MHz, Strength %d%%%s%s", (mode == IW_MODE_INFRA) ? "Infrastructure" : "Ad-Hoc", + flt_freq, strength, (enc_string && strlen (enc_string->str)) ? enc_string->str : "", !broadcast ? ", Hidden" : ""); temp_essid = g_strdup_printf (" %s%s", active ? "*" : "", essid); print_string (temp_essid, temp); g_string_free (enc_string, TRUE); |