diff options
| author | Shawn Routhier <sar@isc.org> | 2012-02-16 21:05:28 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2012-02-16 21:05:28 +0000 |
| commit | b047bd385b742331828fd6911ed39f6cb9980ca9 (patch) | |
| tree | 136475f16354814a99b44a7fc51107210eca3b64 /includes | |
| parent | 865afd5e447e23e9af0b888c92a9e9ce6b38e7a8 (diff) | |
| download | isc-dhcp-b047bd385b742331828fd6911ed39f6cb9980ca9.tar.gz | |
Add support for Infiniband over sockets to the server and
relay code. We've tested this on Solaris and hope to expand
support for Infiniband in the future. This patch also corrects
some issues we found in the socket code. [ISC-Bugs #24245]
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/dhcp.h | 5 | ||||
| -rw-r--r-- | includes/dhcpd.h | 2 | ||||
| -rw-r--r-- | includes/dhctoken.h | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/includes/dhcp.h b/includes/dhcp.h index 1af2adf8..5eb1ad8b 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h @@ -3,6 +3,7 @@ Protocol structures... */ /* + * Copyright (c) 2011-2012 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-2003 by Internet Software Consortium * @@ -79,6 +80,10 @@ struct dhcp_packet { #define HTYPE_ETHER 1 /* Ethernet 10Mbps */ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */ #define HTYPE_FDDI 8 /* FDDI... */ +#define HTYPE_INFINIBAND 32 /* IP over Infiniband */ +#define HTYPE_IPMP 255 /* IPMP - random hw address - there + * is no standard for this so we + * just steal a type */ /* Magic cookie validating dhcp options field (and bootp vendor extensions field). */ diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 453be2f8..67b03b5a 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -436,7 +436,7 @@ struct packet { struct hardware { u_int8_t hlen; - u_int8_t hbuf [17]; + u_int8_t hbuf[21]; }; #if defined(LDAP_CONFIGURATION) diff --git a/includes/dhctoken.h b/includes/dhctoken.h index 43fa2fe5..d88a157f 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h @@ -3,7 +3,7 @@ Tokens for config file lexer and parser. */ /* - * Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2011-2012 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * @@ -364,7 +364,8 @@ enum dhcp_token { INITIAL_DELAY = 664, GETHOSTBYNAME = 665, PRIMARY6 = 666, - SECONDARY6 = 667 + SECONDARY6 = 667, + TOKEN_INFINIBAND = 668 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ |