See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I85b946663d5a0e7606140282bf758c27b8c6f68f
cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing argument", false);
return 0;
}
cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing argument", false);
return 0;
}
- LOGD("Setting iface cfg");
+ ALOGD("Setting iface cfg");
struct in_addr addr;
unsigned flags = 0;
struct in_addr addr;
unsigned flags = 0;
for (int i = 5; i < argc; i++) {
char *flag = argv[i];
if (!strcmp(flag, "up")) {
for (int i = 5; i < argc; i++) {
char *flag = argv[i];
if (!strcmp(flag, "up")) {
- LOGD("Trying to bring up %s", argv[2]);
+ ALOGD("Trying to bring up %s", argv[2]);
if (ifc_up(argv[2])) {
LOGE("Error upping interface");
cli->sendMsg(ResponseCode::OperationFailed, "Failed to up interface", true);
if (ifc_up(argv[2])) {
LOGE("Error upping interface");
cli->sendMsg(ResponseCode::OperationFailed, "Failed to up interface", true);
return 0;
}
} else if (!strcmp(flag, "down")) {
return 0;
}
} else if (!strcmp(flag, "down")) {
- LOGD("Trying to bring down %s", argv[2]);
+ ALOGD("Trying to bring down %s", argv[2]);
if (ifc_down(argv[2])) {
LOGE("Error downing interface");
cli->sendMsg(ResponseCode::OperationFailed, "Failed to down interface", true);
if (ifc_down(argv[2])) {
LOGE("Error downing interface");
cli->sendMsg(ResponseCode::OperationFailed, "Failed to down interface", true);
return 0;
} else if (!strcmp(argv[1], "clearaddrs")) {
// arglist: iface
return 0;
} else if (!strcmp(argv[1], "clearaddrs")) {
// arglist: iface
- LOGD("Clearing all IP addresses on %s", argv[2]);
+ ALOGD("Clearing all IP addresses on %s", argv[2]);
ifc_clear_addresses(argv[2]);
ifc_clear_addresses(argv[2]);
void DnsProxyListener::GetAddrInfoHandler::run() {
if (DBG) {
void DnsProxyListener::GetAddrInfoHandler::run() {
if (DBG) {
- LOGD("GetAddrInfoHandler, now for %s / %s", mHost, mService);
+ ALOGD("GetAddrInfoHandler, now for %s / %s", mHost, mService);
}
struct addrinfo* result = NULL;
}
struct addrinfo* result = NULL;
int argc, char **argv) {
if (DBG) {
for (int i = 0; i < argc; i++) {
int argc, char **argv) {
if (DBG) {
for (int i = 0; i < argc; i++) {
- LOGD("argv[%i]=%s", i, argv[i]);
+ ALOGD("argv[%i]=%s", i, argv[i]);
- LOGD("GetAddrInfoHandler for %s / %s",
+ ALOGD("GetAddrInfoHandler for %s / %s",
name ? name : "[nullhost]",
service ? service : "[nullservice]");
}
name ? name : "[nullhost]",
service ? service : "[nullservice]");
}
int argc, char **argv) {
if (DBG) {
for (int i = 0; i < argc; i++) {
int argc, char **argv) {
if (DBG) {
for (int i = 0; i < argc; i++) {
- LOGD("argv[%i]=%s", i, argv[i]);
+ ALOGD("argv[%i]=%s", i, argv[i]);
void DnsProxyListener::GetHostByAddrHandler::run() {
if (DBG) {
void DnsProxyListener::GetHostByAddrHandler::run() {
if (DBG) {
- LOGD("DnsProxyListener::GetHostByAddrHandler::run\n");
+ ALOGD("DnsProxyListener::GetHostByAddrHandler::run\n");
hp = gethostbyaddr((char*)mAddress, mAddressLen, mAddressFamily);
if (DBG) {
hp = gethostbyaddr((char*)mAddress, mAddressLen, mAddressFamily);
if (DBG) {
- LOGD("GetHostByAddrHandler::run gethostbyaddr errno: %s hp->h_name = %s, name_len = %d\n",
+ ALOGD("GetHostByAddrHandler::run gethostbyaddr errno: %s hp->h_name = %s, name_len = %d\n",
hp ? "success" : strerror(errno),
(hp && hp->h_name) ? hp->h_name: "null",
(hp && hp->h_name) ? strlen(hp->h_name)+ 1 : 0);
hp ? "success" : strerror(errno),
(hp && hp->h_name) ? hp->h_name: "null",
(hp && hp->h_name) ? strlen(hp->h_name)+ 1 : 0);
- LOGD("Stopping PAN services");
+ ALOGD("Stopping PAN services");
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
mPid = 0;
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
mPid = 0;
- LOGD("PAN services stopped");
+ ALOGD("PAN services stopped");
- LOGD("Stopping PPPD services on port %s", tty);
+ ALOGD("Stopping PPPD services on port %s", tty);
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
mPid = 0;
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
mPid = 0;
- LOGD("PPPD services on port %s stopped", tty);
+ ALOGD("PPPD services on port %s stopped", tty);
int ResolverController::setDefaultInterface(const char* iface) {
if (DBG) {
int ResolverController::setDefaultInterface(const char* iface) {
if (DBG) {
- LOGD("setDefaultInterface iface = %s\n", iface);
+ ALOGD("setDefaultInterface iface = %s\n", iface);
}
_resolv_set_default_iface(iface);
}
_resolv_set_default_iface(iface);
int ResolverController::setInterfaceDnsServers(const char* iface, char** servers, int numservers) {
if (DBG) {
int ResolverController::setInterfaceDnsServers(const char* iface, char** servers, int numservers) {
if (DBG) {
- LOGD("setInterfaceDnsServers iface = %s\n", iface);
+ ALOGD("setInterfaceDnsServers iface = %s\n", iface);
}
_resolv_set_nameservers_for_iface(iface, servers, numservers);
}
_resolv_set_nameservers_for_iface(iface, servers, numservers);
int ResolverController::setInterfaceAddress(const char* iface, struct in_addr* addr) {
if (DBG) {
int ResolverController::setInterfaceAddress(const char* iface, struct in_addr* addr) {
if (DBG) {
- LOGD("setInterfaceAddress iface = %s\n", iface);
+ ALOGD("setInterfaceAddress iface = %s\n", iface);
}
_resolv_set_addr_of_iface(iface, addr);
}
_resolv_set_addr_of_iface(iface, addr);
int ResolverController::flushDefaultDnsCache() {
if (DBG) {
int ResolverController::flushDefaultDnsCache() {
if (DBG) {
- LOGD("flushDefaultDnsCache\n");
+ ALOGD("flushDefaultDnsCache\n");
}
_resolv_flush_cache_for_default_iface();
}
_resolv_flush_cache_for_default_iface();
int ResolverController::flushInterfaceDnsCache(const char* iface) {
if (DBG) {
int ResolverController::flushInterfaceDnsCache(const char* iface) {
if (DBG) {
- LOGD("flushInterfaceDnsCache iface = %s\n", iface);
+ ALOGD("flushInterfaceDnsCache iface = %s\n", iface);
}
_resolv_flush_cache_for_iface(iface);
}
_resolv_flush_cache_for_iface(iface);
return -1;
}
if (!iface || (iface[0] == '\0')) {
return -1;
}
if (!iface || (iface[0] == '\0')) {
- LOGD("Softap driver start - wrong interface");
+ ALOGD("Softap driver start - wrong interface");
ifc_close();
#endif
usleep(AP_DRIVER_START_DELAY);
ifc_close();
#endif
usleep(AP_DRIVER_START_DELAY);
- LOGD("Softap driver start: %d", ret);
+ ALOGD("Softap driver start: %d", ret);
return -1;
}
if (!iface || (iface[0] == '\0')) {
return -1;
}
if (!iface || (iface[0] == '\0')) {
- LOGD("Softap driver stop - wrong interface");
+ ALOGD("Softap driver stop - wrong interface");
iface = mIface;
}
*mBuf = 0;
iface = mIface;
}
*mBuf = 0;
}
#endif
ret = setCommand(iface, "STOP");
}
#endif
ret = setCommand(iface, "STOP");
- LOGD("Softap driver stop: %d", ret);
+ ALOGD("Softap driver stop: %d", ret);
- LOGD("Softap startap - Ok");
+ ALOGD("Softap startap - Ok");
usleep(AP_BSS_START_DELAY);
}
}
usleep(AP_BSS_START_DELAY);
}
}
- LOGD("Stopping Softap service");
+ ALOGD("Stopping Softap service");
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
#endif
kill(mPid, SIGTERM);
waitpid(mPid, NULL, 0);
#endif
*mBuf = 0;
ret = setCommand(mIface, "AP_BSS_STOP");
mPid = 0;
*mBuf = 0;
ret = setCommand(mIface, "AP_BSS_STOP");
mPid = 0;
- LOGD("Softap service stopped: %d", ret);
+ ALOGD("Softap service stopped: %d", ret);
usleep(AP_BSS_STOP_DELAY);
return ret;
}
usleep(AP_BSS_STOP_DELAY);
return ret;
}
LOGE("Softap set - failed: %d", ret);
}
else {
LOGE("Softap set - failed: %d", ret);
}
else {
- LOGD("Softap set - Ok");
+ ALOGD("Softap set - Ok");
usleep(AP_SET_CFG_DELAY);
}
#endif
usleep(AP_SET_CFG_DELAY);
}
#endif
LOGE("Softap fwReload - failed: %d", ret);
}
else {
LOGE("Softap fwReload - failed: %d", ret);
}
else {
- LOGD("Softap fwReload - Ok");
+ ALOGD("Softap fwReload - Ok");
LOGE("Softap clients - failed: %d", ret);
} else {
asprintf(retbuf, "Softap clients:%s", mBuf);
LOGE("Softap clients - failed: %d", ret);
} else {
asprintf(retbuf, "Softap clients:%s", mBuf);
- LOGD("Softap clients:%s", mBuf);
+ ALOGD("Softap clients:%s", mBuf);
int TetherController::setIpFwdEnabled(bool enable) {
int TetherController::setIpFwdEnabled(bool enable) {
- LOGD("Setting IP forward enable = %d", enable);
+ ALOGD("Setting IP forward enable = %d", enable);
// In BP tools mode, do not disable IP forwarding
char bootmode[PROPERTY_VALUE_MAX] = {0};
// In BP tools mode, do not disable IP forwarding
char bootmode[PROPERTY_VALUE_MAX] = {0};
- LOGD("Starting tethering services");
+ ALOGD("Starting tethering services");
pid_t pid;
int pipefd[2];
pid_t pid;
int pipefd[2];
close(pipefd[0]);
mDaemonPid = pid;
mDaemonFd = pipefd[1];
close(pipefd[0]);
mDaemonPid = pid;
mDaemonFd = pipefd[1];
- LOGD("Tethering services running");
+ ALOGD("Tethering services running");
- LOGD("Stopping tethering services");
+ ALOGD("Stopping tethering services");
kill(mDaemonPid, SIGTERM);
waitpid(mDaemonPid, NULL, 0);
mDaemonPid = 0;
close(mDaemonFd);
mDaemonFd = -1;
kill(mDaemonPid, SIGTERM);
waitpid(mDaemonPid, NULL, 0);
mDaemonPid = 0;
close(mDaemonFd);
mDaemonFd = -1;
- LOGD("Tethering services stopped");
+ ALOGD("Tethering services stopped");
mDnsForwarders->clear();
for (i = 0; i < numServers; i++) {
mDnsForwarders->clear();
for (i = 0; i < numServers; i++) {
- LOGD("setDnsForwarders(%d = '%s')", i, servers[i]);
+ ALOGD("setDnsForwarders(%d = '%s')", i, servers[i]);
cmdLen += strlen(servers[i]);
if (cmdLen + 2 >= MAX_CMD_SIZE) {
cmdLen += strlen(servers[i]);
if (cmdLen + 2 >= MAX_CMD_SIZE) {
- LOGD("Too many DNS servers listed");
+ ALOGD("Too many DNS servers listed");
- LOGD("Sending update msg to dnsmasq [%s]", daemonCmd);
+ ALOGD("Sending update msg to dnsmasq [%s]", daemonCmd);
if (write(mDaemonFd, daemonCmd, strlen(daemonCmd) +1) < 0) {
LOGE("Failed to send update command to dnsmasq (%s)", strerror(errno));
mDnsForwarders->clear();
if (write(mDaemonFd, daemonCmd, strlen(daemonCmd) +1) < 0) {
LOGE("Failed to send update command to dnsmasq (%s)", strerror(errno));
mDnsForwarders->clear();
static void sigchld_handler(int sig) {
pid_t pid = wait(NULL);
static void sigchld_handler(int sig) {
pid_t pid = wait(NULL);
- LOGD("Child process %d exited", pid);
+ ALOGD("Child process %d exited", pid);