nexus: Rollup update for nexus
nexus: Change field separator from : to ' '
Signed-off-by: San Mehat <san@google.com>
nexus: Add some prototypes for stuff to come
Signed-off-by: San Mehat <san@google.com>
nexus: Add some TODOs
Signed-off-by: San Mehat <san@google.com>
libsysutils: Put a proper token parser into the FrameworkListener which
supports minimal \ escapes and quotes
Signed-off-by: San Mehat <san@google.com>
nexus: Fix a lot of bugs
Signed-off-by: San Mehat <san@google.com>
libsysutils: Remove some debugging
Signed-off-by: San Mehat <san@google.com>
nexus: Send broadcasts for supplicant state changes
Signed-off-by: San Mehat <san@google.com>
nexus: Plumb DHCP listener state changes to NetworkManager
Signed-off-by: San Mehat <san@google.com>
nexus: Make the SupplicantState strings more parsable
Signed-off-by: San Mehat <san@google.com>
nexus: Broadcast a message when dhcp state changes.
Signed-off-by: San Mehat <san@google.com>
nexus: Add a few new response codes
Signed-off-by: San Mehat <san@google.com>
nexus: Rename ErrorCode -> ResponseCode
Signed-off-by: San Mehat <san@google.com>
nexus: Add DHCP event broadcasting. Also adds the framework for
tracking supplicant 'searching-for-AP' state
Signed-off-by: San Mehat <san@google.com>
nexus: REmove WifiScanner
Signed-off-by: San Mehat <san@google.com>
nexus: Change the way scanning works. scanmode can now be selected
independantly of triggering a scan. Also adds rxfilter support
Signed-off-by: San Mehat <san@google.com>
nexus: Add support for configuring bluetooth coexistence scanning and modes
Signed-off-by: San Mehat <san@google.com>
nexus: use case insensitive match for property names
Signed-off-by: San Mehat <san@google.com>
nexus: Rollup of a bunch of stuff:
- 'list' command now takes an argument to match against
- InterfaceConfig has been moved into the Controller base (for now)
- DhcpClient now has some rudimentry locking
- process 'ADDRINFO' messages from dhcpcd
- Drop tertiary dns
Signed-off-by: San Mehat <san@google.com>
nexus: Clean up some of the supplicant variable parsing and add 'wifi.current'
Signed-off-by: San Mehat <san@google.com>
nexus: Add driver-stop/start, initial suspend support
Signed-off-by: San Mehat <san@google.com>
nexus: Add Controller suspend/resume callbacks, as well as locking
Signed-off-by: San Mehat <san@google.com>
nexus: Make ARP probing configurable for DhcpClient
Signed-off-by: San Mehat <san@google.com>
nexus: Add linkspeed / rssi retrieval
Signed-off-by: San Mehat <san@google.com>
nexus: Add WifiStatusPoller to track RSSI/linkspeed when associated
Signed-off-by: San Mehat <san@google.com>
nexus: Disable some debugging and add 'wifi.netcount' property
Signed-off-by: San Mehat <san@google.com>
nexus: Replace the hackish property system with something more flexible with namespaces
Signed-off-by: San Mehat <san@google.com>
libsysutils: Fix a few bugs in SocketListener
Signed-off-by: San Mehat <san@google.com>
nexus: PropertyManager: Add array support
Signed-off-by: San Mehat <san@google.com>
nexus: Clean up properties
Signed-off-by: San Mehat <san@google.com>
nexus: WifiController: Change name of 'CurrentNetwork' property
Signed-off-by: San Mehat <san@google.com>
diff --git a/nexus/DhcpClient.cpp b/nexus/DhcpClient.cpp
index 2bd9c68..a5654d2 100644
--- a/nexus/DhcpClient.cpp
+++ b/nexus/DhcpClient.cpp
@@ -17,7 +17,9 @@
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/socket.h>
#include <arpa/inet.h>
+#include <pthread.h>
#define LOG_TAG "DhcpClient"
#include <cutils/log.h>
@@ -29,6 +31,7 @@
#include "DhcpState.h"
#include "DhcpListener.h"
#include "IDhcpEventHandlers.h"
+#include "Controller.h"
extern "C" {
int ifc_disable(const char *ifname);
@@ -54,9 +57,13 @@
}
DhcpClient::DhcpClient(IDhcpEventHandlers *handlers) :
- mState(DhcpState::STOPPED), mHandlers(handlers) {
+ mState(DhcpState::INIT), mHandlers(handlers) {
mServiceManager = new ServiceManager();
mListener = NULL;
+ mListenerSocket = NULL;
+ mController = NULL;
+ mDoArpProbe = false;
+ pthread_mutex_init(&mLock, NULL);
}
DhcpClient::~DhcpClient() {
@@ -65,41 +72,89 @@
delete mListener;
}
-int DhcpClient::start(const char *interface) {
-
+int DhcpClient::start(Controller *c) {
+ LOGD("Starting DHCP service (arp probe = %d)", mDoArpProbe);
char svc[PROPERTY_VALUE_MAX];
- snprintf(svc, sizeof(svc), "dhcpcd_ng:%s", interface);
+ snprintf(svc,
+ sizeof(svc),
+ "dhcpcd:%s%s",
+ (!mDoArpProbe ? "-A " : ""),
+ c->getBoundInterface());
- if (mServiceManager->start(svc)) {
- LOGE("Failed to start dhcp service");
+ pthread_mutex_lock(&mLock);
+
+ if (mController) {
+ pthread_mutex_unlock(&mLock);
+ errno = EBUSY;
+ return -1;
+ }
+ mController = c;
+
+ sockaddr_in addr;
+ if ((mListenerSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+ LOGE("Failed to create DHCP listener socket");
+ pthread_mutex_unlock(&mLock);
+ return -1;
+ }
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+ addr.sin_port = htons(DhcpClient::STATUS_MONITOR_PORT);
+
+ if (bind(mListenerSocket, (struct sockaddr *) &addr, sizeof(addr))) {
+ LOGE("Failed to bind DHCP listener socket");
+ close(mListenerSocket);
+ mListenerSocket = -1;
+ pthread_mutex_unlock(&mLock);
return -1;
}
- mListener = new DhcpListener(mHandlers);
+ if (mServiceManager->start(svc)) {
+ LOGE("Failed to start dhcp service");
+ pthread_mutex_unlock(&mLock);
+ return -1;
+ }
+
+ mListener = new DhcpListener(mController, mListenerSocket, mHandlers);
if (mListener->startListener()) {
LOGE("Failed to start listener");
#if 0
- mServiceManager->stop("dhcpcd_ng");
+ mServiceManager->stop("dhcpcd");
return -1;
#endif
delete mListener;
mListener = NULL;
+ pthread_mutex_unlock(&mLock);
}
- mState = DhcpState::STARTED;
-
+ pthread_mutex_unlock(&mLock);
return 0;
}
int DhcpClient::stop() {
+ pthread_mutex_lock(&mLock);
+ if (!mController) {
+ pthread_mutex_unlock(&mLock);
+ return 0;
+ }
+
if (mListener) {
mListener->stopListener();
delete mListener;
mListener = NULL;
}
+ close(mListenerSocket);
- if (mServiceManager->stop("dhcpcd_ng"))
+ if (mServiceManager->stop("dhcpcd")) {
LOGW("Failed to stop DHCP service (%s)", strerror(errno));
- mState = DhcpState::STOPPED;
+ // XXX: Kill it the hard way.. but its gotta go!
+ }
+
+ mController = NULL;
+ pthread_mutex_unlock(&mLock);
return 0;
}
+
+void DhcpClient::setDoArpProbe(bool probe) {
+ mDoArpProbe = probe;
+}