Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c88e09cb authored Jun 09, 2010 by Szymon Jakubczak

- creates proper ifc.h and dhcp.h headers for libnetutils

- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
  (see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4

parent f2df6bb9

libnetutils/ifc_utils.h→include/netutils/dhcp.h

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2008, The Android Open Source Project
		* Copyright 2010, 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.
		@@ -14,22 +14,27 @@
		* limitations under the License.
		*/

		#ifndef _IFC_UTILS_H_
		#define _IFC_UTILS_H_
		#ifndef _NETUTILS_DHCP_H_
		#define _NETUTILS_DHCP_H_

		int ifc_init(void);
		#include <sys/cdefs.h>
		#include <arpa/inet.h>

		int ifc_get_ifindex(const char name, int if_indexp);
		int ifc_get_hwaddr(const char name, void ptr);
		__BEGIN_DECLS

		int ifc_up(const char *name);
		int ifc_down(const char *name);
		extern int do_dhcp(char *iname);
		extern int dhcp_do_request(const char *ifname,
		in_addr_t *ipaddr,
		in_addr_t *gateway,
		in_addr_t *mask,
		in_addr_t *dns1,
		in_addr_t *dns2,
		in_addr_t *server,
		uint32_t *lease);
		extern int dhcp_stop(const char *ifname);
		extern int dhcp_release_lease(const char *ifname);
		extern char *dhcp_get_errmsg();

		int ifc_set_addr(const char *name, unsigned addr);
		int ifc_set_mask(const char *name, unsigned mask);
		__END_DECLS

		int ifc_create_default_route(const char *name, unsigned addr);

		int ifc_get_info(const char name, unsigned addr, unsigned mask, unsigned flags);

		#endif
		#endif /* _NETUTILS_DHCP_H_ */

include/netutils/ifc.h

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 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 _NETUTILS_IFC_H_
		#define _NETUTILS_IFC_H_

		#include <sys/cdefs.h>
		#include <arpa/inet.h>

		__BEGIN_DECLS

		extern int ifc_init(void);
		extern void ifc_close(void);

		extern int ifc_get_ifindex(const char name, int if_indexp);
		extern int ifc_get_hwaddr(const char name, void ptr);

		extern int ifc_up(const char *name);
		extern int ifc_down(const char *name);

		extern int ifc_enable(const char *ifname);
		extern int ifc_disable(const char *ifname);

		extern int ifc_reset_connections(const char *ifname);

		extern int ifc_set_addr(const char *name, in_addr_t addr);
		extern int ifc_set_mask(const char *name, in_addr_t mask);
		extern int ifc_set_hwaddr(const char name, const void ptr);

		extern int ifc_add_host_route(const char *name, in_addr_t addr);
		extern int ifc_remove_host_routes(const char *name);
		extern int ifc_get_default_route(const char *ifname);
		extern int ifc_set_default_route(const char *ifname, in_addr_t gateway);
		extern int ifc_create_default_route(const char *name, in_addr_t addr);
		extern int ifc_remove_default_route(const char *ifname);

		extern int ifc_get_info(const char name, in_addr_t addr, in_addr_t *mask,
		in_addr_t *flags);

		extern int ifc_configure(const char *ifname, in_addr_t address,
		in_addr_t netmask, in_addr_t gateway,
		in_addr_t dns1, in_addr_t dns2);

		__END_DECLS

		#endif /* _NETUTILS_IFC_H_ */

libnetutils/dhcp_utils.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,14 @@ static void fill_ip_info(const char *interface,
		}
		}

		static const char *ipaddr_to_string(in_addr_t addr)
		{
		struct in_addr in_addr;

		in_addr.s_addr = addr;
		return inet_ntoa(in_addr);
		}

		/*
		* Start the dhcp client daemon, and wait for it to finish
		* configuring the interface.
		@@ -157,7 +165,13 @@ int dhcp_do_request(const char *interface,
		return -1;
		}
		if (strcmp(prop_value, "ok") == 0) {
		char dns_prop_name[PROPERTY_KEY_MAX];
		fill_ip_info(interface, ipaddr, gateway, mask, dns1, dns2, server, lease);
		/* copy the dhcp.XXX.dns properties to net.XXX.dns */
		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", interface);
		property_set(dns_prop_name, dns1 ? ipaddr_to_string(dns1) : "");
		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", interface);
		property_set(dns_prop_name, dns2 ? ipaddr_to_string(dns2) : "");
		return 0;
		} else {
		snprintf(errmsg, sizeof(errmsg), "DHCP result was %s", prop_value);

libnetutils/dhcpclient.c

+11 −35

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@

		#include <dirent.h>

		#include <netutils/ifc.h>
		#include "dhcpmsg.h"
		#include "ifc_utils.h"
		#include "packet.h"

		#define VERBOSE 2
		@@ -85,16 +85,12 @@ int fatal(const char *reason)
		// exit(1);
		}

		const char *ipaddr(uint32_t addr)
		const char *ipaddr(in_addr_t addr)
		{
		static char buf[32];
		struct in_addr in_addr;

		sprintf(buf,"%d.%d.%d.%d",
		addr & 255,
		((addr >> 8) & 255),
		((addr >> 16) & 255),
		(addr >> 24));
		return buf;
		in_addr.s_addr = addr;
		return inet_ntoa(in_addr);
		}

		typedef struct dhcp_info dhcp_info;
		@@ -128,31 +124,11 @@ void get_dhcp_info(uint32_t ipaddr, uint32_t gateway, uint32_t *mask,
		*lease = last_good_info.lease;
		}

		static int ifc_configure(const char ifname, dhcp_info info)
		static int dhcp_configure(const char ifname, dhcp_info info)
		{
		char dns_prop_name[PROPERTY_KEY_MAX];

		if (ifc_set_addr(ifname, info->ipaddr)) {
		printerr("failed to set ipaddr %s: %s\n", ipaddr(info->ipaddr), strerror(errno));
		return -1;
		}
		if (ifc_set_mask(ifname, info->netmask)) {
		printerr("failed to set netmask %s: %s\n", ipaddr(info->netmask), strerror(errno));
		return -1;
		}
		if (ifc_create_default_route(ifname, info->gateway)) {
		printerr("failed to set default route %s: %s\n", ipaddr(info->gateway), strerror(errno));
		return -1;
		}

		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", ifname);
		property_set(dns_prop_name, info->dns1 ? ipaddr(info->dns1) : "");
		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", ifname);
		property_set(dns_prop_name, info->dns2 ? ipaddr(info->dns2) : "");

		last_good_info = *info;

		return 0;
		return ifc_configure(ifname, info->ipaddr, info->netmask, info->gateway,
		info->dns1, info->dns2);
		}

		static const char *dhcp_type_to_name(uint32_t type)
		@@ -449,7 +425,7 @@ int dhcp_init_ifc(const char *ifname)
		printerr("timed out\n");
		if ( info.type == DHCPOFFER ) {
		printerr("no acknowledgement from DHCP server\nconfiguring %s with offered parameters\n", ifname);
		return ifc_configure(ifname, &info);
		return dhcp_configure(ifname, &info);
		}
		errno = ETIME;
		close(s);
		@@ -530,7 +506,7 @@ int dhcp_init_ifc(const char *ifname)
		if (info.type == DHCPACK) {
		printerr("configuring %s\n", ifname);
		close(s);
		return ifc_configure(ifname, &info);
		return dhcp_configure(ifname, &info);
		} else if (info.type == DHCPNAK) {
		printerr("configuration request denied\n");
		close(s);

libnetutils/ifc_utils.c

+17 −4

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@
		#include <arpa/inet.h>

		#include <linux/if.h>
		#include <linux/if_ether.h>
		#include <linux/if_arp.h>
		#include <linux/sockios.h>
		#include <linux/route.h>
		#include <linux/wireless.h>
		@@ -45,7 +47,7 @@
		static int ifc_ctl_sock = -1;
		void printerr(char *fmt, ...);

		static const char *ipaddr_to_string(uint32_t addr)
		static const char *ipaddr_to_string(in_addr_t addr)
		{
		struct in_addr in_addr;

		@@ -88,7 +90,7 @@ int ifc_get_hwaddr(const char name, void ptr)
		r = ioctl(ifc_ctl_sock, SIOCGIFHWADDR, &ifr);
		if(r < 0) return -1;

		memcpy(ptr, &ifr.ifr_hwaddr.sa_data, 6);
		memcpy(ptr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
		return 0;
		}

		@@ -143,6 +145,17 @@ int ifc_set_addr(const char *name, in_addr_t addr)
		return ioctl(ifc_ctl_sock, SIOCSIFADDR, &ifr);
		}

		int ifc_set_hwaddr(const char name, const void ptr)
		{
		int r;
		struct ifreq ifr;
		ifc_init_ifr(name, &ifr);

		ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
		memcpy(&ifr.ifr_hwaddr.sa_data, ptr, ETH_ALEN);
		return ioctl(ifc_ctl_sock, SIOCSIFHWADDR, &ifr);
		}

		int ifc_set_mask(const char *name, in_addr_t mask)
		{
		struct ifreq ifr;
		@@ -429,9 +442,9 @@ ifc_configure(const char *ifname,

		ifc_close();

		snprintf(dns_prop_name, sizeof(dns_prop_name), "dhcp.%s.dns1", ifname);
		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", ifname);
		property_set(dns_prop_name, dns1 ? ipaddr_to_string(dns1) : "");
		snprintf(dns_prop_name, sizeof(dns_prop_name), "dhcp.%s.dns2", ifname);
		snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", ifname);
		property_set(dns_prop_name, dns2 ? ipaddr_to_string(dns2) : "");

		return 0;