[Dhcp-agent-commits] CVS: dhcp-agent COST,1.8,1.9 THANKS,1.5,1.6 TODO,1.17,1.18 configure,1.11,1.12
Status: Alpha
Brought to you by:
actmodern
Menu
▾
▴
[Dhcp-agent-commits] CVS: dhcp-agent COST,1.8,1.9 THANKS,1.5,1.6 TODO,1.17,1.18 configure,1.11,1.12 configure.in,1.13,1.14 dhcp-agent.h,1.42,1.43 dhcp-client.c,1.20,1.21
|
From: Thamer Al-H. <act...@us...> - 2002-06-03 01:36:07
|
Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv16969
Modified Files:
COST THANKS TODO configure configure.in dhcp-agent.h
dhcp-client.c
Log Message:
some fixes for openbsd (more to come) thanks Brian J. Kifiak <bk...@rt...>
Index: COST
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/COST,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** COST 19 May 2002 00:35:35 -0000 1.8
--- COST 3 Jun 2002 01:36:04 -0000 1.9
***************
*** 3,9 ****
May - June 2001
! 18 pots of coffee; 122 camel filter cigarretes; one sorry poser;
! cleaned up apartment 0 times; bought one futon; 12 measely rye
! beers;
April - May 2001
--- 3,9 ----
May - June 2001
! 32 pots of coffee; 201 camel filter cigarretes; one sorry poser;
! cleaned up apartment 3 times; bought one futon; 22 complete rye
! beers; one infliction of the flu; one burned ram module;
April - May 2001
Index: THANKS
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/THANKS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** THANKS 18 May 2002 18:17:59 -0000 1.5
--- THANKS 3 Jun 2002 01:36:04 -0000 1.6
***************
*** 15,18 ****
-- Bill Traynor for Solaris x86.
-
- -- Stephanie Fox for the Mascot "Fangs"
--- 15,16 ----
Index: TODO
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/TODO,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TODO 25 May 2002 20:55:36 -0000 1.17
--- TODO 3 Jun 2002 01:36:04 -0000 1.18
***************
*** 15,22 ****
other todo:
- -- add parse errors with line numbers (dhcp-client-conf.c dhcp-globconf.c at least)
- -- make dhcp-agent use more goodies from libdnet
- (1) use blob routines to convert data to different formats.
- we ought to keep network data in a blob.
-- add test for kill(0, pid) to see if it correctly identifies the
running process.
--- 15,18 ----
Index: configure
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure 19 May 2002 16:24:37 -0000 1.11
--- configure 3 Jun 2002 01:36:04 -0000 1.12
***************
*** 2518,2524 ****
done
! echo "$as_me:2520: checking for sig_atomic_t" >&5
! echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
! if test "${ac_cv_type_sig_atomic_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
--- 2518,2524 ----
done
! echo "$as_me:2520: checking for struct bpf_timeval" >&5
! echo $ECHO_N "checking for struct bpf_timeval... $ECHO_C" >&6
! if test "${ac_cv_type_struct_bpf_timeval+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
***************
*** 2526,2537 ****
#line 2526 "configure"
#include "confdefs.h"
! #include <signal.h>
int
main ()
{
! if ((sig_atomic_t *) 0)
return 0;
! if (sizeof (sig_atomic_t))
return 0;
;
--- 2526,2537 ----
#line 2526 "configure"
#include "confdefs.h"
! #include <net/bpf.h>
int
main ()
{
! if ((struct bpf_timeval *) 0)
return 0;
! if (sizeof (struct bpf_timeval))
return 0;
;
***************
*** 2551,2554 ****
--- 2551,2604 ----
echo "$as_me:2551: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
+ ac_cv_type_struct_bpf_timeval=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_type_struct_bpf_timeval=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:2561: result: $ac_cv_type_struct_bpf_timeval" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_bpf_timeval" >&6
+ if test $ac_cv_type_struct_bpf_timeval = yes; then
+ cat >>confdefs.h <<\EOF
+ #define HAVE_BPF_TIMEVAL 1
+ EOF
+
+ fi
+
+ echo "$as_me:2570: checking for sig_atomic_t" >&5
+ echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sig_atomic_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 2576 "configure"
+ #include "confdefs.h"
+ #include <signal.h>
+
+ int
+ main ()
+ {
+ if ((sig_atomic_t *) 0)
+ return 0;
+ if (sizeof (sig_atomic_t))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:2592: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2595: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2598: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2601: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_type_sig_atomic_t=yes
else
***************
*** 2559,2563 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2561: result: $ac_cv_type_sig_atomic_t" >&5
echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
if test $ac_cv_type_sig_atomic_t = yes; then
--- 2609,2613 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2611: result: $ac_cv_type_sig_atomic_t" >&5
echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
if test $ac_cv_type_sig_atomic_t = yes; then
***************
*** 2568,2572 ****
fi
! echo "$as_me:2570: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
--- 2618,2622 ----
fi
! echo "$as_me:2620: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
***************
*** 2574,2578 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2576 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 2624,2628 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2626 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 2596,2609 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2598: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2601: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2604: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2607: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
--- 2646,2659 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2648: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2651: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2654: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2657: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
***************
*** 2615,2619 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2617: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
--- 2665,2669 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2667: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
***************
*** 2624,2628 ****
if test -z "$pcap_prefix"; then
! echo "$as_me:2626: checking for pcap library directory" >&5
echo $ECHO_N "checking for pcap library directory... $ECHO_C" >&6
ac_pcap_lib_dir="none"
--- 2674,2678 ----
if test -z "$pcap_prefix"; then
! echo "$as_me:2676: checking for pcap library directory" >&5
echo $ECHO_N "checking for pcap library directory... $ECHO_C" >&6
ac_pcap_lib_dir="none"
***************
*** 2635,2639 ****
if test $ac_pcap_lib_dir = "none" ; then
! { { echo "$as_me:2637: error:
I cannot find the pcap library anywhere. Perhaps you did not install
the pcap package, or you did not install its development header files." >&5
--- 2685,2689 ----
if test $ac_pcap_lib_dir = "none" ; then
! { { echo "$as_me:2687: error:
I cannot find the pcap library anywhere. Perhaps you did not install
the pcap package, or you did not install its development header files." >&5
***************
*** 2644,2652 ****
fi
! echo "$as_me:2646: result: $ac_pcap_lib_dir" >&5
echo "${ECHO_T}$ac_pcap_lib_dir" >&6
PCAP_LIB="-L$ac_pcap_lib_dir -lpcap"
! echo "$as_me:2650: checking for pcap header directory" >&5
echo $ECHO_N "checking for pcap header directory... $ECHO_C" >&6
ac_pcap_header_dir="none"
--- 2694,2702 ----
fi
! echo "$as_me:2696: result: $ac_pcap_lib_dir" >&5
echo "${ECHO_T}$ac_pcap_lib_dir" >&6
PCAP_LIB="-L$ac_pcap_lib_dir -lpcap"
! echo "$as_me:2700: checking for pcap header directory" >&5
echo $ECHO_N "checking for pcap header directory... $ECHO_C" >&6
ac_pcap_header_dir="none"
***************
*** 2659,2663 ****
if test $ac_pcap_header_dir = "none" ; then
! { { echo "$as_me:2661: error:
I cannot find the pcap header file anywhere. Perhaps you did not install
the pcap package, or you did not install its development header files." >&5
--- 2709,2713 ----
if test $ac_pcap_header_dir = "none" ; then
! { { echo "$as_me:2711: error:
I cannot find the pcap header file anywhere. Perhaps you did not install
the pcap package, or you did not install its development header files." >&5
***************
*** 2668,2672 ****
fi
! echo "$as_me:2670: result: $ac_pcap_header_dir" >&5
echo "${ECHO_T}$ac_pcap_header_dir" >&6
PCAP_INC="-I$ac_pcap_header_dir"
--- 2718,2722 ----
fi
! echo "$as_me:2720: result: $ac_pcap_header_dir" >&5
echo "${ECHO_T}$ac_pcap_header_dir" >&6
PCAP_INC="-I$ac_pcap_header_dir"
***************
*** 2685,2689 ****
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
! echo "$as_me:2687: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_DNET_PATH+set}" = set; then
--- 2735,2739 ----
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
! echo "$as_me:2737: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_DNET_PATH+set}" = set; then
***************
*** 2702,2706 ****
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_DNET_PATH="$ac_dir/$ac_word"
! echo "$as_me:2704: found $ac_dir/$ac_word" >&5
break
fi
--- 2752,2756 ----
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_DNET_PATH="$ac_dir/$ac_word"
! echo "$as_me:2754: found $ac_dir/$ac_word" >&5
break
fi
***************
*** 2713,2720 ****
if test -n "$DNET_PATH"; then
! echo "$as_me:2715: result: $DNET_PATH" >&5
echo "${ECHO_T}$DNET_PATH" >&6
else
! echo "$as_me:2718: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 2763,2770 ----
if test -n "$DNET_PATH"; then
! echo "$as_me:2765: result: $DNET_PATH" >&5
echo "${ECHO_T}$DNET_PATH" >&6
else
! echo "$as_me:2768: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 2726,2730 ****
if test $DNET_PATH = "no"; then
! echo "$as_me:2728: checking for eth_open in -ldnet" >&5
echo $ECHO_N "checking for eth_open in -ldnet... $ECHO_C" >&6
if test "${ac_cv_lib_dnet_eth_open+set}" = set; then
--- 2776,2780 ----
if test $DNET_PATH = "no"; then
! echo "$as_me:2778: checking for eth_open in -ldnet" >&5
echo $ECHO_N "checking for eth_open in -ldnet... $ECHO_C" >&6
if test "${ac_cv_lib_dnet_eth_open+set}" = set; then
***************
*** 2734,2738 ****
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 2736 "configure"
#include "confdefs.h"
--- 2784,2788 ----
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 2786 "configure"
#include "confdefs.h"
***************
*** 2753,2766 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:2755: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:2758: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:2761: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2764: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_eth_open=yes
--- 2803,2816 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:2805: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:2808: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:2811: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2814: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_eth_open=yes
***************
*** 2773,2782 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:2775: result: $ac_cv_lib_dnet_eth_open" >&5
echo "${ECHO_T}$ac_cv_lib_dnet_eth_open" >&6
if test $ac_cv_lib_dnet_eth_open = yes; then
DNET_LIB="-ldnet"
else
! { { echo "$as_me:2780: error: \`libdnet not found http://libdnet.sourceforge.net/ to get a copy'" >&5
echo "$as_me: error: \`libdnet not found http://libdnet.sourceforge.net/ to get a copy'" >&2;}
{ (exit 1); exit 1; }; }
--- 2823,2832 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:2825: result: $ac_cv_lib_dnet_eth_open" >&5
echo "${ECHO_T}$ac_cv_lib_dnet_eth_open" >&6
if test $ac_cv_lib_dnet_eth_open = yes; then
DNET_LIB="-ldnet"
else
! { { echo "$as_me:2830: error: \`libdnet not found http://libdnet.sourceforge.net/ to get a copy'" >&5
echo "$as_me: error: \`libdnet not found http://libdnet.sourceforge.net/ to get a copy'" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 2784,2788 ****
DNET_INC=""
! p
else
--- 2834,2838 ----
DNET_INC=""
!
else
***************
*** 2885,2889 ****
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:2887: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
--- 2935,2939 ----
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:2937: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
***************
*** 3061,3065 ****
--he | --h)
# Conflict between --help and --header
! { { echo "$as_me:3063: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
--- 3111,3115 ----
--he | --h)
# Conflict between --help and --header
! { { echo "$as_me:3113: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
***************
*** 3085,3094 ****
# This is an error.
! -*) { { echo "$as_me:3087: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
{ (exit 1); exit 1; }; } ;;
! *) { { echo "$as_me:3092: error: invalid argument: $1" >&5
echo "$as_me: error: invalid argument: $1" >&2;}
{ (exit 1); exit 1; }; };;
--- 3135,3144 ----
# This is an error.
! -*) { { echo "$as_me:3137: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
{ (exit 1); exit 1; }; } ;;
! *) { { echo "$as_me:3142: error: invalid argument: $1" >&5
echo "$as_me: error: invalid argument: $1" >&2;}
{ (exit 1); exit 1; }; };;
***************
*** 3331,3335 ****
if test x"$ac_file" != x-; then
! { echo "$as_me:3333: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
--- 3381,3385 ----
if test x"$ac_file" != x-; then
! { echo "$as_me:3383: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
***************
*** 3349,3353 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:3351: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 3399,3403 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:3401: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 3362,3366 ****
else
# /dev/null tree
! { { echo "$as_me:3364: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 3412,3416 ----
else
# /dev/null tree
! { { echo "$as_me:3414: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 3423,3427 ****
esac
! test x"$ac_file" != x- && { echo "$as_me:3425: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
--- 3473,3477 ----
esac
! test x"$ac_file" != x- && { echo "$as_me:3475: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
***************
*** 3434,3438 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:3436: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 3484,3488 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:3486: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 3447,3451 ****
else
# /dev/null tree
! { { echo "$as_me:3449: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 3497,3501 ----
else
# /dev/null tree
! { { echo "$as_me:3499: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 3564,3568 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:3566: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 3614,3618 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:3616: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
Index: configure.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.in 29 May 2002 03:12:54 -0000 1.13
--- configure.in 3 Jun 2002 01:36:04 -0000 1.14
***************
*** 41,44 ****
--- 41,45 ----
dnl check for types
+ AC_CHECK_TYPE(struct bpf_timeval, [AC_DEFINE(HAVE_BPF_TIMEVAL)], [], [#include <net/bpf.h>])
AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T)], [], [#include <signal.h>])
AC_TYPE_SIGNAL
Index: dhcp-agent.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-agent.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** dhcp-agent.h 30 May 2002 06:44:05 -0000 1.42
--- dhcp-agent.h 3 Jun 2002 01:36:04 -0000 1.43
***************
*** 281,285 ****
--- 281,289 ----
int packet_len; /* total length of packet. */
+ #ifdef HAVE_BPF_TIMEVAL
+ struct bpf_timeval tstamp /* timestamp. */
+ #else
struct timeval tstamp; /* timestamp. */
+ #endif
eth_addr_t hw_addr; /* our hardware address. */
Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dhcp-client.c 29 May 2002 03:12:54 -0000 1.20
--- dhcp-client.c 3 Jun 2002 01:36:04 -0000 1.21
***************
*** 28,32 ****
int interactive = 1; /* by default we begin interactive (messages on stdout/stderr). */
! char *binname = "dhcpclient"; /* we need a name. */char *work_dir = CLIENT_WORK_DIR; /* our default working directory */
/* read up on our global conf. */
--- 28,33 ----
int interactive = 1; /* by default we begin interactive (messages on stdout/stderr). */
! char *binname = "dhcpclient"; /* we need a name. */
! char *work_dir = CLIENT_WORK_DIR; /* our default working directory */
/* read up on our global conf. */
|
