projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
tests
/
test-dhcp-client.c
diff --git
a/tests/test-dhcp-client.c
b/tests/test-dhcp-client.c
index 7ea476ca16afc27e958e43041e289d8c20a8a9e2..991edd4590e16eda721f0d767ff00ef4b5fbb0c2 100644
(file)
--- a/
tests/test-dhcp-client.c
+++ b/
tests/test-dhcp-client.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,7
+23,6
@@
#include "command-line.h"
#include "dhcp.h"
#include "fatal-signal.h"
#include "command-line.h"
#include "dhcp.h"
#include "fatal-signal.h"
-#include "fault.h"
#include "poll-loop.h"
#include "util.h"
#include "vlog.h"
#include "poll-loop.h"
#include "util.h"
#include "vlog.h"
@@
-51,8
+50,6
@@
main(int argc, char *argv[])
int error;
set_program_name(argv[0]);
int error;
set_program_name(argv[0]);
- register_fault_handlers();
- vlog_init();
parse_options(argc, argv);
argc -= optind;
parse_options(argc, argv);
argc -= optind;
@@
-67,10
+64,9
@@
main(int argc, char *argv[])
ovs_fatal(error, "dhclient_create failed");
}
dhclient_init(cli, request_ip.s_addr);
ovs_fatal(error, "dhclient_create failed");
}
dhclient_init(cli, request_ip.s_addr);
- fatal_signal_add_hook(release, cli, true);
+ fatal_signal_add_hook(release,
NULL,
cli, true);
for (;;) {
for (;;) {
- fatal_signal_block();
dhclient_run(cli);
if (dhclient_changed(cli)) {
dhclient_configure_netdev(cli);
dhclient_run(cli);
if (dhclient_changed(cli)) {
dhclient_configure_netdev(cli);
@@
-79,7
+75,6
@@
main(int argc, char *argv[])
}
}
dhclient_wait(cli);
}
}
dhclient_wait(cli);
- fatal_signal_unblock();
poll_block();
}
}
poll_block();
}
}
@@
-95,7
+90,7
@@
release(void *cli_)
}
static void
}
static void
-modify_dhcp_request(struct dhcp_msg *msg, void *aux UNUSED)
+modify_dhcp_request(struct dhcp_msg *msg, void *aux
OVS_
UNUSED)
{
if (vendor_class) {
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, vendor_class);
{
if (vendor_class) {
dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, vendor_class);
@@
-176,8
+171,8
@@
usage(void)
"\nDHCP options:\n"
" --request-ip=IP request specified IP address (default:\n"
" do not request a specific IP)\n"
"\nDHCP options:\n"
" --request-ip=IP request specified IP address (default:\n"
" do not request a specific IP)\n"
- " --vendor-class=STRING use STRING as vendor class
(default:
\n"
- "
none); use OpenFlow to imitate secchan
\n"
+ " --vendor-class=STRING use STRING as vendor class
; use
\n"
+ "
OpenFlow to imitate ovs-openflowd
\n"
" --no-resolv-conf do not update /etc/resolv.conf\n",
program_name, program_name);
vlog_usage();
" --no-resolv-conf do not update /etc/resolv.conf\n",
program_name, program_name);
vlog_usage();