X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-dhcp-client.c;h=79d17736bc556d008b7c8254c3384bea95b387f4;hb=2736b84e2348090d4756f987db37aa7ddfcb50e0;hp=e4471c7b209528823c1336206e5fff3f4ec27757;hpb=39fb08818bbd9c438dbf23caa89937c663451b5a;p=openvswitch diff --git a/tests/test-dhcp-client.c b/tests/test-dhcp-client.c index e4471c7b..79d17736 100644 --- 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. @@ -23,7 +23,6 @@ #include "command-line.h" #include "dhcp.h" #include "fatal-signal.h" -#include "fault.h" #include "poll-loop.h" #include "util.h" #include "vlog.h" @@ -51,7 +50,6 @@ main(int argc, char *argv[]) int error; set_program_name(argv[0]); - register_fault_handlers(); vlog_init(); parse_options(argc, argv); @@ -67,10 +65,9 @@ main(int argc, char *argv[]) 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 (;;) { - fatal_signal_block(); dhclient_run(cli); if (dhclient_changed(cli)) { dhclient_configure_netdev(cli); @@ -79,7 +76,6 @@ main(int argc, char *argv[]) } } dhclient_wait(cli); - fatal_signal_unblock(); poll_block(); } } @@ -95,7 +91,7 @@ release(void *cli_) } 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);