diff options
author | Dmitry Shmidt | 2017-05-16 18:52:52 -0500 |
---|---|---|
committer | android-build-merger | 2017-05-16 18:52:52 -0500 |
commit | 38335f99983ee4fb7e76e87e20c4fbdf4d8c0dd3 (patch) | |
tree | 1b3166b09eb65e578027b5f24689e9b05bd367a5 | |
parent | 32d5160e2369b351a8ef12ffec7a3d9dea560a0c (diff) | |
parent | cebd49c93f3c6b86354f9bfde79966497ebe9336 (diff) | |
download | platform-system-core-38335f99983ee4fb7e76e87e20c4fbdf4d8c0dd3.tar.gz platform-system-core-38335f99983ee4fb7e76e87e20c4fbdf4d8c0dd3.tar.xz platform-system-core-38335f99983ee4fb7e76e87e20c4fbdf4d8c0dd3.zip |
Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6 am: 1f47a6ba48
am: cebd49c93f
Change-Id: I06dd468023d64b15e5f21d1fa61115b836582612
-rw-r--r-- | libnetutils/Android.bp | 14 | ||||
-rw-r--r-- | libnetutils/dhcptool.c | 47 |
2 files changed, 61 insertions, 0 deletions
diff --git a/libnetutils/Android.bp b/libnetutils/Android.bp index f710ba29e..68a74a092 100644 --- a/libnetutils/Android.bp +++ b/libnetutils/Android.bp | |||
@@ -17,3 +17,17 @@ cc_library_shared { | |||
17 | 17 | ||
18 | export_include_dirs: ["include"], | 18 | export_include_dirs: ["include"], |
19 | } | 19 | } |
20 | |||
21 | cc_binary { | ||
22 | name: "dhcptool", | ||
23 | |||
24 | srcs: [ | ||
25 | "dhcptool.c", | ||
26 | ], | ||
27 | |||
28 | shared_libs: [ | ||
29 | "libnetutils", | ||
30 | ], | ||
31 | |||
32 | cflags: ["-Werror"], | ||
33 | } | ||
diff --git a/libnetutils/dhcptool.c b/libnetutils/dhcptool.c new file mode 100644 index 000000000..b3896c391 --- /dev/null +++ b/libnetutils/dhcptool.c | |||
@@ -0,0 +1,47 @@ | |||
1 | /* | ||
2 | * Copyright 2015, 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 | #include <err.h> | ||
18 | #include <errno.h> | ||
19 | #include <error.h> | ||
20 | #include <stdbool.h> | ||
21 | #include <stdlib.h> | ||
22 | |||
23 | #include <netutils/ifc.h> | ||
24 | |||
25 | extern int do_dhcp(char*); | ||
26 | |||
27 | int main(int argc, char* argv[]) { | ||
28 | if (argc != 2) { | ||
29 | error(EXIT_FAILURE, 0, "usage: %s INTERFACE", argv[0]); | ||
30 | } | ||
31 | |||
32 | char* interface = argv[1]; | ||
33 | if (ifc_init()) { | ||
34 | err(errno, "dhcptool %s: ifc_init failed", interface); | ||
35 | ifc_close(); | ||
36 | return EXIT_FAILURE; | ||
37 | } | ||
38 | |||
39 | int rc = do_dhcp(interface); | ||
40 | if (rc) { | ||
41 | err(errno, "dhcptool %s: do_dhcp failed", interface); | ||
42 | } | ||
43 | |||
44 | ifc_close(); | ||
45 | |||
46 | return rc ? EXIT_FAILURE : EXIT_SUCCESS; | ||
47 | } | ||