mirror of
https://gitlab.isc.org/isc-projects/dhcp
synced 2025-08-31 14:25:41 +00:00
Fix up 64-bit faux pas
This commit is contained in:
@@ -70,10 +70,10 @@ struct iaddr subnet_number (addr, mask)
|
||||
struct iaddr ip_addr (subnet, mask, host_address)
|
||||
struct iaddr subnet;
|
||||
struct iaddr mask;
|
||||
unsigned long host_address;
|
||||
u_int32_t host_address;
|
||||
{
|
||||
int i, j, k;
|
||||
unsigned long swaddr;
|
||||
u_int32_t swaddr;
|
||||
struct iaddr rv;
|
||||
unsigned char habuf [sizeof swaddr];
|
||||
|
||||
@@ -106,12 +106,12 @@ struct iaddr ip_addr (subnet, mask, host_address)
|
||||
return rv;
|
||||
}
|
||||
|
||||
unsigned long host_addr (addr, mask)
|
||||
u_int32_t host_addr (addr, mask)
|
||||
struct iaddr addr;
|
||||
struct iaddr mask;
|
||||
{
|
||||
int i;
|
||||
unsigned long swaddr;
|
||||
u_int32_t swaddr;
|
||||
struct iaddr rv;
|
||||
|
||||
rv.len = 0;
|
||||
|
4
dhcpd.h
4
dhcpd.h
@@ -427,8 +427,8 @@ void putShort PROTO ((unsigned char *, short));
|
||||
|
||||
/* inet.c */
|
||||
struct iaddr subnet_number PROTO ((struct iaddr, struct iaddr));
|
||||
struct iaddr ip_addr PROTO ((struct iaddr, struct iaddr, unsigned long));
|
||||
unsigned long host_addr PROTO ((struct iaddr, struct iaddr));
|
||||
struct iaddr ip_addr PROTO ((struct iaddr, struct iaddr, u_int32_t));
|
||||
u_int32_t host_addr PROTO ((struct iaddr, struct iaddr));
|
||||
int addr_eq PROTO ((struct iaddr, struct iaddr));
|
||||
char *piaddr PROTO ((struct iaddr));
|
||||
|
||||
|
@@ -427,8 +427,8 @@ void putShort PROTO ((unsigned char *, short));
|
||||
|
||||
/* inet.c */
|
||||
struct iaddr subnet_number PROTO ((struct iaddr, struct iaddr));
|
||||
struct iaddr ip_addr PROTO ((struct iaddr, struct iaddr, unsigned long));
|
||||
unsigned long host_addr PROTO ((struct iaddr, struct iaddr));
|
||||
struct iaddr ip_addr PROTO ((struct iaddr, struct iaddr, u_int32_t));
|
||||
u_int32_t host_addr PROTO ((struct iaddr, struct iaddr));
|
||||
int addr_eq PROTO ((struct iaddr, struct iaddr));
|
||||
char *piaddr PROTO ((struct iaddr));
|
||||
|
||||
|
8
inet.c
8
inet.c
@@ -70,10 +70,10 @@ struct iaddr subnet_number (addr, mask)
|
||||
struct iaddr ip_addr (subnet, mask, host_address)
|
||||
struct iaddr subnet;
|
||||
struct iaddr mask;
|
||||
unsigned long host_address;
|
||||
u_int32_t host_address;
|
||||
{
|
||||
int i, j, k;
|
||||
unsigned long swaddr;
|
||||
u_int32_t swaddr;
|
||||
struct iaddr rv;
|
||||
unsigned char habuf [sizeof swaddr];
|
||||
|
||||
@@ -106,12 +106,12 @@ struct iaddr ip_addr (subnet, mask, host_address)
|
||||
return rv;
|
||||
}
|
||||
|
||||
unsigned long host_addr (addr, mask)
|
||||
u_int32_t host_addr (addr, mask)
|
||||
struct iaddr addr;
|
||||
struct iaddr mask;
|
||||
{
|
||||
int i;
|
||||
unsigned long swaddr;
|
||||
u_int32_t swaddr;
|
||||
struct iaddr rv;
|
||||
|
||||
rv.len = 0;
|
||||
|
Reference in New Issue
Block a user