projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update settings when device information in device_list is changed" into tizen
[platform/upstream/connman.git]
/
tools
/
dhcp-test.c
diff --git
a/tools/dhcp-test.c
b/tools/dhcp-test.c
old mode 100644
(file)
new mode 100755
(executable)
index
1fbf1f9
..
a6c3e99
--- a/
tools/dhcp-test.c
+++ b/
tools/dhcp-test.c
@@
-2,7
+2,7
@@
*
* Connection Manager
*
*
* Connection Manager
*
- * Copyright (C) 2007-201
0
Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-201
2
Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@
-33,10
+33,11
@@
#include <arpa/inet.h>
#include <net/route.h>
#include <net/ethernet.h>
#include <arpa/inet.h>
#include <net/route.h>
#include <net/ethernet.h>
-#include <linux/if_arp.h>
#include <gdhcp/gdhcp.h>
#include <gdhcp/gdhcp.h>
+#include "../src/connman.h"
+
static GTimer *timer;
static GMainLoop *main_loop;
static GTimer *timer;
static GMainLoop *main_loop;
@@
-102,7
+103,7
@@
static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
address = g_dhcp_client_get_address(dhcp_client);
printf("address %s\n", address);
address = g_dhcp_client_get_address(dhcp_client);
printf("address %s\n", address);
- if (
address == NULL
)
+ if (
!address
)
return;
option_value = g_dhcp_client_get_option(dhcp_client, G_DHCP_SUBNET);
return;
option_value = g_dhcp_client_get_option(dhcp_client, G_DHCP_SUBNET);
@@
-143,7
+144,7
@@
int main(int argc, char *argv[])
printf("Create DHCP client for interface %d\n", index);
dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, index, &error);
printf("Create DHCP client for interface %d\n", index);
dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, index, &error);
- if (
dhcp_client == NULL
) {
+ if (
!dhcp_client
) {
handle_error(error);
exit(0);
}
handle_error(error);
exit(0);
}
@@
-170,15
+171,19
@@
int main(int argc, char *argv[])
timer = g_timer_new();
timer = g_timer_new();
- g_dhcp_client_start(dhcp_client);
+ g_dhcp_client_start(dhcp_client
, NULL
);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
+ __connman_util_init();
+
g_main_loop_run(main_loop);
g_main_loop_run(main_loop);
+ __connman_util_cleanup();
+
g_timer_destroy(timer);
g_dhcp_client_unref(dhcp_client);
g_timer_destroy(timer);
g_dhcp_client_unref(dhcp_client);