diff options
| author | David Hankins <dhankins@isc.org> | 2005-09-08 21:19:21 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2005-09-08 21:19:21 +0000 |
| commit | 8c3b1aeb84b49c8c73a8e2c9ce6074f4be4e9857 (patch) | |
| tree | 0dfe8c3863af66c8bd23d635269e84b8ebda3416 | |
| parent | 53718730031f3dca09f4ef60aba16a135511d3e3 (diff) | |
| download | isc-dhcp-8c3b1aeb84b49c8c73a8e2c9ce6074f4be4e9857.tar.gz | |
Merging rt15042 after review - __u16 is a kernel typedef, not a userland
one. Use u_int16_t instead. Thanks to a patch from Jason Vas Dias.
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | common/tr.c | 12 |
2 files changed, 9 insertions, 6 deletions
@@ -72,6 +72,9 @@ and for prodding me into improving it. memory to zero. Code that memset()'s the result returned by dmalloc() to zero is redundant. These redundancies were removed. +- Some type declaration corrections to u_int16_t were made in common/tr.c + (Token Ring support) thanks to a patch from Jason Vas Dias at RedHat. + Changes since 3.0.3b3 - dhclient.conf documentation for interface {} was updated to reflect recent diff --git a/common/tr.c b/common/tr.c index c3f097b3..5b072ca6 100644 --- a/common/tr.c +++ b/common/tr.c @@ -4,7 +4,7 @@ Contributed in May of 1999 by Andrew Chittenden */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -28,7 +28,7 @@ #ifndef lint static char copyright[] = -"$Id: tr.c,v 1.7.2.2 2004/06/10 17:59:21 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; +"$Id: tr.c,v 1.7.2.3 2005/09/08 21:19:21 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -59,8 +59,8 @@ struct routing_entry { struct routing_entry *next; unsigned char addr[TR_ALEN]; unsigned char iface[5]; - __u16 rcf; /* route control field */ - __u16 rseg[8]; /* routing registers */ + u_int16_t rcf; /* route control field */ + u_int16_t rseg[8]; /* routing registers */ unsigned long access_time; /* time we last used this entry */ }; @@ -217,7 +217,7 @@ static int insert_source_routing (trh, interface) if (rover != NULL) { /* success: route that frame */ if ((rover->rcf & TR_RCF_LEN_MASK) >> 8) { - __u16 rcf = rover->rcf; + u_int16_t rcf = rover->rcf; memcpy(trh->rseg,rover->rseg,sizeof(trh->rseg)); rcf ^= TR_RCF_DIR_BIT; rcf &= ~TR_RCF_BROADCAST_MASK; @@ -254,7 +254,7 @@ static void save_source_routing(trh, interface) struct routing_entry *rover; struct timeval now; unsigned char saddr[TR_ALEN]; - __u16 rcf = 0; + u_int16_t rcf = 0; gettimeofday(&now, NULL); |