colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyfile: parse Bluetooth addresses as MAC addresses

Browse Source
This commit is contained in:
Dan Williams
2010-05-25 23:34:09 -07:00
parent 7ebf9641a0
commit 61448016f4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system-settings/plugins/keyfile/io/reader.c
View File

@@ -32,6 +32,7 @@
#include <nm-setting-connection.h> #include <nm-setting-connection.h>
#include <nm-setting-wired.h> #include <nm-setting-wired.h>
#include <nm-setting-wireless.h> #include <nm-setting-wireless.h>
#include <nm-setting-bluetooth.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <string.h> #include <string.h>
@@ -776,6 +777,10 @@ static KeyParser key_parsers[] = {
NM_SETTING_WIRELESS_BSSID, NM_SETTING_WIRELESS_BSSID,
TRUE, TRUE,
mac_address_parser }, mac_address_parser },
{ NM_SETTING_BLUETOOTH_SETTING_NAME,
NM_SETTING_BLUETOOTH_BDADDR,
TRUE,
mac_address_parser },
{ NULL, NULL, FALSE } { NULL, NULL, FALSE }
}; };

4
system-settings/plugins/keyfile/io/writer.c
View File

@@ -31,6 +31,7 @@
#include <nm-setting-wired.h> #include <nm-setting-wired.h>
#include <nm-setting-wireless.h> #include <nm-setting-wireless.h>
#include <nm-setting-ip4-config.h> #include <nm-setting-ip4-config.h>
#include <nm-setting-bluetooth.h>
#include <nm-utils.h> #include <nm-utils.h>
#include <string.h> #include <string.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@@ -493,6 +494,9 @@ static KeyWriter key_writers[] = {
{ NM_SETTING_WIRELESS_SETTING_NAME, { NM_SETTING_WIRELESS_SETTING_NAME,
NM_SETTING_WIRELESS_BSSID, NM_SETTING_WIRELESS_BSSID,
mac_address_writer }, mac_address_writer },
{ NM_SETTING_BLUETOOTH_SETTING_NAME,
NM_SETTING_BLUETOOTH_BDADDR,
mac_address_writer },
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };