private fork
Fork of GSwifiInterface by
Diff: GSwifiInterface.cpp
- Revision:
- 11:71d67fea5ace
- Parent:
- 8:64184a968e3b
- Child:
- 12:057089026a20
--- a/GSwifiInterface.cpp Thu Oct 31 08:34:45 2013 +0000 +++ b/GSwifiInterface.cpp Fri Nov 15 04:20:14 2013 +0000 @@ -11,32 +11,24 @@ int GSwifiInterface::init(const char* name) { - _state.dhcp = true; - strncpy(_state.name, name, sizeof(_state.name)); - - return 0; + return setAddress(name); } -int GSwifiInterface::init(const char* ip, const char* mask, const char* gateway, const char* name) +int GSwifiInterface::init(const char* ip, const char* netmask, const char* gateway, const char* name) { - _state.dhcp = false; - strncpy(_state.ip, ip, sizeof(_state.ip)); - strncpy(_state.netmask, mask, sizeof(_state.netmask)); - strncpy(_state.gateway, gateway, sizeof(_state.gateway)); - strncpy(_state.name, name, sizeof(_state.name)); - - return 0; + return setAddress(ip, netmask, gateway, name); } int GSwifiInterface::connect(Security sec, const char* ssid, const char* phrase, WiFiMode mode) { + setSsid(sec, ssid, phrase); switch (mode) { case WM_INFRASTRUCTURE: - return join(sec, ssid, phrase); + return join(); case WM_ADHOCK: - return adhock(sec, ssid, phrase); + return adhock(); case WM_LIMITEDAP: - return limitedap(sec, ssid, phrase); + return limitedap(); } return -1; }