ADDR: Define 0xFFFFFFFFU as INFINITY_LIFE_TIME regarding to the kernel.
Subsystems (2)
PATCH 4/7 ADDR: Define 0xFFFFFFFFU as INFINITY_LIFE_TIME regarding to the kernel.
From: Masahide NAKAMURA <[email protected]>
Signed-off-by TAKAMIYA Noriaki <[email protected]>
Signed-off-by Masahide NAKAMURA <[email protected]>
--- ip/ip_common.h | 4 ++++ ip/ipaddress.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
ip/ip_common.h +4 -0
@@ -43,3 +43,7 @@ static inline int rtm_get_table(struct r }extern struct rtnl_handle rth; + +#ifndef INFINITY_LIFE_TIME +#define INFINITY_LIFE_TIME 0xFFFFFFFFU +#endif
ip/ipaddress.c +5 -5
@@ -283,7 +283,7 @@ static int flush_update(void)static int set_lifetime (unsigned int *lifetime,char *argv) {if (strcmp (argv,"forever" ) ==0 ) - *lifetime =0xFFFFFFFFU ; + *lifetime =INFINITY_LIFE_TIME ;else if (get_u32 (lifetime, argv,0 ))return -1 ;
@@ -439,11 +439,11 @@ int print_addrinfo(const struct sockaddrstruct ifa_cacheinfo *ci =RTA_DATA (rta_tb[IFA_CACHEINFO ]);char buf[128 ];fprintf (fp,"%s" , _SL_); -if (ci->ifa_valid ==0xFFFFFFFFU ) +if (ci->ifa_valid ==INFINITY_LIFE_TIME )sprintf (buf,"valid_lft forever" );else sprintf (buf,"valid_lft %usec" , ci->ifa_valid); -if (ci->ifa_prefered ==0xFFFFFFFFU ) +if (ci->ifa_prefered ==INFINITY_LIFE_TIME )sprintf (buf+strlen (buf)," preferred_lft forever" );else sprintf(buf+strlen(buf), " preferred_lft %usec",
@@ -765,8 +765,8 @@ int ipaddr_modify(int cmd, int flags, inint brd_len =0 ;int any_len =0 ;int scoped =0 ; -__u32 preferred_lft =0xFFFFFFFFU ; -__u32 valid_lft =0xFFFFFFFFU ; +__u32 preferred_lft =INFINITY_LIFE_TIME ; +__u32 valid_lft =INFINITY_LIFE_TIME ;struct ifa_cacheinfo cinfo;memset (&req,0 ,sizeof (req));
Signature · 1 line
1.4.2