[Dhcp-agent-commits] dhcp-agent Makefile.in,1.26,1.27 dhcp-arp-discovery.c,1.7,1.8 dhcp-client.c,1.3
Status: Alpha
Brought to you by:
actmodern
From: <act...@us...> - 2002-06-30 18:27:15
|
Update of /cvsroot/dhcp-agent/dhcp-agent In directory usw-pr-cvs1:/tmp/cvs-serv6492 Modified Files: Makefile.in dhcp-arp-discovery.c dhcp-client.c Log Message: lowercased error messages; small indentation fix; this finishes up exception addition -- watch out breaks in flow Index: Makefile.in =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/Makefile.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile.in 30 Jun 2002 08:23:45 -0000 1.26 --- Makefile.in 30 Jun 2002 18:27:12 -0000 1.27 *************** *** 70,75 **** CFLAGS = -Wall -g - AUTOMAKE_OPTIONS = foreign - INCLUDES = -I. @PCAP_INC@ @DNET_INC@ DEFS = @DEFS@ --- 70,73 ---- *************** *** 92,95 **** --- 90,95 ---- man_MANS = dhcpsniff.1 dhcpclient.1 + + AUTOMAKE_OPTIONS = foreign EXTRA_DIST = $(man_MANS) TODO LICENSE CAVEATS UPGRADING Index: dhcp-arp-discovery.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-arp-discovery.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dhcp-arp-discovery.c 30 Jun 2002 08:23:45 -0000 1.7 --- dhcp-arp-discovery.c 30 Jun 2002 18:27:12 -0000 1.8 *************** *** 72,77 **** arg_list = add_to_list(arg_list, net); ! build_arp_request(net, net->ip_addr, address, net->hw_addr); /* 0 for source ip, address to discover for dest, ! * our hardware address so we get a reply back. */ while(retries--) { --- 72,80 ---- arg_list = add_to_list(arg_list, net); ! /* 0 for source ip, address to discover for dest, our ! * hardware address so we get a reply back. */ ! ! build_arp_request(net, net->ip_addr, address, net->hw_addr); ! while(retries--) { Index: dhcp-client.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** dhcp-client.c 30 Jun 2002 08:23:45 -0000 1.36 --- dhcp-client.c 30 Jun 2002 18:27:12 -0000 1.37 *************** *** 277,281 **** if(get_pid_file(interface, &pid)) { ! push_exception("main", "do_kill_client", "Could not get PID for client %s. Maybe it's not running?", interface); exception_errors = unroll_exceptions(); --- 277,281 ---- if(get_pid_file(interface, &pid)) { ! push_exception("main", "do_kill_client", "could not get PID for client %s. maybe it's not running?", interface); exception_errors = unroll_exceptions(); *************** *** 285,289 **** if(kill(pid, SIGTERM) < 0) { ! push_exception("main", "do_kill_client", "Could not send signal to client on %s. Maybe it's not running?", interface); exception_errors = unroll_exceptions(); --- 285,290 ---- if(kill(pid, SIGTERM) < 0) { ! push_exception("main", "do_kill_client", ! "could not send signal to client on %s. maybe it's not running?", interface); exception_errors = unroll_exceptions(); *************** *** 465,469 **** if((dc = create_dhcp_client_control(interface, promiscuous)) == NULL) { push_exception("main", "do_client", ! "Encountered a fatal error. I'm exiting.", interface); exception_errors = unroll_exceptions(); error_exception(exception_errors); --- 466,470 ---- if((dc = create_dhcp_client_control(interface, promiscuous)) == NULL) { push_exception("main", "do_client", ! "encountered a fatal error. I'm exiting.", interface); exception_errors = unroll_exceptions(); error_exception(exception_errors); *************** *** 473,477 **** if(create_pid_file(interface)) { push_exception("main", "do_client", ! "Could not create PID file for interface: %s"); exception_errors = unroll_exceptions(); error_exception(exception_errors); --- 474,478 ---- if(create_pid_file(interface)) { push_exception("main", "do_client", ! "could not create PID file for interface: %s"); exception_errors = unroll_exceptions(); error_exception(exception_errors); |