← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to cli/src/connections.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
cli/src/connections.c
128
128
        {"DBUS-PATH",     N_("DBUS-PATH"),    51, NULL, 0},  /* 9 */
129
129
        {"CON-PATH",      N_("CON-PATH"),     44, NULL, 0},  /* 10 */
130
130
        {"ZONE",          N_("ZONE"),         15, NULL, 0},  /* 11 */
 
131
        {"MASTER-PATH",   N_("MASTER-PATH"),  44, NULL, 0},  /* 12 */
131
132
        {NULL,            NULL,                0, NULL, 0}
132
133
};
133
 
#define NMC_FIELDS_CON_STATUS_ALL     "NAME,UUID,DEVICES,STATE,DEFAULT,DEFAULT6,VPN,ZONE,DBUS-PATH,CON-PATH,SPEC-OBJECT"
134
 
#define NMC_FIELDS_CON_STATUS_COMMON  "NAME,UUID,DEVICES,DEFAULT,VPN"
 
134
#define NMC_FIELDS_CON_STATUS_ALL     "NAME,UUID,DEVICES,STATE,DEFAULT,DEFAULT6,VPN,ZONE,DBUS-PATH,CON-PATH,SPEC-OBJECT,MASTER-PATH"
 
135
#define NMC_FIELDS_CON_STATUS_COMMON  "NAME,UUID,DEVICES,DEFAULT,VPN,MASTER-PATH"
135
136
 
136
137
/* Available fields for 'con status id/uuid/path <con>' */
137
138
static NmcOutputField nmc_fields_status_details_groups[] = {
684
685
                        nmc_fields_con_status[9].value = nm_object_get_path (NM_OBJECT (active));
685
686
                        nmc_fields_con_status[10].value = nm_active_connection_get_connection (active);
686
687
                        nmc_fields_con_status[11].value = nm_setting_connection_get_zone (s_con);
 
688
                        nmc_fields_con_status[12].value = nm_active_connection_get_master (active);
687
689
 
688
690
                        success = TRUE;
689
691
                        break;