--- embedaddon/libnet/src/libnet_build_rpc.c	2012/02/21 22:14:23	1.1
+++ embedaddon/libnet/src/libnet_build_rpc.c	2023/09/27 11:11:38	1.1.1.3
@@ -30,22 +30,15 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
-#if (!(_WIN32) || (__CYGWIN__)) 
-#include "../include/libnet.h"
-#else
-#include "../include/win32/libnet.h"
-#endif
+#include "common.h"
 
 libnet_ptag_t
-libnet_build_rpc_call(u_int32_t rm, u_int32_t xid, u_int32_t prog_num, 
-u_int32_t prog_vers, u_int32_t procedure, u_int32_t cflavor, u_int32_t clength, 
-u_int8_t *cdata, u_int32_t vflavor, u_int32_t vlength, u_int8_t *vdata, 
-u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag)
+libnet_build_rpc_call(uint32_t rm, uint32_t xid, uint32_t prog_num, 
+uint32_t prog_vers, uint32_t procedure, uint32_t cflavor, uint32_t clength, 
+uint8_t *cdata, uint32_t vflavor, uint32_t vlength, const uint8_t *vdata, 
+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_rpc_call_tcp_hdr rpc_hdr;
 
@@ -98,12 +91,12 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l
 
     if (rm)
     {
-        n = libnet_pblock_append(l, p, (u_int8_t *)&rpc_hdr, 
+        n = libnet_pblock_append(l, p, (uint8_t *)&rpc_hdr, 
                 LIBNET_RPC_CALL_TCP_H);
     }
     else
     {
-        n = libnet_pblock_append(l, p, (u_int8_t *)&rpc_hdr.rpc_common, 
+        n = libnet_pblock_append(l, p, (uint8_t *)&rpc_hdr.rpc_common, 
                 LIBNET_RPC_CALL_H);
     }
 
@@ -112,22 +105,9 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l
         goto bad;
     }
  
-    if ((payload && !payload_s) || (!payload && payload_s))
-    {
-        snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-			    "%s(): payload inconsistency\n", __func__);
-        goto bad;
-    }
+    /* boilerplate payload sanity check / append macro */
+    LIBNET_DO_PAYLOAD(l, p);
 
-    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_RPC_CALL_H));
 bad:
@@ -135,4 +115,9 @@ bad:
     return (-1);
 }
 
-/* EOF */
+/**
+ * Local Variables:
+ *  indent-tabs-mode: nil
+ *  c-file-style: "stroustrup"
+ * End:
+ */