xnu-6153.11.26.tar.gz

[apple/xnu.git] / bsd / net / if_llc.h

diff --git a/bsd/net/if_llc.h b/bsd/net/if_llc.h
index 7b0d446e2d92c2ece31bfa5b4230fee59f9fa863..f2ccb92bcba1897cf8bd4b160917ebdc0121fcb9 100644 (file)
--- a/bsd/net/if_llc.h
+++ b/bsd/net/if_llc.h
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000,2009 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -37,11 +37,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -57,7 +53,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *      @(#)if_llc.h   8.1 (Berkeley) 6/10/93
+ *     @(#)if_llc.h    8.1 (Berkeley) 6/10/93

  */
 
 #ifndef _NET_IF_LLC_H_
  */
 
 #ifndef _NET_IF_LLC_H_


@@ -73,55 +69,67 @@
  */
 
 struct llc {
  */
 
 struct llc {

-       u_char  llc_dsap;
-       u_char  llc_ssap;
+       u_int8_t llc_dsap;
+       u_int8_t llc_ssap;

        union {
        union {

-           struct {
-               u_char control;
-               u_char format_id;
-               u_char class_id;
-               u_char window_x2;
-           } type_u;
-           struct {
-               u_char num_snd_x2;
-               u_char num_rcv_x2;
-           } type_i;
-           struct {
-               u_char control;
-               u_char num_rcv_x2;
-           } type_s;
-           struct {
-               u_char control;
-               struct frmrinfo {
-                       u_char rej_pdu_0;
-                       u_char rej_pdu_1;
-                       u_char frmr_control;
-                       u_char frmr_control_ext;
-                       u_char frmr_cause;
-               } frmrinfo;
-           } type_frmr;
-           struct {
-               u_char control;
-               u_char org_code[3];
-               u_short ether_type;
-           } type_snap;
-           struct {
-               u_char control;
-               u_char control_ext;
-           } type_raw;
+               struct {
+                       u_int8_t control;
+                       u_int8_t format_id;
+                       u_int8_t class_id;
+                       u_int8_t window_x2;
+               } type_u;
+               struct {
+                       u_int8_t num_snd_x2;
+                       u_int8_t num_rcv_x2;
+               } type_i;
+               struct {
+                       u_int8_t control;
+                       u_int8_t num_rcv_x2;
+               } type_s;
+               struct {
+                       u_int8_t control;
+                       /*
+                        * We cannot put the following fields in a structure because
+                        * the structure rounding might cause padding.
+                        */
+                       u_int8_t frmr_rej_pdu0;
+                       u_int8_t frmr_rej_pdu1;
+                       u_int8_t frmr_control;
+                       u_int8_t frmr_control_ext;
+                       u_int8_t frmr_cause;
+               } type_frmr;
+               struct {
+                       u_int8_t  control;
+                       u_int8_t  org_code[3];
+                       u_int16_t ether_type;
+               } type_snap __attribute__((__packed__));
+               struct {
+                       u_int8_t control;
+                       u_int8_t control_ext;
+               } type_raw;

        } llc_un;
        } llc_un;

-};
-#define llc_control            llc_un.type_u.control
-#define        llc_control_ext        llc_un.type_raw.control_ext
-#define llc_fid                llc_un.type_u.format_id
-#define llc_class              llc_un.type_u.class_id
-#define llc_window             llc_un.type_u.window_x2
-#define llc_frmrinfo           llc_un.type_frmr.frmrinfo
-#define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0
-#define llc_frmr_pdu1          llc_un.type_frmr.frmrinfo.rej_pdu1
-#define llc_frmr_control       llc_un.type_frmr.frmrinfo.frmr_control
-#define llc_frmr_control_ext   llc_un.type_frmr.frmrinfo.frmr_control_ext
-#define llc_frmr_cause         llc_un.type_frmr.frmrinfo.frmr_control_ext
+} __attribute__((__packed__));
+
+struct frmrinfo {
+       u_int8_t frmr_rej_pdu0;
+       u_int8_t frmr_rej_pdu1;
+       u_int8_t frmr_control;
+       u_int8_t frmr_control_ext;
+       u_int8_t frmr_cause;
+} __attribute__((__packed__));
+
+#define llc_control             llc_un.type_u.control
+#define llc_control_ext         llc_un.type_raw.control_ext
+#define llc_fid                 llc_un.type_u.format_id
+#define llc_class               llc_un.type_u.class
+#define llc_window              llc_un.type_u.window_x2
+#define llc_frmrinfo            llc_un.type_frmr.frmr_rej_pdu0
+#define llc_frmr_pdu0           llc_un.type_frmr.frmr_rej_pdu0
+#define llc_frmr_pdu1           llc_un.type_frmr.frmr_rej_pdu1
+#define llc_frmr_control        llc_un.type_frmr.frmr_control
+#define llc_frmr_control_ext    llc_un.type_frmr.frmr_control_ext
+#define llc_frmr_cause          llc_un.type_frmr.frmr_cause
+#define llc_snap                llc_un.type_snap

 
 /*
  * Don't use sizeof(struct llc_un) for LLC header sizes
 
 /*
  * Don't use sizeof(struct llc_un) for LLC header sizes


@@ -129,44 +137,59 @@ struct llc {
 #define LLC_ISFRAMELEN 4
 #define LLC_UFRAMELEN  3
 #define LLC_FRMRLEN    7
 #define LLC_ISFRAMELEN 4
 #define LLC_UFRAMELEN  3
 #define LLC_FRMRLEN    7

+#define LLC_SNAPFRAMELEN 8

 
 /*
  * Unnumbered LLC format commands
  */
 
 /*
  * Unnumbered LLC format commands
  */

-#define LLC_UI         0x3
-#define LLC_UI_P       0x13
-#define LLC_DISC       0x43
-#define        LLC_DISC_P      0x53
-#define LLC_UA         0x63
-#define LLC_UA_P       0x73
-#define LLC_TEST       0xe3
-#define LLC_TEST_P     0xf3
-#define LLC_FRMR       0x87
-#define        LLC_FRMR_P      0x97
-#define LLC_DM         0x0f
-#define        LLC_DM_P        0x1f
-#define LLC_XID                0xaf
-#define LLC_XID_P      0xbf
-#define LLC_SABME      0x6f
-#define LLC_SABME_P    0x7f
+#define LLC_UI          0x3
+#define LLC_UI_P        0x13
+#define LLC_DISC        0x43
+#define LLC_DISC_P      0x53
+#define LLC_UA          0x63
+#define LLC_UA_P        0x73
+#define LLC_TEST        0xe3
+#define LLC_TEST_P      0xf3
+#define LLC_FRMR        0x87
+#define LLC_FRMR_P      0x97
+#define LLC_DM          0x0f
+#define LLC_DM_P        0x1f
+#define LLC_XID         0xaf
+#define LLC_XID_P       0xbf
+#define LLC_SABME       0x6f
+#define LLC_SABME_P     0x7f

 
 /*
  * Supervisory LLC commands
  */
 
 /*
  * Supervisory LLC commands
  */

-#define        LLC_RR          0x01
-#define        LLC_RNR         0x05
-#define        LLC_REJ         0x09
+#define LLC_RR          0x01
+#define LLC_RNR         0x05
+#define LLC_REJ         0x09

 
 /*
  * Info format - dummy only
  */
 
 /*
  * Info format - dummy only
  */

-#define        LLC_INFO        0x00
+#define LLC_INFO        0x00

 
 /*
  * ISO PDTR 10178 contains among others
  */
 
 /*
  * ISO PDTR 10178 contains among others
  */

-#define LLC_X25_LSAP   0x7e
-#define LLC_SNAP_LSAP  0xaa
-#define LLC_ISO_LSAP   0xfe
+#define LLC_8021D_LSAP  0x42
+#define LLC_X25_LSAP    0x7e
+#define LLC_SNAP_LSAP   0xaa
+#define LLC_ISO_LSAP    0xfe
+
+/*
+ * LLC XID definitions from 802.2, as needed
+ */
+
+#define LLC_XID_FORMAT_BASIC    0x81
+#define LLC_XID_BASIC_MINLEN    (LLC_UFRAMELEN + 3)
+
+#define LLC_XID_CLASS_I         0x1
+#define LLC_XID_CLASS_II        0x3
+#define LLC_XID_CLASS_III       0x5
+#define LLC_XID_CLASS_IV        0x7
+

 
 

-#endif
+#endif /* !_NET_IF_LLC_H_ */