am 192331d9: nexus: Add ListCmd to CommandListener (9b8c28ab) · Commits · e / os / android_system_core

nexus/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ LOCAL_SRC_FILES:= \
	WifiScanner.cpp \		WifiScanner.cpp \
	WifiNetwork.cpp \		WifiNetwork.cpp \
	OpenVpnController.cpp \		OpenVpnController.cpp \
			InterfaceConfig.cpp \

	LOCAL_MODULE:= nexus		LOCAL_MODULE:= nexus

nexus/CommandListener.cpp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -202,3 +202,11 @@ out_inval:
	cli->sendMsg(ErrorCode::CommandParameterError, "Failed to set property.", true);		cli->sendMsg(ErrorCode::CommandParameterError, "Failed to set property.", true);
	return 0;		return 0;
	}		}

			CommandListener::ListCmd::ListCmd() :
			NexusCommand("list") {
			}

			int CommandListener::ListCmd::runCommand(SocketClient cli, char data) {
			return 0;
			}

nexus/CommandListener.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,13 @@ private:
	virtual ~GetCmd() {}		virtual ~GetCmd() {}
	int runCommand(SocketClient c, char data);		int runCommand(SocketClient c, char data);
	};		};

			class ListCmd : public NexusCommand {
			public:
			ListCmd();
			virtual ~ListCmd() {}
			int runCommand(SocketClient c, char data);
			};
	};		};

	#endif		#endif

nexus/InterfaceConfig.cpp

0 → 100644

+67 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2008 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include <string.h>

			#define LOG_TAG "InterfaceConfig"
			#include <cutils/log.h>

			#include "InterfaceConfig.h"

			InterfaceConfig::InterfaceConfig(const char *name) {
			mName = strdup(name);
			mUseDhcp = true;
			}

			InterfaceConfig::~InterfaceConfig() {
			free(mName);
			}

			InterfaceConfig::InterfaceConfig(const char name, const char ip, const char *nm,
			const char gw, const char dns1, const char *dns2,
			const char *dns3) {
			mName = strdup(name);
			mUseDhcp = false;

			if (!inet_aton(ip, &mIp))
			LOGW("Unable to parse ip (%s)", ip);
			if (!inet_aton(nm, &mIp))
			LOGW("Unable to parse netmask (%s)", nm);
			if (!inet_aton(gw, &mIp))
			LOGW("Unable to parse gateway (%s)", gw);
			if (!inet_aton(dns1, &mIp))
			LOGW("Unable to parse dns1 (%s)", dns1);
			if (!inet_aton(dns2, &mIp))
			LOGW("Unable to parse dns2 (%s)", dns2);
			if (!inet_aton(dns3, &mIp))
			LOGW("Unable to parse dns3 (%s)", dns3);
			}

			InterfaceConfig::InterfaceConfig(const char name, const struct in_addr ip,
			const struct in_addr nm, const struct in_addr gw,
			const struct in_addr dns1, const struct in_addr dns2,
			const struct in_addr *dns3) {
			mName = strdup(name);
			mUseDhcp = false;

			memcpy(&mIp, ip, sizeof(struct in_addr));
			memcpy(&mNetmask, nm, sizeof(struct in_addr));
			memcpy(&mGateway, gw, sizeof(struct in_addr));
			memcpy(&mDns1, dns1, sizeof(struct in_addr));
			memcpy(&mDns2, dns2, sizeof(struct in_addr));
			memcpy(&mDns3, dns3, sizeof(struct in_addr));
			}

nexus/InterfaceConfig.h

0 → 100644

+58 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2008 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#ifndef _INTERFACE_CONFIG_H
			#define _INTERFACE_CONFIG_H

			#include <netinet/in.h>
			#include <arpa/inet.h>

			class InterfaceConfig {
			private:
			char *mName;
			bool mUseDhcp;
			struct in_addr mIp;
			struct in_addr mNetmask;
			struct in_addr mGateway;
			struct in_addr mDns1;
			struct in_addr mDns2;
			struct in_addr mDns3;

			public:
			InterfaceConfig(const char *name);
			InterfaceConfig(const char name, const char ip, const char *nm,
			const char gw, const char dns1, const char *dns2,
			const char *dns3);

			InterfaceConfig(const char name, const struct in_addr ip,
			const struct in_addr nm, const struct in_addr gw,
			const struct in_addr dns1, const struct in_addr dns2,
			const struct in_addr *dns3);

			virtual ~InterfaceConfig();

			const char *getName() const { return mName; }
			bool getUseDhcp() const { return mUseDhcp; }
			const struct in_addr &getIp() const { return mIp; }
			const struct in_addr &getNetmask() const { return mNetmask; }
			const struct in_addr &getGateway() const { return mGateway; }
			const struct in_addr &getDns1() const { return mDns1; }
			const struct in_addr &getDns2() const { return mDns2; }
			const struct in_addr &getDns3() const { return mDns3; }
			};


			#endif