Fix up 64-bit faux pas

diff --git a/common/inet.c b/common/inet.c
index ce63a2b4d856f12e1f707cae8af10c26a94e1198..000d97183905af14c68a855318a03da123cb1b25 100644 (file)
--- a/common/inet.c
+++ b/common/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;

diff --git a/dhcpd.h b/dhcpd.h
index 99121f4a9b8bee3735a77917566d2f5b41845dc3..558f8abad502631f1a7f1ca4eb658c13035ecf00 100644 (file)
--- a/dhcpd.h
+++ b/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));
 

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 99121f4a9b8bee3735a77917566d2f5b41845dc3..558f8abad502631f1a7f1ca4eb658c13035ecf00 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/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));
 

diff --git a/inet.c b/inet.c
index ce63a2b4d856f12e1f707cae8af10c26a94e1198..000d97183905af14c68a855318a03da123cb1b25 100644 (file)
--- a/inet.c
+++ b/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;