--- embedaddon/libnet/src/libnet_build_802.1x.c	2012/02/21 22:14:23	1.1.1.1
+++ embedaddon/libnet/src/libnet_build_802.1x.c	2013/07/22 11:54:42	1.1.1.2
@@ -1,5 +1,5 @@
 /*
- *  $Id: libnet_build_802.1x.c,v 1.1.1.1 2012/02/21 22:14:23 misho Exp $
+ *  $Id: libnet_build_802.1x.c,v 1.1.1.2 2013/07/22 11:54:42 misho Exp $
  *
  *  libnet
  *  libnet_build_802.1x.c - 802.1x packet assembler
@@ -40,10 +40,10 @@
 #endif
 
 libnet_ptag_t
-libnet_build_802_1x(u_int8_t eap_ver, u_int8_t eap_type, u_int16_t length,
-u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag)
+libnet_build_802_1x(uint8_t eap_ver, uint8_t eap_type, uint16_t length,
+const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag)
 {
-    u_int32_t n, h;
+    uint32_t n, h;
     libnet_pblock_t *p;
     struct libnet_802_1x_hdr dot1x_hdr;
 
@@ -70,34 +70,19 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l
     dot1x_hdr.dot1x_type = eap_type;
     dot1x_hdr.dot1x_length = htons(length);
 
-    n = libnet_pblock_append(l, p, (u_int8_t *)&dot1x_hdr, LIBNET_802_1X_H);
-    if (n == -1)
+    n = libnet_pblock_append(l, p, (uint8_t *)&dot1x_hdr, LIBNET_802_1X_H);
+    if (n == (uint32_t)-1)
     {
         goto bad;
     }
+    
+    LIBNET_DO_PAYLOAD(l, p);
 
-    if ((payload && !payload_s) || (!payload && payload_s))
-    {
-        snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-                "%s(): payload inconsistency\n", __func__);
-        goto bad;
-    }
- 
-    if (payload && payload_s)
-    {
-        n = libnet_pblock_append(l, p, payload, payload_s);
-        if (n == -1)
-        {
-            goto bad;
-        }
-    }
- 
     return (ptag ? ptag : libnet_pblock_update(l, p, h,
             LIBNET_PBLOCK_802_1X_H));
 bad:
     libnet_pblock_delete(l, p);
     return (-1);
 }
-
 
 /* EOF */