summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-05-18 23:26:35 -0500
committerElliott Hughes2016-05-18 23:26:35 -0500
commit9110eaab4116c7edb38045b21a01226eccd5eb0a (patch)
tree955f4ee00c2f2ba12ac557b7fecf82a82eab9272 /libnetutils
parent6cf91d1c4dafbdbd14330d61fbeb28a21607f03a (diff)
parent847d9635980d2343a47bf31519055fb2bbdddc32 (diff)
downloadplatform-system-core-9110eaab4116c7edb38045b21a01226eccd5eb0a.tar.gz
platform-system-core-9110eaab4116c7edb38045b21a01226eccd5eb0a.tar.xz
platform-system-core-9110eaab4116c7edb38045b21a01226eccd5eb0a.zip
resolve merge conflicts of 847d963 to nyc-dev-plus-aosp
Change-Id: Ib97f56112bff71e2997116f969fd6d3e30e72f26
Diffstat (limited to 'libnetutils')
-rw-r--r--libnetutils/dhcptool.c3
-rw-r--r--libnetutils/include/netutils/dhcp.h44
2 files changed, 2 insertions, 45 deletions
diff --git a/libnetutils/dhcptool.c b/libnetutils/dhcptool.c
index a2d3869b4..d23afd3bd 100644
--- a/libnetutils/dhcptool.c
+++ b/libnetutils/dhcptool.c
@@ -20,9 +20,10 @@
20#include <stdbool.h> 20#include <stdbool.h>
21#include <stdlib.h> 21#include <stdlib.h>
22 22
23#include <netutils/dhcp.h>
24#include <netutils/ifc.h> 23#include <netutils/ifc.h>
25 24
25extern int do_dhcp(char*);
26
26int main(int argc, char* argv[]) { 27int main(int argc, char* argv[]) {
27 if (argc != 2) { 28 if (argc != 2) {
28 error(EXIT_FAILURE, 0, "usage: %s INTERFACE", argv[0]); 29 error(EXIT_FAILURE, 0, "usage: %s INTERFACE", argv[0]);
diff --git a/libnetutils/include/netutils/dhcp.h b/libnetutils/include/netutils/dhcp.h
deleted file mode 100644
index 008dbd887..000000000
--- a/libnetutils/include/netutils/dhcp.h
+++ /dev/null
@@ -1,44 +0,0 @@
1/*
2 * Copyright 2010, The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17#ifndef _NETUTILS_DHCP_H_
18#define _NETUTILS_DHCP_H_
19
20#include <sys/cdefs.h>
21#include <arpa/inet.h>
22
23__BEGIN_DECLS
24
25extern int do_dhcp(char *iname);
26extern int dhcp_start(const char *ifname);
27extern int dhcp_start_renew(const char *ifname);
28extern int dhcp_get_results(const char *ifname,
29 char *ipaddr,
30 char *gateway,
31 uint32_t *prefixLength,
32 char *dns[],
33 char *server,
34 uint32_t *lease,
35 char *vendorInfo,
36 char *domain,
37 char *mtu);
38extern int dhcp_stop(const char *ifname);
39extern int dhcp_release_lease(const char *ifname);
40extern char *dhcp_get_errmsg();
41
42__END_DECLS
43
44#endif /* _NETUTILS_DHCP_H_ */