u_intN_t is dead, long live uintN_t.

And, as we require at least autoconf 2.61, and as autoconf 2.61 and
later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to
define the uintN_t and intN_t macros if the system doesn't define them
for us.

This lets us get rid of bitypes.h as well.

1 files changed, 21 insertions, 21 deletions

diff --git a/print-rip.c b/print-rip.c
index 1fb6dd65..c1b036e4 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -37,9 +37,9 @@
 static const char tstr[] = "[|rip]";
 
 struct rip {
-	u_int8_t rip_cmd;		/* request/response */
-	u_int8_t rip_vers;		/* protocol version # */
-	u_int8_t unused[2];		/* unused */
+	uint8_t rip_cmd;		/* request/response */
+	uint8_t rip_vers;		/* protocol version # */
+	uint8_t unused[2];		/* unused */
 };
 
 #define	RIPCMD_REQUEST		1	/* want info */
@@ -84,12 +84,12 @@ static const struct tok rip_cmd_values[] = {
  */
 
 struct rip_netinfo {
-	u_int16_t rip_family;
-	u_int16_t rip_tag;
-	u_int32_t rip_dest;
-	u_int32_t rip_dest_mask;
-	u_int32_t rip_router;
-	u_int32_t rip_metric;		/* cost of route */
+	uint16_t rip_family;
+	uint16_t rip_tag;
+	uint32_t rip_dest;
+	uint32_t rip_dest_mask;
+	uint32_t rip_router;
+	uint32_t rip_metric;		/* cost of route */
 };
 
 static void
@@ -102,14 +102,14 @@ rip_entry_print_v1(netdissect_options *ndo,
 	family = EXTRACT_16BITS(&ni->rip_family);
 	if (family != BSD_AFNUM_INET && family != 0) {
 		ND_PRINT((ndo, "\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family)));
-		print_unknown_data(ndo, (u_int8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
+		print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
 		return;
 	}
 	if (EXTRACT_16BITS(&ni->rip_tag) ||
 	    EXTRACT_32BITS(&ni->rip_dest_mask) ||
 	    EXTRACT_32BITS(&ni->rip_router)) {
 		/* MBZ fields not zero */
-                print_unknown_data(ndo, (u_int8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
+                print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);
 		return;
 	}
 	if (family == 0) {
@@ -131,7 +131,7 @@ rip_entry_print_v2(netdissect_options *ndo,
 
 	family = EXTRACT_16BITS(&ni->rip_family);
 	if (family == 0xFFFF) { /* variable-sized authentication structures */
-		u_int16_t auth_type = EXTRACT_16BITS(&ni->rip_tag);
+		uint16_t auth_type = EXTRACT_16BITS(&ni->rip_tag);
 		if (auth_type == 2) {
 			register u_char *p = (u_char *)&ni->rip_dest;
 			u_int i = 0;
@@ -140,24 +140,24 @@ rip_entry_print_v2(netdissect_options *ndo,
 				ND_PRINT((ndo, "%c", ND_ISPRINT(*p) ? *p : '.'));
 		} else if (auth_type == 3) {
 			ND_PRINT((ndo, "\n\t  Auth header:"));
-			ND_PRINT((ndo, " Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni + 4)));
-			ND_PRINT((ndo, " Key-ID %u,", *((u_int8_t *)ni + 6)));
-			ND_PRINT((ndo, " Auth Data Len %u,", *((u_int8_t *)ni + 7)));
+			ND_PRINT((ndo, " Packet Len %u,", EXTRACT_16BITS((uint8_t *)ni + 4)));
+			ND_PRINT((ndo, " Key-ID %u,", *((uint8_t *)ni + 6)));
+			ND_PRINT((ndo, " Auth Data Len %u,", *((uint8_t *)ni + 7)));
 			ND_PRINT((ndo, " SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask)));
 			ND_PRINT((ndo, " MBZ %u,", EXTRACT_32BITS(&ni->rip_router)));
 			ND_PRINT((ndo, " MBZ %u", EXTRACT_32BITS(&ni->rip_metric)));
 		} else if (auth_type == 1) {
 			ND_PRINT((ndo, "\n\t  Auth trailer:"));
-			print_unknown_data(ndo, (u_int8_t *)&ni->rip_dest, "\n\t  ", remaining);
+			print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t  ", remaining);
 			return remaining; /* AT spans till the packet end */
 		} else {
 			ND_PRINT((ndo, "\n\t  Unknown (%u) Authentication data:",
 			       EXTRACT_16BITS(&ni->rip_tag)));
-			print_unknown_data(ndo, (u_int8_t *)&ni->rip_dest, "\n\t  ", remaining);
+			print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t  ", remaining);
 		}
 	} else if (family != BSD_AFNUM_INET && family != 0) {
 		ND_PRINT((ndo, "\n\t  AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family)));
-                print_unknown_data(ndo, (u_int8_t *)&ni->rip_tag, "\n\t  ", RIP_ROUTELEN-2);
+                print_unknown_data(ndo, (uint8_t *)&ni->rip_tag, "\n\t  ", RIP_ROUTELEN-2);
 	} else { /* BSD_AFNUM_INET or AFI 0 */
 		ND_PRINT((ndo, "\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
                        tok2str(bsd_af_values, "%u", family),
@@ -213,7 +213,7 @@ rip_print(netdissect_options *ndo,
 		 *
 		 * so perhaps we should just dump the packet, in hex.
 		 */
-                print_unknown_data(ndo, (u_int8_t *)&rp->rip_cmd, "\n\t", length);
+                print_unknown_data(ndo, (uint8_t *)&rp->rip_cmd, "\n\t", length);
 		break;
 	default:
                 /* dump version and lets see if we know the commands name*/
@@ -256,14 +256,14 @@ rip_print(netdissect_options *ndo,
                     /* fall through */
 	        default:
                     if (ndo->ndo_vflag <= 1) {
-                        if(!print_unknown_data(ndo, (u_int8_t *)rp, "\n\t", length))
+                        if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length))
                             return;
                     }
                     break;
                 }
                 /* do we want to see an additionally hexdump ? */
                 if (ndo->ndo_vflag> 1) {
-                    if(!print_unknown_data(ndo, (u_int8_t *)rp, "\n\t", length))
+                    if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length))
                         return;
                 }
         }